ActionItem1050: new generation layout

Aurelio A. Heckert · Antonio Terceiro
1 parent ec400745
Showing 18 changed files with 264 additions and 87 deletions Show diff stats
app/controllers/application.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/boxes_helper.rb
app/views/cms/_blog.rhtml
app/views/content_viewer/blog_page.rhtml
app/views/content_viewer/view_page.rhtml
app/views/layouts/_javascript.rhtml
app/views/layouts/application-ng.rhtml
app/views/layouts/application.rhtml
app/views/profile_editor/index.rhtml
public/designs/themes/noosfero/stylesheets/common.css
public/images/top-bar/assets-menu-bg-azul.gif
public/images/top-bar/assets-menu-top-azul.gif
public/stylesheets/article.css
public/stylesheets/button.css
public/stylesheets/common.css
public/stylesheets/menu.css
@@ -2,6 +2,12 @@
 # available in all controllers.
 class ApplicationController < ActionController::Base
+  include ApplicationHelper
+  layout :get_layout
+  def get_layout
+    theme_option(:layout) || 'application'
+  end
+
   filter_parameter_logging :password
   def log_processing
@@ -290,7 +290,12 @@ module ApplicationHelper
     if in_theme
       result << theme_path
     end
-    result << '/stylesheets/' << name << '.css'
+    name += '.css'  if ( name[-4..-1] != '.css' )
+    if ( name[0..0] == '/' )
+      result << name
+    else
+      result << '/stylesheets/' << name
+    end
   end
   def theme_path
@@ -301,6 +306,10 @@ module ApplicationHelper
     end
   end
+  def theme_stylesheet_path
+    theme_path + '/style.css'
+  end
+
   def current_theme
     return session[:theme] if (session[:theme])
     p = profile
@@ -311,13 +320,21 @@ module ApplicationHelper
     end
   end
-  def theme_footer
-    footer = ('../../public' + theme_path + '/footer.rhtml')
-    if File.exists?(RAILS_ROOT + '/app/views/' + footer)
-      render :file => footer
+  def theme_include(template)
+    file = ('../../public' + theme_path + '/' + template + '.rhtml')
+    if File.exists?(RAILS_ROOT + '/app/views/' + file)
+      render :file => file
     end
   end
+  def theme_header
+    theme_include('header')
+  end
+
+  def theme_footer
+    theme_include('footer')
+  end
+
   def is_testing_theme
     !@controller.session[:theme].nil?
   end
@@ -727,13 +744,16 @@ module ApplicationHelper
     end
   end
-  def template_stylesheet_tag
+  def template_stylesheet_path
     if profile.nil?
-      stylesheet_link_tag '/designs/templates/default/stylesheets/style.css'
+      '/designs/templates/default/stylesheets/style.css'
     else
-      stylesheet_link_tag "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
+      "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
     end
   end
+  def template_stylesheet_tag
+    stylesheet_import template_stylesheet_path()
+  end
   def login_url
     options = Noosfero.url_options.merge({ :controller => 'account', :action => 'login' })
@@ -770,9 +790,11 @@ module ApplicationHelper
   end
   def meta_tags_for_article(article)
-    if article and (article.blog? or (article.parent and article.parent.blog?))
-      blog = article.blog? ? article : article.parent
-      "<link rel='alternate' type='application/rss+xml' title='#{blog.feed.title}' href='#{url_for blog.feed.url}' />"
+    if @controller.controller_name == 'content_viewer'
+      if article and (article.blog? or (article.parent and article.parent.blog?))
+        blog = article.blog? ? article : article.parent
+        "<link rel='alternate' type='application/rss+xml' title='#{blog.feed.title}' href='#{url_for blog.feed.url}' />"
+      end
     end
   end
@@ -789,14 +811,40 @@ module ApplicationHelper
     end
   end
-  def icon_theme_stylesheet_tag
+  def icon_theme_stylesheet_path
     theme_path = "/designs/icons/#{environment.icon_theme}/style.css"
     if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
