Commit bf460736d9bf4668a06a9d0977f2c591aab7aa25
1 parent
df994dfd
Exists in
master
and in
29 other branches
ActionItem420: by now the footer text is a theme file
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1919 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
9 changed files
with
36 additions
and
16 deletions
Show diff stats
app/views/layouts/application.rhtml
| @@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
| 9 | </title> | 9 | </title> |
| 10 | <meta name="description" content="FIXME: Descriptions of Noosfero" /> | 10 | <meta name="description" content="FIXME: Descriptions of Noosfero" /> |
| 11 | <meta name="keywords" content="Noosfero, Community, Open Source" /> | 11 | <meta name="keywords" content="Noosfero, Community, Open Source" /> |
| 12 | + <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" /> | ||
| 12 | 13 | ||
| 13 | <%= javascript_include_tag 'default-config' %> | 14 | <%= javascript_include_tag 'default-config' %> |
| 14 | <%= javascript_include_tag :defaults %> | 15 | <%= javascript_include_tag :defaults %> |
| @@ -137,17 +138,7 @@ | @@ -137,17 +138,7 @@ | ||
| 137 | </div><!-- id="wrap" --> | 138 | </div><!-- id="wrap" --> |
| 138 | 139 | ||
| 139 | <div id="footer"> | 140 | <div id="footer"> |
| 140 | - <a href="http://ynternet.org" id="footer-esq"> | ||
| 141 | - <%= _('A Ynternet.org project') %><br/> | ||
| 142 | - Communication libre pour une société libre | ||
| 143 | - </a> | ||
| 144 | - <a href="http://colivre.coop.br" id="footer-dir"> | ||
| 145 | - <%= _('Developed by Colivre') %><br/> | ||
| 146 | - Free Technologies Cooperative | ||
| 147 | - </a> | ||
| 148 | - <%= language_chooser %> | ||
| 149 | - <p/> | ||
| 150 | - <%= footer %> | 141 | + <%= render :file => ('../../public/designs/themes/' + current_theme + '/footer.rhtml' ) %> |
| 151 | </div><!-- id="footer" --> | 142 | </div><!-- id="footer" --> |
| 152 | 143 | ||
| 153 | <div id="helpBox" style="display:none"> | 144 | <div id="helpBox" style="display:none"> |
| @@ -0,0 +1,11 @@ | @@ -0,0 +1,11 @@ | ||
| 1 | +<a href="http://fbes.org.br" id="footer-esq"> | ||
| 2 | + <%= _('A FBES project') %><br/> | ||
| 3 | + Fórum Brasileiro de Economia Solidária | ||
| 4 | +</a> | ||
| 5 | +<a href="http://colivre.coop.br" id="footer-dir"> | ||
| 6 | + <%= _('Developed by Colivre') %><br/> | ||
| 7 | + Cooperativa de Tecnologias Livres | ||
| 8 | +</a> | ||
| 9 | +<%= language_chooser %> | ||
| 10 | +<p/> | ||
| 11 | +<%= footer %> |
| @@ -0,0 +1,12 @@ | @@ -0,0 +1,12 @@ | ||
| 1 | +<a href="http://ynternet.org" id="footer-esq"> | ||
| 2 | + <%= _('A Ynternet.org project') %><br/> | ||
| 3 | + Communication libre pour une société libre | ||
| 4 | +</a> | ||
| 5 | +<a href="http://www1.loterie.ch" id="footer-dir"> | ||
| 6 | + <%= _('Sponsored by Loterie Romande') %><br/> | ||
| 7 | + lottery games in Switzerland | ||
| 8 | +</a> | ||
| 9 | +<%= language_chooser %> | ||
| 10 | +<p/> | ||
| 11 | +<%= footer %> | ||
| 12 | + |
781 Bytes
public/designs/themes/zen3/images/bg-footer.png
309 Bytes
No preview for this file type
1.28 KB
public/designs/themes/zen3/stylesheets/common.css
| 1 | 1 | ||
| 2 | body { | 2 | body { |
| 3 | - background: #BABDB6; #888A85; | 3 | + background: #9ca09a; #A1A59F; /* #BABDB6; #888A85; */ |
| 4 | } | 4 | } |
| 5 | 5 | ||
| 6 | #wrap { | 6 | #wrap { |
| @@ -42,7 +42,9 @@ ul li { | @@ -42,7 +42,9 @@ ul li { | ||
| 42 | /* * * Footer * * * * * * * * * * * * * * * * * * * */ | 42 | /* * * Footer * * * * * * * * * * * * * * * * * * * */ |
| 43 | 43 | ||
| 44 | #footer { | 44 | #footer { |
| 45 | - background: url("../images/bg-footer.png") repeat-x; | 45 | + background: url("../images/bg-footer.gif") repeat-x; |
| 46 | + height: 55px; | ||
| 47 | + max-height: 35px; | ||
| 46 | margin: 0px; | 48 | margin: 0px; |
| 47 | padding: 10px; | 49 | padding: 10px; |
| 48 | color: #FFF; | 50 | color: #FFF; |
| @@ -72,13 +74,13 @@ ul li { | @@ -72,13 +74,13 @@ ul li { | ||
| 72 | float: left; | 74 | float: left; |
| 73 | text-align: left; | 75 | text-align: left; |
| 74 | background: url(../images/logo-ynternet-footer.gif) no-repeat 0% 50%; | 76 | background: url(../images/logo-ynternet-footer.gif) no-repeat 0% 50%; |
| 75 | - padding: 5px 0px 10px 45px; | 77 | + padding: 6px 0px 10px 45px; |
| 76 | } | 78 | } |
| 77 | #footer-dir { | 79 | #footer-dir { |
| 78 | float: right; | 80 | float: right; |
| 79 | text-align: right; | 81 | text-align: right; |
| 80 | - background: url(../images/logo-colivre-footer.gif) no-repeat 100% 50%; | ||
| 81 | - padding: 5px 45px 10px 0px; | 82 | + background: url(../images/logo-loterie-footer.gif) no-repeat 100% 50%; |
| 83 | + padding: 6px 45px 10px 0px; | ||
| 82 | } | 84 | } |
| 83 | 85 | ||
| 84 | #footer-esq:hover, | 86 | #footer-esq:hover, |
public/designs/themes/zen3/stylesheets/menu.css
| @@ -137,6 +137,10 @@ | @@ -137,6 +137,10 @@ | ||
| 137 | margin-left: -3px; | 137 | margin-left: -3px; |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | +.action_home_index #user_box #link_login { | ||
| 141 | + display: none; /* do not show this link in the fist page */ | ||
| 142 | +} | ||
| 143 | + | ||
| 140 | /* * * Assets Menu * * * * * * * * * * * */ | 144 | /* * * Assets Menu * * * * * * * * * * * */ |
| 141 | 145 | ||
| 142 | #assets_menu { | 146 | #assets_menu { |