Download as
Browse Code »

Commit 361e89c1411201464e1b4d2c2a80a73fb0a3e3d6

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 3fe538f1
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

Fixing positions 

* addThis
  * blog-feed-link
  * article-actions
Showing 4 changed files with 35 additions and 49 deletions   Show diff stats
app/views/content_viewer/blog_page.rhtml
  Diff comments   View file @361e89c
... ... @@ -3,7 +3,6 @@
3 3 <%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %>
4 4  
5 5 <div>
6   - <%= link_to(image_tag('icons-mime/rss-feed.png'), article.feed.url, :class => 'blog-feed-link') if article.blog? && article.feed %>
7 6 <div class='blog-description'>
8 7 <%= article.body %>
9 8 </div>
... ...
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @361e89c
... ... @@ -6,26 +6,9 @@
6 6  
7 7 <div id="article">
8 8  
9   -<%
10   - # AddThis Button
11   - if block_given? && web2_conf['addthis']
12   - opts = web2_conf['addthis']
13   -%>
14   -<div id="addThis">
15   -<script type="text/javascript">
16   - addthis_brand = '<%= escape_javascript( @environment.name ) %>';
17   -<%=
18   - str = ''
19   - opts.each { |k, v|
20   - str += ' addthis_'+ k +' = "'+ escape_javascript( v ) +"\";\n"
21   - }
22   - str
23   -%></script>
24   -<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
25   -</div>
26   -<% end %>
27 9  
28 10 <div<%= " class='logged-in'" if user %>>
  11 + <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.blog? && @page.feed %>
29 12 <%= article_title(@page, :no_link => true) %>
30 13 <div id="article-actions">
31 14 <% if @page.allow_post_content?(user) %>
... ... @@ -69,6 +52,7 @@
69 52 </div>
70 53 </div>
71 54  
  55 +
72 56 <% if !@page.tags.empty? %>
73 57 <div id="article-tags">
74 58 <%= _("This article's tags:") %>
... ... @@ -115,6 +99,25 @@
115 99 </div>
116 100 <% end %>
117 101  
  102 +<%
  103 + # AddThis Button
  104 + if block_given? && web2_conf['addthis']
  105 + opts = web2_conf['addthis']
  106 +%>
  107 +<div id="addThis">
  108 +<script type="text/javascript">
  109 + addthis_brand = '<%= escape_javascript( @environment.name ) %>';
  110 +<%=
  111 + str = ''
  112 + opts.each { |k, v|
  113 + str += ' addthis_'+ k +' = "'+ escape_javascript( v ) +"\";\n"
  114 + }
  115 + str
  116 +%></script>
  117 +<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
  118 +</div>
  119 +<% end %>
  120 +
118 121 <div class="comments">
119 122 <a name="comments_list"></a>
120 123 <% if @page.accept_comments? %>
... ...
public/designs/themes/base/style.css
  Diff comments   View file @361e89c
... ... @@ -966,6 +966,14 @@ hr.pre-posts, hr.sep-posts {
966 966 display: none;
967 967 }
968 968  
  969 +.blog-feed-link {
  970 + float: right;
  971 + margin-left: 5px;
  972 + position: absolute;
  973 + right: 0px;
  974 + top: -2px;
  975 +}
  976 +
969 977 .blog-post {
970 978 background: url(imgs/blog-sep.png) repeat-x;
971 979 padding: 15px 20px 5px 20px;
... ... @@ -976,10 +984,6 @@ hr.pre-posts, hr.sep-posts {
976 984 margin-top: 25px;
977 985 }
978 986  
979   -#article-actions {
980   - top: -28px;
981   -}
982   -
983 987 #article-actions a.button,
984 988 #article-actions a.button:hover {
985 989 border: none;
... ... @@ -990,10 +994,8 @@ hr.pre-posts, hr.sep-posts {
990 994 color: #555753;
991 995 }
992 996  
993   -#bt_addThis {
994   - position: absolute;
995   - top: -15px;
996   - right: 0px;
  997 +#addThis {
  998 + text-align: right;
997 999 }
998 1000  
999 1001 #content .blog-post .title {
... ... @@ -1019,7 +1021,6 @@ hr.pre-posts, hr.sep-posts {
1019 1021 }
1020 1022  
1021 1023 #article-tags {
1022   - float: right;
1023 1024 color: #FFF;
1024 1025 }
1025 1026 #article-tags a {
... ...
public/stylesheets/application.css
  Diff comments   View file @361e89c
... ... @@ -969,8 +969,8 @@ code input {
969 969  
970 970 #article-actions {
971 971 position: absolute;
972   - top: -25px;
973   - right: -17px;
  972 + top: 1px;
  973 + right: 20px;
974 974 padding-right: 15px;
975 975 }
976 976  
... ... @@ -1143,8 +1143,6 @@ a.comment-picture {
1143 1143 margin-bottom: -5px;
1144 1144 }
1145 1145 #bt_addThis {
1146   - float: right;
1147   - margin: 0px;
1148 1146 }
1149 1147  
1150 1148 #addthis_dropdown15 table td {
... ... @@ -1234,16 +1232,6 @@ a.comment-picture {
1234 1232 font-size: small;
1235 1233 }
1236 1234  
1237   -.blog-feed-link {
1238   - float: right;
1239   -}
1240   -
1241   -.blog-description {
1242   - margin-right: 30px;
1243   -}
1244   -
1245   -
1246   -
1247 1235 a.button, a.button:visited,
1248 1236 body.noosfero a.button, body.noosfero a.button:visited,
1249 1237 input.button {
... ... @@ -1802,12 +1790,8 @@ input.disabled {
1802 1790 Use article.css for article related css
1803 1791 */
1804 1792  
1805   -.main-block .main-block h1 {
1806   - overflow: hidden;
1807   -}
1808   -
1809   -.main-block .article-body {
1810   - overflow-x: auto;
  1793 +.main-block, .main-block h1{
  1794 + overflow: visible;
1811 1795 }
1812 1796  
1813 1797 body div#activation_enterprise {
... ... @@ -2003,7 +1987,6 @@ div#activation_enterprise div {
2003 1987 .profile-info-picture img {
2004 1988 border: none;
2005 1989 padding: 2px;
2006   - background: #FFF;
2007 1990 }
2008 1991  
2009 1992 .profile-info-picture .sex-male,
... ...