Download as
Browse Code »

Commit 50ee8b0f8cc325b470505db672512e5c379b64fe

Authored by Antonio Terceiro
1 parent 15460295
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

New Noosfero default theme. 

  * some small CSS enhancements in the system CSS
  * new 'base' theme which can be used as a ... wait for it ... base for new
    themes
  * new 'noosfero' theme based on the 'base' theme. It only adds a
    noosfero logo and header/footer/navigation templates.
  * Now looking for favicon.ico in the root of the theme directory
  * Now looking for errors.css in the root ot the theme directory
Showing 27 changed files with 65 additions and 165 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @50ee8b0
... ... @@ -368,6 +368,10 @@ module ApplicationHelper
368 368 theme_include('footer')
369 369 end
370 370  
  371 + def theme_extra_navigation
  372 + theme_include('navigation')
  373 + end
  374 +
371 375 def is_testing_theme
372 376 !@controller.session[:theme].nil?
373 377 end
... ...
app/views/blocks/profile_info.rhtml
  Diff comments   View file @50ee8b0
... ... @@ -17,7 +17,9 @@
17 17 <ul class="profile-info-data">
18 18 <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
19 19 <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
20   - <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %></li>
  20 + <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
  21 + <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
  22 + <% end %>
21 23 <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
22 24 <li><%= link_to _('Control panel'), block.owner.admin_url %></li>
23 25 <% end %>
... ...
app/views/layouts/application-ng.rhtml
  Diff comments   View file @50ee8b0
... ... @@ -6,7 +6,7 @@
6 6 <!--<meta http-equiv="refresh" content="1"/>-->
7 7 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
8 8 <meta name="description" content="<%= @environment.name %>" />
9   - <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/imgs/favicon.ico' %>" type="image/x-icon" />
  9 + <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/favicon.ico' %>" type="image/x-icon" />
10 10 <%= noosfero_javascript %>
11 11 <%= import_blocks_stylesheets %>
12 12 <%= import_controller_stylesheets %>
... ... @@ -96,8 +96,7 @@
96 96 '/assets/people', :id=>'people' %></li>
97 97 <li><%= link_to '<span class="icon-menu-community">' + _('Communities') + '</span>',
98 98 '/assets/communities', :id=>'communities' %></li>
99   - <li><%= link_to '<span class="icon-menu-events">' + 'Agenda Livre' + '</span>',
100   - '/assets/events', :id=>'events' %></li>
  99 + <%= theme_extra_navigation %>
101 100 </ul>
102 101 <div id="navigation-end"></div>
103 102 </div><!-- end id="navigation" -->
... ...
app/views/layouts/application.rhtml
  Diff comments   View file @50ee8b0
... ... @@ -5,7 +5,7 @@
5 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6 6 <meta name="description" content="<%= @environment.name %>" />
7 7 <meta name="keywords" content="Noosfero, Community, Open Source" />
8   - <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />
  8 + <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/favicon.ico' %>" type="image/x-icon" />
9 9 <!-- ok --><%= meta_tags_for_article(@page) %>
10 10  
11 11 <%= noosfero_javascript %>
... ...
public/500.html
  Diff comments   View file @50ee8b0
... ... @@ -4,7 +4,8 @@
4 4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
5 5 <meta http-equiv="refresh" content="60"/>
6 6 <title>Technical problems</title>
7   - <link rel="stylesheet" type="text/css" href="/designs/themes/default/stylesheets/errors.css"/>
  7 + <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
  8 + <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
8 9 <script type='text/javascript' src='/javascripts/prototype.js'></script>
9 10 <script type='text/javascript' src='/javascripts/errors.js'></script>
10 11 </head>
... ...
public/500.html.erb
  Diff comments   View file @50ee8b0
... ... @@ -4,7 +4,8 @@
4 4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
5 5 <meta http-equiv="refresh" content="60"/>
6 6 <title>Technical problems</title>
7   - <link rel="stylesheet" type="text/css" href="/designs/themes/default/stylesheets/errors.css"/>
  7 + <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
  8 + <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
8 9 <script type='text/javascript' src='/javascripts/prototype.js'></script>
9 10 <script type='text/javascript' src='/javascripts/errors.js'></script>
10 11 </head>
... ...
public/503.html
  Diff comments   View file @50ee8b0
... ... @@ -4,7 +4,8 @@
4 4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
5 5 <meta http-equiv="refresh" content="60"/>
6 6 <title>Noosfero - System Maintainance</title>
7   - <link rel="stylesheet" type="text/css" href="/designs/themes/default/stylesheets/errors.css"/>
  7 + <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
  8 + <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
8 9 <script type='text/javascript' src='/javascripts/prototype.js'></script>
9 10 <script type='text/javascript' src='/javascripts/errors.js'></script>
10 11 </head>
... ...
public/503.html.erb
  Diff comments   View file @50ee8b0
