Titled dashboard, admin, profile areas. Wider top panel. Restored search input

Dmitriy Zaporozhets
1 parent fbd5296e
Showing 8 changed files with 50 additions and 25 deletions Show diff stats
app/assets/stylesheets/common.scss
app/assets/stylesheets/top_panel.scss
app/helpers/application_helper.rb
app/views/layouts/_head_panel.html.haml
app/views/layouts/admin.html.haml
app/views/layouts/application.html.haml
app/views/layouts/profile.html.haml
app/views/layouts/project.html.haml
@@ -97,7 +97,7 @@ $blue_link: &quot;#2fa0bb&quot;;
   min-width:$min_app_width;
   max-width:$max_app_width;
   margin:auto;
-  margin-top:52px;
+  margin-top:62px;
 }
  
 .container-fluid > .sidebar { 
@@ -11,24 +11,25 @@ body header {
   -moz-box-shadow: 0 -1px 0 white inset;
   -webkit-box-shadow: 0 -1px 0 white inset;
  
-  height:50px;
+  height:60px;
  
   .wrapper { 
     margin:auto;
     min-width:$min_app_width;
     max-width:$max_app_width;
     position:relative;
-    padding:10px $app_padding;
+    padding:15px $app_padding;
   }
  
   .project_name {
     float:left;
     width:400px;
+    margin:0;
     margin-right:30px;
-    font-size:16px;
+    font-size:20px;
+    line-height:28px;
     font-weight:bold;
-    padding:8px;
-    color:#333;
+    color:#666;
     text-shadow: 0 1px 1px #FFF;
   }
  
@@ -118,7 +119,7 @@ body header {
 header .account-box{ 
   position: absolute; 
   right: 0; 
-  top: 8px;
+  top: 13px;
   z-index: 10000;
   width: 128px;
   font-size: 11px;
@@ -71,11 +71,11 @@ module ApplicationHelper
  
     if @project && !@project.new_record?
       project_nav = [
-        { :label => "#{@project.code} / Issues", :url => project_issues_path(@project) },
-        { :label => "#{@project.code} / Wall", :url => wall_project_path(@project) },
-        { :label => "#{@project.code} / Tree", :url => tree_project_ref_path(@project, @project.root_ref) },
-        { :label => "#{@project.code} / Commits", :url => project_commits_path(@project) },
-        { :label => "#{@project.code} / Team", :url => team_project_path(@project) }
+        { :label => "#{@project.name} / Issues", :url => project_issues_path(@project) },
+        { :label => "#{@project.name} / Wall", :url => wall_project_path(@project) },
+        { :label => "#{@project.name} / Tree", :url => tree_project_ref_path(@project, @project.root_ref) },
+        { :label => "#{@project.name} / Commits", :url => project_commits_path(@project) },
+        { :label => "#{@project.name} / Team", :url => team_project_path(@project) }
       ]
     end
  
@@ -83,11 +83,15 @@ module ApplicationHelper
   end
  
   def project_layout
-    @project && !@project.new_record?
+    layout == "project"
+  end
+
+  def admin_layout
+    layout == "admin"
   end
  
   def profile_layout
-    controller.controller_name == "dashboard" || current_page?(projects_path) || controller.controller_name == "profile" || controller.controller_name == "keys"
+    layout == "profile"
   end
  
   def help_layout
@@ -97,4 +101,8 @@ module ApplicationHelper
   def ldap_enable?
     Devise.omniauth_providers.include?(:ldap)
   end
+
+  def layout 
+    controller.send :_layout
+  end
 end
@@ -6,9 +6,8 @@
         = link_to root_path, :class => "home", :title => "Home" do 
           = image_tag "logo.png", :width => 100
  
-      - if project_layout
-        .project_name
-          = truncate @project.name, :length => 35
+      %h1.project_name= title
+      .search= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input xlarge"
  
  
       .account-box
@@ -18,3 +17,20 @@
           = link_to profile_path, :class => "username" do
             My profile
           = link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete
+
+:javascript
+  $(function(){
+    $("#search").autocomplete({
+      source: #{raw search_autocomplete_source},
+      select: function(event, ui) { location.href = ui.item.url }
+    });
+
+    $(document).keypress(function(e) {
+      if( $(e.target).is(":input") ) return;
+        switch(e.which)  {
+        case 115:  focusSearch();
+        e.preventDefault();
+      }
+    });
+  });
+
@@ -2,8 +2,8 @@
 %html{ :lang => "en"}
   = render "layouts/head"
   %body.admin
-    = render :partial => "layouts/flash"
-    = render :partial => "layouts/head_panel"
+    = render "layouts/flash"
+    = render "layouts/head_panel", :title => "Admin area"
     .container-fluid
       .sidebar
         .fixed
@@ -2,8 +2,8 @@
 %html{ :lang => "en"}
   = render "layouts/head"
   %body.application
-    = render :partial => "layouts/flash"
-    = render :partial => "layouts/head_panel"
+    = render "layouts/flash"
+    = render "layouts/head_panel", :title => "Dashboard"
     .container-fluid
       .sidebar
         = render :partial => "layouts/app_side"
@@ -2,8 +2,8 @@
 %html{ :lang => "en"}
   = render "layouts/head"
   %body.profile
-    = render :partial => "layouts/flash"
-    = render :partial => "layouts/head_panel"
+    = render "layouts/flash"
+    = render "layouts/head_panel", :title => "Profile"
     .container-fluid
       .sidebar
         %aside
@@ -2,8 +2,8 @@
 %html{ :lang => "en"}
   = render "layouts/head"
   %body.project
-    = render :partial => "layouts/flash"
-    = render :partial => "layouts/head_panel"
+    = render "layouts/flash"
+    = render "layouts/head_panel", :title => @project.name
     .container-fluid
       .sidebar= render :partial => "layouts/project_side"
       .content
...	...	@@ -97,7 +97,7 @@ $blue_link: "#2fa0bb";
97	97	min-width:$min_app_width;
98	98	max-width:$max_app_width;
99	99	margin:auto;
100		- margin-top:52px;
	100	+ margin-top:62px;
101	101	}
102	102
103	103	.container-fluid > .sidebar {
...	...
...	...	@@ -11,24 +11,25 @@ body header {
11	11	-moz-box-shadow: 0 -1px 0 white inset;
12	12	-webkit-box-shadow: 0 -1px 0 white inset;
13	13
14		- height:50px;
	14	+ height:60px;
15	15
16	16	.wrapper {
17	17	margin:auto;
18	18	min-width:$min_app_width;
19	19	max-width:$max_app_width;
20	20	position:relative;
21		- padding:10px $app_padding;
	21	+ padding:15px $app_padding;
22	22	}
23	23
24	24	.project_name {
25	25	float:left;
26	26	width:400px;
	27	+ margin:0;
27	28	margin-right:30px;
28		- font-size:16px;
	29	+ font-size:20px;
	30	+ line-height:28px;
29	31	font-weight:bold;
30		- padding:8px;
31		- color:#333;
	32	+ color:#666;
32	33	text-shadow: 0 1px 1px #FFF;
33	34	}
34	35
...	...	@@ -118,7 +119,7 @@ body header {
118	119	header .account-box{
119	120	position: absolute;
120	121	right: 0;
121		- top: 8px;
	122	+ top: 13px;
122	123	z-index: 10000;
123	124	width: 128px;
124	125	font-size: 11px;
...	...
...	...	@@ -71,11 +71,11 @@ module ApplicationHelper
71	71
72	72	if @project && !@project.new_record?
73	73	project_nav = [
74		- { :label => "#{@project.code} / Issues", :url => project_issues_path(@project) },
75		- { :label => "#{@project.code} / Wall", :url => wall_project_path(@project) },
76		- { :label => "#{@project.code} / Tree", :url => tree_project_ref_path(@project, @project.root_ref) },
77		- { :label => "#{@project.code} / Commits", :url => project_commits_path(@project) },
78		- { :label => "#{@project.code} / Team", :url => team_project_path(@project) }
	74	+ { :label => "#{@project.name} / Issues", :url => project_issues_path(@project) },
	75	+ { :label => "#{@project.name} / Wall", :url => wall_project_path(@project) },
	76	+ { :label => "#{@project.name} / Tree", :url => tree_project_ref_path(@project, @project.root_ref) },
	77	+ { :label => "#{@project.name} / Commits", :url => project_commits_path(@project) },
	78	+ { :label => "#{@project.name} / Team", :url => team_project_path(@project) }
79	79	]
80	80	end
81	81
...	...	@@ -83,11 +83,15 @@ module ApplicationHelper
83	83	end
84	84
85	85	def project_layout
86		- @project && !@project.new_record?
	86	+ layout == "project"
	87	+ end
	88	+
	89	+ def admin_layout
	90	+ layout == "admin"
87	91	end
88	92
89	93	def profile_layout
90		- controller.controller_name == "dashboard" \|\| current_page?(projects_path) \|\| controller.controller_name == "profile" \|\| controller.controller_name == "keys"
	94	+ layout == "profile"
91	95	end
92	96
93	97	def help_layout
...	...	@@ -97,4 +101,8 @@ module ApplicationHelper
97	101	def ldap_enable?
98	102	Devise.omniauth_providers.include?(:ldap)
99	103	end
	104	+
	105	+ def layout
	106	+ controller.send :_layout
	107	+ end
100	108	end
...	...
...	...	@@ -6,9 +6,8 @@
6	6	= link_to root_path, :class => "home", :title => "Home" do
7	7	= image_tag "logo.png", :width => 100
8	8
9		- - if project_layout
10		- .project_name
11		- = truncate @project.name, :length => 35
	9	+ %h1.project_name= title
	10	+ .search= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input xlarge"
12	11
13	12
14	13	.account-box
...	...	@@ -18,3 +17,20 @@
18	17	= link_to profile_path, :class => "username" do
19	18	My profile
20	19	= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete
	20	+
	21	+:javascript
	22	+ $(function(){
	23	+ $("#search").autocomplete({
	24	+ source: #{raw search_autocomplete_source},
	25	+ select: function(event, ui) { location.href = ui.item.url }
	26	+ });
	27	+
	28	+ $(document).keypress(function(e) {
	29	+ if( $(e.target).is(":input") ) return;
	30	+ switch(e.which) {
	31	+ case 115: focusSearch();
	32	+ e.preventDefault();
	33	+ }
	34	+ });
	35	+ });
	36	+
...	...
...	...	@@ -2,8 +2,8 @@
2	2	%html{ :lang => "en"}
3	3	= render "layouts/head"
4	4	%body.admin
5		- = render :partial => "layouts/flash"
6		- = render :partial => "layouts/head_panel"
	5	+ = render "layouts/flash"
	6	+ = render "layouts/head_panel", :title => "Admin area"
7	7	.container-fluid
8	8	.sidebar
9	9	.fixed
...	...