Download as
Browse Code »

Commit 4672245c0cdb8258f39226ad3e063ca128ff6eed

Authored by AurelioAHeckert
1 parent 73926c55
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem360: Theme Zen3 80% 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1769 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 15 changed files with 389 additions and 82 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @4672245
1 -<div class="article"> 1 +<div id="article">
2 2
3 <% 3 <%
4 # AddThis Button 4 # AddThis Button
@@ -19,23 +19,31 @@ @@ -19,23 +19,31 @@
19 <a href="http://www.addthis.com/bookmark.php" class="bt_addthis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]', '<%= escape_javascript( @environment.name()+' :: '+@page.title ) %>')" 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> 19 <a href="http://www.addthis.com/bookmark.php" class="bt_addthis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]', '<%= escape_javascript( @environment.name()+' :: '+@page.title ) %>')" 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>
20 <% end; end %> 20 <% end; end %>
21 21
22 -<h2><%= @page.title %></h2>  
23 -  
24 -<% if logged_in? && current_user.person.has_permission?('post_content', profile) %>  
25 -<div class="article-actions">  
26 - <%= link_to content_tag( 'span', _('Edit') ),  
27 - { :controller => 'cms', :action => 'edit', :id => @page },  
28 - :class => 'button with-text icon-edit' %> 22 +<div onmouseover="showArticleActions(true)"
  23 + onmouseout="showArticleActions(false)">
  24 + <h1><%= @page.title %></h1>
  25 + <script type="text/javascript">
  26 + function showArticleActions( show ) {
  27 + var act = $("article-actions");
  28 + if ( act ) act.style.display = ( show ? "block" : "none" );
  29 + }
  30 + </script>
  31 + <% if logged_in? && current_user.person.has_permission?('post_content', profile) %>
  32 + <div id="article-actions" style="display:none">
  33 + <%= link_to content_tag( 'span', _('Edit') ),
  34 + { :controller => 'cms', :action => 'edit', :id => @page },
  35 + :class => 'button with-text icon-edit' %>
  36 + </div>
  37 + <% end %>
29 </div> 38 </div>
30 -<% end %>  
31 39
32 -<div class="article-tags"> 40 +<div id="article-tags">
33 <%= _("This article's tags:") %> 41 <%= _("This article's tags:") %>
34 <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tag', :id => t.name ) }.join("\n") %> 42 <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tag', :id => t.name ) }.join("\n") %>
35 </div> 43 </div>
36 44
37 <% if @page.parent && !@page.parent.path.blank? %> 45 <% if @page.parent && !@page.parent.path.blank? %>
38 -<div class="article-parent"> 46 +<div id="article-parent">
39 <%= link_to_document(@page.parent, _('Up')) %> 47 <%= link_to_document(@page.parent, _('Up')) %>
40 </div> 48 </div>
41 <% end %> 49 <% end %>
@@ -52,13 +60,15 @@ @@ -52,13 +60,15 @@
52 <% end %> 60 <% end %>
53 --> 61 -->
54 62
55 -<div class="article-cat">  
56 - <h3><%= _('Categories') %></h3>  
57 - <%= @page.categories.map {|item| link_to_category(item) }.join(', ') %> 63 +<div id="article-cat">
  64 + <h4><%= _('Categories') %></h4>
  65 + <ul>
  66 + <li><%= @page.categories.map {|item| link_to_category(item) }.join("</li>\n<li>") %></li>
  67 + </ul>
58 </div> 68 </div>
59 69
60 <h3><%= @comments.size == 0 ? _('No comments yet') : (n_('One comment', '%{comments} comments', @comments.size)) % { :comments => @comments.size} %></h3> 70 <h3><%= @comments.size == 0 ? _('No comments yet') : (n_('One comment', '%{comments} comments', @comments.size)) % { :comments => @comments.size} %></h3>
61 <%= render :partial => 'comment', :collection => @comments %> 71 <%= render :partial => 'comment', :collection => @comments %>
62 <%= render :partial => 'comment_form' %> 72 <%= render :partial => 'comment_form' %>
63 73
64 -</div><!-- end class="article" --> 74 +</div><!-- end id="article" -->
public/designs/themes/ecosol/stylesheets/blocks/main-block.css
  Diff comments   View file @4672245
