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

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
Antonio Terceiro
1 parent 15460295
Showing 27 changed files with 65 additions and 165 deletions Show diff stats
app/helpers/application_helper.rb
app/views/blocks/profile_info.rhtml
app/views/layouts/application-ng.rhtml
app/views/layouts/application.rhtml
public/500.html
public/500.html.erb
public/503.html
public/503.html.erb
public/designs/themes/noosfero/errors.css
public/designs/themes/noosfero/favicon.ico
public/designs/themes/noosfero/footer.rhtml
public/designs/themes/noosfero/header.rhtml
public/designs/themes/noosfero/images/favicon.ico
public/designs/themes/noosfero/images/logo-colivre-footer.gif
public/designs/themes/noosfero/images/logo-noosfero.png
public/designs/themes/noosfero/images/logo-noosfero.xcf
public/designs/themes/noosfero/navigation.rhtml
public/designs/themes/noosfero/style.css
public/designs/themes/noosfero/stylesheets/common.css
public/designs/themes/noosfero/stylesheets/errors.css
@@ -368,6 +368,10 @@ module ApplicationHelper
     theme_include('footer')
   end
+  def theme_extra_navigation
+    theme_include('navigation')
+  end
+
   def is_testing_theme
     !@controller.session[:theme].nil?
   end
@@ -17,7 +17,9 @@
 <ul class="profile-info-data">
   <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
-  <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %></li>
+  <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
+    <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
+  <% end %>
   <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
     <li><%= link_to _('Control panel'), block.owner.admin_url %></li>
   <% end %>
@@ -6,7 +6,7 @@
     <!--<meta http-equiv="refresh" content="1"/>-->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="description" content="<%= @environment.name %>" />
-    <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/imgs/favicon.ico' %>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/favicon.ico' %>" type="image/x-icon" />
     <%= noosfero_javascript %>
     <%= import_blocks_stylesheets %>
     <%= import_controller_stylesheets %>
@@ -96,8 +96,7 @@
                             '/assets/people', :id=>'people'           %></li>
             <li><%= link_to '<span class="icon-menu-community">' + _('Communities') + '</span>',
                             '/assets/communities', :id=>'communities' %></li>
-            <li><%= link_to '<span class="icon-menu-events">' + 'Agenda Livre' + '</span>',
-                            '/assets/events', :id=>'events'           %></li>
+            <%= theme_extra_navigation %>
           </ul>
           <div id="navigation-end"></div>
         </div><!-- end id="navigation" -->
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="description" content="<%= @environment.name %>" />
     <meta name="keywords" content="Noosfero, Community, Open Source" />
-    <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/favicon.ico' %>" type="image/x-icon" />
     <!-- ok --><%= meta_tags_for_article(@page) %>
     <%= noosfero_javascript %>
@@ -4,7 +4,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta http-equiv="refresh" content="60"/>
   <title>Technical problems</title>
-  <link rel="stylesheet" type="text/css" href="/designs/themes/default/stylesheets/errors.css"/>
+  <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
+  <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
   <script type='text/javascript' src='/javascripts/prototype.js'></script>
   <script type='text/javascript' src='/javascripts/errors.js'></script>
 </head>
@@ -4,7 +4,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta http-equiv="refresh" content="60"/>
   <title>Technical problems</title>
-  <link rel="stylesheet" type="text/css" href="/designs/themes/default/stylesheets/errors.css"/>
+  <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
+  <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
   <script type='text/javascript' src='/javascripts/prototype.js'></script>
   <script type='text/javascript' src='/javascripts/errors.js'></script>
 </head>
@@ -4,7 +4,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta http-equiv="refresh" content="60"/>
   <title>Noosfero - System Maintainance</title>
-  <link rel="stylesheet" type="text/css" href="/designs/themes/default/stylesheets/errors.css"/>
+  <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
+  <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
   <script type='text/javascript' src='/javascripts/prototype.js'></script>
   <script type='text/javascript' src='/javascripts/errors.js'></script>
 </head>
