ActionItem152: aleatoriedades...

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1282 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem152: aleatoriedades...
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1282 3f533792-8f58-4932-b0fe-aaf55b0a4547
AurelioAHeckert
1 parent 7712c736
Showing 21 changed files with 105 additions and 69 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/tags_helper.rb
app/models/tags_block.rb
app/views/cms/select_article_type.rhtml
app/views/content_viewer/no_home_page.rhtml
app/views/features/index.rhtml
app/views/layouts/application.rhtml
app/views/profile_editor/index.rhtml
app/views/shared/user_menu.rhtml
public/designs/icons/default/control-HC.gif
public/designs/icons/default/edit-design-HC.gif
public/designs/icons/default/help.gif
public/designs/icons/default/help.png
public/designs/icons/default/style.css
public/images/help.png
public/stylesheets/button.css
public/stylesheets/common.css
public/stylesheets/help.css
public/stylesheets/lightbox.css
public/stylesheets/login-box.css
@@ -50,7 +50,9 @@ module ApplicationHelper
   # textile, into HTML). It defaults to <tt>:html</tt>.
   #
   # TODO: implement correcly the 'Help' button click
-  def help(content = nil, type = :html, &block)
+  def help(content = nil, link_name = nil, options = {}, &block)
+
+    link_name ||= _('Help')
     @help_message_id ||= 1
     help_id = "help_message_#{@help_message_id}"
@@ -60,13 +62,16 @@ module ApplicationHelper
       content = capture(&block)
     end
-    if type == :textile
+    if options[:type] == :textile
       content = RedCloth.new(content).to_html
     end
+    
+    options[:class] = '' if ! options[:class]
+    options[:class] += ' button icon-help' # with-text
     # TODO: implement this button, and add style='display: none' to the help
     # message DIV
-    button = link_to_function(content_tag('span', _('Help')), "Element.show('#{help_id}')", :class => 'help_button' )
+    button = link_to_function(content_tag('span', link_name), "Element.show('#{help_id}')", options )
     close_button = content_tag("div", link_to_function(_("Close"), "Element.hide('#{help_id}')", :class => 'close_help_button'))
     text = content_tag('div', button + content_tag('div', content_tag('div', content) + close_button, :class => 'help_message', :id => help_id, :style => 'display: none;'), :class => 'help_box')
@@ -80,8 +85,9 @@ module ApplicationHelper
   # alias for <tt>help(content, :textile)</tt>. You can pass a block in the
   # same way you would do if you called <tt>help</tt> directly.
-  def help_textile(content = nil, &block)
-    help(content, :textile, &block)
+  def help_textile(content = nil, link_name = nil, options = {}, &block)
+    options[:type] = :textile
+    help(content, link_name, options, &block)
   end
   # TODO: do something more useful here
@@ -27,8 +27,12 @@ module TagsHelper
   # courtesy of Aurelio: http://www.colivre.coop.br/Aurium/Nuvem 
   # (pt_BR only).
   def tag_cloud(tags, tagname_option, url, options = {})
+  
-    return _('No tags yet.') if tags.empty?
+    return _('No tags yet.') + '<br/>' +
+           '<a href="' + _('http://en.wikipedia.org/wiki/Tag_%28metadata%29') +
+           '" class="button with-text icon-help" target="wptags"><span>' +
+           _('What are tags?') + '</span></a>' if tags.empty?
     max_size = options[:max_size] || Cloud::MAX_SIZE
     min_size = options[:min_size] || Cloud::MIN_SIZE
 class TagsBlock < Block
   include TagsHelper
+  include ApplicationHelper
   def self.description
     _('List count of contents by tag')
@@ -8,7 +9,13 @@ class TagsBlock &lt; Block
   def content
     content_tag('h3', _('Tags'), :class => 'block-title') +
