Download as
Browse Code »

Commit b2673656342a647f7a9b541ae846779c70511156

Authored by AurelioAHeckert
1 parent f8fcdd69
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

ActionItem51: quase pronto 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1613 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 20 changed files with 191 additions and 157 deletions   Show diff stats
app/views/category/_article.rhtml
  Diff comments   View file @b267365
1   -<li><%= _('"%s", by %s. Last update: %s.') % [link_to(article.title, article.url), link_to(article.last_changed_by.name, article.last_changed_by.url), show_date(article.updated_on) ] %></li>
  1 +<li>
  2 + <strong><%= link_to(article.title, article.url) %></strong>
  3 + <div class="item_meta">
  4 + <span class="cat_item_by"><%=
  5 + _('by %s') % link_to(article.last_changed_by.name, article.last_changed_by.url)
  6 + %></span>
  7 + <span class="cat_item_update"><%= _('Last update: %s.') % show_date(article.updated_on) %></span>
  8 + </div>
  9 +</li>
... ...
app/views/category/_category.rhtml
  Diff comments   View file @b267365
1 1 <h2><%= _('Recent articles') %></h2>
2   -<ul>
  2 +<ul class="recent_on_cat recent_articles">
3 3 <%= render :partial => 'article', :collection => @recent_articles %>
4 4 </ul>
5 5  
6 6 <h2><%= _('Recent Comments') %></h2>
7   -<ul>
  7 +<ul class="recent_on_cat recent_comments">
8 8 <% @recent_comments.each do |comment| %>
9   - <li><%= _('"%{comment}" by %{author} on "%{article}"') % { :comment => link_to(comment.title, comment.url), :article => link_to(comment.article.title, comment.article.url), :author => comment.author_name } %></li>
  9 + <li>
  10 + <strong><%= link_to(comment.title, comment.url) %></strong>
  11 + <div class="item_meta">
  12 + <%= _('by %{author} on "%{article}"') % {
  13 + :comment => link_to(comment.title, comment.url),
  14 + :article => link_to(comment.article.title, comment.article.url),
  15 + :author => comment.author_name } %>
  16 + </div>
  17 + </li>
10 18 <% end %>
11 19 </ul>
12 20  
13 21 <h2><%= _('Most commented articles') %></h2>
14   -<ul>
  22 +<ul class="most_commented">
15 23 <%= render :partial => 'article', :collection => @most_commented_articles %>
16 24 </ul>
... ...
app/views/category/view.rhtml
  Diff comments   View file @b267365
... ... @@ -6,7 +6,9 @@
6 6  
7 7 <h1 id="categiry-name"><%= _('Category: %s') % @category.name %></h1>
8 8  
  9 + <div class="category_itens">
9 10 <%= render :partial => @category.class.name.underscore %>
  11 + </div><!-- end class="category_itens" -->
10 12  
11 13 <div id="category-childs">
12 14 <h2> <%= _('Sub-categories') %> </h2>
... ...
app/views/layouts/application.rhtml
  Diff comments   View file @b267365
... ... @@ -15,8 +15,10 @@
15 15 %>
16 16 <%=
17 17 # Load the principal css files:
18   - stylesheet_import( %w( common help menu article button search blocks forms login-box ) ) +
19   - "\n" +
  18 + stylesheet_import( %w( common help menu article button search blocks forms login-box )
  19 + ) + "\n" +
  20 + stylesheet_import( %w( common help menu article button search blocks forms login-box ),
  21 + :themed_source => true ) + "\n" +
20 22 # Load the boxes's css file if each exists:
21 23 import_blocks_stylesheets +
22 24 # Load the controller's css file if it exists:
... ...
public/designs/themes/default/images/bg-top-azul.png 0 → 100644
View file @b267365

78.7 KB
public/designs/themes/default/images/bg-top-cinza.jpg 0 → 100644
View file @b267365

13.4 KB
public/designs/themes/default/images/bg-top-laranja.png 0 → 100644
View file @b267365

76.2 KB
public/designs/themes/default/images/bg-top-lilas.png 0 → 100644
View file @b267365

79 KB
public/designs/themes/default/images/bg-top-verde.png 0 → 100644
View file @b267365