-      stylesheet_link_tag theme_path
+      theme_path
     else
-      "<!-- Not included: #{stylesheet_link_tag theme_path} -->\n" +
-      stylesheet_link_tag("/designs/icons/default/style.css")
+      '/designs/icons/default/style.css'
     end
   end
+  def icon_theme_stylesheet_tag
+    theme_path = "/designs/icons/#{environment.icon_theme}/style.css"
+    stylesheet_import icon_theme_stylesheet_path()
+  end
+
+  def page_title
+    (@page ? @page.name + ' - ' : '') +
+    (@profile ? @profile.name + ' - ' : '') +
+    @environment.name +
+    (@category ? "&rarr; #{@category.full_name}" : '')
+  end
+
+  def noosfero_javascript
+    render :file =>  'layouts/_javascript'
+  end
+
+  def import_controller_stylesheets(options = {})
+    stylesheet_import( "controller_"+ @controller.controller_name(), options )
+  end
+
+  def pngfix_stylesheet_path
+    'iepngfix/iepngfix.css'
+  end
+  def pngfix_stylesheet
+    stylesheet_import pngfix_stylesheet_path()
+  end
+
 end
@@ -21,14 +21,20 @@ module BlogHelper
       :next_label => _('Older posts &raquo;')
     })
     content = []
-    articles.map{ |i|
-      css_add = ''
-      if i.published? || (user==i.profile)
-        css_add = '-not-published' if !i.published?
-        content << content_tag('div', display_post(i), :class => 'blog-post' + css_add, :id => "post-#{i.id}")
+    artic_len = articles.length
+    articles.each_with_index{ |art,i|
+      css_add = [ 'position-'+(i+1).to_s() ]
+      if art.published? || (user==art.profile)
+        css_add << 'first' if i == 0
+        css_add << 'last'  if i == (artic_len-1)
+        css_add << 'not-published' if !art.published?
+        content << content_tag('div',
+                       display_post(art),
+                       :class => 'blog-post ' + css_add.join(' '),
+                       :id => "post-#{art.id}")
       end
     }
-    content.join("\n<hr />\n") + (pagination or '')
+    content.join("\n<hr class='sep-posts'/>\n") + (pagination or '')
   end
   def display_post(article)
 module BoxesHelper
+  def insert_boxes(content)
+    if @controller.send(:boxes_editor?)
+      content + display_boxes_editor(@controller.boxes_holder)
+    else
+      if @controller.send(:uses_design_blocks?)
+        display_boxes(@controller.boxes_holder, content)
+      else
+        content_tag('div', content, :class => 'no-boxes')
+      end
+    end
+  end
+
   def box_decorator
     @box_decorator || DontMoveBlocks
   end
@@ -204,10 +216,9 @@ module BoxesHelper
     @controller.boxes_holder.boxes.map(&:blocks).inject([]){|ac, a| ac + a}
   end
-  def import_blocks_stylesheets
-    blocks_css_files = current_blocks.map{|b|'blocks/' + b.css_class_name}.uniq
-    stylesheet_import(blocks_css_files) + "\n" +
-    stylesheet_import(blocks_css_files, :themed_source => true )
+  def import_blocks_stylesheets(options = {})
+    @blocks_css_files ||= current_blocks.map{|b|'blocks/' + b.css_class_name}.uniq
+    stylesheet_import(@blocks_css_files, options)
   end
 end
 <%= error_messages_for 'blog' %>
-<h3><%= _('My Blog') %></h3>
+<h1><%= _('My Blog') %></h1>
 <%= render :file => 'shared/tiny_mce' %>
 <%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %>
 <div><%= article.body %></div>
-<hr/>
+<hr class="pre-posts"/>
 <div class="blog-posts">
   <%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children)) %>
 </div>
@@ -17,7 +17,7 @@
   }
   str
 %></script>