-    tag_cloud(owner.tags, :id, owner.generate_url(:controller => 'profile', :action => 'tag') + '/', :max_size => 20, :min_size => 10)
+    help_textile(
+              _('The tag is created when you add some one to your article.
+                 Try to add some tags to some articles and see your tag cloud to grow.'),
+              _('How tags works here?') ) +
+    tag_cloud( owner.tags, :id,
+               owner.generate_url(:controller => 'profile', :action => 'tag') + '/',
+               :max_size => 20, :min_size => 10 )
   end
 end
-<p>
-  <%= _('Choose the type of article:') %>
-</p>
+<h2> <%= _('Choose the type of article:') %> </h2>
-<ul>
+<ul id="article_types">
   <% for type in @article_types %>
     <li>
     <%= link_to type[:short_description], :action => 'new', :type => type[:name] %>
-    <p><%= type[:description] %></p>
+    <br/> <%= type[:description] %>
     </li>
   <% end %>
 </ul>
-<h2><%= _("Missing home page") %></h2>
+<h1 class="block-title"><%= _("Missing home page") %></h1>
 <p>
 <%= _('%s did not choose an article for homepage yet.') % profile.name %>
 </p>
+
+<% if user == profile %>
+<p>
+<%= link_to _('Click hire to set your homepage now!'), :controller => 'cms' %>
+</p>
+<% end %>
@@ -4,4 +4,4 @@
 <%= help_textile _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.
-Check all the features you want to enable for your environment, uncheck all the ones you don\t want, and use the \'Save changes\' button to confirm your changes.') %>
+Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the *"Save changes" button* to confirm your changes.'), _('Help'), :class => 'with-text' %>
@@ -2,10 +2,9 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>
+      <%= @environment.name() %>
       <%- if @category -%>
-        Noosfero &rarr; <%= @category.full_name -%>
-      <%- else -%>
-        Noosfero
+        &rarr; <%= @category.full_name -%>
       <%- end -%>
     </title>
     <meta name="description" content="FIXME: Descriptions of Noosfero" />
-<h1><%= _('My profile') %></h1>
+<h1 class="block-title"><%= _('My profile') %></h1>
 <%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : _('Put image')), :action => 'change_image'  %>
@@ -10,20 +10,32 @@
   %>
   <div id="user_menu_ul">
     <ul>
+
       <li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li>
+
       <li><%= link_to_myprofile( '<span class="icon-menu-ctrl-panel"></span>'+ _('control panel'),
                                    {}, nil, :id => 'link_edit_profile' ) %></li>