... ... @@ -4,7 +4,8 @@
4 4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
5 5 <meta http-equiv="refresh" content="60"/>
6 6 <title>Noosfero - System Maintainance</title>
7   - <link rel="stylesheet" type="text/css" href="/designs/themes/default/stylesheets/errors.css"/>
  7 + <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
  8 + <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
8 9 <script type='text/javascript' src='/javascripts/prototype.js'></script>
9 10 <script type='text/javascript' src='/javascripts/errors.js'></script>
10 11 </head>
... ...
public/designs/themes/noosfero/errors.css 0 → 100644
  Diff comments   View file @50ee8b0
... ... @@ -0,0 +1 @@
  1 +@import url(../base/errors.css);
... ...
public/designs/themes/noosfero/favicon.ico 0 → 100644
View file @50ee8b0
No preview for this file type
public/designs/themes/noosfero/footer.rhtml
  Diff comments   View file @50ee8b0
1   -<p> <%= language_chooser %> </p>
2   -<%= footer %>
  1 +<div id="footer-links">
  2 +</div><!-- end id="footer-links" -->
  3 +<div id="copyright">
  4 + <p id='noosfero-license'>
  5 + Powered by <a
  6 + href="http://www.noosfero.org/" id='link-noosfero'>Noosfero</a>, licensed under
  7 + <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public
  8 + License</a>, version 3 or above. </p>
  9 + <!-- Desenvolvido com
  10 + <a href="http://noosfero.com.br"
  11 + title="FLOSS for Social!">Noosfero</a-->
  12 +</div><!-- end id="copyright" -->
... ...
public/designs/themes/noosfero/header.rhtml 0 → 100644
  Diff comments   View file @50ee8b0
... ... @@ -0,0 +1,5 @@
  1 +<div id='language-chooser'><%= language_chooser(:element => 'dropdown') %></div>
  2 +<div id="friends">
  3 + &nbsp;
  4 +</div><!-- end id="friends" -->
  5 +
... ...
public/designs/themes/noosfero/images/favicon.ico
View file @1546029
No preview for this file type
public/designs/themes/noosfero/images/logo-colivre-footer.gif
View file @1546029

1.49 KB
public/designs/themes/noosfero/images/logo-noosfero.png 0 → 100644
View file @50ee8b0

12.5 KB
public/designs/themes/noosfero/images/logo-noosfero.xcf 0 → 100644
View file @50ee8b0
No preview for this file type
public/designs/themes/noosfero/navigation.rhtml 0 → 100644
  Diff comments   View file @50ee8b0
... ... @@ -0,0 +1,2 @@
  1 +<li><a href="/assets/enterprises"><span class='icon-menu-enterprise'><%= _('Enterprises') %></span></a></li>
  2 +<li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
... ...
public/designs/themes/noosfero/style.css 0 → 100644
  Diff comments   View file @50ee8b0
... ... @@ -0,0 +1,5 @@
  1 +@import url(../base/style.css);
  2 +
  3 +#site-title {
  4 + background: url(images/logo-noosfero.png) no-repeat;
  5 +}
