diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 60a63a4..0eaa31e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -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
diff --git a/app/views/blocks/profile_info.rhtml b/app/views/blocks/profile_info.rhtml
index 63d95c1..43e6605 100644
--- a/app/views/blocks/profile_info.rhtml
+++ b/app/views/blocks/profile_info.rhtml
@@ -17,7 +17,9 @@
- <%= link_to __('Homepage'), block.owner.url, :class => 'url' %>
- <%= link_to _('View profile'), block.owner.public_profile_url %>
- - <%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
+ <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
+ - <%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %>
+ <% end %>
<% if !user.nil? and user.has_permission?('edit_profile', profile) %>
- <%= link_to _('Control panel'), block.owner.admin_url %>
<% end %>
diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml
index e998933..44526a8 100644
--- a/app/views/layouts/application-ng.rhtml
+++ b/app/views/layouts/application-ng.rhtml
@@ -6,7 +6,7 @@
-
+
<%= noosfero_javascript %>
<%= import_blocks_stylesheets %>
<%= import_controller_stylesheets %>
@@ -96,8 +96,7 @@
'/assets/people', :id=>'people' %>
- <%= link_to '',
'/assets/communities', :id=>'communities' %>
- - <%= link_to '',
- '/assets/events', :id=>'events' %>
+ <%= theme_extra_navigation %>
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index aef22c0..d4da627 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -5,7 +5,7 @@
-
+
<%= meta_tags_for_article(@page) %>
<%= noosfero_javascript %>
diff --git a/public/500.html b/public/500.html
index 70a997e..122d7d6 100644
--- a/public/500.html
+++ b/public/500.html
@@ -4,7 +4,8 @@
Technical problems
-
+
+
diff --git a/public/500.html.erb b/public/500.html.erb
index e1bc3eb..98fe352 100644
--- a/public/500.html.erb
+++ b/public/500.html.erb
@@ -4,7 +4,8 @@
Technical problems
-
+
+
diff --git a/public/503.html b/public/503.html
index 7dd4562..d1bea30 100644
--- a/public/503.html
+++ b/public/503.html
@@ -4,7 +4,8 @@
Noosfero - System Maintainance
-
+
+
diff --git a/public/503.html.erb b/public/503.html.erb
index c4ea60b..c5e8c15 100644
--- a/public/503.html.erb
+++ b/public/503.html.erb
@@ -4,7 +4,8 @@
Noosfero - System Maintainance
-
+
+
diff --git a/public/designs/themes/noosfero/errors.css b/public/designs/themes/noosfero/errors.css
new file mode 100644
index 0000000..9e30f76
--- /dev/null
+++ b/public/designs/themes/noosfero/errors.css
@@ -0,0 +1 @@
+@import url(../base/errors.css);
diff --git a/public/designs/themes/noosfero/favicon.ico b/public/designs/themes/noosfero/favicon.ico
new file mode 100644
index 0000000..ff2bde6
Binary files /dev/null and b/public/designs/themes/noosfero/favicon.ico differ
diff --git a/public/designs/themes/noosfero/footer.rhtml b/public/designs/themes/noosfero/footer.rhtml
index e6d1498..54a7bb9 100644
--- a/public/designs/themes/noosfero/footer.rhtml
+++ b/public/designs/themes/noosfero/footer.rhtml
@@ -1,2 +1,12 @@
- <%= language_chooser %>
-<%= footer %>
+
+
diff --git a/public/designs/themes/noosfero/header.rhtml b/public/designs/themes/noosfero/header.rhtml
new file mode 100644
index 0000000..ebe5dc1
--- /dev/null
+++ b/public/designs/themes/noosfero/header.rhtml
@@ -0,0 +1,5 @@
+<%= language_chooser(:element => 'dropdown') %>
+
+
+
+
diff --git a/public/designs/themes/noosfero/images/favicon.ico b/public/designs/themes/noosfero/images/favicon.ico
deleted file mode 100644
index 84d88a1..0000000
Binary files a/public/designs/themes/noosfero/images/favicon.ico and /dev/null differ
diff --git a/public/designs/themes/noosfero/images/logo-colivre-footer.gif b/public/designs/themes/noosfero/images/logo-colivre-footer.gif
deleted file mode 100644
index 9b3bc3c..0000000
Binary files a/public/designs/themes/noosfero/images/logo-colivre-footer.gif and /dev/null differ
diff --git a/public/designs/themes/noosfero/images/logo-noosfero.png b/public/designs/themes/noosfero/images/logo-noosfero.png
new file mode 100644
index 0000000..3e43713
Binary files /dev/null and b/public/designs/themes/noosfero/images/logo-noosfero.png differ
diff --git a/public/designs/themes/noosfero/images/logo-noosfero.xcf b/public/designs/themes/noosfero/images/logo-noosfero.xcf
new file mode 100644
index 0000000..e3c37e7
Binary files /dev/null and b/public/designs/themes/noosfero/images/logo-noosfero.xcf differ
diff --git a/public/designs/themes/noosfero/navigation.rhtml b/public/designs/themes/noosfero/navigation.rhtml
new file mode 100644
index 0000000..098e08b
--- /dev/null
+++ b/public/designs/themes/noosfero/navigation.rhtml
@@ -0,0 +1,2 @@
+
+
diff --git a/public/designs/themes/noosfero/style.css b/public/designs/themes/noosfero/style.css
new file mode 100644
index 0000000..4380525
--- /dev/null
+++ b/public/designs/themes/noosfero/style.css
@@ -0,0 +1,5 @@
+@import url(../base/style.css);
+
+#site-title {
+ background: url(images/logo-noosfero.png) no-repeat;
+}
diff --git a/public/designs/themes/noosfero/stylesheets/common.css b/public/designs/themes/noosfero/stylesheets/common.css
deleted file mode 100644
index 42f174f..0000000
--- a/public/designs/themes/noosfero/stylesheets/common.css
+++ /dev/null
@@ -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;
-}
diff --git a/public/designs/themes/noosfero/stylesheets/errors.css b/public/designs/themes/noosfero/stylesheets/errors.css
deleted file mode 100644
index 9e1ffd0..0000000
--- a/public/designs/themes/noosfero/stylesheets/errors.css
+++ /dev/null
@@ -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;
-}
diff --git a/public/designs/themes/noosfero/stylesheets/login-box.css b/public/designs/themes/noosfero/stylesheets/login-box.css
deleted file mode 100644
index 5533650..0000000
--- a/public/designs/themes/noosfero/stylesheets/login-box.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.login-box-content {
- -moz-border-radius: 40px;
-}
-
-.login-box-content .forgot-passwd {
- text-align: center;
-}
diff --git a/public/designs/themes/noosfero/stylesheets/menu.css b/public/designs/themes/noosfero/stylesheets/menu.css
deleted file mode 100644
index c62a628..0000000
--- a/public/designs/themes/noosfero/stylesheets/menu.css
+++ /dev/null
@@ -1,5 +0,0 @@
-#navigation_bar {
- top: 3px;
- left: 3px;
- right: 3px;
-}
diff --git a/public/designs/themes/noosfero/theme.yml b/public/designs/themes/noosfero/theme.yml
index d5bb839..5d56a45 100644
--- a/public/designs/themes/noosfero/theme.yml
+++ b/public/designs/themes/noosfero/theme.yml
@@ -1,3 +1,2 @@
-title: "Noosfero"
-description: "Noosfero default theme"
-js: [ ]
+theme: "Noosfero default theme"
+layout: "application-ng"
diff --git a/public/designs/themes/noosfero/thumbnail.jpg b/public/designs/themes/noosfero/thumbnail.jpg
deleted file mode 100644
index 034fb9f..0000000
Binary files a/public/designs/themes/noosfero/thumbnail.jpg and /dev/null differ
diff --git a/public/stylesheets/blocks/profile-info-block.css b/public/stylesheets/blocks/profile-info-block.css
index 136290f..ad5fb7a 100644
--- a/public/stylesheets/blocks/profile-info-block.css
+++ b/public/stylesheets/blocks/profile-info-block.css
@@ -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;
}
diff --git a/public/stylesheets/lightbox.css b/public/stylesheets/lightbox.css
index d3dc035..fa06254 100644
--- a/public/stylesheets/lightbox.css
+++ b/public/stylesheets/lightbox.css
@@ -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;
diff --git a/public/stylesheets/thickbox.css b/public/stylesheets/thickbox.css
index 55deaaa..ab42e0e 100644
--- a/public/stylesheets/thickbox.css
+++ b/public/stylesheets/thickbox.css
@@ -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%;
--
libgit2 0.21.2