1 1
2 -.article {  
3 - position: relative;  
4 - text-align: justify;  
5 -}  
6 -  
7 -.article-tags { 2 +#article-tags {
8 text-align: right; 3 text-align: right;
9 font-size: 10px; 4 font-size: 10px;
10 margin-top: -9px; 5 margin-top: -9px;
11 padding-right: 15px; 6 padding-right: 15px;
12 } 7 }
13 8
14 -.article-tags a { 9 +#article-tags a {
15 color: #729FCF; 10 color: #729FCF;
16 border: 1px solid #B8CFE7; 11 border: 1px solid #B8CFE7;
17 text-decoration: none; 12 text-decoration: none;
18 padding: 0px 2px 1px 2px; 13 padding: 0px 2px 1px 2px;
19 } 14 }
20 -.article-tags a:hover { 15 +#article-tags a:hover {
21 color: #FFF; 16 color: #FFF;
22 border: 1px solid #3465A4; 17 border: 1px solid #3465A4;
23 background: #729FCF; 18 background: #729FCF;
24 } 19 }
25 20
26 -.article-actions {  
27 - position: absolute;  
28 - top: -5px;  
29 - right: 0px;  
30 - padding-right: 15px;  
31 -}  
32 -  
33 -.article-parent { 21 +#article-parent {
34 text-align: right; 22 text-align: right;
35 padding-right: 15px; 23 padding-right: 15px;
36 } 24 }
37 25
38 -.article-cat { 26 +#article-cat {
39 position: relative; 27 position: relative;
40 border: 1px dotted #B8CFE7; 28 border: 1px dotted #B8CFE7;
41 margin-top: 10px; 29 margin-top: 10px;
42 padding: 10px; 30 padding: 10px;
43 } 31 }
44 32
45 -#content .article-cat h3 { 33 +#content #article-cat h3 {
46 margin: 0px 0px 5px 0px; 34 margin: 0px 0px 5px 0px;
47 } 35 }
48 36
49 -/* * * Comments * * */  
50 -  
51 -.article-comment {  
52 - position: relative;  
53 - border: 1px solid #B8CFE7;  
54 - margin-bottom: 10px;  
55 - padding: 10px;  
56 -}  
57 -  
58 -.comment-from-owner {  
59 - border: 1px solid #3465A4;  
60 - background: #B8CFE7;  
61 -}  
62 -  
63 -#content .article-comment h4 {  
64 - font-size: 14px;  
65 - margin: 0px;  
66 -}  
67 -  
68 -.comment-picture {  
69 - position: relative;  
70 - display: block;  
71 - width: 50px;  
72 - height: 50px;  
73 - background-repeat: no-repeat;  
74 - background-position: 50% 50%;  
75 - margin-right: 10px;  
76 - float: left;  
77 -}  
78 -.comment-picture span {  
79 - display: none;  
80 -}  
81 -  
82 -.comment-info {  
83 - font-size: 10px;  
84 - color: #999;  
85 -}  
86 -.comment-from-owner .comment-info {  
87 - color: #729FCF;  
88 -}  
89 -  
90 -.comment-text {  
91 - clear: left;  
92 -}  
93 -  
94 -.comment-logged-out .comment-text {  
95 - color: #888;  
96 -}  
97 -  
public/designs/themes/zen3/images/list-dot.gif 0 → 100644
View file @4672245

