ActionItem1049: general review while working on the new icon theme

Antonio Terceiro
1 parent 0d84f345
Showing 11 changed files with 35 additions and 31 deletions Show diff stats
app/controllers/my_profile/profile_design_controller.rb
app/helpers/boxes_helper.rb
app/views/cms/media_listing.rhtml
app/views/cms/view.rhtml
app/views/cms/why_categorize.rhtml
app/views/content_viewer/_article.rhtml
app/views/content_viewer/view_page.rhtml
app/views/shared/user_menu.rhtml
config/routes.rb
public/designs/icons/default/style.css
public/stylesheets/article.css
@@ -5,7 +5,7 @@ class ProfileDesignController &lt; BoxOrganizerController
   protect 'edit_profile_design', :profile
   def available_blocks
-    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock ]
+    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock ]
     # blocks exclusive for organizations
     if profile.has_members?
@@ -20,7 +20,6 @@ class ProfileDesignController &lt; BoxOrganizerController
     # blocks exclusive for enterprises
     if profile.enterprise?
-      blocks << ProfileImageBlock
       blocks << LocalizationBlock
       blocks << DisabledEnterpriseMessageBlock
     end
@@ -190,7 +190,7 @@ module BoxesHelper
     if !block.main?
       buttons << icon_button(:eyes, _('Toggle block visibility'), {:action => 'toggle_visibility', :id => block.id})
-      buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post'})
+      buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
     end
     if block.respond_to?(:help)
@@ -7,7 +7,7 @@
   %>
   <%= javascript_include_tag :defaults %>
   <%= javascript_include_tag 'lowpro' %>
-  <%= stylesheet_link_tag '/designs/icons/default/style.css' %>
+  <%= icon_theme_stylesheet_tag %>
 </head>
 <body class='noosfero'>
   <script type="text/javascript">
 <h1>
-  <%= icon('cms') %>
   <%= _('Content management') %>
 </h1>
@@ -15,7 +14,7 @@
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
   <% if !@article or !@article.blog? %>
-    <%= button :add, _('New folder'), :action => 'new', :type => 'Folder', :parent_id => parent_id %>
+    <%= button :newfolder, _('New folder'), :action => 'new', :type => 'Folder', :parent_id => parent_id %>
   <% end %>
   <%= lightbox_button('new', label_for_new_article(@article), :action => 'new', :parent_id => parent_id) %>
   <%= button('upload-file', _('Upload files'), :action => 'upload_files', :parent_id => parent_id) %>
@@ -30,6 +29,21 @@
     <th><%= _('Actions') %></th>
   </tr>
+  <% if @article %>
+    <tr>
+      <td>
+        <%= image_tag 'icons-mime/gnome-folder.png' %>
+        <% if @article.parent %>
+          <%= link_to '.. (parent folder)', :action => 'view', :id => @article.parent.id %>
+        <% else %>
+          <%= link_to '.. (parent folder)', :action => 'index' %>
+        <% end %>
+      </td>
+      <td><%= Folder.short_description %></td>
+      <td> </td>
+    </tr>
+  <% end %>
+
   <%# folders %>
   <% for folder in @folders %>
     <tr>
@@ -69,9 +83,4 @@
     </tr>
   <% end %>
-  <% if @subitems.empty? || @folders.empty? %>
-    <tr><td colspan='3' align='center'><em><%= _('None') %></em></td></tr>
-  <% end %>
-
-
 </table>
@@ -5,5 +5,5 @@
 </p>
 <% button_bar do %>
-  <%= lightbox_close_button _('OK') %>
+  <%= lightbox_close_button _('Close') %>
 <% end %>
-<%= link_to '', article.url, '', :class => article.css_class_name) %>
+<%= link_to '', article.url, :class => article.css_class_name %>
 <span><%= link_to article.title, article.view_url %></span>
@@ -21,17 +21,10 @@
 </div>
 <% end; end %>
-<div onmouseover="showArticleActions(true)"
-     onmouseout="showArticleActions(false)">
+<div>
   <%= article_title(@page, :no_link => true) %>
-  <script type="text/javascript">
-    function showArticleActions( show ) {
-      var act = $("article-actions");
-      if ( act ) act.className = ( show ? "show" : "hidden" );
-    }
-  </script>
   <% if logged_in? && current_user.person.has_permission?('post_content', profile) %>
-    <div id="article-actions" class="hidden">
+    <div id="article-actions">
       <% unless @page.blog? %>
       <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
           profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
@@ -43,16 +36,17 @@
             profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page }),
             :class => 'button with-text icon-delete' %>
         <% end %>
-        <% if profile.kind_of?(Person) && !environment.enabled?('disable_cms') %>
+        <% if profile.kind_of?(Person) && !environment.enabled?('disable_cms') && !@page.folder? %>
           <%= link_to content_tag( 'span', _('Spread this') ),
               profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }),
               :class => 'button with-text icon-spread' %>
         <% end %>
