ActionItem318: a better control panel

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

ActionItem318: a better control panel
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1733 3f533792-8f58-4932-b0fe-aaf55b0a4547
AurelioAHeckert
1 parent 88e96a20
Showing 8 changed files with 59 additions and 29 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/profile_helper.rb
app/views/admin_panel/index.rhtml
app/views/layouts/application.rhtml
app/views/profile_editor/edit_categories.rhtml
app/views/profile_editor/index.rhtml
public/designs/themes/default/stylesheets/controller_profile_editor.css
public/stylesheets/controller_profile_editor.css
@@ -451,10 +451,14 @@ module ApplicationHelper
   end
   attr_reader :environment
-  def select_categories(object_name)
+  def select_categories(object_name, title=nil, title_size=4)
+    if title.nil?
+      title = _('Categories')
+    end
+
     object = instance_variable_get("@#{object_name}")
-    result = content_tag 'h4', _('Categories')
+    result = content_tag 'h'+title_size.to_s(), title
     result << javascript_tag( 'function open_close_cat( link ) {
       var div = link.parentNode.getElementsByTagName("div")[0];
       var end = function(){
@@ -5,14 +5,19 @@ module ProfileHelper
     if info.nil?
       content_tag('div', _('This profile does not have any public information'))
     else
-      table_rows = ''
+      table_rows = content_tag( 'tr',
+                     content_tag( 'th',
+                       "\n" +
+                       button( :edit, _('edit your informations'), :controller => 'profile_editor', :action => 'edit' ) +
+                       "\n",
+                     :colspan => 2, :class => 'header' )
+                   ) + "\n"
       info.summary.each do |item|
         name = item[0]
         value = item[1]
         if value.is_a?(Proc)
           value = self.instance_eval(value)
         end
-
         table_rows << content_tag('tr', content_tag('th', name) + content_tag('td', value))
         table_rows << "\n"
       end
-/<h1><%= _('Administrator Panel') %></h1>
+<h1><%= _('Administrator Panel') %></h1>
 <p><%= _('You, as an environment administrator, has the following options:')%></p>
@@ -107,12 +107,12 @@
       </div><!-- id="noosfero_bar" -->
-      <div id='frame'><!-- Frame que envolve toda pagina de um usuario -->
-        <div id='header'>
+      <div id="frame"><!-- Frame que envolve toda pagina de um usuario -->
+        <div id="header">
           <!-- Abaixo um cabeçalho especifico para a pagina de usuario. -->
-        </div><!-- id='header' -->
-        <div id='content'>
-          <div id='header_content'>
+        </div><!-- id="header" -->
+        <div id="content">
+          <div id="header_content">
           </div>
           <% if @controller.send(:boxes_editor?) %>
 <% form_for :profile_object, @profile_object, :url  => { :action => 'edit_categories'} do |f| %>
-  <%= select_categories('profile_object') %>
+  <%= select_categories('profile_object', _('Select your interest categories'), 1) %>
   <% button_bar do %>
     <%= submit_button('save', _('Save'), :cancel => {:action => 'edit_categories'}) %>
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
@@ -4,20 +4,13 @@
 <%= render :partial => 'pending_tasks' %>
-<%= link_to (@profile.image ? image_tag( @profile.image.public_filename) :
-                              _('Upload your picture') ),
-    { :action => 'change_image' },
-    :class => (@profile.image ? 'change-user-picture' : 'set-user-picture' ),
-    :help => _('Click here to upload any image to be your picture') %>
-
-<p/>
-
 <%= display_profile_info(profile) %>
-
 <% file_manager do %>
-  <%= file_manager_button(_('Edit Profile'), 'icons-app/edit-profile.png', :controller => 'profile_editor', :action => 'edit') %>
+  <%= file_manager_button(_('Change your picture'), profile_icon(@profile, :portrait), :controller => 'profile_editor', :action => 'change_image') %>
+
+  <%# file_manager_button(_('Edit Profile'), 'icons-app/edit-profile.png', :controller => 'profile_editor', :action => 'edit') %>
   <%= file_manager_button(_('Pending tasks'), 'icons-app/todo.png', :controller => 'tasks', :action => 'index') %>
@@ -25,7 +18,7 @@
   <%= file_manager_button(_('Manage Content'), 'icons-app/cms.png', :controller => 'cms') %>
-  <%= file_manager_button(_('Edit Categories'), 'icons-app/categories.png', :controller => 'profile_editor', :action => 'edit_categories')  %>
+  <%= file_manager_button(_('My Interests'), 'icons-app/categories.png', :controller => 'profile_editor', :action => 'edit_categories')  %>
   <%= file_manager_button(_('Change Password'), 'icons-app/change-password.png', :controller => 'account', :action => 'change_password') if profile.person? %>
@@ -33,7 +26,7 @@
   <%= file_manager_button(_('Manage Members'), 'icons-app/members.png', :controller => 'profile_members') if profile.organization?  %>
-  <%= file_manager_button(_('Consumed Products'), 'icons-app/consumed_product.png', :controller => 'consumed_products')  %>
+  <%= file_manager_button(_('Consumed Products'), 'icons-app/consumed_product.png', :controller => 'consumed_products') if profile.enterprise? %>
   <%= file_manager_button(_('Manage Products'), 'icons-app/products.png', :controller => 'manage_products') if profile.enterprise? %>
+@import url(controller_cms.css);
-#profile-editor-index .change-user-picture img {
+.profile_info {
   border: 2px solid #3465A4;
-  padding: 1px;
 }
-#profile-editor-index .set-user-picture {
-  text-decoration: none;
-  border: 2px solid #3465A4;
+.profile_info .button:hover {
+  color: #FFF !important;
+}
+
+.profile_info th,
+.profile_info td {
+  border: 1px solid #729FCF;
+}
+
+.profile_info .header {
+  background: #729FCF;
+  border: 1px solid #3465A4;
+}
+.profile_info th {
   background: #B8CFE7;
-  padding: 1px 5px;
 }
+
+@import url(controller_cms.css);
+
+.profile_info {
+  width: 100%;
+}
+
 .profile_info th {
+  width: 10%;
   text-align: right;
+  white-space: nowrap;
 }
 .profile_info td,
 .profile_info th {
   padding: 2px 10px;
 }
+
+.profile_info .header {
+  background: #BBB;
+}
+
+.profile_info .button {
+  border: none !important;
+  background-color: transparent !important;
+}
1	-/<h1><%= _('Administrator Panel') %></h1>	1	+<h1><%= _('Administrator Panel') %></h1>
2		2
3	<p><%= _('You, as an environment administrator, has the following options:')%></p>	3	<p><%= _('You, as an environment administrator, has the following options:')%></p>
4		4
1	<% form_for :profile_object, @profile_object, :url => { :action => 'edit_categories'} do \|f\| %>	1	<% form_for :profile_object, @profile_object, :url => { :action => 'edit_categories'} do \|f\| %>
2	- <%= select_categories('profile_object') %>	2	+ <%= select_categories('profile_object', _('Select your interest categories'), 1) %>
3	<% button_bar do %>	3	<% button_bar do %>
4	<%= submit_button('save', _('Save'), :cancel => {:action => 'edit_categories'}) %>	4	<%= submit_button('save', _('Save'), :cancel => {:action => 'edit_categories'}) %>
5	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>	5	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
		1	+@import url(controller_cms.css);
1		2
2	-#profile-editor-index .change-user-picture img {	3	+.profile_info {
3	border: 2px solid #3465A4;	4	border: 2px solid #3465A4;
4	- padding: 1px;
5	}	5	}
6		6
7	-#profile-editor-index .set-user-picture {
8	- text-decoration: none;
9	- border: 2px solid #3465A4;	7	+.profile_info .button:hover {
		8	+ color: #FFF !important;
		9	+}
		10	+
		11	+.profile_info th,
		12	+.profile_info td {
		13	+ border: 1px solid #729FCF;
		14	+}
		15	+
		16	+.profile_info .header {
		17	+ background: #729FCF;
		18	+ border: 1px solid #3465A4;
		19	+}
		20	+.profile_info th {
10	background: #B8CFE7;	21	background: #B8CFE7;
11	- padding: 1px 5px;
12	}	22	}
		23	+
		1	+@import url(controller_cms.css);
		2	+
		3	+.profile_info {
		4	+ width: 100%;
		5	+}
		6	+
1	.profile_info th {	7	.profile_info th {
		8	+ width: 10%;
2	text-align: right;	9	text-align: right;
		10	+ white-space: nowrap;
3	}	11	}
4		12
5	.profile_info td,	13	.profile_info td,
6	.profile_info th {	14	.profile_info th {
7	padding: 2px 10px;	15	padding: 2px 10px;
8	}	16	}
		17	+
		18	+.profile_info .header {
		19	+ background: #BBB;
		20	+}
		21	+
		22	+.profile_info .button {
		23	+ border: none !important;
		24	+ background-color: transparent !important;
		25	+}