Merge pull request #131 from randaalex/admin-panel-disign

The simple update of design admin panel

12 files changed, 128 insertions, 83 deletions

diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 58c9c907b2a..08891e8f8a6 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -54,6 +54,7 @@
 
 table.round-borders {
   float:left;
+  text-align: left;
 }
 
 a {
@@ -207,7 +208,7 @@ input.ssh_project_url {
 .lite_button {
   display:block;
   float:left;
-  margin: 0px 5px;
+  margin: 0px 5px 0px 0px;
   padding:5px 10px;
 
   font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss
index 1f050b9f42b..9344b000777 100644
--- a/app/assets/stylesheets/style.scss
+++ b/app/assets/stylesheets/style.scss
@@ -11,8 +11,8 @@ html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-
 body { margin: 0; font-size: 13px; line-height: 1.231; }
 body, button, input, select, textarea { font-family: sans-serif; color: #222; }
 
-::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; }
-::selection { background: #fe57a1; color: #fff; text-shadow: none; }
+::-moz-selection { background: #79c3e0; color: #fff; text-shadow: none; }
+::selection { background: #79c3e0; color: #fff; text-shadow: none; }
 
 a { color: #00e; }
 a:hover { color: #06e; }
@@ -315,6 +315,19 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
 }
 /* eo Errors */
 
+/* Notices */
+#notice{background: #dfffe1;  padding: 20px; margin-bottom: 20px; border-radius: 5px; color: green; font-size: 1.3em;}
+/* eo Notices */
+
+/* InfoBlock */
+#infoblock{
+  background: #eeeeee;  
+  padding: 20px; 
+  margin-bottom: 20px; 
+  border-radius: 5px; 
+}
+/* eo InfoBlock */
+
 /* General */
 #container{background-color: white; overflow: hidden; }
 body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)}
@@ -588,7 +601,7 @@ body.project-page h2.icon .project-name i.arrow{float: right;
 }
 
 body.project-page h2.icon span{  background-position:  -78px -68px; }
-body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; }
+body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; padding-bottom: 10px;}
 body.project-page .page-title{margin-bottom: 0}
 body.project-page .project-sidebar {width: 220px;  left: 0; top: 0; height: 100%; bottom: 0;  position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; }
 
diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml
index 36cc264f175..4a4d469997e 100644
--- a/app/views/admin/projects/_form.html.haml
+++ b/app/views/admin/projects/_form.html.haml
@@ -29,6 +29,7 @@
     %br
     = f.text_area :description
   .clear
+  %hr
   .actions
     = f.submit 'Save', :class => "lbutton"
 
diff --git a/app/views/admin/projects/edit.html.haml b/app/views/admin/projects/edit.html.haml
index 9d9a1ee0a3f..cca3343bc3a 100644
--- a/app/views/admin/projects/edit.html.haml
+++ b/app/views/admin/projects/edit.html.haml
@@ -1,5 +1,5 @@
+%h2= @admin_project.name
 = render 'form'
 
-= link_to 'Show', [:admin, @admin_project]
-\|
-= link_to 'Back', admin_projects_path
+= link_to 'Back', admin_projects_path, :class => "right lbutton"
+= link_to 'Show', [:admin, @admin_project], :class => "right lbutton"
\ No newline at end of file
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index c529b82ea44..7ae9397cf95 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -20,7 +20,5 @@
       %td= link_to 'Edit', edit_admin_project_path(project), :id => "edit_#{dom_id(project)}"
       %td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete
 
-%br
-
 = paginate @admin_projects
-= link_to 'New Project', new_admin_project_path
+= link_to 'New Project', new_admin_project_path, :class => "lbutton"
diff --git a/app/views/admin/projects/new.html.haml b/app/views/admin/projects/new.html.haml
index 3a4d50e19f9..1100e73dfc4 100644
--- a/app/views/admin/projects/new.html.haml
+++ b/app/views/admin/projects/new.html.haml
@@ -2,4 +2,4 @@
 
 = render 'form'
 
-= link_to 'Back', admin_projects_path
+= link_to 'Back', admin_projects_path, :class => 'right lbutton'
\ No newline at end of file
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index fc2e63241ae..89b9afa84c1 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -1,37 +1,53 @@
-%p#notice= notice
-
-.span-8.colborder
-  %h2= @admin_project.name
-
-  %p
-    %b Name:
-    = @admin_project.name
-  %p
-    %b Code:
-    = @admin_project.code
-  %p
-    %b Path:
-    = @admin_project.path
-  %p
-    %b Description:
-    = @admin_project.description
-
-  = link_to 'Edit', edit_admin_project_path(@admin_project)
-  \|
-  = link_to 'Back', admin_projects_path
+- unless notice.nil?
+  %p#notice= notice
+
+
+%h2= @admin_project.name
+
+%table.round-borders
+  %tr
+    %td
+      %b
+        Name:
+    %td
+      = @admin_project.name    
+  %tr
+    %td
+      %b
+        Code:
+    %td
+      = @admin_project.code
+  %tr
+    %td
+      %b
+        Path:
+    %td
+      = @admin_project.path
+  %tr
+    %td
+      %b
+        Description:
+    %td
+      = @admin_project.description
+  %tr
+    %td{:colspan => 2}
+      = link_to 'Edit', edit_admin_project_path(@admin_project), :class => "lbutton"
+      = link_to 'Back', admin_projects_path, :class => "right lbutton"
+
 
 .span-14
 
   %h2 Team
 
   %table.round-borders
-    %tr
-      %th Name
-      %th Added
-      %th Web
-      %th Git
-      %th Admin
-      %th
+    %thead
+      %tr
+        %th Name
+        %th Added
+        %th Web
+        %th Git
+        %th Admin
+        %th
 
     - @admin_project.users_projects.each do |tm|
       %tr
@@ -42,4 +58,4 @@
         %td.span-2= check_box_tag "admin",  1, @admin_project.admins.include?(tm.user), :disabled => :disabled
         %td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
 
-  = link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id})
+  = link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}),  :class => "lbutton"
diff --git a/app/views/admin/team_members/show.html.haml b/app/views/admin/team_members/show.html.haml
index 29d1160ce5f..dd42dee7a26 100644
--- a/app/views/admin/team_members/show.html.haml
+++ b/app/views/admin/team_members/show.html.haml
@@ -1,6 +1,6 @@
 %p#notice= notice
 