-<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]', '<%= escape_javascript( @environment.name()+' :: '+@page.title ) %>')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
+<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
 </div>
 <% end; end %>
@@ -0,0 +1,12 @@
+<%= javascript_include_tag 'default-config' %>
+<%= javascript_include_tag :defaults %>
+<%= javascript_include_tag 'jquery-latest.js' %>
+<script type="text/javascript">
+  jQuery.noConflict();
+</script>
+<%= javascript_include_tag 'thickbox.js' %>
+
+<%= javascript_include_tag 'menu' %>
+<%= javascript_include_tag 'auto-open-menu' %>
+<%= include_lightbox_header %>
+<%= javascript_include_tag 'cms' if @controller.controller_name == 'cms' %>
@@ -0,0 +1,105 @@
+<html>
+  <head>
+    <title><%= page_title %></title>
+    <%= meta_tags_for_article(@page) %>
+    <!--<meta http-equiv="refresh" content="1"/>-->
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <%= noosfero_javascript %>
+    <%= import_blocks_stylesheets %>
+    <%= import_controller_stylesheets %>
+    <%= stylesheet_import(
+          %w( common help menu article button search ),
+          %w( blocks forms login-box thickbox profiles),
+          template_stylesheet_path(),
+          icon_theme_stylesheet_path(),
+          theme_stylesheet_path(),
+          pngfix_stylesheet_path()
+        ) %>
+  </head>
+  <body class="<%=
+    # Identify the current controller and action for the CSS:
+    " controller-"+ @controller.controller_name() +
+    " action-"+ @controller.controller_name() +"-"+ @controller.action_name() +
+    " template-"+ ( profile.nil? ? "default" : profile.layout_template )
+    %>" onresize="registerDocumentSize()">
+    <script type="text/javascript">
+      /* Adds a class to "msie" to the body element if a Microsoft browser is
+       * detected. This is needed to workaround several of their limitations.
+       */
+      if ( navigator.appVersion.indexOf("MSIE") > -1 ) {
+        document.body.className += " msie msie" +
+          navigator.appVersion.replace(/^.*MSIE\s+([0-9]+).*$/, "$1");
+      }
+      function registerDocumentSize() {
+        document.body.className = document.body.className
+                                          .replace(/(^| )docSize.+( |$)/g, " ");
+        for ( var x=100; x<=1500; x+=100 ) {
+          if ( document.body.clientWidth > x ) {
+            document.body.className += " docSize-GT-" + x;
+          } else {
+            document.body.className += " docSize-LT-" + x;
+          }
+        }
+      }
+      registerDocumentSize();
+    </script>
+
+    <a href="#content" id="link-go-content"><span>Ir para o conteúdo</span></a>
+
+    <div id="wrap-1">
+      <div id='theme-header'>
+        <%= theme_header %>
+      </div>
+      <div id="wrap-2">
+        <div id="user">
+          <% if logged_in? %>
+            <%= _('Welcome, %s.') % link_to('<i></i><strong>' + user.identifier + '</strong>', user.url, :id => "homepage-link", :title => _('Go to your homepage')) %>
+            <%= link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', user.admin_url, :id => "controlpanel", :title => _("Configure the system")) %>
+            <%= link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :id => "controlpanel", :title => _("Configure your personal account and content")) %>
+            <%= link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) %>
+          <% else %>
+            <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
+            <div id='inlineLoginBox' style='display: none;'>
+              <%= render :file => 'account/login' %>
+              <center><%= thickbox_close_button _('Close') %></center>
+            </div>
+          <% end %>
+
+          <form action="/search" class="search_form" method="get" class="clean">
+        	 <input name="query" size="15" value="<%=_('Search...')%>"
+        	        onfocus="this.form.className='focused';
+        	                 if(this.value=='<%=_('Search...')%>'){this.value=''}"
+        	        onblur="this.form.className='';
+        	                if(/^\s*$/.test(this.value)){
+        	                  this.value='<%=_('Search...')%>';
+        	                  this.form.className='clean'
+        	                }" />
+        	 <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
+          </form>
+        </div><!-- end id="user" -->
+
+        <h1 id="site-title">
+          <a href="http://softwarelivre.org"><span> Title of the Site </span></a>
+        </h1>
+        <div id="navigation">
+          <ul>
+            <li><%= link_to '<span class="icon-menu-people">' + _('People') + '</span>',
+                            '/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">' + _('Events') + '</span>',
+                            '/assets/events', :id=>'events'           %></li>
+          </ul>
+          <div id="navigation-end"></div>
+        </div><!-- end id="navigation" -->
+        <div id="content">
+          <%= insert_boxes(yield) %>
+          <br style='clear: both'/>
+        </div><!-- end id="content" -->
+      </div><!-- end id="wrap-2" -->
+    </div><!-- end id="wrap-1" -->
+    <div id="theme-footer">
+      <%= theme_footer %>
+    </div><!-- end id="theme-footer" -->
+  </body>
+</html>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
   <head>
