diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-02-16 16:02:40 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-02-23 15:47:23 -0600 |
| commit | 103f5a116b1ae6ecbef69d6903b26f7259f090cb (patch) | |
| tree | 0e3d762be03e421a0f07a96c8ad94dc333724f89 /app/views/dashboard | |
| parent | 4802bd512a2492c7560acde077fee2f4cd9483b3 (diff) | |
| download | gitlab-ce-103f5a116b1ae6ecbef69d6903b26f7259f090cb.tar.gz | |
Created unit tests, fixtures and integration tests
Also changed the user_callout haml to a partial and
added the corresponding SVG icon
Diffstat (limited to 'app/views/dashboard')
| -rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 13 | ||||
| -rw-r--r-- | app/views/dashboard/projects/index.html.haml | 5 |
2 files changed, 5 insertions, 13 deletions
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index 0aec51cf7c9..48b0fd504f4 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -1,18 +1,5 @@ = content_for :flash_message do = render 'shared/project_limit' -#user-callout - .bordered-box.landing.content-block - = icon("times", class: "dismiss-icon") - .row - .col-sm-3.col-xs-12.svg-container - = custom_icon('icon_cycle_analytics_splash') - .col-sm-8.col-xs-12.inner-content - %h4 - Customize your experience - %p - Change syntax themes, default project pages, and more in preferences. - - = link_to "Check it out", profile_preferences_path, class: 'btn' .top-area %ul.nav-links = nav_link(page: [dashboard_projects_path, root_path]) do diff --git a/app/views/dashboard/projects/index.html.haml b/app/views/dashboard/projects/index.html.haml index 4f36a4a1c73..c7a8beab0d5 100644 --- a/app/views/dashboard/projects/index.html.haml +++ b/app/views/dashboard/projects/index.html.haml @@ -5,6 +5,8 @@ - page_title "Projects" - header_title "Projects", dashboard_projects_path += render partial: 'shared/user_callout' + - if @projects.any? || params[:filter_projects] = render 'dashboard/projects_head' @@ -15,3 +17,6 @@ = render 'projects' - else = render "zero_authorized_projects" + +:javascript + var userCallout = new gl.UserCallout();
\ No newline at end of file |