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 | 32 | <div id='noosfero_bar' class='category<%= category_color %>'> |
33 | 33 | <div id='top_bar' class='category<%= category_color %>'> |
34 | 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 | 47 | </div><!-- accessibility_menu --> |
38 | 48 | <div id='path_category'> |
39 | 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 | 50 | |
51 | 51 | #accessibility_menu { |
52 | 52 | float: right; |
53 | - margin-right: 10px; | |
53 | + margin-right: 5px; | |
54 | + text-align: right; | |
54 | 55 | font-family: Verdana, Arial, Serif-sans; |
55 | 56 | font-size: 9px; |
56 | 57 | color: #dfdfdf; |
57 | 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 | 98 | #accessibility_menu a { |
61 | 99 | padding-left: 9px; |
62 | 100 | margin-left: 5px; |
... | ... | @@ -70,20 +108,26 @@ color: #ffffff; |
70 | 108 | color: #ffffff; |
71 | 109 | } |
72 | 110 | |
111 | + | |
73 | 112 | /* Itens Navigation Bar */ |
74 | 113 | |
75 | 114 | #navigation_bar { |
76 | - float: left; | |
115 | + position: absolute; | |
116 | + top: 20px; | |
117 | + left: 0px; | |
118 | + width: 100%; | |
77 | 119 | padding: 0px !important; |
78 | 120 | margin-top: -5px !important; |
79 | 121 | height: 40px; |
80 | 122 | vertical-align: middle; |
81 | 123 | line-height: 40px; |
124 | + z-index: 996; | |
82 | 125 | } |
83 | 126 | |
84 | 127 | #navigation_bar ul { |
85 | 128 | padding: 0px !important; |
86 | 129 | margin: 0px !important; |
130 | + z-index: 997; | |
87 | 131 | } |
88 | 132 | |
89 | 133 | #navigation_bar ul li { |
... | ... | @@ -96,6 +140,7 @@ color: #ffffff; |
96 | 140 | #navigation_bar ul li a { |
97 | 141 | float: left; |
98 | 142 | display: block; |
143 | + cursor: default; | |
99 | 144 | margin-top: 5px; |
100 | 145 | text-align: center; |
101 | 146 | width: 124px; |
... | ... | @@ -108,13 +153,13 @@ color: #ffffff; |
108 | 153 | |
109 | 154 | #navigation_bar ul ul { |
110 | 155 | position: absolute; |
111 | -top: 58px; | |
156 | +top: 43px; | |
112 | 157 | margin: 0px; |
113 | 158 | padding: 0px; |
114 | 159 | width: 100%; |
115 | 160 | left: 0px; |
116 | 161 | display: none; |
117 | -z-index: 999; | |
162 | +z-index: 998; | |
118 | 163 | } |
119 | 164 | |
120 | 165 | #navigation_bar ul li ul li { |
... | ... | @@ -123,6 +168,7 @@ z-index: 999; |
123 | 168 | |
124 | 169 | #navigation_bar ul li ul li a { |
125 | 170 | display: inline; |
171 | + cursor: pointer; | |
126 | 172 | width: auto; |
127 | 173 | padding-left: 5px; |
128 | 174 | padding-right: 5px; |
... | ... | @@ -131,12 +177,14 @@ z-index: 999; |
131 | 177 | } |
132 | 178 | |
133 | 179 | #search_box { |
134 | -float: right; | |
180 | +position: absolute; | |
181 | +right: 0px; | |
135 | 182 | margin: 0px; |
136 | 183 | width: 200px; |
137 | -height: 35px; | |
184 | +height: 33px; | |
138 | 185 | padding-top: 5px; |
139 | 186 | padding-left: 15px; |
187 | +z-index: 999; | |
140 | 188 | } |
141 | 189 | |
142 | 190 | #input_search { | ... | ... |