Download as
Browse Code »

Commit 405b8a443e36756098cf2b5778d13a371229ca2f

Authored by AurelioAHeckert
1 parent 1d34206a
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

ActionItem539: a better highlight in the control panel 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2164 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 7 changed files with 54 additions and 16 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @405b8a4
@@ -167,7 +167,11 @@ module ApplicationHelper @@ -167,7 +167,11 @@ module ApplicationHelper
167 end 167 end
168 168
169 def file_manager(&block) 169 def file_manager(&block)
170 - concat(content_tag('div', capture(&block), :class => 'file-manager') + "<br style='clear: left;'/>", block.binding) 170 + concat(
  171 + content_tag('div',
  172 + content_tag('div', capture(&block) + '<br style="clear:left;"/>&nbsp;'),
  173 + :class => 'file-manager'),
  174 + block.binding)
171 end 175 end
172 176
173 def file_manager_button(title, icon, url) 177 def file_manager_button(title, icon, url)
app/views/profile_editor/index.rhtml
  Diff comments   View file @405b8a4
@@ -41,6 +41,9 @@ @@ -41,6 +41,9 @@
41 <% end %> 41 <% end %>
42 42
43 <% if @profile.person? %> 43 <% if @profile.person? %>
  44 +
  45 + &nbsp;<hr />
  46 +
44 <h2><%= _('Manage my groups') %></h2> 47 <h2><%= _('Manage my groups') %></h2>
45 48
46 <% button_bar do %> 49 <% button_bar do %>
public/designs/themes/ecosol/stylesheets/common.css
  Diff comments   View file @405b8a4
@@ -70,6 +70,10 @@ body.category4 #content h4, body.category4 #content h5, body.category4 #content @@ -70,6 +70,10 @@ body.category4 #content h4, body.category4 #content h5, body.category4 #content
70 list-style: url(../images/list-dot.gif); 70 list-style: url(../images/list-dot.gif);
71 } 71 }
72 72
  73 +hr {
  74 + border: none;
  75 + border-top: 2px dotted #2A5896;
  76 +}
73 77
74 #lightbox{ 78 #lightbox{
75 background: #FFF url(../images/bg-top-cinza.jpg) no-repeat 50% -15px; 79 background: #FFF url(../images/bg-top-cinza.jpg) no-repeat 50% -15px;
public/designs/themes/ecosol/stylesheets/controller_profile_editor.css
  Diff comments   View file @405b8a4
@@ -21,13 +21,30 @@ @@ -21,13 +21,30 @@
21 background: #B8CFE7; 21 background: #B8CFE7;
22 } 22 }
23 23
24 -div.file-manager  
25 -div.file-manager-button a:hover { 24 +.file-manager
  25 +.file-manager-button a:hover {
26 color: #006; 26 color: #006;
27 border-color: #2A5896; 27 border-color: #2A5896;
28 background-color: #CFDFF7; 28 background-color: #CFDFF7;
  29 + -moz-border-radius: 15px;
29 } 30 }
30 31
31 -div#profile-editor-index div.control-panel { 32 +#profile-editor-index .control-panel {
  33 +}
  34 +
  35 +#profile-editor-index .file-manager {
32 background: #B8CFE7; 36 background: #B8CFE7;
  37 + -moz-border-radius: 25px;
  38 + padding: 0px 0px 0px 10px;
  39 +}
  40 +.msie #profile-editor-index .file-manager {
  41 + border: 2px solid #2A5896;
  42 +}
  43 +.msie6 #profile-editor-index .file-manager div {
  44 + position: relative;
33 } 45 }
  46 +
  47 +.button-bar {
  48 + margin-bottom: 5px;
  49 +}
  50 +
public/designs/themes/zen3/stylesheets/common.css
  Diff comments   View file @405b8a4
@@ -39,6 +39,11 @@ a:hover { @@ -39,6 +39,11 @@ a:hover {
39 color: #EA0; 39 color: #EA0;
40 } 40 }
41 41
  42 +hr {
  43 + border: none;
  44 + border-top: 2px dotted #CE5C00;
  45 +}
  46 +
42 ul li { 47 ul li {
43 list-style: url(../images/list-dot.gif); 48 list-style: url(../images/list-dot.gif);
44 } 49 }
public/designs/themes/zen3/stylesheets/controller_profile_editor.css
  Diff comments   View file @405b8a4
@@ -25,13 +25,26 @@ ul.categories li.cat_checked { @@ -25,13 +25,26 @@ ul.categories li.cat_checked {
25 border-bottom: 1px solid #CE5C00; 25 border-bottom: 1px solid #CE5C00;
26 } 26 }
27 27
28 -div.file-manager  
29 -div.file-manager-button a:hover { 28 +.file-manager
  29 +.file-manager-button a:hover {
30 background: #FCAF3E !important; 30 background: #FCAF3E !important;
31 color: #000 !important; 31 color: #000 !important;
32 border-color: #CE5C00; 32 border-color: #CE5C00;
33 } 33 }
34 34
35 -div#profile-editor-index div.control-panel { 35 +#profile-editor-index .control-panel {
  36 +}
  37 +
  38 +#profile-editor-index .file-manager {
36 background: #FFE890; 39 background: #FFE890;
  40 + padding: 0px 0px 0px 10px;
  41 + border: 2px solid #CE5C00;
  42 +}
  43 +.msie6 #profile-editor-index .file-manager div {
  44 + position: relative;
37 } 45 }
  46 +
  47 +.button-bar {
  48 + margin-bottom: 5px;
  49 +}
  50 +
public/stylesheets/controller_profile_editor.css
  Diff comments   View file @405b8a4
@@ -54,14 +54,6 @@ div.file-manager-button a { @@ -54,14 +54,6 @@ div.file-manager-button a {
54 overflow: hidden; 54 overflow: hidden;
55 font-size: 90%; 55 font-size: 90%;
56 text-decoration: none; 56 text-decoration: none;
  57 + line-height: 100%;
57 } 58 }
58 59
59 -div.file-manager  
60 -div.file-manager-button a:hover {  
61 - -moz-border-radius: 15px;  
62 -}  
63 -  
64 -div#profile-editor-index div.control-panel {  
65 - padding: 10px;  
66 - -moz-border-radius: 15px;  
67 -}