Download as
Browse Code »

Commit 34ec01ce19cad66562de0713984c5f452588a2a3

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 062a7dee
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fixing positions 

  * addThis
  * blog-feed-link
  * article-actions
Showing 4 changed files with 35 additions and 45 deletions   Show diff stats
app/views/content_viewer/blog_page.rhtml
  Diff comments   View file @34ec01c
... ... @@ -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 @34ec01c
... ... @@ -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) %>
... ... @@ -63,6 +46,7 @@
63 46 </div>
64 47 </div>
65 48  
  49 +
66 50 <% if !@page.tags.empty? %>
67 51 <div id="article-tags">
68 52 <%= _("This article's tags:") %>
... ... @@ -105,6 +89,25 @@
105 89 </div>
106 90 <% end %>
107 91  
  92 +<%
  93 + # AddThis Button
  94 + if block_given? && web2_conf['addthis']
  95 + opts = web2_conf['addthis']
  96 +%>
  97 +<div id="addThis">
  98 +<script type="text/javascript">
  99 + addthis_brand = '<%= escape_javascript( @environment.name ) %>';
  100 +<%=
  101 + str = ''
  102 + opts.each { |k, v|
  103 + str += ' addthis_'+ k +' = "'+ escape_javascript( v ) +"\";\n"
  104 + }
  105 + str
  106 +%></script>
  107 +<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>
  108 +</div>
  109 +<% end %>
  110 +
108 111 <div class="comments">
109 112 <a name="comments_list"></a>
110 113 <% if @page.accept_comments? %>
... ...
public/designs/themes/base/style.css
  Diff comments   View file @34ec01c
... ... @@ -904,6 +904,14 @@ hr.pre-posts, hr.sep-posts {
904 904 display: none;
905 905 }
906 906  
  907 +.blog-feed-link {
  908 + float: right;
  909 + margin-left: 5px;
  910 + position: absolute;
  911 + right: 0px;
  912 + top: -2px;
  913 +}
  914 +
907 915 .blog-post {
908 916 background: url(imgs/blog-sep.png) repeat-x;
909 917 padding: 15px 20px 5px 20px;
... ... @@ -918,10 +926,6 @@ hr.pre-posts, hr.sep-posts {
918 926 margin-top: 25px;
919 927 }
920 928  
921   -#article-actions {
922   - top: -28px;
923   -}
924   -
925 929 #article-actions a.button,
926 930 #article-actions a.button:hover {
927 931 border: none;
... ... @@ -932,10 +936,8 @@ hr.pre-posts, hr.sep-posts {
932 936 color: #555753;
933 937 }
934 938  
935   -#bt_addThis {
936   - position: absolute;
937   - top: -15px;
938   - right: 0px;
  939 +#addThis {
  940 + text-align: right;
939 941 }
940 942  
941 943 #content .blog-post .title {
... ... @@ -961,7 +963,6 @@ hr.pre-posts, hr.sep-posts {
961 963 }
962 964  
963 965 #article-tags {
964   - float: right;
965 966 color: #FFF;
966 967 }
967 968 #article-tags a {
... ...
public/stylesheets/application.css
  Diff comments   View file @34ec01c
... ... @@ -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 {
... ... @@ -1797,8 +1785,8 @@ input.disabled {
1797 1785 Use article.css for article related css
1798 1786 */
1799 1787  
1800   -.main-block .article-body, .main-block h1 {
1801   - overflow: hidden;
  1788 +.main-block, .main-block h1{
  1789 + overflow: visible;
1802 1790 }
1803 1791  
1804 1792 body div#activation_enterprise {
... ... @@ -1994,7 +1982,6 @@ div#activation_enterprise div {
1994 1982 .profile-info-picture img {
1995 1983 border: none;
1996 1984 padding: 2px;
1997   - background: #FFF;
1998 1985 }
1999 1986  
2000 1987 .profile-info-picture .sex-male,
... ...