59 Bytes
public/designs/themes/zen3/stylesheets/article.css 0 → 100644
  Diff comments   View file @4672245
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
  1 +/*
  2 +** Style for Article Related Elements
  3 +*/
  4 +
  5 +#article .post_comment_box h4 {
  6 + background: #FD8;
  7 +}
  8 +
  9 +#article .post_comment_box.closed h4 {
  10 + border: 1px solid #f57900;
  11 +}
  12 +
  13 +#article .post_comment_box.opened {
  14 + border: 1px solid #f57900;
  15 + background: #FD8;
  16 +}
  17 +
public/designs/themes/zen3/stylesheets/blocks/communities-block.css 0 → 120000
  Diff comments   View file @4672245
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +profile-list-block.css
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/zen3/stylesheets/blocks/enterprises-block.css 0 → 120000
  Diff comments   View file @4672245
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +profile-list-block.css
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/zen3/stylesheets/blocks/friends-block.css 0 → 120000
  Diff comments   View file @4672245
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +profile-list-block.css
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/zen3/stylesheets/blocks/main-block.css 0 → 100644
  Diff comments   View file @4672245
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
  1 +
  2 +/* * * Comments * * */
  3 +
  4 +.article-comment {
  5 + border: 1px solid #fcaf3e;
  6 +}
  7 +
  8 +.comment-from-owner {
  9 + border: 1px solid #f57900;
  10 + background: #FD8;
  11 +}
  12 +
  13 +.comment-from-owner .comment-info {
  14 + color: #ab835c;
  15 +}
  16 +
  17 +.comment-text {
  18 + clear: left;
  19 +}
  20 +
  21 +.comment-logged-out .comment-text {
  22 + color: #888;
  23 +}
  24 +
public/designs/themes/zen3/stylesheets/blocks/members-block.css 0 → 120000
  Diff comments   View file @4672245
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +profile-list-block.css
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/zen3/stylesheets/blocks/profile-info-block.css 0 → 100644
  Diff comments   View file @4672245
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +.profile-info-block h2 {
  2 + text-align: center;
  3 +}
  4 +
  5 +.profile-info-picture {
  6 + border: 2px solid #A40000;
  7 + padding: 1px;
  8 + background: #FFF;
  9 + margin-right: 40px;
  10 +}
  11 +.msie6 .profile-info-picture {
  12 + margin-right: 20px;
  13 +}
  14 +
  15 +.profile-info-data {
  16 + width: 110px;
  17 + font-size: 10px;
  18 + text-align: right;
  19 + position: relative;
  20 + top: 20px;
  21 +}
  22 +
  23 +.profile-info-options {
  24 + clear: both;
  25 +}
  26 +
  27 +.profile-info-options {
  28 + text-align: center;
  29 +}
  30 +
public/designs/themes/zen3/stylesheets/blocks/profile-list-block.css 0 → 100644
  Diff comments   View file @4672245
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
  1 +
  2 +.common-profile-list-block li a {
  3 + border: 2px solid #FFF;
  4 + color: #C00;
  5 + -moz-border-radius: 4px;
  6 +}
  7 +
  8 +.common-profile-list-block li a:hover {
  9 + border: 2px solid #C00;
  10 + background: #fcaf3e;
  11 + color: #FFF;
  12 +}
  13 +
public/designs/themes/zen3/stylesheets/common.css
  Diff comments   View file @4672245
@@ -17,6 +17,30 @@ body { @@ -17,6 +17,30 @@ body {
17 background: #FFF url(../images/bg-top.png) repeat-x; 17 background: #FFF url(../images/bg-top.png) repeat-x;
18 } 18 }
19 19
  20 +/* * * Content * * * * * * * * * * * * * * * * * * * */
  21 +
  22 +#content h1, #content h2, #content h3,
  23 +#content h4, #content h5, #content h6 {
  24 + margin: 10px 0px;
  25 + color: #A40000;
  26 +}
  27 +
  28 +a {
  29 + color: #ce5c00;
  30 +}
  31 +a:visited {
  32 + color: #ab835c;
  33 +}
  34 +a:hover {
  35 + color: #EA0;
  36 +}
  37 +
  38 +ul li {
  39 + list-style: url(../images/list-dot.gif);
  40 +}
  41 +
  42 +/* * * Footer * * * * * * * * * * * * * * * * * * * */
  43 +