-    <title><%=
-       (@page ? @page.name + ' - ' : '') +
-       (@profile ? @profile.name + ' - ' : '') +
-       @environment.name +
-       (@category ? "&rarr; #{@category.full_name}" : '')
-    %></title>
+    <title><%= page_title %></title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="description" content="FIXME: Descriptions of Noosfero" />
     <meta name="keywords" content="Noosfero, Community, Open Source" />
     <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />
-    <%= meta_tags_for_article(@page) if @controller.controller_name == 'content_viewer' %>
-    <%= javascript_include_tag 'default-config' %>
-    <%= javascript_include_tag :defaults %>
-    <%# javascript_include_tag 'animator' %>
+    <!-- ok --><%= meta_tags_for_article(@page) %>
-    <%= javascript_include_tag 'jquery-latest.js' %>
-    <script type="text/javascript">
-      jQuery.noConflict();
-    </script>
-    <%= javascript_include_tag 'thickbox.js' %>
-
-    <%= javascript_include_tag 'menu' %>
-    <%= javascript_include_tag 'auto-open-menu' %>
-    <%= include_lightbox_header %>
-    <%= javascript_include_tag 'cms' if @controller.controller_name == 'cms' %>
+    <%= noosfero_javascript %>
     <%= theme_javascript %>
     <%#
@@ -39,16 +22,17 @@
       stylesheet_import( %w( common help menu article button search blocks forms login-box ),
                          :themed_source => true ) + "\n" +
       # Load the boxes's css file if each exists:
-      import_blocks_stylesheets +
+      import_blocks_stylesheets + "\n" +
+      import_blocks_stylesheets(:themed_source => true) + "\n" +
       # Load the controller's css file if it exists:
-      stylesheet_import( "controller_"+ @controller.controller_name() ) + "\n" +
-      stylesheet_import( "controller_"+ @controller.controller_name(), :themed_source => true )
+      import_controller_stylesheets + "\n" +
+      import_controller_stylesheets(:themed_source => true)
     %>
     <%= template_stylesheet_tag %>
     <%= icon_theme_stylesheet_tag %>
-    <%= stylesheet_link_tag 'iepngfix/iepngfix.css' %>
+    <%= pngfix_stylesheet %>
   </head>
   <body class='noosfero category<%= category_color %><%=
@@ -146,18 +130,7 @@
           <div id="header_content">
           </div>
-          <% if @controller.send(:boxes_editor?) %>
-            <%= yield %>
-            <%= display_boxes_editor(@controller.boxes_holder) %>
-          <% else %>
-            <% if uses_design_blocks?  %>
-              <%= display_boxes(@controller.boxes_holder, yield) %>
-            <% else %>
-              <div class='no-boxes'>
-                <%= yield %>
-              </div>
-            <% end %>
-          <% end %>
+          <%= insert_boxes(yield) %>
         </div><!-- id="content" -->
         <div id="footer_content"><!-- Rodape do Conteudo -->