-        <% if @page.display_as_gallery? %>
-          <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
-        <% else %>
+        <% if !@page.display_as_gallery? %>
           <%= lightbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
         <% end %>
+        <% if @page.folder? %>
+          <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
+        <% end %>
       <% end %>
       <% if profile.kind_of?(Enterprise) && @page.display_as_gallery? %>
         <%= button('upload-file', _('Upload files'), :controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent)) %>
@@ -36,7 +36,7 @@
         </li>
         <% if user.is_admin?(environment) %>
-          <li><%= link_to( '<span class="icon-menu-"></span>'+ _('Admin'),
+          <li><%= link_to( '<span class="icon-menu-admin"></span>'+ _('Admin'),
                              {:controller => 'admin_panel' },
                              :id => 'link_admin_panel',
                              :help => _('Access the site administration panel.')
@@ -23,6 +23,11 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'images/*stuff', :controller => 'not_found', :action => 'index'
   map.connect 'stylesheets/*stuff', :controller => 'not_found', :action => 'index'
+  map.connect 'designs/*stuff', :controller => 'not_found', :action => 'index'
+  map.connect 'articles/*stuff', :controller => 'not_found', :action => 'index'
+  map.connect 'javascripts/*stuff', :controller => 'not_found', :action => 'index'
+  map.connect 'thumbnails/*stuff', :controller => 'not_found', :action => 'index'
+  map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'index'
   # user account controller
   map.connect 'account/new_password/:code', :controller => 'account', :action => 'new_password'
@@ -2,6 +2,7 @@
 .icon-home      { background-image: url(gnome-home.png)          }
 .icon-new       { background-image: url(new-HC.gif)              }
 .icon-close     { background-image: url(cancel-HC.gif)           }
+.icon-newfolder { background-image: url(add-HC.gif) }
 .icon-open      { background-image: url(folder-open.gif)         }
 .icon-cms       { background-image: url(abiword_48.png)          }
 .icon-save      { background-image: url(save-HC.gif)             }
@@ -10,10 +10,6 @@
   right: -17px;
   padding-right: 15px;
 }
-#article-actions.hidden {
-  opacity: 0.5;
-	filter: alpha(opacity=50);
-}
 #article-tags {
   font-size: 10px;
	@@ -190,7 +190,7 @@ module BoxesHelper		@@ -190,7 +190,7 @@ module BoxesHelper
190		190
191	if !block.main?	191	if !block.main?
192	buttons << icon_button(:eyes, _('Toggle block visibility'), {:action => 'toggle_visibility', :id => block.id})	192	buttons << icon_button(:eyes, _('Toggle block visibility'), {:action => 'toggle_visibility', :id => block.id})
193	- buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post'})	193	+ buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
194	end	194	end
195		195
196	if block.respond_to?(:help)	196	if block.respond_to?(:help)
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	%>	7	%>
8	<%= javascript_include_tag :defaults %>	8	<%= javascript_include_tag :defaults %>
9	<%= javascript_include_tag 'lowpro' %>	9	<%= javascript_include_tag 'lowpro' %>
10	- <%= stylesheet_link_tag '/designs/icons/default/style.css' %>	10	+ <%= icon_theme_stylesheet_tag %>
11	</head>	11	</head>
12	<body class='noosfero'>	12	<body class='noosfero'>
13	<script type="text/javascript">	13	<script type="text/javascript">
	@@ -5,5 +5,5 @@		@@ -5,5 +5,5 @@
5	</p>	5	</p>
6		6
7	<% button_bar do %>	7	<% button_bar do %>
8	- <%= lightbox_close_button _('OK') %>	8	+ <%= lightbox_close_button _('Close') %>
9	<% end %>	9	<% end %>
1	-<%= link_to '', article.url, '', :class => article.css_class_name) %>	1	+<%= link_to '', article.url, :class => article.css_class_name %>
2	<span><%= link_to article.title, article.view_url %></span>	2	<span><%= link_to article.title, article.view_url %></span>
	@@ -36,7 +36,7 @@		@@ -36,7 +36,7 @@
36	</li>	36	</li>
37		37
38	<% if user.is_admin?(environment) %>	38	<% if user.is_admin?(environment) %>
39	- <li><%= link_to( '<span class="icon-menu-"></span>'+ _('Admin'),	39	+ <li><%= link_to( '<span class="icon-menu-admin"></span>'+ _('Admin'),
40	{:controller => 'admin_panel' },	40	{:controller => 'admin_panel' },
41	:id => 'link_admin_panel',	41	:id => 'link_admin_panel',
42	:help => _('Access the site administration panel.')	42	:help => _('Access the site administration panel.')