From be4856c4ce9580cd76e3b68e3b4b8b0546af5331 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Mon, 3 Apr 2017 17:26:17 +0100 Subject: Updated changes with recent codebase --- app/assets/stylesheets/framework/common.scss | 1 - app/assets/stylesheets/framework/forms.scss | 4 ++ app/assets/stylesheets/pages/projects.scss | 2 +- app/views/admin/groups/_form.html.haml | 50 +++++++++++----------- app/views/admin/groups/new.html.haml | 2 - app/views/groups/_create_chat_team.html.haml | 24 +++++------ app/views/groups/_group_lfs_settings.html.haml | 19 ++++---- app/views/groups/new.html.haml | 6 +-- .../shared/_choose_group_avatar_button.html.haml | 2 +- app/views/shared/_group_form.html.haml | 3 +- app/views/shared/_group_tips.html.haml | 5 --- 11 files changed, 54 insertions(+), 64 deletions(-) delete mode 100644 app/views/shared/_group_tips.html.haml (limited to 'app') diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 6a7cc23c5d1..2c33b235980 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -31,7 +31,6 @@ .underlined-link { text-decoration: underline; } .hint { font-style: italic; color: $hint-color; } .light { color: $common-gray; } -.lighter { color: $gl-gray-light; } .slead { color: $common-gray; diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 432024779fd..862bc93b3f5 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -34,6 +34,10 @@ label { &.label-light { font-weight: 600; } + + &.label-block { + display: block; + } } .control-label { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index eb0c9d2faef..5cbd14974a5 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -305,7 +305,7 @@ } .fa-lock { - color: $orange-dark; + color: $red-500; } } } diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 589f4557b52..db4783f46d0 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -1,30 +1,30 @@ -= form_for [:admin, @group], html: { class: "form-horizontal" } do |f| - = form_errors(@group) - = render 'shared/group_form', f: f +.row.prepend-top-default + .col-lg-3.profile-settings-sidebar + %h4.prepend-top-0 + New Group + %p + A group is a collection of several projects. + Groups can be private, public or limited to any logged in users. + You can move existing projects to a group. + .col-lg-9 + = form_for [:admin, @group], html: { class: "form-horizontal" } do |f| + = form_errors(@group) + = render 'shared/group_form', f: f - .form-group.group-description-holder - = f.label :avatar, "Group avatar", class: 'control-label' - .col-sm-10 - = render 'shared/choose_group_avatar_button', f: f + .form-group.col-xs-12 + = f.label :avatar, 'Group avatar', class: 'label-light label-block' + = render 'shared/choose_group_avatar_button', f: f - = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group + .form-group.col-xs-12.project-visibility-level-holder + = f.label :visibility_level, class: 'label-light' do + Visibility Level + = link_to icon('question-circle'), help_page_path("public_access/public_access") + = render('shared/visibility_radios', model_method: :visibility_level, form: f, can_change_visibility_level: can_change_group_visibility_level?(@group), selected_level: visibility_level, form_model: @group) - .form-group - .col-sm-offset-2.col-sm-10 - = render 'shared/allow_request_access', form: f + .form-group.col-xs-12 + = render 'shared/allow_request_access', form: f - = render 'groups/group_lfs_settings', f: f + = render 'groups/group_lfs_settings', f: f - - if @group.new_record? - .form-group - .col-sm-offset-2.col-sm-10 - .alert.alert-info - = render 'shared/group_tips' - .form-actions - = f.submit 'Create group', class: "btn btn-create" - = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel" - - - else - .form-actions - = f.submit 'Save changes', class: "btn btn-save" - = link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel" + = f.submit "#{@group.new_record? ? 'Create group' : 'Save changes'}", class: 'btn btn-create' + = link_to 'Cancel', @group.new_record? ? admin_groups_path : admin_group_path(@group), class: 'btn btn-cancel' diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml index 8f9fe96249f..a57334b34a9 100644 --- a/app/views/admin/groups/new.html.haml +++ b/app/views/admin/groups/new.html.haml @@ -1,4 +1,2 @@ - page_title "New Group" -%h3.page-title New group -%hr = render 'form', visibility_level: default_group_visibility diff --git a/app/views/groups/_create_chat_team.html.haml b/app/views/groups/_create_chat_team.html.haml index 20de1b4c973..bcdb631ca92 100644 --- a/app/views/groups/_create_chat_team.html.haml +++ b/app/views/groups/_create_chat_team.html.haml @@ -1,16 +1,14 @@ -.form-group - = f.label :create_chat_team, class: 'control-label' do +.form-group.col-xs-12 + = f.label :create_chat_team, class: 'label-block' do %span.mattermost-icon = custom_icon('icon_mattermost') Mattermost - .col-sm-10 - .checkbox.js-toggle-container - = f.label :create_chat_team do - .js-toggle-button= f.check_box(:create_chat_team, { checked: true }, true, false) - Create a Mattermost team for this group - %br - %small.light.js-toggle-content - Mattermost URL: - = Settings.mattermost.host - %span> / - %span{ "data-bind-out" => "create_chat_team" } + .checkbox.js-toggle-container + = f.label :create_chat_team, class: 'label-block' do + .js-toggle-button= f.check_box(:create_chat_team, { checked: true }, true, false) + Create a Mattermost team for this group + %small.hint.js-toggle-content + Mattermost URL: + = Settings.mattermost.host + %span> / + %span{ "data-bind-out" => "create_chat_team" } diff --git a/app/views/groups/_group_lfs_settings.html.haml b/app/views/groups/_group_lfs_settings.html.haml index 3c622ca5c3c..9df36eb5827 100644 --- a/app/views/groups/_group_lfs_settings.html.haml +++ b/app/views/groups/_group_lfs_settings.html.haml @@ -1,11 +1,10 @@ - if current_user.admin? - .form-group - .col-sm-offset-2.col-sm-10 - .checkbox - = f.label :lfs_enabled do - = f.check_box :lfs_enabled, checked: @group.lfs_enabled? - %strong - Allow projects within this group to use Git LFS - = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs') - %br/ - %span.descr This setting can be overridden in each project. + .form-group.col-xs-12 + .checkbox + = f.label :lfs_enabled do + = f.check_box :lfs_enabled, checked: @group.lfs_enabled? + %strong + Allow projects within this group to use Git LFS + = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs') + %br/ + %span.descr This setting can be overridden in each project. diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index 08739ff7ed1..d51d88509af 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -15,9 +15,7 @@ = render 'shared/group_form', f: f, autofocus: true .form-group.col-xs-12 - = f.label :description, class: 'label-light' do - Group avatar - %br + = f.label :description, 'Group avatar', class: 'label-light label-block' = render 'shared/choose_group_avatar_button', f: f .form-group.col-xs-12.project-visibility-level-holder @@ -28,5 +26,5 @@ = render 'create_chat_team', f: f if Gitlab.config.mattermost.enabled - = f.submit 'Create group', class: "btn btn-create", tabindex: 3 + = f.submit 'Create group', class: 'btn btn-create', tabindex: 3 = link_to 'Cancel', dashboard_groups_path, class: 'btn btn-cancel' diff --git a/app/views/shared/_choose_group_avatar_button.html.haml b/app/views/shared/_choose_group_avatar_button.html.haml index 96956ccc9d8..ec40f47f398 100644 --- a/app/views/shared/_choose_group_avatar_button.html.haml +++ b/app/views/shared/_choose_group_avatar_button.html.haml @@ -4,4 +4,4 @@   %span.file_name.js-avatar-filename File name... = f.file_field :avatar, class: 'js-group-avatar-input hidden' -.lighter The maximum file size allowed is 200KB. +.hint The maximum file size allowed is 200KB. diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml index 89e176bb909..20b667f3921 100644 --- a/app/views/shared/_group_form.html.haml +++ b/app/views/shared/_group_form.html.haml @@ -7,7 +7,6 @@ %span Group name = f.text_field :name, placeholder: 'open-source', class: 'form-control' -<<<<<<< HEAD .form-group.col-xs-12 = f.label :path, class: 'label-light' do %span Group path @@ -35,6 +34,6 @@ .form-group.col-xs-12 = f.label :description, class: 'label-light' do Description - %span.lighter (optional) + %span.hint (optional) = f.text_area :description, maxlength: 250, class: 'form-control js-gfm-input', rows: 4 diff --git a/app/views/shared/_group_tips.html.haml b/app/views/shared/_group_tips.html.haml deleted file mode 100644 index 46e4340511a..00000000000 --- a/app/views/shared/_group_tips.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -%ul - %li A group is a collection of several projects - %li Members of a group may only view projects they have permission to access - %li Group project URLs are prefixed with the group namespace - %li Existing projects may be moved into a group -- cgit v1.2.3