New project page with bootstrap3

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

New project page with bootstrap3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent a11d25b1
Showing 4 changed files with 89 additions and 85 deletions Show diff stats
app/views/dashboard/projects.html.haml
app/views/layouts/_head_panel.html.haml
app/views/projects/_visibility_level.html.haml
app/views/projects/new.html.haml
@@ -25,28 +25,29 @@
   All projects you have access to are listed here. Public projects are not included here unless you are a member
 %hr
 .row
-  .col-md-3.hidden-sm.hidden-xs
-    %ul.nav.nav-pills.nav-stacked
-      = nav_tab :scope, nil do
-        = link_to projects_dashboard_filter_path(scope: nil) do
-          All
-          %span.pull-right
-            = current_user.authorized_projects.count
-      = nav_tab :scope, 'personal' do
-        = link_to projects_dashboard_filter_path(scope: 'personal') do
-          Personal
-          %span.pull-right
-            = current_user.personal_projects.count
-      = nav_tab :scope, 'joined' do
-        = link_to projects_dashboard_filter_path(scope: 'joined') do
-          Joined
-          %span.pull-right
-            = current_user.authorized_projects.joined(current_user).count
-      = nav_tab :scope, 'owned' do
-        = link_to projects_dashboard_filter_path(scope: 'owned') do
-          Owned
-          %span.pull-right
-            = current_user.owned_projects.count
+  .col-md-3.hidden-sm.hidden-xs.side-filters
+    %fieldset
+      %ul.nav.nav-pills.nav-stacked
+        = nav_tab :scope, nil do
+          = link_to projects_dashboard_filter_path(scope: nil) do
+            All
+            %span.pull-right
+              = current_user.authorized_projects.count
+        = nav_tab :scope, 'personal' do
+          = link_to projects_dashboard_filter_path(scope: 'personal') do
+            Personal
+            %span.pull-right
+              = current_user.personal_projects.count
+        = nav_tab :scope, 'joined' do
+          = link_to projects_dashboard_filter_path(scope: 'joined') do
+            Joined
+            %span.pull-right
+              = current_user.authorized_projects.joined(current_user).count
+        = nav_tab :scope, 'owned' do
+          = link_to projects_dashboard_filter_path(scope: 'owned') do
+            Owned
+            %span.pull-right
+              = current_user.owned_projects.count
     %fieldset
       %legend Visibility
@@ -8,34 +8,35 @@
         %span.separator
       %h1.project_name= title
-      %ul.nav.navbar-nav
-        %li
-          %a
-            %div.gl-hide.turbolink-spinner
-              %i.icon-refresh.icon-spin
-              Loading...
-        %li.hidden-sm
-          = render "layouts/search"
-        %li
-          = link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
-            %i.icon-globe
-        %li
-          = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
-            %i.icon-paste
-        - if current_user.is_admin?
+      .navbar-collapse.collapse
+        %ul.nav.navbar-nav
           %li
-            = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
-              %i.icon-cogs
-        - if current_user.can_create_project?
+            %a
+              %div.gl-hide.turbolink-spinner
+                %i.icon-refresh.icon-spin
+                Loading...
+          %li.hidden-sm
+            = render "layouts/search"
           %li
-            = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project'  do
-              %i.icon-plus
-        %li
-          = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"'  do
-            %i.icon-user
-        %li
-          = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout'  do
-            %i.icon-signout
-        %li
-          = link_to current_user, class: "profile-pic", id: 'profile-pic' do
-            = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
+            = link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
+              %i.icon-globe
+          %li
+            = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
+              %i.icon-paste
+          - if current_user.is_admin?
+            %li
+              = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
+                %i.icon-cogs
+          - if current_user.can_create_project?
+            %li
+              = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project'  do
+                %i.icon-plus
+          %li
+            = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"'  do
+              %i.icon-user
+          %li
+            = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout'  do
+              %i.icon-signout
+          %li
+            = link_to current_user, class: "profile-pic", id: 'profile-pic' do
+              = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
 .form-group.project-visibility-level-holder
-  = f.label :visibility_level do
+  = f.label :visibility_level, class: 'control-label' do
     Visibility Level
     = link_to "(?)", help_public_access_path
