diff options
| author | Camil Staps <info@camilstaps.nl> | 2019-01-28 13:19:53 +0100 |
|---|---|---|
| committer | Camil Staps <info@camilstaps.nl> | 2019-08-07 20:49:14 +0200 |
| commit | 6baff6504b234e209a5e1d78349dbd2589d5d7e8 (patch) | |
| tree | 809269461586e00974cb8c309c77aca77b058e49 /app/views/projects | |
| parent | 91f574b820e03b4abb97a8351e420d1ef24e8505 (diff) | |
| download | gitlab-ce-6baff6504b234e209a5e1d78349dbd2589d5d7e8.tar.gz | |
Change sorting options for starrers: name (asc/desc), most/least recent star
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/starrers/_starrer.html.haml | 12 | ||||
| -rw-r--r-- | app/views/projects/starrers/index.html.haml | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/views/projects/starrers/_starrer.html.haml b/app/views/projects/starrers/_starrer.html.haml index d8eee17dff4..377d62f8abd 100644 --- a/app/views/projects/starrers/_starrer.html.haml +++ b/app/views/projects/starrers/_starrer.html.haml @@ -1,19 +1,19 @@ -- user = local_assigns.fetch(:user) +- starrer = local_assigns.fetch(:starrer) .col-lg-3.col-md-4.col-sm-12 .card .card-body - = image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: '' + = image_tag avatar_icon_for_user(starrer.user, 40), class: "avatar s40", alt: '' .user-info .block-truncated - = link_to user.name, user_path(user), class: 'user js-user-link', data: { user_id: user.id } + = link_to starrer.user.name, user_path(starrer.user), class: 'user js-user-link', data: { user_id: starrer.user.id } .block-truncated - %span.cgray= user.to_reference + %span.cgray= starrer.user.to_reference - - if user == current_user + - if starrer.user == current_user %span.badge.badge-success.prepend-left-5= _("It's you") .block-truncated - = time_ago_with_tooltip(user.starred_since) + = time_ago_with_tooltip(starrer.starred_since) diff --git a/app/views/projects/starrers/index.html.haml b/app/views/projects/starrers/index.html.haml index ef1781e378c..662da94107a 100644 --- a/app/views/projects/starrers/index.html.haml +++ b/app/views/projects/starrers/index.html.haml @@ -14,16 +14,16 @@ %button.user-search-btn{ type: "submit", "aria-label" => _("Submit search") } = icon("search") .dropdown.inline.user-sort-dropdown - = dropdown_toggle(users_sort_options_hash[@sort], { toggle: 'dropdown' }) + = dropdown_toggle(starrers_sort_options_hash[@sort], { toggle: 'dropdown' }) %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable %li.dropdown-header = _("Sort by") - - users_sort_options_hash.each do |value, title| + - starrers_sort_options_hash.each do |value, title| %li = link_to filter_user_path(sort: value), class: ("is-active" if @sort == value) do = title - if @starrers.size > 0 .row.prepend-top-10 - = render partial: 'starrer', collection: @starrers, as: :user + = render partial: 'starrer', collection: @starrers, as: :starrer - else .nothing-here-block Nobody has starred this repository yet |