-<h1 class='control-panel-title'><%= _('Control Panel') %> &mdash; <%= profile.name %></h1>
+<div id="profile-editor-index">
+
+  <h1 class="block-title">
+    <span class='control-panel-title'><%= profile.name %></span>
+    <span class='control-panel-sep'>&#150;</span>
+    <span class='control-panel-subtitle'><%= _('Control Panel') %></span>
+  </h1>
 <%= render :partial => 'pending_tasks' %>
@@ -60,3 +66,5 @@
 <% end %>
 </div>
+
+</div>
@@ -6,7 +6,7 @@ body.noosfero {
 #wrap {
   background-position: 50% 22px;
   background-repeat: repeat-x;
-  border: 3px solid #2A5896;
+  border: 3px solid #888;
 }
 .box-3 {
@@ -27,7 +27,7 @@ a:hover, a:active        { color: #08F }
 hr {
   border: none;
-  border-top: 2px dotted #2A5896;
+  border-top: 2px dotted black;
 }
 #footer {
@@ -60,14 +60,14 @@
 .article-comment {
   position: relative;
-  border: 1px solid #B8CFE7;
+  border: 1px solid #ccc;
   margin-bottom: 10px;
   padding: 4px;
 }
 .comment-from-owner {
-  border: 1px solid #3465A4;
-  background: #B8CFE7;
+  border: 1px solid #888;
+  background: #eee;
 }
 #article .article-comment h4 {
@@ -106,7 +106,7 @@ a.comment-picture {
 }
 .comment-from-owner .comment-info {
-  color: #729FCF;
+  color: #666;
 }
 .comment-text {
@@ -128,18 +128,18 @@ a.comment-picture {
 .post_comment_box h4 {
   padding: 1px 20px;
   margin: 0px;
-  background: #B8CFE7;
+  background: #eee;
 }
 .post_comment_box.closed h4 {
   display: inline;
-  border: 1px solid #729FCF;
+  border: 1px solid #888;
   cursor: pointer;
 }
 .post_comment_box.opened {
-  border: 1px solid #729FCF;
-  background: #B8CFE7;
+  border: 1px solid #888;
+  background: #eee;
 }
 .post_comment_box form {
@@ -238,22 +238,22 @@ a.comment-picture {
 /* NOT PUBLISHED BLOG POSTS */
-.blog-post-not-published {
+.blog-post.not-published {
   background: url(/images/hachure.png);
   opacity: 0.25;
   filter: alpha(opacity=25);
   zoom: 1;
 }
-.blog-post-not-published a {
+.blog-post.not-published a {
   text-decoration: none;
 }
-#content .blog-post-not-published .created-at {
+#content .blog-post.not-published .created-at {
   text-align: left;
 }
-.blog-post-not-published .metadata {
+.blog-post.not-published .metadata {
   display: block;
   text-align: center;
   font-size: small;
-body.noosfero a.button,
-body.noosfero a.button:visited,
+a.button, a.button:visited,
+body.noosfero a.button, body.noosfero a.button:visited,
 input.button {
   margin: 0px 2px;
   background-repeat: no-repeat;
@@ -27,6 +27,8 @@ input.button {
   padding-right: 4px;
 }
+a.button.with-text,
+a.button.with-text:visited,
 body.noosfero a.button.with-text,
 body.noosfero a.button.with-text:visited,
 input.button.with-text {
@@ -43,6 +45,9 @@ input.button.with-text {
   padding: 0px 2px 2px 20px;
   background-position: 3px 50%;
 }
+.msie a.button.with-text,
+.msie a.button.with-text:visited,
+.msie input.button.with-text,
 body.noosfero.msie a.button.with-text,
 body.noosfero.msie a.button.with-text:visited,
 body.noosfero.msie input.button.with-text {
@@ -51,14 +56,17 @@ body.noosfero.msie input.button.with-text {
   line-height: 20px;
   margin: 2px;
 }
+.msie input.button.with-text,
 body.noosfero.msie input.button.with-text {
   line-height: 16px;
   padding: 0px 0px 1px 15px;
   background-position: 2px 50%;
 }
+a.button:hover,
 body.noosfero a.button:hover,
 input.button:hover,
+a.button.with-text:hover,
 body.noosfero a.button.with-text:hover,
 input.button.with-text:hover {
   border: 1px solid #678;
@@ -151,7 +151,7 @@ div#notice {
 #content h1, #content h2, #content h3,
 #content h4, #content h5, #content h6 {
   margin: 10px 0px;
-  color: #2A5896;
+  /*color: #2A5896;*/
 }
 #content h1 { font-size: 24px }
 #content h2 { font-size: 20px }
@@ -11,7 +11,7 @@
   height: 22px;
   font-size: 11px;
   letter-spacing: -1px;
-  background: #2A5896 url(../images/white-pixel.gif) 0px 100% repeat-x;
+  background: #888 url(../images/white-pixel.gif) 0px 100% repeat-x;
 }
 #navigation_bar {
@@ -135,12 +135,13 @@
   width: 11px;
   height: 11px;
   overflow: hidden;
-  background: url(../images/top-bar/assets-menu-top-azul.gif);
+  /*background: url(../images/top-bar/assets-menu-top-azul.gif);*/
 }
 #assets_menu_list {
   padding: 0px 0px 6px 5px;
-  background: url(../images/top-bar/assets-menu-bg-azul.gif) 0% 100%;
+  /*background: url(../images/top-bar/assets-menu-bg-azul.gif) 0% 100%;*/
+  background-color: #888;
 }
 #assets_menu ul {
@@ -278,8 +279,7 @@
   position: absolute;
   top: 21px;
   right: 0px;
-  background: url(../images/top-bar/assets-menu-bg-azul.gif) 0% 100%;
-  border-right: 1px solid #FFF;
+  background: #888;
 }
 #user_menu ul {
	@@ -2,6 +2,12 @@		@@ -2,6 +2,12 @@
2	# available in all controllers.	2	# available in all controllers.
3	class ApplicationController < ActionController::Base	3	class ApplicationController < ActionController::Base
4		4
		5	+ include ApplicationHelper
		6	+ layout :get_layout
		7	+ def get_layout
		8	+ theme_option(:layout) \|\| 'application'
		9	+ end
		10	+
5	filter_parameter_logging :password	11	filter_parameter_logging :password
6		12
7	def log_processing	13	def log_processing
1	<%= error_messages_for 'blog' %>	1	<%= error_messages_for 'blog' %>
2		2
3	-<h3><%= _('My Blog') %></h3>	3	+<h1><%= _('My Blog') %></h1>
4		4
5	<%= render :file => 'shared/tiny_mce' %>	5	<%= render :file => 'shared/tiny_mce' %>
6		6
1	<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %>	1	<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %>
2		2
3	<div><%= article.body %></div>	3	<div><%= article.body %></div>
4	-<hr/>	4	+<hr class="pre-posts"/>
5	<div class="blog-posts">	5	<div class="blog-posts">
6	<%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children)) %>	6	<%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children)) %>
7	</div>	7	</div>
	@@ -17,7 +17,7 @@		@@ -17,7 +17,7 @@
17	}	17	}
18	str	18	str
19	%></script>	19	%></script>
20	-<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]', '<%= escape_javascript( @environment.name()+' :: '+@page.title ) %>')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>	20	+<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
21	</div>	21	</div>
22	<% end; end %>	22	<% end; end %>
23		23
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+<%= javascript_include_tag 'default-config' %>
	2	+<%= javascript_include_tag :defaults %>
	3	+<%= javascript_include_tag 'jquery-latest.js' %>
	4	+<script type="text/javascript">
	5	+ jQuery.noConflict();
	6	+</script>
	7	+<%= javascript_include_tag 'thickbox.js' %>
	8	+
	9	+<%= javascript_include_tag 'menu' %>
	10	+<%= javascript_include_tag 'auto-open-menu' %>
	11	+<%= include_lightbox_header %>
	12	+<%= javascript_include_tag 'cms' if @controller.controller_name == 'cms' %>
@@ -0,0 +1,105 @@		@@ -0,0 +1,105 @@
	1	+<html>
	2	+ <head>
	3	+ <title><%= page_title %></title>
	4	+ <%= meta_tags_for_article(@page) %>
	5	+ <!--<meta http-equiv="refresh" content="1"/>-->
	6	+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
	7	+ <%= noosfero_javascript %>
	8	+ <%= import_blocks_stylesheets %>
	9	+ <%= import_controller_stylesheets %>
	10	+ <%= stylesheet_import(
	11	+ %w( common help menu article button search ),
	12	+ %w( blocks forms login-box thickbox profiles),
	13	+ template_stylesheet_path(),
	14	+ icon_theme_stylesheet_path(),
	15	+ theme_stylesheet_path(),
	16	+ pngfix_stylesheet_path()
	17	+ ) %>
	18	+ </head>
	19	+ <body class="<%=
	20	+ # Identify the current controller and action for the CSS:
	21	+ " controller-"+ @controller.controller_name() +
	22	+ " action-"+ @controller.controller_name() +"-"+ @controller.action_name() +
	23	+ " template-"+ ( profile.nil? ? "default" : profile.layout_template )
	24	+ %>" onresize="registerDocumentSize()">
	25	+ <script type="text/javascript">
	26	+ /* Adds a class to "msie" to the body element if a Microsoft browser is
	27	+ * detected. This is needed to workaround several of their limitations.
	28	+ */
	29	+ if ( navigator.appVersion.indexOf("MSIE") > -1 ) {
	30	+ document.body.className += " msie msie" +
	31	+ navigator.appVersion.replace(/^.MSIE\s+([0-9]+).$/, "$1");
	32	+ }
	33	+ function registerDocumentSize() {
	34	+ document.body.className = document.body.className
	35	+ .replace(/(^\| )docSize.+( \|$)/g, " ");
	36	+ for ( var x=100; x<=1500; x+=100 ) {
	37	+ if ( document.body.clientWidth > x ) {
	38	+ document.body.className += " docSize-GT-" + x;
	39	+ } else {
	40	+ document.body.className += " docSize-LT-" + x;
	41	+ }
	42	+ }
	43	+ }
	44	+ registerDocumentSize();
	45	+ </script>
	46	+
	47	+ <a href="#content" id="link-go-content"><span>Ir para o conteúdo</span></a>
	48	+
	49	+ <div id="wrap-1">
	50	+ <div id='theme-header'>
	51	+ <%= theme_header %>
	52	+ </div>
	53	+ <div id="wrap-2">
	54	+ <div id="user">
	55	+ <% if logged_in? %>
	56	+ <%= _('Welcome, %s.') % link_to('<i></i><strong>' + user.identifier + '</strong>', user.url, :id => "homepage-link", :title => _('Go to your homepage')) %>
	57	+ <%= link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', user.admin_url, :id => "controlpanel", :title => _("Configure the system")) %>
	58	+ <%= link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :id => "controlpanel", :title => _("Configure your personal account and content")) %>
	59	+ <%= link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) %>
	60	+ <% else %>
	61	+ <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
	62	+ <div id='inlineLoginBox' style='display: none;'>
	63	+ <%= render :file => 'account/login' %>
	64	+ <center><%= thickbox_close_button _('Close') %></center>
	65	+ </div>
	66	+ <% end %>
	67	+
	68	+ <form action="/search" class="search_form" method="get" class="clean">
	69	+ <input name="query" size="15" value="<%=_('Search...')%>"
	70	+ onfocus="this.form.className='focused';
	71	+ if(this.value=='<%=_('Search...')%>'){this.value=''}"
	72	+ onblur="this.form.className='';
	73	+ if(/^\s*$/.test(this.value)){
	74	+ this.value='<%=_('Search...')%>';
	75	+ this.form.className='clean'
	76	+ }" />
	77	+ <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
	78	+ </form>
	79	+ </div><!-- end id="user" -->
	80	+
	81	+ <h1 id="site-title">
	82	+ <a href="http://softwarelivre.org"><span> Title of the Site </span></a>
	83	+ </h1>
	84	+ <div id="navigation">
	85	+ <ul>
	86	+ <li><%= link_to '<span class="icon-menu-people">' + _('People') + '</span>',
	87	+ '/assets/people', :id=>'people' %></li>
	88	+ <li><%= link_to '<span class="icon-menu-community">' + _('Communities') + '</span>',
	89	+ '/assets/communities', :id=>'communities' %></li>
	90	+ <li><%= link_to '<span class="icon-menu-events">' + _('Events') + '</span>',
	91	+ '/assets/events', :id=>'events' %></li>
	92	+ </ul>
	93	+ <div id="navigation-end"></div>
	94	+ </div><!-- end id="navigation" -->
	95	+ <div id="content">
	96	+ <%= insert_boxes(yield) %>
	97	+ <br style='clear: both'/>
	98	+ </div><!-- end id="content" -->
	99	+ </div><!-- end id="wrap-2" -->
	100	+ </div><!-- end id="wrap-1" -->
	101	+ <div id="theme-footer">
	102	+ <%= theme_footer %>
	103	+ </div><!-- end id="theme-footer" -->
	104	+ </body>
	105	+</html>
