Download as
Browse Code »

Commit 885496948da519ab675cb3dda9e63229ae4268c1

Authored by Daniela Feitosa
1 parent 6c01c176
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

Cosmetics improvements 

- Added translation markup
- Fixed indentation
- css of link

(ActionItem2875)
Showing 3 changed files with 24 additions and 16 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @8854969
@@ -150,7 +150,7 @@ class CmsController < MyProfileController @@ -150,7 +150,7 @@ class CmsController < MyProfileController
150 if article.nil? 150 if article.nil?
151 session[:notice] = _('Homepage reseted.') 151 session[:notice] = _('Homepage reseted.')
152 else 152 else
153 - session[:notice] = _('"%s" configured as home page.') % article.name 153 + session[:notice] = _('"%s" configured as homepage.') % article.name
154 end 154 end
155 155
156 redirect_to (request.referer || profile.url) 156 redirect_to (request.referer || profile.url)
app/views/cms/view.rhtml
  Diff comments   View file @8854969
@@ -3,17 +3,17 @@ @@ -3,17 +3,17 @@
3 </h1> 3 </h1>
4 4
5 <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %> 5 <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
6 - <div class="cms-homepage">  
7 - Homepage:  
8 - <% if profile.home_page %>  
9 - <%= link_to_article(profile.home_page) %>  
10 - <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %>  
11 - <% else %>  
12 - <span class="cms-homepage-default"><%= _('Profile Information') %></span>  
13 - <% end %>  
14 - </div> 6 + <div class="cms-homepage">
  7 + <%= _('Profile Homepage:') %>
  8 + <% if profile.home_page %>
  9 + <%= link_to_article(profile.home_page) %>
  10 + <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %>
  11 + <% else %>
  12 + <span class="cms-homepage-default"><%= _('Profile Information') %></span>
  13 + <% end %>
  14 + </div>
15 <% end %> 15 <% end %>
16 - 16 +
17 <% button_bar(:style => 'margin-bottom: 1em;') do %> 17 <% button_bar(:style => 'margin-bottom: 1em;') do %>
18 <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %> 18 <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
19 19
@@ -68,11 +68,11 @@ @@ -68,11 +68,11 @@
68 <%= button_without_text :eyes, _('Public view'), article.view_url %> 68 <%= button_without_text :eyes, _('Public view'), article.view_url %>
69 <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%> 69 <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%>
70 <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %> 70 <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
71 - <% if profile.home_page != article %>  
72 - <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>  
73 - <% else %>  
74 - <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %>  
75 - <% end%> 71 + <% if profile.home_page != article %>
  72 + <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
  73 + <% else %>
  74 + <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %>
  75 + <% end %>
76 <% end %> 76 <% end %>
77 <%= display_delete_button(article) if !remove_content_button(:delete) %> 77 <%= display_delete_button(article) if !remove_content_button(:delete) %>
78 </td> 78 </td>
public/stylesheets/application.css
  Diff comments   View file @8854969
@@ -3156,6 +3156,14 @@ table.cms-articles .icon:hover { @@ -3156,6 +3156,14 @@ table.cms-articles .icon:hover {
3156 border-right: 1px solid #ccc; 3156 border-right: 1px solid #ccc;
3157 } 3157 }
3158 3158
  3159 +.cms-homepage a.icon {
  3160 + border: none;
  3161 +}
  3162 +
  3163 +.cms-homepage a:hover {
  3164 + background-color: transparent;
  3165 +}
  3166 +
3159 .select-article-type { 3167 .select-article-type {
3160 padding: 5px 20px; 3168 padding: 5px 20px;
3161 width: 455px; 3169 width: 455px;