Commit cdde5e0bd87ff4a83880c10bba545aaef9df90cb
1 parent
3c170303
Exists in
master
and in
29 other branches
ActionItem290: footer formated
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1715 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
7 changed files
with
44 additions
and
39 deletions
Show diff stats
app/views/layouts/application.rhtml
| @@ -134,11 +134,11 @@ | @@ -134,11 +134,11 @@ | ||
| 134 | 134 | ||
| 135 | <div id="footer"> | 135 | <div id="footer"> |
| 136 | <a href="http://fbes.org.br" id="footer-esq"> | 136 | <a href="http://fbes.org.br" id="footer-esq"> |
| 137 | - <%= _('A FBES project') %> <br/> | 137 | + <%= _('A FBES project') %><br/> |
| 138 | Fórum Brasileiro de Economia Solidária | 138 | Fórum Brasileiro de Economia Solidária |
| 139 | </a> | 139 | </a> |
| 140 | <a href="http://colivre.coop.br" id="footer-dir"> | 140 | <a href="http://colivre.coop.br" id="footer-dir"> |
| 141 | - <%= _('Desenvolvimento Colivre') %> <br/> | 141 | + <%= _('Developed by Colivre') %><br/> |
| 142 | Cooperativa de Tecnologias Livres | 142 | Cooperativa de Tecnologias Livres |
| 143 | </a> | 143 | </a> |
| 144 | <%= language_chooser %> | 144 | <%= language_chooser %> |
app/views/search/_search_form.rhtml
| @@ -4,8 +4,8 @@ | @@ -4,8 +4,8 @@ | ||
| 4 | 4 | ||
| 5 | <div class="search-field"> | 5 | <div class="search-field"> |
| 6 | <span class="formfield"> | 6 | <span class="formfield"> |
| 7 | - <%= text_field_tag 'query', @query, :id => 'popup-search-input', :size => 50 %> | ||
| 8 | - <%= javascript_tag '$("popup-search-input").focus()' %> | 7 | + <%= text_field_tag 'query', @query, :id => ( lightbox? ? 'popup-search-input' : '' ), :size => 50 %> |
| 8 | + <%= javascript_tag '$("popup-search-input").focus()' if lightbox? %> | ||
| 9 | </span> | 9 | </span> |
| 10 | <%= submit_button(:search, _('Search')) %> | 10 | <%= submit_button(:search, _('Search')) %> |
| 11 | </div> | 11 | </div> |
1.49 KB
1.5 KB
public/designs/themes/default/stylesheets/common.css
| @@ -140,3 +140,40 @@ div.file-manager-button a:hover { | @@ -140,3 +140,40 @@ div.file-manager-button a:hover { | ||
| 140 | #lightbox{ | 140 | #lightbox{ |
| 141 | background: #FFF url(../images/bg-top-cinza.jpg) no-repeat 50% -15px; | 141 | background: #FFF url(../images/bg-top-cinza.jpg) no-repeat 50% -15px; |
| 142 | } | 142 | } |
| 143 | + | ||
| 144 | +#footer { | ||
| 145 | + background: #ffffff url("/images/bg_footer.png") repeat-x; | ||
| 146 | + background-position: 0px 0px; | ||
| 147 | + margin: 0px; | ||
| 148 | + padding: 10px; | ||
| 149 | +} | ||
| 150 | + | ||
| 151 | +#footer a { | ||
| 152 | + border-bottom: 1px dotted #777; | ||
| 153 | +} | ||
| 154 | +#footer a:hover { | ||
| 155 | + border: 0px; | ||
| 156 | +} | ||
| 157 | + | ||
| 158 | +#footer a#footer-esq { | ||
| 159 | + background: url(../images/logo-fbes-footer.gif) no-repeat 0% 50%; | ||
| 160 | + padding: 5px 0px 5px 45px; | ||
| 161 | + float: left; | ||
| 162 | + text-align: left; | ||
| 163 | + border: none; | ||
| 164 | + opacity: 0.5; | ||
| 165 | +} | ||
| 166 | + | ||
| 167 | +#footer a#footer-dir { | ||
| 168 | + background: url(../images/logo-colivre-footer.gif) no-repeat 100% 50%; | ||
| 169 | + padding: 5px 35px 5px 0px; | ||
| 170 | + float: right; | ||
| 171 | + text-align: right; | ||
| 172 | + border: none; | ||
| 173 | + opacity: 0.5; | ||
| 174 | +} | ||
| 175 | + | ||
| 176 | +#footer a#footer-esq:hover, | ||
| 177 | +#footer a#footer-dir:hover { | ||
| 178 | + opacity: 1; | ||
| 179 | +} |
public/javascripts/application.js
| @@ -2,11 +2,13 @@ | @@ -2,11 +2,13 @@ | ||
| 2 | // This file is automatically included by javascript_include_tag :defaults | 2 | // This file is automatically included by javascript_include_tag :defaults |
| 3 | 3 | ||
| 4 | function noosfero_init() { | 4 | function noosfero_init() { |
| 5 | - focus_first_field(); | 5 | + // focus_first_field(); it is moving the page view when de form is down. |
| 6 | } | 6 | } |
| 7 | 7 | ||
| 8 | /* If applicable, find the first field in which the user can type and move the | 8 | /* If applicable, find the first field in which the user can type and move the |
| 9 | * keyboard focus to it. | 9 | * keyboard focus to it. |
| 10 | + * | ||
| 11 | + * ToDo: focus only inside the view box to do not roll the page. | ||
| 10 | */ | 12 | */ |
| 11 | function focus_first_field() { | 13 | function focus_first_field() { |
| 12 | form = document.forms[0]; | 14 | form = document.forms[0]; |
public/stylesheets/common.css
| @@ -93,10 +93,6 @@ div#errorExplanation h2 { | @@ -93,10 +93,6 @@ div#errorExplanation h2 { | ||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | #footer { | 95 | #footer { |
| 96 | - background: #ffffff url("../images/bg_footer.png") repeat-x; | ||
| 97 | - background-position: 0px 0px; | ||
| 98 | - margin: 0px; | ||
| 99 | - padding: 10px; | ||
| 100 | text-align: center; | 96 | text-align: center; |
| 101 | clear: both; | 97 | clear: both; |
| 102 | font-size: 10px; | 98 | font-size: 10px; |
| @@ -106,41 +102,11 @@ div#errorExplanation h2 { | @@ -106,41 +102,11 @@ div#errorExplanation h2 { | ||
| 106 | #footer a { | 102 | #footer a { |
| 107 | color: #777; | 103 | color: #777; |
| 108 | text-decoration: none; | 104 | text-decoration: none; |
| 109 | - border-bottom: 1px dotted #777; | ||
| 110 | } | 105 | } |
| 111 | - | ||
| 112 | #footer a:hover { | 106 | #footer a:hover { |
| 113 | color: #555; | 107 | color: #555; |
| 114 | - border: 0px; | ||
| 115 | -} | ||
| 116 | - | ||
| 117 | -#footer ul { | ||
| 118 | - margin: 0px; | ||
| 119 | - padding: 0px; | ||
| 120 | -} | ||
| 121 | - | ||
| 122 | -#footer li { | ||
| 123 | - display: block; | ||
| 124 | - float: right; | ||
| 125 | - margin-right: 20px; | ||
| 126 | - height: 20px; | ||
| 127 | -} | ||
| 128 | - | ||
| 129 | -#footer a#footer-esq { | ||
| 130 | - padding: 5px 0px 0px 10px; | ||
| 131 | - float: left; | ||
| 132 | - text-align: left; | ||
| 133 | - border: none; | ||
| 134 | } | 108 | } |
| 135 | 109 | ||
| 136 | -#footer a#footer-dir { | ||
| 137 | - padding: 5px 10px 0px 0px; | ||
| 138 | - float: right; | ||
| 139 | - text-align: right; | ||
| 140 | - border: none; | ||
| 141 | -} | ||
| 142 | - | ||
| 143 | - | ||
| 144 | /*********************************************************/ | 110 | /*********************************************************/ |
| 145 | 111 | ||
| 146 | 112 |