1	-<h1 class='control-panel-title'><%= _('Control Panel') %> — <%= profile.name %></h1>	1	+<div id="profile-editor-index">
		2	+
		3	+ <h1 class="block-title">
		4	+ <span class='control-panel-title'><%= profile.name %></span>
		5	+ <span class='control-panel-sep'></span>
		6	+ <span class='control-panel-subtitle'><%= _('Control Panel') %></span>
		7	+ </h1>
2		8
3	<%= render :partial => 'pending_tasks' %>	9	<%= render :partial => 'pending_tasks' %>
4		10
	@@ -60,3 +66,5 @@		@@ -60,3 +66,5 @@
60	<% end %>	66	<% end %>
61		67
62	</div>	68	</div>
		69	+
		70	+</div>
	@@ -6,7 +6,7 @@ body.noosfero {		@@ -6,7 +6,7 @@ body.noosfero {
6	#wrap {	6	#wrap {
7	background-position: 50% 22px;	7	background-position: 50% 22px;
8	background-repeat: repeat-x;	8	background-repeat: repeat-x;
9	- border: 3px solid #2A5896;	9	+ border: 3px solid #888;
10	}	10	}
11		11
12	.box-3 {	12	.box-3 {
	@@ -27,7 +27,7 @@ a:hover, a:active { color: #08F }		@@ -27,7 +27,7 @@ a:hover, a:active { color: #08F }
27		27
28	hr {	28	hr {
29	border: none;	29	border: none;
30	- border-top: 2px dotted #2A5896;	30	+ border-top: 2px dotted black;
31	}	31	}
32		32
33	#footer {	33	#footer {
	@@ -151,7 +151,7 @@ div#notice {		@@ -151,7 +151,7 @@ div#notice {
151	#content h1, #content h2, #content h3,	151	#content h1, #content h2, #content h3,
152	#content h4, #content h5, #content h6 {	152	#content h4, #content h5, #content h6 {
153	margin: 10px 0px;	153	margin: 10px 0px;
154	- color: #2A5896;	154	+ /color: #2A5896;/
155	}	155	}
156	#content h1 { font-size: 24px }	156	#content h1 { font-size: 24px }
157	#content h2 { font-size: 20px }	157	#content h2 { font-size: 20px }