-.span-10
+#infoblock
   %p
     %b Name:
     = @admin_team_member.user_name
@@ -11,7 +11,7 @@
     %b Since:
     = @admin_team_member.updated_at
 
-.span-10
+#infoblock
   .span-6
     %b Access:
   .span-8
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 06e5be19aa4..35d8aa47e31 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -44,6 +44,6 @@
       %br
       = f.text_field :twitter
     .clear
-    %br
+    %hr
     .actions
       = f.submit 'Save', :class => "lbutton"
diff --git a/app/views/admin/users/edit.html.haml b/app/views/admin/users/edit.html.haml
index fac995175fe..a9ae7986da2 100644
--- a/app/views/admin/users/edit.html.haml
+++ b/app/views/admin/users/edit.html.haml
@@ -1,4 +1,4 @@
 = render 'form'
 
-= link_to 'Show', [:admin, @admin_user], :class => "right lbutton"
 = link_to 'Back', admin_users_path, :class => "right lbutton"
+= link_to 'Show', [:admin, @admin_user], :class => "right lbutton"
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index e12cfc7763b..78e84398fd5 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -18,8 +18,5 @@
       %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}"
       %td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete
 
-%br
-
 = paginate @admin_users
-
-= link_to 'New User', new_admin_user_path
+= link_to 'New User', new_admin_user_path, :class => "lbutton"
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 5bc5bf9ab83..2437a01a150 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -1,45 +1,64 @@
-%p#notice= notice
+- unless notice.nil?
+  %p#notice= notice
 
-.span-8.colborder
-  %p
-    %b Name:
-    = @admin_user.name
-  %p
-    %b Email:
-    = @admin_user.email
-  %p
-    %b Admin:
-    = @admin_user.admin
-  %p
-    %b Projects limit:
-    = @admin_user.projects_limit
+%h2= @admin_user.name
 
-  %p
-    %b Skype:
-    = @admin_user.skype
-  %p
-    %b LinkedIn:
-    = @admin_user.linkedin
-  %p
-    %b Twitter:
-    = @admin_user.twitter
-
-  .clear
-  = link_to 'Edit', edit_admin_user_path(@admin_user)
-  \|
-  = link_to 'Back', admin_users_path
+%table.round-borders
+  %tr
+    %td
+      %b
+        Email:
+    %td
+      = @admin_user.email
+  %tr
+    %td
+      %b
+        Admin:
+        %td= check_box_tag "admin", 1, @admin_user.admin, :disabled => :disabled
+  %tr
+    %td
+      %b
+        Projects limit:
+    %td
+      = @admin_user.projects_limit
+  - unless @admin_user.skype.empty?
+    %tr
+      %td
+        %b
+          Skype:
+      %td
+        = @admin_user.skype
+  - unless @admin_user.linkedin.empty?
+    %tr
+      %td
+        %b
+          Linkedin:
+      %td
+        = @admin_user.linkedin
+  - unless @admin_user.twitter.empty?
+    %tr
+      %td
+        %b
+          Twitter:
+      %td
+        = @admin_user.twitter
+  %tr
+    %td{:colspan => 2}
+      = link_to 'Edit', edit_admin_user_path(@admin_user), :class => "lbutton"
+      = link_to 'Back', admin_users_path, :class => "right lbutton"
 
 .span-14
   %h2 Projects
 
   %table.round-borders
     %tr
-      %th Name
-      %th Added
-      %th Web
-      %th Git
-      %th Admin
-      %th
+      %thead
+        %th Name
+        %th Added
+        %th Web
+        %th Git
+        %th Admin
+        %th
 
     - @admin_user.users_projects.each do |tm|
       - project = tm.project
@@ -52,4 +71,4 @@
         %td= link_to 'Edit', edit_admin_team_member_path(tm)
         %td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
 
-  = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id})
+  = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "lbutton"