diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-09-18 11:28:50 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-09-18 11:48:06 +0300 |
commit | 5faa6e75d09cf4c957a14c88b28c156610d035a7 (patch) | |
tree | af7393ee5919db36ea1909e6bf3f7d069bc9af67 /app/views | |
parent | 7b10bd954f2fd593d66f3920988a312375d34eea (diff) | |
parent | 0aec0d53b10078613b66b0d41424ee4264ae6406 (diff) |
Merge branch 'master' into project-header-titles
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/ci/helps/oauth2.html.haml | 20 | ||||
-rw-r--r-- | app/views/ci/helps/show.html.haml | 40 | ||||
-rw-r--r-- | app/views/layouts/ci/_nav_admin.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/ci/_nav_dashboard.html.haml | 24 | ||||
-rw-r--r-- | app/views/layouts/ci/application.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/_admin.html.haml | 7 | ||||
-rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 14 | ||||
-rw-r--r-- | app/views/layouts/nav/_project.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/blob/_upload.html.haml | 10 | ||||
-rw-r--r-- | app/views/projects/blob/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/blob/show.html.haml | 6 |
11 files changed, 35 insertions, 101 deletions
diff --git a/app/views/ci/helps/oauth2.html.haml b/app/views/ci/helps/oauth2.html.haml deleted file mode 100644 index 2031b7340d4..00000000000 --- a/app/views/ci/helps/oauth2.html.haml +++ /dev/null @@ -1,20 +0,0 @@ -.welcome-block - %h1 - Welcome to GitLab CI - %p - GitLab CI integrates with your GitLab installation and runs tests for your projects. - - %h3 You need only 2 steps to set it up - - %ol - %li - In the GitLab admin area under OAuth applications create a new entry. The redirect url should be - %code= callback_ci_user_sessions_url - %li - Update the GitLab CI config with the application id and the application secret from GitLab. - %li - Restart your GitLab CI instance - %li - Refresh this page when GitLab CI has started again - - diff --git a/app/views/ci/helps/show.html.haml b/app/views/ci/helps/show.html.haml deleted file mode 100644 index 9b32d529c60..00000000000 --- a/app/views/ci/helps/show.html.haml +++ /dev/null @@ -1,40 +0,0 @@ -.jumbotron - %h2 - GitLab CI - %span= GitlabCi::VERSION - %small= GitlabCi::REVISION - %p - GitLab CI integrates with your GitLab installation and run tests for your projects. - %br - Login with your GitLab account, add a project with one click and enjoy running your tests. - %br - Read more about GitLab CI at #{link_to "about.gitlab.com/gitlab-ci", "https://about.gitlab.com/gitlab-ci/", target: "_blank"}. - - -.bs-callout.bs-callout-success - %h4 - = link_to 'https://gitlab.com/gitlab-org/gitlab-ci/blob/master/doc/api' do - %i.fa.fa-cogs - API - %p Explore how you can access GitLab CI via the API. - -.bs-callout.bs-callout-info - %h4 - = link_to 'https://gitlab.com/gitlab-org/gitlab-ci/tree/master/doc/examples' do - %i.fa.fa-info-sign - Build script examples - %p This includes the build script we use to test GitLab CE. - -.bs-callout.bs-callout-danger - %h4 - = link_to 'https://gitlab.com/gitlab-org/gitlab-ci/issues' do - %i.fa.fa-bug - Issue tracker - %p Reports about recent bugs and problems.. - -.bs-callout.bs-callout-warning - %h4 - = link_to 'http://feedback.gitlab.com/forums/176466-general/category/64310-gitlab-ci' do - %i.fa.fa-thumbs-up - Feedback forum - %p Suggest improvements or new features for GitLab CI. diff --git a/app/views/layouts/ci/_nav_admin.html.haml b/app/views/layouts/ci/_nav_admin.html.haml index 4e4c8ab1079..e9974c85733 100644 --- a/app/views/layouts/ci/_nav_admin.html.haml +++ b/app/views/layouts/ci/_nav_admin.html.haml @@ -1,9 +1,9 @@ %ul.nav.nav-sidebar = nav_link do - = link_to ci_root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do + = link_to admin_root_path, title: 'Back to admin', data: {placement: 'right'}, class: 'back-link' do = icon('caret-square-o-left fw') %span - Back to dashboard + Back to admin %li.separate-item = nav_link path: 'projects#index' do diff --git a/app/views/layouts/ci/_nav_dashboard.html.haml b/app/views/layouts/ci/_nav_dashboard.html.haml deleted file mode 100644 index 55bacb66061..00000000000 --- a/app/views/layouts/ci/_nav_dashboard.html.haml +++ /dev/null @@ -1,24 +0,0 @@ -%ul.nav.nav-sidebar - = nav_link do - = link_to root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do - = icon('caret-square-o-left fw') - %span - Back to GitLab - %li.separate-item - = nav_link path: 'projects#index' do - = link_to ci_root_path do - %i.fa.fa-home - %span - Projects - - if current_user && current_user.is_admin? - %li - = link_to ci_admin_projects_path do - %i.fa.fa-cogs - %span - Admin - = nav_link path: "helps#show" do - = link_to ci_help_path do - %i.fa.fa-info - %span - Help - diff --git a/app/views/layouts/ci/application.html.haml b/app/views/layouts/ci/application.html.haml index b9f871d5447..9cc7fb85142 100644 --- a/app/views/layouts/ci/application.html.haml +++ b/app/views/layouts/ci/application.html.haml @@ -8,4 +8,4 @@ - else = render "layouts/header/public", title: header_title - = render 'layouts/ci/page', sidebar: 'nav_dashboard' + = render 'layouts/ci/page' diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml index 3fe0127041e..2079feeeab6 100644 --- a/app/views/layouts/nav/_admin.html.haml +++ b/app/views/layouts/nav/_admin.html.haml @@ -4,7 +4,7 @@ = icon('dashboard fw') %span Overview - = nav_link(controller: :projects) do + = nav_link(controller: [:admin, :projects]) do = link_to admin_namespaces_projects_path, title: 'Projects', data: {placement: 'right'} do = icon('cube fw') %span @@ -24,6 +24,11 @@ = icon('key fw') %span Deploy Keys + = nav_link do + = link_to ci_admin_projects_path, title: 'Continuous Integration', data: {placement: 'right'} do + = icon('building fw') + %span + Continuous Integration = nav_link(controller: :logs) do = link_to admin_logs_path, title: 'Logs', data: {placement: 'right'} do = icon('file-text fw') diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 5381002ecf5..3bda7c46959 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -1,5 +1,5 @@ %ul.nav.nav-sidebar - = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do + = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: 'home'}) do = link_to root_path, title: 'Projects', data: {placement: 'right'} do = icon('home fw') %span @@ -31,6 +31,11 @@ %span Merge Requests %span.count= current_user.assigned_merge_requests.opened.count + = nav_link(path: 'ci/projects#index') do + = link_to ci_projects_path, title: 'Continuous Integration', data: {placement: 'right'} do + = icon('building fw') + %span + Continuous Integration = nav_link(controller: :snippets) do = link_to dashboard_snippets_path, title: 'Your snippets', data: {placement: 'right'} do = icon('clipboard fw') @@ -41,13 +46,10 @@ = icon('question-circle fw') %span Help + + %li.separate-item = nav_link(controller: :profile) do = link_to profile_path, title: 'Profile settings', data: {placement: 'bottom'} do = icon('user fw') %span Profile Settings - = nav_link(controller: :ci) do - = link_to ci_root_path, title: 'Continuous Integration', data: {placement: 'right'} do - = icon('building fw') - %span - GitLab CI diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 8ce46d4865b..a218ec7486c 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -76,6 +76,13 @@ Merge Requests %span.count.merge_counter= @project.merge_requests.opened.count + - if @project.gitlab_ci? + = nav_link(controller: [:ci, :project]) do + = link_to ci_project_path(@project.gitlab_ci_project), title: 'Continuous Integration', data: {placement: 'right'} do + = icon('building fw') + %span + Continuous Integration + - if project_nav_tab? :settings = nav_link(controller: [:project_members, :teams]) do = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab', data: {placement: 'right'} do diff --git a/app/views/projects/blob/_upload.html.haml b/app/views/projects/blob/_upload.html.haml index 2cfb79486dc..1a1df127703 100644 --- a/app/views/projects/blob/_upload.html.haml +++ b/app/views/projects/blob/_upload.html.haml @@ -3,12 +3,12 @@ .modal-content .modal-header %a.close{href: "#", "data-dismiss" => "modal"} × - %h3.page-title #{@title} + %h3.page-title #{title} %p.light From branch %strong= @ref .modal-body - = form_tag @form_path, method: @method, class: 'blob-file-upload-form-js form-horizontal' do + = form_tag form_path, method: method, class: 'blob-file-upload-form-js form-horizontal' do .dropzone .dropzone-previews.blob-upload-dropzone-previews %p.dz-message.light @@ -17,12 +17,12 @@ %br .dropzone-alerts{class: "alert alert-danger data", style: "display:none"} = render 'shared/commit_message_container', params: params, - placeholder: @placeholder + placeholder: placeholder .form-group .col-sm-offset-2.col-sm-10 - = button_tag @button_title, class: 'btn btn-small btn-primary btn-upload-file', id: 'submit-all' + = button_tag button_title, class: 'btn btn-small btn-primary btn-upload-file', id: 'submit-all' = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal" :coffeescript disableButtonIfEmptyField $('.blob-file-upload-form-js').find('#commit_message'), '.btn-upload-file' - new BlobFileDropzone($('.blob-file-upload-form-js'), '#{@method}') + new BlobFileDropzone($('.blob-file-upload-form-js'), '#{method}') diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml index 126e21d7b4d..1950586b112 100644 --- a/app/views/projects/blob/new.html.haml +++ b/app/views/projects/blob/new.html.haml @@ -7,7 +7,7 @@ { class: 'upload-link', 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal'} an existing one -= render 'projects/blob/upload' += render 'projects/blob/upload', title: 'Upload', placeholder: 'Upload new file', button_title: 'Upload file', form_path: namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post .file-editor = form_tag(namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post, class: 'form-horizontal form-new-file js-requires-input') do diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml index 1f7859198d8..fa4be4a1bc4 100644 --- a/app/views/projects/blob/show.html.haml +++ b/app/views/projects/blob/show.html.haml @@ -11,4 +11,8 @@ - if allowed_tree_edit? = render 'projects/blob/remove' - = render 'projects/blob/upload' + + - title = "Replace #{@blob.name}" + = render 'projects/blob/upload', title: title, placeholder: title, + button_title: 'Replace file', form_path: namespace_project_update_blob_path(@project.namespace, @project, @id), + method: :put |