diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-06 19:11:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-06 19:11:05 +0000 |
| commit | d47b3e63d539985cb74d53c868fd7f2d295162f5 (patch) | |
| tree | 321067a9b24425bcdc2de35abe1d569f484bc0a3 /app | |
| parent | b93744e3008fd2ba313f62f9e5ad8820e0cc8582 (diff) | |
| parent | 639d428046938b5976f87726746d862441ee7036 (diff) | |
| download | gitlab-ce-d47b3e63d539985cb74d53c868fd7f2d295162f5.tar.gz | |
Merge branch 'more-opengraph' into 'master'
Add Open Graph data for group, project and commit.
See merge request !2211
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 25 | ||||
| -rw-r--r-- | app/views/layouts/_head.html.haml | 7 | ||||
| -rw-r--r-- | app/views/layouts/group.html.haml | 7 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/commit/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
6 files changed, 22 insertions, 30 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 791cb9e50bd..82f805fa444 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -27,35 +27,20 @@ module PageLayoutHelper # # Returns an HTML-safe String. def page_description(description = nil) - @page_description ||= page_description_default - if description.present? @page_description = description.squish - else + elsif @page_description.present? sanitize(@page_description, tags: []).truncate_words(30) end end - # Default value for page_description when one hasn't been defined manually by - # a view - def page_description_default - if @project - @project.description || brand_title - else - brand_title - end - end - def page_image default = image_url('gitlab_logo.png') - if @project - @project.avatar_url || default - elsif @user - avatar_icon(@user) - else - default - end + subject = @project || @user || @group + + image = subject.avatar_url if subject.present? + image || default end # Define or get attributes to be used as Twitter card metadata diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index dd133ee8b56..38ca4f91c4d 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -1,10 +1,13 @@ +- page_description brand_title unless page_description + +- site_name = "GitLab" %head{prefix: "og: http://ogp.me/ns#"} %meta{charset: "utf-8"} %meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge'} -# Open Graph - http://ogp.me/ %meta{property: 'og:type', content: "object"} - %meta{property: 'og:site_name', content: "GitLab"} + %meta{property: 'og:site_name', content: site_name} %meta{property: 'og:title', content: page_title} %meta{property: 'og:description', content: page_description} %meta{property: 'og:image', content: page_image} @@ -17,7 +20,7 @@ %meta{property: 'twitter:image', content: page_image} = page_card_meta_tags - %title= page_title('GitLab') + %title= page_title(site_name) %meta{name: "description", content: page_description} = favicon_link_tag 'favicon.ico' diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index 31888c5580e..2e483b7148d 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -1,5 +1,6 @@ -- page_title @group.name -- header_title group_title(@group) unless header_title -- sidebar "group" unless sidebar +- page_title @group.name +- page_description @group.description unless page_description +- header_title group_title(@group) unless header_title +- sidebar "group" unless sidebar = render template: "layouts/application" diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index abf73bcc709..ab527e8e438 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -1,6 +1,7 @@ -- page_title @project.name_with_namespace -- header_title project_title(@project) unless header_title -- sidebar "project" unless sidebar +- page_title @project.name_with_namespace +- page_description @project.description unless page_description +- header_title project_title(@project) unless header_title +- sidebar "project" unless sidebar - content_for :scripts_body_top do - project = @target_project || @project diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml index 069b8b1f169..58aa45e8d2c 100644 --- a/app/views/projects/commit/show.html.haml +++ b/app/views/projects/commit/show.html.haml @@ -1,4 +1,6 @@ -- page_title "#{@commit.title} (#{@commit.short_id})", "Commits" +- page_title "#{@commit.title} (#{@commit.short_id})", "Commits" +- page_description @commit.description + = render "projects/commits/header_title" = render "commit_box" - if @ci_commit diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index ffbe445b447..8436be433b1 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -68,4 +68,4 @@ = render 'projects/last_commit', commit: @repository.commit, project: @project %div{class: "project-show-#{default_project_view}"} - = render default_project_view
\ No newline at end of file + = render default_project_view |