diff options
author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-04-05 23:41:28 +1100 |
---|---|---|
committer | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-05-06 16:41:46 +0100 |
commit | 6daec21a161821816b1eda03b52369d61685fe48 (patch) | |
tree | d2a967ffaf26efac40c95e4482109f632f6b9fa7 /app/views/explore | |
parent | 6bab1f8dde3365007c83f3719758a96589673225 (diff) | |
download | gitlab-ce-6daec21a161821816b1eda03b52369d61685fe48.tar.gz |
Updated layout for various breakpoints
Updated translations
Adds sort direction dropdown
Allows the project list sorting direction to be changed,
available options can be sorted ascending or descending.
Implements the changes from the UX review.
Diffstat (limited to 'app/views/explore')
-rw-r--r-- | app/views/explore/projects/index.html.haml | 5 | ||||
-rw-r--r-- | app/views/explore/projects/starred.html.haml | 5 | ||||
-rw-r--r-- | app/views/explore/projects/trending.html.haml | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml index dd2bf6a5ef8..fed226a184c 100644 --- a/app/views/explore/projects/index.html.haml +++ b/app/views/explore/projects/index.html.haml @@ -5,9 +5,10 @@ = render_dashboard_gold_trial(current_user) - if current_user - = render 'dashboard/projects_head' + = render 'dashboard/projects_head', is_explore: true - else = render 'explore/head' -= render 'explore/projects/nav' +- unless Feature.enabled?(:project_list_filter_bar) + = render 'explore/projects/nav' = render 'projects', projects: @projects diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml index dd2bf6a5ef8..fed226a184c 100644 --- a/app/views/explore/projects/starred.html.haml +++ b/app/views/explore/projects/starred.html.haml @@ -5,9 +5,10 @@ = render_dashboard_gold_trial(current_user) - if current_user - = render 'dashboard/projects_head' + = render 'dashboard/projects_head', is_explore: true - else = render 'explore/head' -= render 'explore/projects/nav' +- unless Feature.enabled?(:project_list_filter_bar) + = render 'explore/projects/nav' = render 'projects', projects: @projects diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml index dd2bf6a5ef8..e4e612175f5 100644 --- a/app/views/explore/projects/trending.html.haml +++ b/app/views/explore/projects/trending.html.haml @@ -5,9 +5,10 @@ = render_dashboard_gold_trial(current_user) - if current_user - = render 'dashboard/projects_head' + = render 'dashboard/projects_head', is_explore: true, is_explore_trending: true - else = render 'explore/head' -= render 'explore/projects/nav' +- unless Feature.enabled?(:project_list_filter_bar) + = render 'explore/projects/nav' = render 'projects', projects: @projects |