Commit ec4e2491a7018530be5a2bdbb10f9d73c563facf
1 parent
bd29a833
Exists in
master
and in
28 other branches
ActionItem110: Footer and box search backgrounds
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@720 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
5 changed files
with
56 additions
and
38 deletions
Show diff stats
app/views/layouts/application.rhtml
| @@ -61,11 +61,21 @@ | @@ -61,11 +61,21 @@ | ||
| 61 | 61 | ||
| 62 | <div id="wrap" class='category<%= category_color %>'> | 62 | <div id="wrap" class='category<%= category_color %>'> |
| 63 | <div id='noosfero_bar' class='category<%= category_color %>'> | 63 | <div id='noosfero_bar' class='category<%= category_color %>'> |
| 64 | + <div id='top_bar' class='category<%= category_color %>'> | ||
| 64 | <div id='accessibility_menu'> | 65 | <div id='accessibility_menu'> |
| 65 | <a href='#content' title='Ir para o conteúdo'>Ir para conteúdo</a> | 66 | <a href='#content' title='Ir para o conteúdo'>Ir para conteúdo</a> |
| 66 | <a href='#'>Acessibilidade</a> | 67 | <a href='#'>Acessibilidade</a> |
| 67 | </div><!-- accessibility_menu --> | 68 | </div><!-- accessibility_menu --> |
| 68 | - | 69 | + <div id='path_category'> |
| 70 | + <% if @category %> | ||
| 71 | + <%= @category.full_name %> | ||
| 72 | + <% else @category %> | ||
| 73 | + <div id='user_options'> | ||
| 74 | + <%= user_options %> | ||
| 75 | + </div><!-- id='user_options' --> | ||
| 76 | + <% end %> | ||
| 77 | + </div> | ||
| 78 | + </div> | ||
| 69 | <div id='search_box'> | 79 | <div id='search_box'> |
| 70 | <form id='search_box_form' action="" method="GET"> | 80 | <form id='search_box_form' action="" method="GET"> |
| 71 | <input id="input_search" type='text' name='q' value='<%= _('Your search here ...')%>'> | 81 | <input id="input_search" type='text' name='q' value='<%= _('Your search here ...')%>'> |
| @@ -73,23 +83,14 @@ | @@ -73,23 +83,14 @@ | ||
| 73 | </form> | 83 | </form> |
| 74 | </div><!-- id='search_box' --> | 84 | </div><!-- id='search_box' --> |
| 75 | 85 | ||
| 76 | - <div id='navigation_bar'> | 86 | + <div id='navigation_bar' class='category<%= category_color %>'> |
| 77 | <%= render :file => 'shared/categories_menu' %> | 87 | <%= render :file => 'shared/categories_menu' %> |
| 78 | </div><!-- id='navigation_bar' --> | 88 | </div><!-- id='navigation_bar' --> |
| 79 | 89 | ||
| 80 | <script type="text/javascript"> | 90 | <script type="text/javascript"> |
| 81 | - prepareMenu('navigation_bar', { timeout: 50 }); | 91 | + prepareMenu('navigation_bar', { timeout: 10 }); |
| 82 | </script> | 92 | </script> |
| 83 | 93 | ||
| 84 | - <div id='path_category'> | ||
| 85 | - <% if @category %> | ||
| 86 | - <%= @category.full_name %> | ||
| 87 | - <% else @category %> | ||
| 88 | - <div id='user_options'> | ||
| 89 | - <%= user_options %> | ||
| 90 | - </div><!-- id='user_options' --> | ||
| 91 | - <% end %> | ||
| 92 | - </div> | ||
| 93 | 94 | ||
| 94 | </div><!-- id="noosfero_bar" --> | 95 | </div><!-- id="noosfero_bar" --> |
| 95 | <div id='frame'><!-- Frame que envolve toda pagina de um usuario --> | 96 | <div id='frame'><!-- Frame que envolve toda pagina de um usuario --> |
public/images/bg_footer.png
public/images/bg_searchbox.png
public/stylesheets/common.css
| @@ -60,3 +60,9 @@ div#errorExplanation h2 { | @@ -60,3 +60,9 @@ div#errorExplanation h2 { | ||
| 60 | color: white; | 60 | color: white; |
| 61 | text-align: center; | 61 | text-align: center; |
| 62 | } | 62 | } |
| 63 | + | ||
| 64 | +div#footer { | ||
| 65 | +background: #ffffff url("../images/bg_footer.png") repeat-x !important; | ||
| 66 | +background-position: 0px 0px; | ||
| 67 | +} | ||
| 68 | + |
public/stylesheets/menu.css
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | height: 11px; | 4 | height: 11px; |
| 5 | padding: 0px; | 5 | padding: 0px; |
| 6 | margin-top: -5px; | 6 | margin-top: -5px; |
| 7 | + margin-right: 5px; | ||
| 7 | font-family: Verdana, Arial, Serif-sans; | 8 | font-family: Verdana, Arial, Serif-sans; |
| 8 | z-index: 9999; | 9 | z-index: 9999; |
| 9 | } | 10 | } |
| @@ -11,9 +12,8 @@ | @@ -11,9 +12,8 @@ | ||
| 11 | /* Menu Itens Accessibility */ | 12 | /* Menu Itens Accessibility */ |
| 12 | 13 | ||
| 13 | #accessibility_menu { | 14 | #accessibility_menu { |
| 14 | - position: absolute; | ||
| 15 | - right: 10px; | ||
| 16 | - top: 35px; | 15 | + float: right; |
| 16 | + margin-right: 10px; | ||
| 17 | font-family: Verdana, Arial, Serif-sans; | 17 | font-family: Verdana, Arial, Serif-sans; |
| 18 | font-size: 10px; | 18 | font-size: 10px; |
| 19 | color: #dfdfdf; | 19 | color: #dfdfdf; |
| @@ -33,17 +33,19 @@ | @@ -33,17 +33,19 @@ | ||
| 33 | color: #ffffff; | 33 | color: #ffffff; |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | -/* Div Header */ | 36 | +/* Top Bar */ |
| 37 | 37 | ||
| 38 | -#user_options a { | ||
| 39 | -height: 35px !important ; | 38 | +#top_bar { |
| 39 | +height: 20px; | ||
| 40 | +line-height: 20px; | ||
| 40 | color: #ffffff !important ; | 41 | color: #ffffff !important ; |
| 41 | -font-size: 10px !important ; | 42 | +font-size: 12px !important ; |
| 42 | font-family: Sans-serif !important ; | 43 | font-family: Sans-serif !important ; |
| 43 | font-weight: bold !important ; | 44 | font-weight: bold !important ; |
| 44 | vertical-align: middle !important ; | 45 | vertical-align: middle !important ; |
| 45 | -padding: 0px 5px 0px 5px !important ; | ||
| 46 | -text-decoration: underline !important ; | 46 | +padding: 0px !important ; |
| 47 | +margin: 0px; | ||
| 48 | +text-align: left; | ||
| 47 | } | 49 | } |
| 48 | 50 | ||
| 49 | /* Itens Navigation Bar */ | 51 | /* Itens Navigation Bar */ |
| @@ -51,7 +53,7 @@ text-decoration: underline !important ; | @@ -51,7 +53,7 @@ text-decoration: underline !important ; | ||
| 51 | #navigation_bar { | 53 | #navigation_bar { |
| 52 | float: left; | 54 | float: left; |
| 53 | padding: 0px !important; | 55 | padding: 0px !important; |
| 54 | - margin: 0px !important; | 56 | + margin-top: -5px !important; |
| 55 | height: 40px; | 57 | height: 40px; |
| 56 | vertical-align: middle; | 58 | vertical-align: middle; |
| 57 | line-height: 40px; | 59 | line-height: 40px; |
| @@ -83,12 +85,12 @@ text-decoration: underline !important ; | @@ -83,12 +85,12 @@ text-decoration: underline !important ; | ||
| 83 | } | 85 | } |
| 84 | 86 | ||
| 85 | #navigation_bar ul ul { | 87 | #navigation_bar ul ul { |
| 88 | +position: absolute; | ||
| 89 | +top: 58px; | ||
| 86 | margin: 0px; | 90 | margin: 0px; |
| 87 | padding: 0px; | 91 | padding: 0px; |
| 88 | width: 100%; | 92 | width: 100%; |
| 89 | left: 0px; | 93 | left: 0px; |
| 90 | -position: absolute; | ||
| 91 | -top: 40px; | ||
| 92 | display: none; | 94 | display: none; |
| 93 | z-index: 999; | 95 | z-index: 999; |
| 94 | } | 96 | } |
| @@ -108,11 +110,13 @@ z-index: 999; | @@ -108,11 +110,13 @@ z-index: 999; | ||
| 108 | 110 | ||
| 109 | #search_box { | 111 | #search_box { |
| 110 | float: right; | 112 | float: right; |
| 111 | -margin-top: 10px; | ||
| 112 | -margin-right: 10px; | ||
| 113 | -height: 20px; | ||
| 114 | -line-height: 20px; | ||
| 115 | -vertical-align: middle; | 113 | +margin: 0px; |
| 114 | +width: 200px; | ||
| 115 | +height: 35px; | ||
| 116 | +padding-top: 5px; | ||
| 117 | +padding-left: 15px; | ||
| 118 | +background: url("../images/bg_searchbox.png") no-repeat; | ||
| 119 | +background-position: bottom left; | ||
| 116 | } | 120 | } |
| 117 | 121 | ||
| 118 | #input_search { | 122 | #input_search { |
| @@ -144,16 +148,7 @@ color: #545454; | @@ -144,16 +148,7 @@ color: #545454; | ||
| 144 | border: 1px inset #dfdfdf; | 148 | border: 1px inset #dfdfdf; |
| 145 | } | 149 | } |
| 146 | 150 | ||
| 147 | -/* Path Category */ | ||
| 148 | 151 | ||
| 149 | -#path_category { | ||
| 150 | - clear: both; | ||
| 151 | - padding: 3px; | ||
| 152 | - font-size: 12px; | ||
| 153 | - font-weight: bold; | ||
| 154 | - text-align: left; | ||
| 155 | - color: #fff; | ||
| 156 | -} | ||
| 157 | 152 | ||
| 158 | /* Itens Colors Change */ | 153 | /* Itens Colors Change */ |
| 159 | 154 | ||
| @@ -172,6 +167,10 @@ border: 1px inset #dfdfdf; | @@ -172,6 +167,10 @@ border: 1px inset #dfdfdf; | ||
| 172 | border: 5px solid #204a87 !important; | 167 | border: 5px solid #204a87 !important; |
| 173 | } | 168 | } |
| 174 | 169 | ||
| 170 | +#top_bar.category { | ||
| 171 | +background-color: #204a87; | ||
| 172 | +} | ||
| 173 | + | ||
| 175 | #category a { | 174 | #category a { |
| 176 | background: url("../images/bg_menu_options.png") no-repeat; | 175 | background: url("../images/bg_menu_options.png") no-repeat; |
| 177 | background-position: 0px 0px; | 176 | background-position: 0px 0px; |
| @@ -209,6 +208,10 @@ li#category ul li a:hover { | @@ -209,6 +208,10 @@ li#category ul li a:hover { | ||
| 209 | border: 5px solid #ce5c00 !important; | 208 | border: 5px solid #ce5c00 !important; |
| 210 | } | 209 | } |
| 211 | 210 | ||
| 211 | +#top_bar.category1 { | ||
| 212 | +background-color: #ce5c00; | ||
| 213 | +} | ||
| 214 | + | ||
| 212 | #category1 a { | 215 | #category1 a { |
| 213 | background: url("../images/bg_menu_options.png") no-repeat; | 216 | background: url("../images/bg_menu_options.png") no-repeat; |
| 214 | background-position: -124px 0px; | 217 | background-position: -124px 0px; |
| @@ -246,6 +249,10 @@ li#category1 ul li a:hover { | @@ -246,6 +249,10 @@ li#category1 ul li a:hover { | ||
| 246 | border: 5px solid #4e9a06 !important; | 249 | border: 5px solid #4e9a06 !important; |
| 247 | } | 250 | } |
| 248 | 251 | ||
| 252 | +#top_bar.category2 { | ||
| 253 | +background-color: #4e9a06; | ||
| 254 | +} | ||
| 255 | + | ||
| 249 | #category2 a { | 256 | #category2 a { |
| 250 | background: url("../images/bg_menu_options.png") no-repeat; | 257 | background: url("../images/bg_menu_options.png") no-repeat; |
| 251 | background-position: -246px 0px; | 258 | background-position: -246px 0px; |
| @@ -283,6 +290,10 @@ li#category2 ul li a:hover { | @@ -283,6 +290,10 @@ li#category2 ul li a:hover { | ||
| 283 | border: 5px solid #5c3566 !important; | 290 | border: 5px solid #5c3566 !important; |
| 284 | } | 291 | } |
| 285 | 292 | ||
| 293 | +#top_bar.category3 { | ||
| 294 | +background-color: #5c3566; | ||
| 295 | +} | ||
| 296 | + | ||
| 286 | #category3 a { | 297 | #category3 a { |
| 287 | background: url("../images/bg_menu_options.png") no-repeat; | 298 | background: url("../images/bg_menu_options.png") no-repeat; |
| 288 | background-position: -368px 0px; | 299 | background-position: -368px 0px; |