Download as
Browse Code »

Commit 2b9d5ed9c7f27392ae436d9fb59e5a9600badc4a

Authored by Daniel Cunha
Committed by Antonio Terceiro
1 parent 6d2eb048
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

Fixes position of translations link when article has a big title 

(ActionItem1796)
Showing 2 changed files with 3 additions and 19 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @2b9d5ed
@@ -55,10 +55,10 @@ @@ -55,10 +55,10 @@
55 <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :class => 'button with-text icon-new' %> 55 <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :class => 'button with-text icon-new' %>
56 <% end %> 56 <% end %>
57 <% end %> 57 <% end %>
58 - <%= article_translations(@page) %>  
59 <div id="article-header"> 58 <div id="article-header">
60 <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %> 59 <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
61 <%= article_title(@page, :no_link => true) %> 60 <%= article_title(@page, :no_link => true) %>
  61 + <%= article_translations(@page) %>
62 </div> 62 </div>
63 </div> 63 </div>
64 64
public/stylesheets/application.css
  Diff comments   View file @2b9d5ed
@@ -5409,23 +5409,14 @@ h1#agenda-title { @@ -5409,23 +5409,14 @@ h1#agenda-title {
5409 margin-top: 10px; 5409 margin-top: 10px;
5410 } 5410 }
5411 5411
5412 -  
5413 .article-translations-menu { 5412 .article-translations-menu {
5414 - float: right;  
5415 - bottom: -15px;  
5416 -}  
5417 -  
5418 -.opera .article-translations-menu {  
5419 - bottom: -8px;  
5420 -}  
5421 -  
5422 -.webkit .article-translations-menu {  
5423 - bottom: -10px; 5413 + bottom: 17px;
5424 } 5414 }
5425 5415
5426 .article-translations-menu { 5416 .article-translations-menu {
5427 text-decoration: none !important; 5417 text-decoration: none !important;
5428 height: 0; 5418 height: 0;
  5419 + float: right;
5429 } 5420 }
5430 5421
5431 .article-translations .menu-submenu-header, 5422 .article-translations .menu-submenu-header,
@@ -5436,18 +5427,11 @@ h1#agenda-title { @@ -5436,18 +5427,11 @@ h1#agenda-title {
5436 5427
5437 .article-translations .menu-submenu { 5428 .article-translations .menu-submenu {
5438 bottom: auto; 5429 bottom: auto;
5439 - top: 60px;  
5440 right: 0; 5430 right: 0;
5441 border: 1px solid; 5431 border: 1px solid;
5442 background: #fff; 5432 background: #fff;
5443 } 5433 }
5444 5434
5445 -.msie7 .article-translations .menu-submenu,  
5446 -.webkit .article-translations .menu-submenu,  
5447 -.opera .article-translations .menu-submenu {  
5448 - top: 30px;  
5449 -}  
5450 -  
5451 .article-translations .menu-submenu-list { 5435 .article-translations .menu-submenu-list {
5452 list-style: none; 5436 list-style: none;
5453 } 5437 }