@@ -4,7 +4,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta http-equiv="refresh" content="60"/>
   <title>Noosfero - System Maintainance</title>
-  <link rel="stylesheet" type="text/css" href="/designs/themes/default/stylesheets/errors.css"/>
+  <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
+  <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
   <script type='text/javascript' src='/javascripts/prototype.js'></script>
   <script type='text/javascript' src='/javascripts/errors.js'></script>
 </head>
@@ -0,0 +1 @@
+@import url(../base/errors.css);
-<p> <%= language_chooser %> </p>
-<%= footer %>
+<div id="footer-links">
+</div><!-- end id="footer-links" -->
+<div id="copyright">
+  <p id='noosfero-license'>
+  Powered by <a
+    href="http://www.noosfero.org/" id='link-noosfero'>Noosfero</a>, licensed under
+    <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public
+      License</a>, version 3 or above.  </p>
+  <!-- Desenvolvido com
+  <a href="http://noosfero.com.br"
+     title="FLOSS for Social!">Noosfero</a-->
+</div><!-- end id="copyright" -->
@@ -0,0 +1,5 @@
+<div id='language-chooser'><%= language_chooser(:element => 'dropdown') %></div>
+<div id="friends">
+  &nbsp;
+</div><!-- end id="friends" -->
+
@@ -0,0 +1,2 @@
+<li><a href="/assets/enterprises"><span class='icon-menu-enterprise'><%= _('Enterprises') %></span></a></li>
+<li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
@@ -0,0 +1,5 @@
+@import url(../base/style.css);
+
+#site-title {
+  background: url(images/logo-noosfero.png) no-repeat;
+}
@@ -1,83 +0,0 @@
-body.noosfero {
-  background-position: 50% 25px;
-  background-repeat: repeat-x;
-}
-
-#wrap {
-  background-position: 50% 22px;
-  background-repeat: repeat-x;
-  border: 3px solid #888;
-}
-
-.box-3 {
-  padding-top: 35px;
-}
-
-#path_category {
-  position: absolute;
-  top: 40px;
-  left: 30px;
-  font-weight: bold;
-  z-index: 10;
-}
-
-a                        { color: #05B }
-a:visited                { color: #68C }
-a:hover, a:active        { color: #08F }
-
-hr {
-  border: none;
-  border-top: 2px dotted black;
-}
-
-#footer {
-  margin: 0px;
-  padding: 10px;
-}
-
-#footer a {
-  border-bottom: 1px dotted #777;
-}
-#footer a:hover {
-  border: 0px;
-}
-
-#footer a#footer-esq {
-  padding: 5px 0px 5px 45px;
-  float: left;
-  text-align: left;
-  border: none;
-}
-
-#footer a#footer-dir {
-  padding: 5px 35px 5px 0px;
-  float: right;
-  text-align: right;
-  border: none;
-  opacity: 0.5;
-}
-
-#footer a#footer-esq:hover,
-#footer a#footer-dir:hover {
-  opacity: 1;
-}
-
-/* * * category ajax selector * * */
-
-#category-ajax-selector {
-  border: none;
-  background: #B8CFE7;
-  -moz-border-radius: 10px;
-}
-
-#category-ajax-selector .box-title {
-  border: 1px solid #B8CFE7;
-  background: #B8CFE7;
-  -moz-border-radius-topleft: 8px;
-  -moz-border-radius-topright: 8px;
-}
-
-#category-ajax-selector .select-subcategory-link {
-  border: 1px solid #729FCF;
-  -moz-border-radius: 6px;
-}
@@ -1,37 +0,0 @@
-body {
-  font-family: sans-serif;
-  margin: 0px;
-  padding: 0% 0%;
-  height: 100%;
-}
-
-#wrap {
-  background: #CCC url(/503-small.jpg) 100% 100% no-repeat;
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  padding: 1em 3em 1em 3em;
-}
-
-#languages {
-  float: left;
-  width: 40%;
-  margin-top: 3em;
-  border-top: 1px solid #aaa;
-  font-size: smaller;
-}
-
-h1 {
-  margin: 30px 0px 0px 0px;
-  font-weight: bold;
-  color: #555;
-}
-
-a, a:visited {
-  color: #666;
-}
-a:hover {
-  color: black;
-}
@@ -1,7 +0,0 @@
-.login-box-content {
-  -moz-border-radius: 40px;
-}
-
-.login-box-content .forgot-passwd {
-  text-align: center;
-}
@@ -1,5 +0,0 @@
-#navigation_bar {
-  top: 3px;
-  left: 3px;
-  right: 3px;
-}
-title: "Noosfero"
-description: "Noosfero default theme"
-js: [ ]
+theme: "Noosfero default theme"
+layout: "application-ng"
@@ -25,8 +25,12 @@
   display: block;
 }