20 #footer { 44 #footer {
21 background: url("../images/bg-footer.png") repeat-x; 45 background: url("../images/bg-footer.png") repeat-x;
22 margin: 0px; 46 margin: 0px;
public/designs/themes/zen3/stylesheets/controller_content_viewer.css 0 → 100644
View file @4672245
No preview for this file type
public/designs/themes/zen3/stylesheets/controller_search.css 0 → 100644
  Diff comments   View file @4672245
@@ -0,0 +1,172 @@ @@ -0,0 +1,172 @@
  1 +
  2 +#view-category,
  3 +#search-results {
  4 + padding: 0% 2% 10px 2%;
  5 +}
  6 +
  7 +#view-category a,
  8 +#search-results a {
  9 + text-decoration: none;
  10 +}
  11 +#view-category a:hover,
  12 +#search-results .search-results-type-comment a:hover,
  13 +#search-results .search-results-type-article a:hover,
  14 +#search-results .search-results-type-product a:hover {
  15 + text-decoration: underline;
  16 +}
  17 +
  18 +#content .search_form {
  19 + margin: 0px;
  20 + padding: 0% 10%;
  21 +}
  22 +
  23 +.search-options {
  24 + border: 1px solid #E26B00;
  25 +}
  26 +
  27 +/*
  28 +.search-results-box {
  29 + Xwidth: 32.5%;
  30 +}
  31 +
  32 +.search-results-box.odd {
  33 + Xmargin-left: 0px;
  34 +}
  35 +
  36 +.search-results-box.col2_of3,
  37 +.search-results-box.col3_of3 {
  38 + Xmargin-left: 1.25%;
  39 +}
  40 +*/
  41 +
  42 +.category-innerbox,
  43 +.search-results-innerbox {
  44 + padding: 10px 0px 10px 10px;
  45 + overflow: auto;
  46 + border: none;
  47 + background: #FD8;
  48 + -moz-border-radius: 15px;
  49 +}
  50 +
  51 +.search-results-type-product li li a {
  52 + color: #000;
  53 +}
  54 +
  55 +#search-results .common-profile-list-block li a {
  56 + border: 2px solid #FD8;
  57 +}
  58 +#search-results .common-profile-list-block li a:hover {
  59 + border: 2px solid #C00;
  60 + background: #fcaf3e;
  61 + color: #FFF;
  62 +}
  63 +
  64 +.search-results-type-empty div {
  65 + color: #FEB;
  66 +}
  67 +
  68 +.item_meta {
  69 + font-size: 10px;
  70 + padding: 0px 0px 5px 0px;
  71 +}
  72 +
  73 +.search-results-type-profile.common-profile-list-block a {
  74 + width: 90px;
  75 +}
  76 +.search-results-type-profile.common-profile-list-block li div {
  77 + width: 88px;
  78 + height: 64px;
  79 +}
  80 +.search-results-type-profile.common-profile-list-block li span {
  81 + display: block;
  82 + width: 82px;
  83 +}
  84 +
  85 +.search-results-type-profile.common-profile-list-block li a {
  86 + color: #000;
  87 +}
  88 +
  89 +body.category1 .search-results-type-profile.common-profile-list-block li a {
  90 + background: #FDD79E;
  91 +}
  92 +body.category2 .search-results-type-profile.common-profile-list-block li a {
  93 + border: 2px solid #C4F099 !important;
  94 +}
  95 +body.category2 .search-results-type-profile.common-profile-list-block li a:hover {
  96 + border: 2px solid #61B60E !important;
  97 + background: #D0F8A0 !important;
  98 +}
  99 +body.category3 .search-results-type-profile.common-profile-list-block li a {
  100 + background: #D6BFD3;
  101 +}
  102 +body.category4 .search-results-type-profile.common-profile-list-block li a {
  103 + background: #F79494;
  104 +}
  105 +
  106 +/* * * Category Page * * * * * * * * * * * * */
  107 +
  108 +#view-category h3 {
  109 + font-size: 14px;
  110 + line-height: 20px;
  111 + margin: 0px;
  112 + padding: 20px 0px 0px 20px;
  113 +}
  114 +
  115 +#most-commented h2 {
  116 + font-size: 14px;
  117 +}
  118 +
  119 +#category-recent-articles {
  120 + width: 53%;
  121 + float: left;
  122 +}
  123 +
  124 +.category-innerbox {
  125 + height: 170px;
  126 +}
  127 +#category-recent-articles .category-innerbox {
  128 + height: 400px;
  129 +}
  130 +
  131 +body.category1 .category-innerbox {
  132 + background: #FDD79E;
  133 +}
  134 +body.category2 .category-innerbox {
  135 + background: #C4F099;
  136 +}
  137 +body.category3 .category-innerbox {
  138 + background: #D6BFD3;
  139 +}
  140 +body.category4 .category-innerbox {
  141 + background: #F79494;
  142 +}
  143 +
  144 +#content #category-recent-articles ul,
  145 +#content #category-recent-articles li {
  146 + margin: 0px;
  147 + padding: 0px;
  148 + list-style: none;
  149 + color: #888;
  150 +}
  151 +
  152 +#category-childs {
  153 + clear: both;
  154 +}
  155 +
  156 +#category-childs ul {
  157 + margin: 0px;
  158 + padding: 0px 0px 0px 20px;
  159 +}
  160 +
  161 +#category-childs li {
  162 + margin: 0px;
  163 + padding: 0px;
  164 + float: left;
  165 + width: 33%;
  166 + font-size: 12px;
  167 +}
  168 +
  169 +#category-childs a {
  170 + font-weight: bold;
  171 +}
  172 +