82.1 KB
public/designs/themes/default/images/bg-top-vermelho.png 0 → 100644
View file @b267365

70.2 KB
public/designs/themes/default/stylesheets/common.css 0 → 100644
  Diff comments   View file @b267365
... ... @@ -0,0 +1,154 @@
  1 +
  2 +body.noosfero {
  3 + /*
  4 + ** a imagem de fundo colorida é mais pesada, por isso carregamos
  5 + ** essa cinza mais leve antes para melhorar a esperiência do usuário.
  6 + */
  7 + background-position: 50% 25px;
  8 + background-repeat: repeat-x;
  9 + background-image: url(../images/bg-top-cinza.jpg);
  10 +}
  11 +
  12 +#wrap {
  13 + background-position: 50% 22px;
  14 + background-repeat: repeat-x;
  15 + background-image: url(../images/bg-top-azul.png);
  16 +}
  17 +
  18 +body.category1 #wrap { background-image: url("../images/bg-top-laranja.png"); }
  19 +body.category2 #wrap { background-image: url("../images/bg-top-verde.png"); }
  20 +body.category3 #wrap { background-image: url("../images/bg-top-lilas.png"); }
  21 +body.category4 #wrap { background-image: url("../images/bg-top-vermelho.png"); }
  22 +
  23 +#path_category {
  24 + position: absolute;
  25 + top: 40px;
  26 + left: 30px;
  27 + font-weight: bold;
  28 + z-index: 10;
  29 +}
  30 +
  31 +a { color: #05B }
  32 +body.category2 a { color: #270 }
  33 +a:visited { color: #68C }
  34 +body.category2 a:visited { color: #8A6 }
  35 +a:hover, a:active { color: #08F }
  36 +body.category2 a:hover { color: #5C0 }
  37 +
  38 +/* List of Category Item */
  39 +
  40 +.category_itens ul a {
  41 + text-decoration: none;
  42 +}
  43 +
  44 +.category_itens .item_meta {
  45 + font-size: 12px;
  46 + padding: 0px 0px 5px 0px;
  47 +}
  48 +
  49 +.category_itens .cat_item_update {
  50 + color: #999;
  51 +}
  52 +
  53 +/* file manager (big) style */
  54 +
  55 +div.file-manager {
  56 + clear: both;
  57 +}
  58 +
  59 +div.file-manager
  60 +div.file-manager-button {
  61 + float: left;
  62 + width: 140px;
  63 + text-align: center;
  64 + margin-right: 0.5em;
  65 + margin-top: 0.5em;
  66 +}
  67 +
  68 +div.file-manager
  69 +div.file-manager-button a img {
  70 + border: none;
  71 +}
  72 +
  73 +div.file-manager
  74 +div.file-manager-button a {
  75 + border: 1px solid #e0e0e0;
  76 + display: block;
  77 + padding: 3px;
  78 + height: 90px;
  79 + overflow: hidden;
  80 + background: white;
  81 + font-size: 90%;
  82 +}
  83 +
  84 +div.file-manager
  85 +div.file-manager-button a:hover {
  86 + border: 1px solid #006;
  87 + background: #acf;
  88 + color: #006;
  89 +}
  90 +
  91 +/************* file manager (small) style *****************/
  92 +.file-manager-small {
  93 + background: white;
  94 + border: 1px solid gray;
  95 +}
  96 +
  97 +.file-manager-title {
  98 + font-weight: bold;
  99 + border: 1px solid gray;
  100 + border-bottom: none;
  101 + border-top: none;
  102 + padding: 2px;
  103 + background: #579;
  104 + color: white;
  105 + height: 24px;
  106 +}
  107 +
  108 +.file-manager-small ul {
  109 + padding: 5px;
  110 + margin: 0px;
  111 +}
  112 +
  113 +.file-manager-small li {
  114 + list-style: none;
  115 + padding: 2px;
  116 +}
  117 +
  118 +div.file-manager-small
  119 +div.file-manager-button a div {
  120 + display: inline;
  121 +}
  122 +
  123 +div.file-manager-small
  124 +div.file-manager-button a img {
  125 + border: none;
  126 + vertical-align: middle;
  127 +}
  128 +
  129 +div.file-manager-small
  130 +div.file-manager-button a {
  131 + border: 1px solid transparent;
  132 +}
  133 +
  134 +div.file-manager-small
  135 +div.file-manager-button a:hover {
  136 + border: 1px solid #006;
  137 + background: #acf;
  138 + color: #006;
  139 +}
  140 +
  141 +.file-manager-small {
  142 + position: relative;
  143 +}
  144 +
  145 +.file-manager-small .file-manager-controls {
  146 + border-top: 1px solid gray;
  147 + padding: 4px;
  148 +}
  149 +
  150 +.file-manager-small .file-manager-controls * {
  151 + text-align: right;
  152 +}
  153 +
  154 +
... ...
public/images/bg-top-azul.png
View file @f8fcdd6

78.7 KB
public/images/bg-top-cinza.jpg
View file @f8fcdd6

13.4 KB
public/images/bg-top-laranja.png
View file @f8fcdd6

76.2 KB
public/images/bg-top-lilas.png
View file @f8fcdd6

79 KB
public/images/bg-top-verde.png
View file @f8fcdd6

82.1 KB
public/images/bg-top-vermelho.png
View file @f8fcdd6

70.2 KB
public/images/bg_bgheader.png
View file @f8fcdd6

229 Bytes
public/stylesheets/button.css
  Diff comments   View file @b267365
1 1  
2   -a.button,
3   -a.button:visited,
  2 +body.noosfero a.button,
  3 +body.noosfero a.button:visited,
4 4 input.button {
5 5 margin: 0px 2px;
6 6 background-repeat: no-repeat;
... ... @@ -31,8 +31,8 @@ input.button {
31 31 padding-right: 4px;
32 32 }
33 33  
34   -a.button.with-text,
35   -a.button.with-text:visited,
  34 +body.noosfero a.button.with-text,
  35 +body.noosfero a.button.with-text:visited,
36 36 input.button.with-text {
37 37 background-color: #EEE;
38 38 padding: 3px 2px 3px 22px;
... ... @@ -47,23 +47,23 @@ input.button.with-text {
47 47 padding: 0px 2px 2px 20px;
48 48 background-position: 3px 50%;
49 49 }
50   -.msie a.button.with-text,
51   -.msie a.button.with-text:visited,
52   -.msie input.button.with-text {
  50 +body.noosfero.msie a.button.with-text,
  51 +body.noosfero.msie a.button.with-text:visited,
  52 +body.noosfero.msie input.button.with-text {
53 53 padding: 0px 2px 0px 22px;
54 54 background-position: 3px 50%;
55 55 line-height: 20px;
56 56 margin: 2px;
57 57 }
58   -.msie input.button.with-text {
  58 +body.noosfero.msie input.button.with-text {
59 59 line-height: 16px;
60 60 padding: 0px 0px 1px 15px;
61 61 background-position: 2px 50%;
62 62 }
63 63  
64   -a.button:hover,
  64 +body.noosfero a.button:hover,
65 65 input.button:hover,
66   -a.button.with-text:hover,
  66 +body.noosfero a.button.with-text:hover,
67 67 input.button.with-text:hover {
68 68 border: 1px solid #678;
69 69 background-color: #CDE;
... ...
public/stylesheets/common.css
  Diff comments   View file @b267365
... ... @@ -4,15 +4,6 @@ body {
4 4 font-family: Verdana, Sans-Serif;
5 5 font-size: 14px;
6 6 }
7   -body.noosfero {
8   - /*
9   - ** a imagem de fundo colorida é mais pesada, por isso carregamos
10   - ** essa cinza mais leve antes para melhorar a esperiência do usuário.
11   - */
12   - background-position: 50% 25px;
13   - background-repeat: repeat-x;
14   - background-image: url(../images/bg-top-cinza.jpg);
15   -}
16 7  
17 8 #beta-tag {
18 9 position: absolute;
... ... @@ -26,25 +17,6 @@ body.noosfero {
26 17 display: none;
27 18 }
28 19  
29   -#wrap {
30   - background-position: 50% 22px;
31   - background-repeat: repeat-x;
32   - background-image: url(../images/bg-top-azul.png);
33   -}
34   -
35   -body.category1 #wrap { background-image: url("../images/bg-top-laranja.png"); }
36   -body.category2 #wrap { background-image: url("../images/bg-top-verde.png"); }
37   -body.category3 #wrap { background-image: url("../images/bg-top-lilas.png"); }
38   -body.category4 #wrap { background-image: url("../images/bg-top-vermelho.png"); }
39   -
40   -#path_category {
41   - position: absolute;
42   - top: 40px;
43   - left: 30px;
44   - font-weight: bold;
45   - z-index: 10;
46   -}
47   -
48 20 #header {
49 21 height: 60px;
50 22 }
... ... @@ -56,7 +28,6 @@ body.category4 #wrap { background-image: url(&quot;../images/bg-top-vermelho.png&quot;); }
56 28 padding: 0em;
57 29 }
58 30  
59   -
60 31 #notice {
61 32 cursor: pointer;
62 33 }
... ... @@ -77,16 +48,6 @@ body.category4 #wrap {
77 48 border-color: #B80000;
78 49 }
79 50  
80   -a {
81   - color: #05B;
82   -}
83   -a:visited {
84   - color: #68C;
85   -}
86   -a:hover a:active {
87   - color: #08F;
88   -}
89   -
90 51 #environment_identification {
91 52 position: absolute !important;
92 53 background: url("../images/bg_blue_logo.png") 5px no-repeat !important;
... ... @@ -162,107 +123,6 @@ div#footer li {
162 123 height: 20px;
163 124 }
164 125  
165   -/* file manager (big) style */
166   -
167   -div.file-manager {
168   - clear: both;
169   -}
170   -
171   -div.file-manager
172   -div.file-manager-button {
173   - float: left;
174   - width: 140px;
175   - text-align: center;
176   - margin-right: 0.5em;
177   - margin-top: 0.5em;
178   -}
179   -
180   -div.file-manager
181   -div.file-manager-button a img {
182   - border: none;
183   -}
184   -
185   -div.file-manager
186   -div.file-manager-button a {
187   - border: 1px solid #e0e0e0;
188   - display: block;
189   - padding: 3px;
190   - height: 90px;
191   - overflow: hidden;
192   - background: white;
193   - font-size: 90%;
194   -}
195   -
196   -div.file-manager
197   -div.file-manager-button a:hover {
198   - border: 1px solid #006;
199   - background: #acf;
200   - color: #006;
201   -}
202   -
203   -/************* file manager (small) style *****************/
204   -.file-manager-small {
205   - background: white;
206   - border: 1px solid gray;
207   -}
208   -
209   -.file-manager-title {
210   - font-weight: bold;
211   - border: 1px solid gray;
212   - border-bottom: none;
213   - border-top: none;
214   - padding: 2px;
215   - background: #579;
216   - color: white;
217   - height: 24px;
218   -}
219   -
220   -.file-manager-small ul {
221   - padding: 5px;
222   - margin: 0px;
223   -}
224   -
225   -.file-manager-small li {
226   - list-style: none;
227   - padding: 2px;
228   -}
229   -
230   -div.file-manager-small
231   -div.file-manager-button a div {
232   - display: inline;
233   -}
234   -
235   -div.file-manager-small
236   -div.file-manager-button a img {
237   - border: none;
238   - vertical-align: middle;
239   -}
240   -
241   -div.file-manager-small
242   -div.file-manager-button a {
243   - border: 1px solid transparent;
244   -}
245   -
246   -div.file-manager-small
247   -div.file-manager-button a:hover {
248   - border: 1px solid #006;
249   - background: #acf;
250   - color: #006;
251   -}
252   -
253   -.file-manager-small {
254   - position: relative;
255   -}
256   -
257   -.file-manager-small .file-manager-controls {
258   - border-top: 1px solid gray;
259   - padding: 4px;
260   -}
261   -
262   -.file-manager-small .file-manager-controls * {
263   - text-align: right;
264   -}
265   -
266 126  
267 127 /*********************************************************/
268 128  
... ...