From 885496948da519ab675cb3dda9e63229ae4268c1 Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Mon, 25 Nov 2013 11:50:24 +0000 Subject: [PATCH] Cosmetics improvements --- app/controllers/my_profile/cms_controller.rb | 2 +- app/views/cms/view.rhtml | 30 +++++++++++++++--------------- public/stylesheets/application.css | 8 ++++++++ 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb index 75b155b..f945e41 100644 --- a/app/controllers/my_profile/cms_controller.rb +++ b/app/controllers/my_profile/cms_controller.rb @@ -150,7 +150,7 @@ class CmsController < MyProfileController if article.nil? session[:notice] = _('Homepage reseted.') else - session[:notice] = _('"%s" configured as home page.') % article.name + session[:notice] = _('"%s" configured as homepage.') % article.name end redirect_to (request.referer || profile.url) diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml index 8c33eb8..8697b95 100644 --- a/app/views/cms/view.rhtml +++ b/app/views/cms/view.rhtml @@ -3,17 +3,17 @@ <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %> -
- Homepage: - <% if profile.home_page %> - <%= link_to_article(profile.home_page) %> - <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %> - <% else %> - <%= _('Profile Information') %> - <% end %> -
+
+ <%= _('Profile Homepage:') %> + <% if profile.home_page %> + <%= link_to_article(profile.home_page) %> + <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %> + <% else %> + <%= _('Profile Information') %> + <% end %> +
<% end %> - + <% button_bar(:style => 'margin-bottom: 1em;') do %> <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %> @@ -68,11 +68,11 @@ <%= button_without_text :eyes, _('Public view'), article.view_url %> <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%> <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %> - <% if profile.home_page != article %> - <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %> - <% else %> - <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %> - <% end%> + <% if profile.home_page != article %> + <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %> + <% else %> + <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %> + <% end %> <% end %> <%= display_delete_button(article) if !remove_content_button(:delete) %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index d128627..3bc1d4c 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -3156,6 +3156,14 @@ table.cms-articles .icon:hover { border-right: 1px solid #ccc; } +.cms-homepage a.icon { + border: none; +} + +.cms-homepage a:hover { + background-color: transparent; +} + .select-article-type { padding: 5px 20px; width: 455px; -- libgit2 0.21.2