Commit 77bc8e2c969b212785e3f10bd0a982a427c571c8
1 parent
38212a81
Exists in
staging
and in
42 other branches
ActionItem114: EStrutura para icons de acesso rapido na barra.
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@814 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
8 changed files
with
66 additions
and
8 deletions
Show diff stats
app/views/layouts/application.rhtml
@@ -32,8 +32,18 @@ | @@ -32,8 +32,18 @@ | ||
32 | <div id='noosfero_bar' class='category<%= category_color %>'> | 32 | <div id='noosfero_bar' class='category<%= category_color %>'> |
33 | <div id='top_bar' class='category<%= category_color %>'> | 33 | <div id='top_bar' class='category<%= category_color %>'> |
34 | <div id='accessibility_menu'> | 34 | <div id='accessibility_menu'> |
35 | - <a href='#content' title='Ir para o conteúdo'>Ir para conteúdo</a> | ||
36 | - <%= accessibility_link %> | 35 | + <a href='#content'><span><%= _('Go Content') %></span></a> |
36 | + <%= | ||
37 | + if logged_in? | ||
38 | + ( accessibility_link ) + " " + | ||
39 | + ( link_to_homepage((content_tag('span', _('My account'))))) + " " + | ||
40 | + ( link_to(_('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?) + " " + | ||
41 | + (link_to (content_tag('span', _('Logout'))), { :controller => 'account', :action => 'logout'}, :method => 'post') | ||
42 | + else | ||
43 | + ( accessibility_link ) + " " + | ||
44 | + (link_to (content_tag('span', _('Login'))), :controller => 'account', :action => 'login') | ||
45 | + end | ||
46 | + %> | ||
37 | </div><!-- accessibility_menu --> | 47 | </div><!-- accessibility_menu --> |
38 | <div id='path_category'> | 48 | <div id='path_category'> |
39 | <% if @category %> | 49 | <% if @category %> |
1.19 KB
974 Bytes
854 Bytes
1.54 KB
604 Bytes
935 Bytes
public/stylesheets/menu.css
@@ -50,13 +50,51 @@ color: #ffffff; | @@ -50,13 +50,51 @@ color: #ffffff; | ||
50 | 50 | ||
51 | #accessibility_menu { | 51 | #accessibility_menu { |
52 | float: right; | 52 | float: right; |
53 | - margin-right: 10px; | 53 | + margin-right: 5px; |
54 | + text-align: right; | ||
54 | font-family: Verdana, Arial, Serif-sans; | 55 | font-family: Verdana, Arial, Serif-sans; |
55 | font-size: 9px; | 56 | font-size: 9px; |
56 | color: #dfdfdf; | 57 | color: #dfdfdf; |
57 | font-weight: normal; | 58 | font-weight: normal; |
58 | } | 59 | } |
59 | 60 | ||
61 | +/* Images Icons Mini-BAR | ||
62 | +#accessibility_menu span { | ||
63 | +display: none; | ||
64 | +} | ||
65 | + | ||
66 | +#accessibility_menu a { | ||
67 | +display: block; | ||
68 | +float: right; | ||
69 | +padding: 0px !important; | ||
70 | +margin: 0px !important; | ||
71 | +width: 24px !important; | ||
72 | +height: 24px !important; | ||
73 | +background-position: top left !important; | ||
74 | +background-repeat: no-repeat !important; | ||
75 | +} | ||
76 | + | ||
77 | +#accessibility_menu a#icon_go_content { | ||
78 | +background-image: url('../images/icons-bar/go-content.png'); | ||
79 | +} | ||
80 | + | ||
81 | +#accessibility_menu a#icon_go_home { | ||
82 | +background-image: url('../images/icons-bar/go-home.png'); | ||
83 | +} | ||
84 | + | ||
85 | +#accessibility_menu a#icon_logout { | ||
86 | +background-image: url('../images/icons-bar/logout.png'); | ||
87 | +} | ||
88 | + | ||
89 | +#accessibility_menu a#icon_login { | ||
90 | +background-image: url('../images/icons-bar/login.png'); | ||
91 | +} | ||
92 | + | ||
93 | +#accessibility_menu a#icon_accessibility { | ||
94 | +background-image: url('../images/icons-bar/accessibility.png'); | ||
95 | +} | ||
96 | +*/ | ||
97 | + | ||
60 | #accessibility_menu a { | 98 | #accessibility_menu a { |
61 | padding-left: 9px; | 99 | padding-left: 9px; |
62 | margin-left: 5px; | 100 | margin-left: 5px; |
@@ -70,20 +108,26 @@ color: #ffffff; | @@ -70,20 +108,26 @@ color: #ffffff; | ||
70 | color: #ffffff; | 108 | color: #ffffff; |
71 | } | 109 | } |
72 | 110 | ||
111 | + | ||
73 | /* Itens Navigation Bar */ | 112 | /* Itens Navigation Bar */ |
74 | 113 | ||
75 | #navigation_bar { | 114 | #navigation_bar { |
76 | - float: left; | 115 | + position: absolute; |
116 | + top: 20px; | ||
117 | + left: 0px; | ||
118 | + width: 100%; | ||
77 | padding: 0px !important; | 119 | padding: 0px !important; |
78 | margin-top: -5px !important; | 120 | margin-top: -5px !important; |
79 | height: 40px; | 121 | height: 40px; |
80 | vertical-align: middle; | 122 | vertical-align: middle; |
81 | line-height: 40px; | 123 | line-height: 40px; |
124 | + z-index: 996; | ||
82 | } | 125 | } |
83 | 126 | ||
84 | #navigation_bar ul { | 127 | #navigation_bar ul { |
85 | padding: 0px !important; | 128 | padding: 0px !important; |
86 | margin: 0px !important; | 129 | margin: 0px !important; |
130 | + z-index: 997; | ||
87 | } | 131 | } |
88 | 132 | ||
89 | #navigation_bar ul li { | 133 | #navigation_bar ul li { |
@@ -96,6 +140,7 @@ color: #ffffff; | @@ -96,6 +140,7 @@ color: #ffffff; | ||
96 | #navigation_bar ul li a { | 140 | #navigation_bar ul li a { |
97 | float: left; | 141 | float: left; |
98 | display: block; | 142 | display: block; |
143 | + cursor: default; | ||
99 | margin-top: 5px; | 144 | margin-top: 5px; |
100 | text-align: center; | 145 | text-align: center; |
101 | width: 124px; | 146 | width: 124px; |
@@ -108,13 +153,13 @@ color: #ffffff; | @@ -108,13 +153,13 @@ color: #ffffff; | ||
108 | 153 | ||
109 | #navigation_bar ul ul { | 154 | #navigation_bar ul ul { |
110 | position: absolute; | 155 | position: absolute; |
111 | -top: 58px; | 156 | +top: 43px; |
112 | margin: 0px; | 157 | margin: 0px; |
113 | padding: 0px; | 158 | padding: 0px; |
114 | width: 100%; | 159 | width: 100%; |
115 | left: 0px; | 160 | left: 0px; |
116 | display: none; | 161 | display: none; |
117 | -z-index: 999; | 162 | +z-index: 998; |
118 | } | 163 | } |
119 | 164 | ||
120 | #navigation_bar ul li ul li { | 165 | #navigation_bar ul li ul li { |
@@ -123,6 +168,7 @@ z-index: 999; | @@ -123,6 +168,7 @@ z-index: 999; | ||
123 | 168 | ||
124 | #navigation_bar ul li ul li a { | 169 | #navigation_bar ul li ul li a { |
125 | display: inline; | 170 | display: inline; |
171 | + cursor: pointer; | ||
126 | width: auto; | 172 | width: auto; |
127 | padding-left: 5px; | 173 | padding-left: 5px; |
128 | padding-right: 5px; | 174 | padding-right: 5px; |
@@ -131,12 +177,14 @@ z-index: 999; | @@ -131,12 +177,14 @@ z-index: 999; | ||
131 | } | 177 | } |
132 | 178 | ||
133 | #search_box { | 179 | #search_box { |
134 | -float: right; | 180 | +position: absolute; |
181 | +right: 0px; | ||
135 | margin: 0px; | 182 | margin: 0px; |
136 | width: 200px; | 183 | width: 200px; |
137 | -height: 35px; | 184 | +height: 33px; |
138 | padding-top: 5px; | 185 | padding-top: 5px; |
139 | padding-left: 15px; | 186 | padding-left: 15px; |
187 | +z-index: 999; | ||
140 | } | 188 | } |
141 | 189 | ||
142 | #input_search { | 190 | #input_search { |