-      <li><%= link_to( '<span class="icon-menu-"></span>'+_('Edit Profile'),
+
+      <li><%= link_to( '<span class="icon-menu-edit"></span>'+_('Edit Profile'),
                       :controller => 'profile_editor', :profile => user.identifier, :action => 'edit' ) %></li>
-      <li><%= link_to( '<span class="icon-menu-"></span>'+_('Consumed Products'),
+
+      <li><%= link_to( '<span class="icon-menu-product"></span>'+_('Consumed Products'),
                       :profile => user.identifier, :controller => 'consumed_products' ) %></li>
       <%=
         '<li>'+ link_to( '<span class="icon-menu-"></span>'+ _('Admin'),
                          { :controller => 'admin_panel' }, :id => 'link_admin_panel' ) +
         '</li>' if user.is_admin?
       %>
+
+      <li><%= link_to( '<span class="icon-menu-ed-design"></span>'+_('Edit Visual Design'),
+                       :controller => 'profile_design', :profile => user.identifier ) %></li>
+
+      <li><%= link_to( '<span class="icon-menu-"></span>'+_('Manage Content'),
+                       :controller => 'cms', :profile => user.identifier) %></li>
+
       <li><%= lightbox_link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'),
-                                  { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout' ) %></li>
+                                { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout' ) %></li>
+
     </ul>
   </div><!-- id="user_menu_ul" -->
@@ -19,14 +19,16 @@
 .icon-search  { background-image: url(gnome-search.png);       }
 .icon-ok      { background-image: url(gtk-ok.png);             }
 .icon-login   { background-image: url(key-HC.gif);             }
+.icon-help    { background-image: url(help.gif);               }
 .icon-menu-           { background-image: url(menu-without-ico-HC.gif) }
 .icon-menu-blog       { background-image: url(blog-HC.gif);            }
 .icon-menu-album      { background-image: url(album-HC.gif);           }
 .icon-menu-product    { background-image: url(product-HC.gif);         }
 .icon-menu-enterprise { background-image: url(enterprise-HC.gif);      }
 .icon-menu-community  { background-image: url(community-HC.gif);       }
-.icon-menu-ctrl-panel { background-image: url(edit-HC.gif);            }
+.icon-menu-edit       { background-image: url(edit-HC.gif);            }
+.icon-menu-ctrl-panel { background-image: url(control-HC.gif);         }
 .icon-menu-login      { background-image: url(enter-HC.gif);           }
 .icon-menu-logout     { background-image: url(exit-HC.gif);            }
 .icon-menu-search     { background-image: url(search-HC.gif);          }
-
+.icon-menu-ed-design  { background-image: url(edit-design-HC.gif);     }
@@ -2,20 +2,23 @@
   margin-top: 1em;
 }
-.button {
-  border: none;
+a.button,
+a.button:visited,
+input.button {
   margin-left: 5px;
-  background-color: #EEE;
   background-repeat: no-repeat;
-  background-position: 2px 50%;
-  padding-left: 25px;
-  padding-right: 2px;
+  background-position: 50% 50%;
+  padding: 1px 0px 1px 20px;
   height: 24px;
   line-height: 22px;
   font-size: 12px;
+  color: black;
+  text-decoration: none;
+  border: 1px solid #DDD;
 }
 input.button {
   float: none;
+  background-position: 2px 50%;
 }
 .button-bar .button {
@@ -29,17 +32,6 @@ input.button {
   color: #000;
 }
-.button, .button:visited {
-  color: black;
-  text-decoration: none;
-  border: 1px solid #AAA;
-}
-
-.button:hover {
-  border: 1px solid #777;
-  background-color: #DDD;
-}
-
 .button span {
   display: none;
 }
@@ -48,6 +40,24 @@ input.button {
   padding-right: 4px;
 }
+a.button.with-text,
+a.button.with-text:visited,
+input.button.with-text {
+  background-color: #EEE;
+  padding: 1px 2px 1px 25px;
+  background-position: 2px 50%;
+  border: 1px solid #AAA;
+}
+
+a.button:hover,
+input.button:hover,
+a.button.with-text:hover,
+input.button.with-text:hover {
+  border: 1px solid #777;
+  background-color: #DDD;
+  color: #000;
+}
+
 .icon-button {
   border: none;
 }
@@ -46,7 +46,7 @@ body.category4 #wrap { background-image: url(&quot;../images/bg-top-vermelho.png&quot;); }
 }
 #header {
-  height: 30px;
+  height: 50px;
 }
 #design_boxes {
@@ -77,11 +77,14 @@ body.category4 #wrap {
   border-color: #B80000;
 }
-a img {
-  border: 1px solid transparent;
+a {
+  color: #05B;
 }
-a:hover img {
-  border: 1px solid gray;
+a:visited {
+  color: #68C;
+}
+a:hover a:active {
+  color: #08F;
 }
 #environment_identification {
@@ -335,20 +338,12 @@ div#notice {
 #content h1 {
   text-align: center;
 }
-
-#login-box a,
-#content a {
-  color: #05B;
+#content h1, #content h2, #content h3,
+#content h4, #content h5, #content h6 {
+  margin: 10px 0px;
 }
-#login-box a:visited,
-#content a:visited {
-  color: #68C;
-}
-#login-box a:hover,
-#login-box a:active,
-#content a:hover,
-#content a:active {
-  color: #08F;
+#content .block-title {
+  margin: 0px 0px 10px 0px;
 }
 /* Category */