public/stylesheets/blocks/main-block.css
  Diff comments   View file @4672245
1 1
  2 +#article {
  3 + position: relative;
  4 + text-align: justify;
  5 +}
  6 +
  7 +#article-actions {
  8 + position: absolute;
  9 + top: 0px;
  10 + right: 0px;
  11 + padding-right: 15px;
  12 +}
  13 +
  14 +#article-tags {
  15 + font-size: 10px;
  16 + text-align: right;
  17 +}
  18 +#article-tags a {
  19 + text-decoration: none;
  20 +}
  21 +
  22 +#article-cat {
  23 + font-size: 10px;
  24 +}
  25 +
  26 +/* * * Comments * * */
  27 +
  28 +.article-comment {
  29 + position: relative;
  30 + border: 1px solid #B8CFE7;
  31 + margin-bottom: 10px;
  32 + padding: 10px;
  33 +}
  34 +
  35 +.comment-from-owner {
  36 + border: 1px solid #3465A4;
  37 + background: #B8CFE7;
  38 +}
  39 +
  40 +#content #article-comment h4 {
  41 + font-size: 14px;
  42 + margin: 0px;
  43 +}
  44 +
  45 +.comment-picture {
  46 + position: relative;
  47 + display: block;
  48 + width: 50px;
  49 + height: 50px;
  50 + background-repeat: no-repeat;
  51 + background-position: 50% 50%;
  52 + margin-right: 10px;
  53 + float: left;
  54 +}
  55 +.comment-picture span {
  56 + display: none;
  57 +}
  58 +
  59 +.comment-info {
  60 + font-size: 10px;
  61 + color: #999;
  62 +}
  63 +.comment-from-owner .comment-info {
  64 + color: #729FCF;
  65 +}
  66 +
  67 +.comment-text {
  68 + clear: left;
  69 +}
  70 +
  71 +.comment-logged-out .comment-text {
  72 + color: #888;
  73 +}
  74 +