... ...
public/designs/themes/noosfero/stylesheets/common.css
View file @1546029
... ... @@ -1,83 +0,0 @@
1   -body.noosfero {
2   - background-position: 50% 25px;
3   - background-repeat: repeat-x;
4   -}
5   -
6   -#wrap {
7   - background-position: 50% 22px;
8   - background-repeat: repeat-x;
9   - border: 3px solid #888;
10   -}
11   -
12   -.box-3 {
13   - padding-top: 35px;
14   -}
15   -
16   -#path_category {
17   - position: absolute;
18   - top: 40px;
19   - left: 30px;
20   - font-weight: bold;
21   - z-index: 10;
22   -}
23   -
24   -a { color: #05B }
25   -a:visited { color: #68C }
26   -a:hover, a:active { color: #08F }
27   -
28   -hr {
29   - border: none;
30   - border-top: 2px dotted black;
31   -}
32   -
33   -#footer {
34   - margin: 0px;
35   - padding: 10px;
36   -}
37   -
38   -#footer a {
39   - border-bottom: 1px dotted #777;
40   -}
41   -#footer a:hover {
42   - border: 0px;
43   -}
44   -
45   -#footer a#footer-esq {
46   - padding: 5px 0px 5px 45px;
47   - float: left;
48   - text-align: left;
49   - border: none;
50   -}
51   -
52   -#footer a#footer-dir {
53   - padding: 5px 35px 5px 0px;
54   - float: right;
55   - text-align: right;
56   - border: none;
57   - opacity: 0.5;
58   -}
59   -
60   -#footer a#footer-esq:hover,
61   -#footer a#footer-dir:hover {
62   - opacity: 1;
63   -}
64   -
65   -/* * * category ajax selector * * */
66   -
67   -#category-ajax-selector {
68   - border: none;
69   - background: #B8CFE7;
70   - -moz-border-radius: 10px;
71   -}
72   -
73   -#category-ajax-selector .box-title {
74   - border: 1px solid #B8CFE7;
75   - background: #B8CFE7;
76   - -moz-border-radius-topleft: 8px;
77   - -moz-border-radius-topright: 8px;
78   -}
79   -
80   -#category-ajax-selector .select-subcategory-link {
81   - border: 1px solid #729FCF;
82   - -moz-border-radius: 6px;
83   -}
public/designs/themes/noosfero/stylesheets/errors.css
View file @1546029
... ... @@ -1,37 +0,0 @@
1   -body {
2   - font-family: sans-serif;
3   - margin: 0px;
4   - padding: 0% 0%;
5   - height: 100%;
6   -}
7   -
8   -#wrap {
9   - background: #CCC url(/503-small.jpg) 100% 100% no-repeat;
10   - position: absolute;
11   - top: 0px;
12   - bottom: 0px;
13   - left: 0px;
14   - right: 0px;
15   - padding: 1em 3em 1em 3em;
16   -}
17   -
18   -#languages {
19   - float: left;
20   - width: 40%;
21   - margin-top: 3em;
22   - border-top: 1px solid #aaa;
23   - font-size: smaller;
24   -}
25   -
26   -h1 {
27   - margin: 30px 0px 0px 0px;
28   - font-weight: bold;
29   - color: #555;
30   -}
31   -
32   -a, a:visited {
33   - color: #666;
34   -}
35   -a:hover {
36   - color: black;
37   -}
public/designs/themes/noosfero/stylesheets/login-box.css
View file @1546029
... ... @@ -1,7 +0,0 @@
1   -.login-box-content {
2   - -moz-border-radius: 40px;
3   -}
4   -
5   -.login-box-content .forgot-passwd {
6   - text-align: center;
7   -}
public/designs/themes/noosfero/stylesheets/menu.css
View file @1546029
... ... @@ -1,5 +0,0 @@
1   -#navigation_bar {
2   - top: 3px;
3   - left: 3px;
4   - right: 3px;
5   -}
public/designs/themes/noosfero/theme.yml
  Diff comments   View file @50ee8b0
1   -title: "Noosfero"
2   -description: "Noosfero default theme"
3   -js: [ ]
  1 +theme: "Noosfero default theme"
  2 +layout: "application-ng"
... ...
public/designs/themes/noosfero/thumbnail.jpg
View file @1546029

3.51 KB
public/stylesheets/blocks/profile-info-block.css
  Diff comments   View file @50ee8b0
... ... @@ -25,8 +25,12 @@
25 25 display: block;
26 26 }
27 27  
  28 +.profile-info-block a {
  29 + font-size: smaller;
  30 +}
  31 +
28 32 .profile-info-picture img {
29   - border: 1px solid #204A87;
  33 + border: none;
30 34 padding: 2px;
31 35 background: #FFF;
32 36 }
... ... @@ -111,6 +115,6 @@
111 115 #content .profile-info-block ul li {
112 116 list-style: none;
113 117 list-style-image: none;
114   - margin: 0px;
  118 + margin: 0px 0px 5px 0px;
115 119 padding: 2px;
116 120 }
... ...
public/stylesheets/lightbox.css
  Diff comments   View file @50ee8b0
... ... @@ -9,22 +9,19 @@ Modified : February 1, 2006
9 9  
10 10 - - - - - - - - - - - - - - - - - - - - - */
11 11  
12   -#lightbox{
13   - display: none;
14   - position: absolute;
15   - top: 50%;
16   - left: 50%;
17   - z-index: 300;
18   - width: 500px;
19   - margin: -200px 0 0 -250px;
20   - border: 10px solid #000;
21   - text-align: left;
  12 +#lightbox {
  13 + display: none;
  14 + position: absolute;
  15 + top: 150px;
  16 + left: 50%;
  17 + z-index: 300;
  18 + width: 500px;
  19 + margin-left: -265px;
  20 + border: 1px solid #000;
  21 + text-align: left;
22 22 padding: 1em;
23 23 background: #FFF;
24 24 }
25   -#lightbox[id]{
26   - position:fixed;
27   -}
28 25  
29 26 #overlay{
30 27 display:none;
... ... @@ -35,9 +32,9 @@ Modified : February 1, 2006
35 32 height:100%;
36 33 z-index:200;
37 34 background-color:#000;
38   - -moz-opacity: 0.5;
39   - opacity:.50;
40   - filter: alpha(opacity=50);
  35 + -moz-opacity: 0.75;
  36 + opacity:.75;
  37 + filter: alpha(opacity=75);
41 38 }
42 39 #overlay[id]{
43 40 position:fixed;
... ...
public/stylesheets/thickbox.css
  Diff comments   View file @50ee8b0
... ... @@ -53,7 +53,7 @@
53 53 z-index: 202;
54 54 color:#000000;
55 55 display:none;
56   - border: 4px solid #525252;
  56 + border: 1px solid #000;
57 57 text-align:left;
58 58 top:50%;
59 59 left:50%;
... ...