@@ -14,10 +14,3 @@ div.help_message {
   overflow: auto;
 }
-a.help_button:before {
-  content: url(../images/help.png)
-}
-
-a.help_button:hover {
-  background: #ffa;
-}
@@ -35,9 +35,9 @@ Modified : February 1, 2006
 	height:100%;
 	z-index:5000;
 	background-color:#000;
-	-moz-opacity: 0.8;
-	opacity:.80;
-	filter: alpha(opacity=80);
+	-moz-opacity: 0.5;
+	opacity:.50;
+	filter: alpha(opacity=50);
 }
 #overlay[id]{
 	position:fixed;
@@ -17,7 +17,6 @@
 }
 #login-box h2 {
-  color: #888;
   font-size: 18px;
   text-align: center;
   margin: 0px;
@@ -190,6 +190,7 @@ body.category4 #assets_menu_list { background-image: url(/images/top-bar/assets-
 }
 #user_box a,
+#assets_menu a,
 .top_extra_menu a {
   font-size: 12px;
   font-weight: bold;
@@ -304,6 +305,10 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF }
   background: url(/images/top-bar/assets-menu-bg-azul.gif) 0% 100%;
   border-right: 1px solid #FFF;
 }
+body.category1 #user_menu_ul { background-image: url(/images/top-bar/assets-menu-bg-laranja.gif)   }
+body.category2 #user_menu_ul { background-image: url(/images/top-bar/assets-menu-bg-verde.gif)     }
+body.category3 #user_menu_ul { background-image: url(/images/top-bar/assets-menu-bg-lilas.gif)     }
+body.category4 #user_menu_ul { background-image: url(/images/top-bar/assets-menu-bg-vermelho.gif)  }
 #user_menu ul {
   width: 150px;
1	-<h2><%= _("Missing home page") %></h2>	1	+<h1 class="block-title"><%= _("Missing home page") %></h1>
2		2
3	<p>	3	<p>
4	<%= _('%s did not choose an article for homepage yet.') % profile.name %>	4	<%= _('%s did not choose an article for homepage yet.') % profile.name %>
5	</p>	5	</p>
		6	+
		7	+<% if user == profile %>
		8	+<p>
		9	+<%= link_to _('Click hire to set your homepage now!'), :controller => 'cms' %>
		10	+</p>
		11	+<% end %>
	@@ -4,4 +4,4 @@		@@ -4,4 +4,4 @@
4		4
5	<%= help_textile _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.	5	<%= help_textile _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.
6		6
7	-Check all the features you want to enable for your environment, uncheck all the ones you don\t want, and use the \'Save changes\' button to confirm your changes.') %>	7	+Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the "Save changes" button to confirm your changes.'), _('Help'), :class => 'with-text' %>
1	-<h1><%= _('My profile') %></h1>	1	+<h1 class="block-title"><%= _('My profile') %></h1>
2		2
3	<%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : _('Put image')), :action => 'change_image' %>	3	<%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : _('Put image')), :action => 'change_image' %>
4		4
	@@ -14,10 +14,3 @@ div.help_message {		@@ -14,10 +14,3 @@ div.help_message {
14	overflow: auto;	14	overflow: auto;
15	}	15	}
16		16
17	-a.help_button:before {
18	- content: url(../images/help.png)
19	-}
20	-
21	-a.help_button:hover {
22	- background: #ffa;
23	-}
	@@ -17,7 +17,6 @@		@@ -17,7 +17,6 @@
17	}	17	}
18		18
19	#login-box h2 {	19	#login-box h2 {
20	- color: #888;
21	font-size: 18px;	20	font-size: 18px;
22	text-align: center;	21	text-align: center;
23	margin: 0px;	22	margin: 0px;