-  - if can_change_visibility_level
-    - Gitlab::VisibilityLevel.values.each do |level|
-      - restricted = restricted_visibility_levels.include?(level)
-      .col-sm-10
-        = f.radio_button :visibility_level, level, checked: (visibility_level == level), disabled: restricted
-        %span.descr{:class => ("restricted" if restricted)}
-          = label :project_visibility_level, level do
-            = visibility_level_icon(level)
-            %strong
-              = visibility_level_label(level)
-          .light= visibility_level_description(level)
-    - unless restricted_visibility_levels.empty?
+  .col-sm-10
+    - if can_change_visibility_level
+      - Gitlab::VisibilityLevel.values.each do |level|
+        .append-bottom-10
+          - restricted = restricted_visibility_levels.include?(level)
+          = f.radio_button :visibility_level, level, checked: (visibility_level == level), disabled: restricted
+          %span.descr{:class => ("restricted" if restricted)}
+            = label :project_visibility_level, level do
+              = visibility_level_icon(level)
+              %strong
+                = visibility_level_label(level)
+            .light.prepend-left-20= visibility_level_description(level)
+      - unless restricted_visibility_levels.empty?
+        .col-sm-10
+          %span.info
+            Some visibility level settings have been restricted by the administrator.
+    - else
       .col-sm-10
         %span.info
-          Some visibility level settings have been restricted by the administrator.
-  - else
-    .col-sm-10
-      %span.info
-        = visibility_level_icon(visibility_level)
-        %strong
-          = visibility_level_label(visibility_level)
-        .light= visibility_level_description(visibility_level)
+          = visibility_level_icon(visibility_level)
+          %strong
+            = visibility_level_label(visibility_level)
+          .light= visibility_level_description(visibility_level)
@@ -3,50 +3,51 @@
     = render 'projects/errors'
   .project-edit-content
-    = form_for @project, remote: true do |f|
+    = form_for @project, remote: true, html: { class: 'new_project form-horizontal' } do |f|
       .form-group.project-name-holder
-        = f.label :name do
+        = f.label :name, class: 'control-label' do
           %strong Project name
         .col-sm-10
-          = f.text_field :name, placeholder: "Example Project", class: "input-lg", tabindex: 1, autofocus: true
+          = f.text_field :name, placeholder: "Example Project", class: "form-control", tabindex: 1, autofocus: true
           %span.help-inline
             = link_to "#", class: 'js-toggle-visibility-link' do
               %span Customize repository name?
       .form-group.js-toggle-visibility-container.gl-hide
-        = f.label :path do
+        = f.label :path, class: 'control-label' do
           %span Repository name
         .col-sm-10
-          .input-append
-            = f.text_field :path
-            %span.add-on .git
+          .input-group
+            = f.text_field :path, class: 'form-control'
+            %span.input-group-addon .git
       - if current_user.can_select_namespace?
         .form-group
-          = f.label :namespace_id do
+          = f.label :namespace_id, class: 'control-label' do
             %span Namespace
           .col-sm-10
             = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen', tabindex: 2}
       .form-group
+        .col-sm-2
         .col-sm-10
           = link_to "#", class: 'appear-link' do
             %i.icon-upload-alt
             %span Import existing repository?
       .form-group.appear-data.import-url-data
-        = f.label :import_url do
+        = f.label :import_url, class: 'control-label' do
           %span Import existing repo
         .col-sm-10
-          = f.text_field :import_url, class: 'input-lg', placeholder: 'https://github.com/randx/six.git'
+          = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
           .light
             URL must be cloneable
       .form-group
-        = f.label :description do
+        = f.label :description, class: 'control-label' do
           Description
           %span.light (optional)
         .col-sm-10
-          = f.text_area :description, placeholder: "Awesome project", class: "input-lg", rows: 3, maxlength: 250, tabindex: 3
+          = f.text_area :description, placeholder: "Awesome project", class: "form-control", rows: 3, maxlength: 250, tabindex: 3
       = render "visibility_level", f: f, visibility_level: gitlab_config.default_projects_features.visibility_level, can_change_visibility_level: true
       .form-actions
@@ -54,7 +55,7 @@
         - if current_user.can_create_group?
           .pull-right
-            .col-sm-10.light
+            .light
               Need a group for several dependent projects?
               = link_to new_group_path, class: "btn btn-tiny" do
                 Create a group