Commit 306a464f31bfb6f396e62094b704a237010fd790
1 parent
80f6ba04
Exists in
master
and in
29 other branches
ActionItem152: user menu - quase...
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1269 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
30 additions
and
14 deletions
Show diff stats
app/views/layouts/user_menu.rhtml
@@ -21,8 +21,10 @@ | @@ -21,8 +21,10 @@ | ||
21 | { :controller => 'admin_panel' }, :id => 'link_admin_panel' ) + | 21 | { :controller => 'admin_panel' }, :id => 'link_admin_panel' ) + |
22 | '</li>' if current_user.person.is_admin? | 22 | '</li>' if current_user.person.is_admin? |
23 | %> | 23 | %> |
24 | - <li><a href="#"><span class="icon-menu-"></span><small>essa aba será 100% fechada</small></a></li> | ||
25 | - <li><a href="#"><span class="icon-menu-"></span> soon...</a></li> | 24 | + <li><%= link_to( '<span class="icon-menu-"></span>'+_('Edit Profile'), |
25 | + :controller => 'profile_editor', :action => 'edit' ) %></li> | ||
26 | + <li><%= link_to( '<span class="icon-menu-"></span>'+_('Consumed Products'), | ||
27 | + :controller => 'consumed_products' ) %></li> | ||
26 | </ul> | 28 | </ul> |
27 | 29 | ||
28 | <% else %> | 30 | <% else %> |
public/stylesheets/menu.css
@@ -167,7 +167,7 @@ body.category3 #assets_menu_layout_iten { background: url(/images/top-bar/assets | @@ -167,7 +167,7 @@ body.category3 #assets_menu_layout_iten { background: url(/images/top-bar/assets | ||
167 | body.category4 #assets_menu_layout_iten { background: url(/images/top-bar/assets-menu-top-vermelho.gif) } | 167 | body.category4 #assets_menu_layout_iten { background: url(/images/top-bar/assets-menu-top-vermelho.gif) } |
168 | 168 | ||
169 | #assets_menu_list { | 169 | #assets_menu_list { |
170 | - padding: 2px 0px 6px 5px; | 170 | + padding: 0px 0px 6px 5px; |
171 | background: url(/images/top-bar/assets-menu-bg-azul.gif) 0% 100%; | 171 | background: url(/images/top-bar/assets-menu-bg-azul.gif) 0% 100%; |
172 | } | 172 | } |
173 | body.category1 #assets_menu_list { background-image: url(/images/top-bar/assets-menu-bg-laranja.gif) } | 173 | body.category1 #assets_menu_list { background-image: url(/images/top-bar/assets-menu-bg-laranja.gif) } |
@@ -180,7 +180,7 @@ body.category4 #assets_menu_list { background-image: url(/images/top-bar/assets- | @@ -180,7 +180,7 @@ body.category4 #assets_menu_list { background-image: url(/images/top-bar/assets- | ||
180 | padding: 0px; | 180 | padding: 0px; |
181 | overflow: hidden; | 181 | overflow: hidden; |
182 | height: 56px; | 182 | height: 56px; |
183 | - width: 165px; | 183 | + width: 135px; |
184 | } | 184 | } |
185 | 185 | ||
186 | .top_extra_menu li { | 186 | .top_extra_menu li { |
@@ -196,8 +196,11 @@ body.category4 #assets_menu_list { background-image: url(/images/top-bar/assets- | @@ -196,8 +196,11 @@ body.category4 #assets_menu_list { background-image: url(/images/top-bar/assets- | ||
196 | text-decoration: none; | 196 | text-decoration: none; |
197 | color: #B8CFE7; | 197 | color: #B8CFE7; |
198 | display: block; | 198 | display: block; |
199 | - padding-left: 0px; | 199 | + padding-left: 20px; |
200 | height: 18px; | 200 | height: 18px; |
201 | + white-space: nowrap; | ||
202 | + overflow: hidden; | ||
203 | + position: relative; | ||
201 | } | 204 | } |
202 | body.category1 #user_box a, | 205 | body.category1 #user_box a, |
203 | body.category1 .top_extra_menu a { color: #FDD79E } | 206 | body.category1 .top_extra_menu a { color: #FDD79E } |
@@ -223,13 +226,15 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } | @@ -223,13 +226,15 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } | ||
223 | 226 | ||
224 | #user_box a span, | 227 | #user_box a span, |
225 | .top_extra_menu a span { | 228 | .top_extra_menu a span { |
229 | + position: absolute; | ||
230 | + top: 0px; | ||
231 | + left: 0px; | ||
226 | display: block; | 232 | display: block; |
227 | width: 18px; | 233 | width: 18px; |
228 | - height: 100%; | 234 | + height: 18px; |
229 | float: left; | 235 | float: left; |
230 | background-repeat: no-repeat; | 236 | background-repeat: no-repeat; |
231 | background-position: 50% 50%; | 237 | background-position: 50% 50%; |
232 | - margin-right: 2px; | ||
233 | opacity: 0.7; | 238 | opacity: 0.7; |
234 | filter: alpha(opacity=70); | 239 | filter: alpha(opacity=70); |
235 | } | 240 | } |
@@ -249,8 +254,9 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } | @@ -249,8 +254,9 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } | ||
249 | } | 254 | } |
250 | 255 | ||
251 | #open_search { | 256 | #open_search { |
252 | - float: right; | ||
253 | - margin-right: 10px; | 257 | + position: absolute; |
258 | + top: 2px; | ||
259 | + left: 64px; | ||
254 | } | 260 | } |
255 | #user_box #open_search:hover { | 261 | #user_box #open_search:hover { |
256 | background: none; | 262 | background: none; |
@@ -261,8 +267,8 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } | @@ -261,8 +267,8 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } | ||
261 | #user_menu { | 267 | #user_menu { |
262 | position: absolute; | 268 | position: absolute; |
263 | top: 0px; | 269 | top: 0px; |
264 | - right: 180px; | ||
265 | - width: 130px; | 270 | + right: 150px; |
271 | + width: 170px; | ||
266 | } | 272 | } |
267 | 273 | ||
268 | .user_menu_first_link { | 274 | .user_menu_first_link { |
@@ -288,12 +294,20 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } | @@ -288,12 +294,20 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } | ||
288 | position: absolute; | 294 | position: absolute; |
289 | top: 21px; | 295 | top: 21px; |
290 | right: 0px; | 296 | right: 0px; |
291 | - width: 130px; | ||
292 | - max-width: 121px; | ||
293 | - padding: 2px 4px 5px 5px; | 297 | + width: 150px; |
298 | + max-width: 140px; | ||
299 | + padding: 0px 4px 5px 5px; | ||
294 | margin: 0px; | 300 | margin: 0px; |
295 | border: 1px solid #FFF; | 301 | border: 1px solid #FFF; |
296 | border-top: none; | 302 | border-top: none; |
297 | background: #2A5896; | 303 | background: #2A5896; |
298 | } | 304 | } |
305 | +#user_menu li { | ||
306 | + width: 100%; | ||
307 | + overflow: hidden; | ||
308 | +} | ||
299 | 309 | ||
310 | +#user_menu a { | ||
311 | + Xposition: relative; | ||
312 | + Xwidth: 100%; | ||
313 | +} |