UI: add new button, top panel restyle etc

27 files changed, 88 insertions, 64 deletions

diff --git a/app/assets/images/Arrow-Left-UI.PNG b/app/assets/images/Arrow-Left-UI.PNG
new file mode 100644
index 00000000000..80a34b411f1
--- /dev/null
+++ b/app/assets/images/Arrow-Left-UI.PNG
diff --git a/app/assets/images/Gear-UI.PNG b/app/assets/images/Gear-UI.PNG
index c1d84e06da6..7720f0eb21a 100644
--- a/app/assets/images/Gear-UI.PNG
+++ b/app/assets/images/Gear-UI.PNG
diff --git a/app/assets/images/Home-UI.PNG b/app/assets/images/Home-UI.PNG
index f57f8d09c86..f739af3c2ac 100644
--- a/app/assets/images/Home-UI.PNG
+++ b/app/assets/images/Home-UI.PNG
diff --git a/app/assets/images/Info-UI.PNG b/app/assets/images/Info-UI.PNG
new file mode 100644
index 00000000000..92795486913
--- /dev/null
+++ b/app/assets/images/Info-UI.PNG
diff --git a/app/assets/images/Rss-UI.PNG b/app/assets/images/Rss-UI.PNG
new file mode 100644
index 00000000000..2116571ebbc
--- /dev/null
+++ b/app/assets/images/Rss-UI.PNG
diff --git a/app/assets/images/add_new.png b/app/assets/images/add_new.png
index 12fa22c88c9..bf2fbec2964 100644
--- a/app/assets/images/add_new.png
+++ b/app/assets/images/add_new.png
diff --git a/app/assets/images/rss_icon_gray.png b/app/assets/images/rss_icon_gray.png
deleted file mode 100644
index 90e509aa4bd..00000000000
--- a/app/assets/images/rss_icon_gray.png
+++ /dev/null
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index d6aaec73e6e..eae9383a02e 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -556,8 +556,13 @@ a.project-update.titled {
 }
 
 .add_new { 
-  float:right;
-  padding: 6px 12px;
+  float: right;
+  background: #A6B807;
+  color: white;
+  padding: 4px 10px;
+  @include round-borders-all(4px);
+  font-size:11px;
+  margin: 10px 0;
 }
 
 
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss
index 01ef6c345d0..a360b21aea4 100644
--- a/app/assets/stylesheets/style.scss
+++ b/app/assets/stylesheets/style.scss
@@ -125,7 +125,7 @@ table  thead th{
 td, th{ padding: .9em 1em; vertical-align: middle; }
 
 table  thead .image{width:100px}
-table  tr:hover, .listed_items tr.odd:hover{background-color:#FFFFCF}
+.listed_items tr.odd:hover{background-color:#FFFFCF}
 /* eo Tables */
 
 /* Buttons */
diff --git a/app/assets/stylesheets/top_panel.scss b/app/assets/stylesheets/top_panel.scss
index 98f5ab4c454..2490aa9226a 100644
--- a/app/assets/stylesheets/top_panel.scss
+++ b/app/assets/stylesheets/top_panel.scss
@@ -1,18 +1,18 @@
 .main_links {
-  width:124px;
+  width:90px;
+  margin-right:40px;
   float:left;
+  background:#ddd;
+  @include round-borders-all(8px);
+  border-color:#ccc;
+
   a {
     position: relative;
     float:left;
-    padding: 4px;
-
-    &.home { 
-      margin-right:15px;
-      width: 26px;
-    }
+    padding: 3px 10px;
 
-    &.admin { 
-      width: 21px;
+    img { 
+      width: 22px;
     }
   }
 }
@@ -147,8 +147,9 @@ body header {
 
 .rss-icon { 
   margin:0 15px;
-  padding:5px;
+  padding:3px;
   border:1px solid #ccc;
   border-radius:3px;
   float:left;
+  background:#DDD;
 }
diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss
index 42eb060f8fd..57070871680 100644
--- a/app/assets/stylesheets/tree.scss
+++ b/app/assets/stylesheets/tree.scss
@@ -113,3 +113,9 @@ table.highlighttable .linenodiv pre {
   padding-right: 4px;
   color:#888;
 }
+
+.tree-item { 
+  &:hover { 
+    background: #FFFFCF;
+  }
+}
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
new file mode 100644
index 00000000000..b22280d2fd2
--- /dev/null
+++ b/app/controllers/help_controller.rb
@@ -0,0 +1,4 @@
+class HelpController < ApplicationController
+  def index
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0e4ad533ad7..9f0f1e68954 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -89,4 +89,8 @@ module ApplicationHelper
   def profile_layout
     controller.controller_name == "dashboard" || current_page?(projects_path) || controller.controller_name == "profile" || controller.controller_name == "keys"
   end
+
+  def help_layout
+    controller.controller_name == "help" 
+  end
 end
diff --git a/app/views/commits/index.html.haml b/app/views/commits/index.html.haml
index 0c93f163787..5a760b3a2dc 100644
--- a/app/views/commits/index.html.haml
+++ b/app/views/commits/index.html.haml
@@ -3,7 +3,7 @@
   = content_for :rss_icon do 
     .rss-icon
       = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }) do 
-        = image_tag "rss_icon_gray.png", :width => 16, :title => "feed"
+        = image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
 
 - if params[:path]
   %h2
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/app/views/help/index.html.haml
diff --git a/app/views/issues/_head.html.haml b/app/views/issues/_head.html.haml
new file mode 100644
index 00000000000..7d44b87564f
--- /dev/null
+++ b/app/views/issues/_head.html.haml
@@ -0,0 +1,14 @@
+.top-tabs
+  = link_to project_issues_path(@project), :class => "tab #{'active' if current_page?(project_issues_path(@project)) }" do 
+    %span 
+    Issues  
+  
+  -#= link_to project_issues_path(@project), :class => "tab" do 
+    %span 
+    Milestones
+
+  - if current_page?(project_issues_path(@project))
+    - if can? current_user, :write_issue, @project
+      = link_to new_project_issue_path(@project), :class => "add_new", :title => "New Issue", :remote => true do 
+        Add new
+
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 4d9109aac19..d55e07f1adb 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -1,23 +1,9 @@
-.top-tabs
-  = link_to project_issues_path(@project), :class => "tab #{'active' if current_page?(project_issues_path(@project)) }" do 
-    %span 
-    Issues  
-  
-  -#= link_to project_issues_path(@project), :class => "tab" do 
-    %span 
-    Milestones
-
-  - if current_page?(project_issues_path(@project))
-    - if can? current_user, :write_issue, @project
-      = link_to new_project_issue_path(@project), :class => "add_new", :title => "New Issue", :remote => true do 
-        = image_tag "add_new.png", :width => 14
-
-
+= render "issues/head"
 - if current_user.private_token   
   = content_for :rss_icon do 
     .rss-icon
       = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do 
-        = image_tag "rss_icon_gray.png", :width => 16, :title => "feed"
+        = image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
 
 %div#issues-table-holder
   .top_panel_issues
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index ac90dec00a1..101b411072f 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -4,10 +4,9 @@
     .top_panel_content
       %div.main_links
         = link_to root_path, :class => "home", :title => "Home" do 
-          = image_tag "Home-UI.PNG", :width => 26
-        - if current_user.is_admin?
-          = link_to admin_root_path, :class => "admin", :title => "Admin"  do 
-            = image_tag "Gear-UI.PNG", :width => 20
+          = image_tag "Home-UI.PNG"
+        = link_to :back, :title => "Back" do 
+          = image_tag "Arrow-Left-UI.PNG"
 
       - if project_layout
         .project_name
@@ -19,12 +18,16 @@
             = render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
         = yield :rss_icon
 
-      - elsif profile_layout
+      - else
         .dashboard_links
           = link_to "Activities", dashboard_path, :class => "#{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
           -#= link_to "Projects", projects_path, :class => "#{"active" if current_page?(projects_path)}"
           = link_to "Issues", dashboard_issues_path, :class => "#{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
-          = link_to "Merge Requests", dashboard_merge_requests_path, :class => "#{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
+          = link_to "Requests", dashboard_merge_requests_path, :class => "#{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
+          - if current_user.is_admin?
+            = link_to admin_root_path, :class => "admin", :title => "Admin"  do 
+              Admin
+          = link_to "Help", help_path, :class => "#{"active" if controller.controller_name == "help"}"
         .search
           = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
 
diff --git a/app/views/merge_requests/_head.html.haml b/app/views/merge_requests/_head.html.haml
new file mode 100644
index 00000000000..bbf54da2725
--- /dev/null
+++ b/app/views/merge_requests/_head.html.haml
@@ -0,0 +1,12 @@
+.top-tabs
+  = link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do 
+    %span 
+    Merge Requests  
+  
+
+  - if current_page?(project_merge_requests_path(@project))
+    - if can? current_user, :write_merge_request, @project
+      = link_to new_project_merge_request_path(@project), :class => "add_new", :title => "New Merge request", :remote => true do 
+        Add new
+
+
diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml
index edc223ba684..dc8ddf07511 100644
--- a/app/views/merge_requests/index.html.haml
+++ b/app/views/merge_requests/index.html.haml
@@ -1,7 +1,5 @@
-%h2.icon
-  %span>
-  Merge Requests
-.right= link_to 'New Merge request', new_project_merge_request_path(@project), :class => "grey-button"
+= render "merge_requests/head"
+
 - if @merge_requests.opened.count > 0
   %div{ :class => "update-data ui-box ui-box-small ui-box-big" }
     %h3
@@ -21,3 +19,9 @@
   .clear
   %br
 
+- unless @merge_requests.count > 0
+  .notice_holder
+    %li Merge Requests do not exist yet.
+    - if can? current_user, :write_merge_request, @project
+      %li You can add a new one by clicking on "Add New" button
+
diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml
index 6478853d77d..cbcd0660e10 100644
--- a/app/views/projects/_project_head.html.haml
+++ b/app/views/projects/_project_head.html.haml
@@ -18,10 +18,10 @@
   - if current_page?(project_snippets_path(@project))
     - if can? current_user, :write_snippet, @project
       = link_to new_project_snippet_path(@project), :class => "add_new", :title => "New Snippet" do 
-        = image_tag "add_new.png", :width => 14
+        Add new
 
 
   - if current_page?(team_project_path(@project))
     - if can? current_user, :admin_team_member, @project
       = link_to new_project_team_member_path(@project), :class => "add_new", :title => "New Team Member" do 
-        = image_tag "add_new.png", :width => 14
+        Add New
diff --git a/app/views/projects/_projects_top_menu.html.haml b/app/views/projects/_projects_top_menu.html.haml
deleted file mode 100644
index 9e199183b15..00000000000
--- a/app/views/projects/_projects_top_menu.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-%div.top_project_menu
-  %span= link_to 'All', projects_path, :class => current_page?(projects_path) ? "current" : nil
-  - if current_user.can_create_project?
-    %span= link_to "New Project", new_project_path, :class => current_page?(:controller => "projects", :action => "new") ? "current" : nil
-  %span.right
-    = link_to_function(image_tag("list_view_icon.jpg"), "switchProjectView()", :style => "border:none;box-shadow:none;")
-
-:javascript
-  function switchProjectView(){
-    $(".tile").toggle();
-    $(".list").toggle();
-    if($(".tile").is(":visible")){
-      $.cookie('project_view', 'tile', { expires: 14 });
-    } else {
-      $.cookie('project_view', 'list', { expires: 14 });
-    }
-  }
diff --git a/app/views/repositories/_head.html.haml b/app/views/repositories/_head.html.haml
index 7b476362bed..0095098e894 100644
--- a/app/views/repositories/_head.html.haml
+++ b/app/views/repositories/_head.html.haml
@@ -19,10 +19,10 @@
   - if current_page?(project_hooks_path(@project))
     - if can? current_user, :admin_project, @project
       = link_to new_project_hook_path(@project), :class => "add_new", :title => "New Web Hook" do 
-        = image_tag "add_new.png", :width => 14
+        Add new
 
   - if current_page?(project_deploy_keys_path(@project))
     - if can? current_user, :admin_project, @project
       = link_to new_project_deploy_key_path(@project), :class => "add_new", :title => "New Deploy Key" do 
-        = image_tag "add_new.png", :width => 14
+        Add new
 
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index c7c4c6b1324..1021dd1f597 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -8,5 +8,5 @@
   .notice_holder
     %li Snippets do not exist yet.
     - if can? current_user, :write_snippet, @project
-      %li You can add a new one by clicking on plus icon
+      %li You can add a new one by clicking on "Add New" button
     
diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml
index e3ba64c5fad..2a299fd0ba3 100644
--- a/app/views/team_members/_form.html.haml
+++ b/app/views/team_members/_form.html.haml
@@ -6,11 +6,11 @@
           .entity-button
             Team List
             %i
-    %h2= "New Team member"
+    %h3= "New Team member"
 
     %hr
   -if @team_member.errors.any?
-    %ul
+    %ul.errors_holder
       - @team_member.errors.full_messages.each do |msg|
         %li= msg
 
diff --git a/app/views/team_members/new.html.haml b/app/views/team_members/new.html.haml
index 4f70fb4b046..40eb4cebf08 100644
--- a/app/views/team_members/new.html.haml
+++ b/app/views/team_members/new.html.haml
@@ -1 +1,2 @@
+= render "projects/project_head"
 = render "team_members/form"
diff --git a/config/routes.rb b/config/routes.rb
index 3a4018d5cff..4f0e6fcbeae 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,7 @@ Gitlab::Application.routes.draw do
 
   get 'tags'=> 'tags#index'
   get 'tags/:tag' => 'projects#index'
+  get 'help' => 'help#index'
 
   namespace :admin do
     resources :users