+.profile-info-block a {
+  font-size: smaller;
+}
+
 .profile-info-picture img {
-  border: 1px solid #204A87;
+  border: none;
   padding: 2px;
   background: #FFF;
 }
@@ -111,6 +115,6 @@
 #content .profile-info-block ul li {
   list-style: none;
   list-style-image: none;
-  margin: 0px;
+  margin: 0px 0px 5px 0px;
   padding: 2px;
 }
@@ -9,22 +9,19 @@ Modified : February 1, 2006
 - - - - - - - - - - - - - - - - - - - - - */
-#lightbox{
-	display: none;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	z-index: 300;
-	width: 500px;
-	margin: -200px 0 0 -250px;
-	border: 10px solid #000;
-	text-align: left;
+#lightbox {
+  display: none;
+  position: absolute;
+  top: 150px;
+  left: 50%;
+  z-index: 300;
+  width: 500px;
+  margin-left: -265px;
+  border: 1px solid #000;
+  text-align: left;
   padding: 1em;
   background: #FFF;
 }
-#lightbox[id]{
-	position:fixed;
-}
 #overlay{
 	display:none;
@@ -35,9 +32,9 @@ Modified : February 1, 2006
 	height:100%;
 	z-index:200;
 	background-color:#000;
-	-moz-opacity: 0.5;
-	opacity:.50;
-	filter: alpha(opacity=50);
+	-moz-opacity: 0.75;
+	opacity:.75;
+	filter: alpha(opacity=75);
 }
 #overlay[id]{
 	position:fixed;
@@ -53,7 +53,7 @@
 	z-index: 202;
 	color:#000000;
 	display:none;
-	border: 4px solid #525252;
+	border: 1px solid #000;
 	text-align:left;
 	top:50%;
 	left:50%;
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	5	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6	<meta name="description" content="<%= @environment.name %>" />	6	<meta name="description" content="<%= @environment.name %>" />
7	<meta name="keywords" content="Noosfero, Community, Open Source" />	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	<!-- ok --><%= meta_tags_for_article(@page) %>	9	<!-- ok --><%= meta_tags_for_article(@page) %>
10		10
11	<%= noosfero_javascript %>	11	<%= noosfero_javascript %>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+@import url(../base/errors.css);
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" -->
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<div id='language-chooser'><%= language_chooser(:element => 'dropdown') %></div>
	2	+<div id="friends">
	3	+
	4	+</div><!-- end id="friends" -->
	5	+
@@ -0,0 +1,2 @@		@@ -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>
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+@import url(../base/style.css);
	2	+
	3	+#site-title {
	4	+ background: url(images/logo-noosfero.png) no-repeat;
	5	+}
	@@ -1,83 +0,0 @@	@@ -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	-}
	@@ -1,37 +0,0 @@	@@ -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	-}
	@@ -1,7 +0,0 @@	@@ -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	-}
	@@ -1,5 +0,0 @@	@@ -1,5 +0,0 @@
1	-#navigation_bar {
2	- top: 3px;
3	- left: 3px;
4	- right: 3px;
5	-}