Download as
Browse Code »

Commit 4d68bf9576dc5bf7030351f3ca9d6b3a0322a591

Authored by AurelioAHeckert
1 parent 88e96a20
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem318: a better control panel 

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