Download as
Browse Code »

Commit eaa9dbd3b1c663cb54a004a67fc3db8731b25ba5

Authored by AntonioTerceiro
1 parent 902034a3
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

r258@sede: terceiro | 2007-07-29 20:11:48 -0300 

ActionItem0: adding parenthesis so Ruby stops complaining
 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@262 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 317 additions and 297 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @eaa9dbd
... ... @@ -91,9 +91,9 @@ module ApplicationHelper
91 91 # TODO: test this helper
92 92 def user_links
93 93 links = [
94   - [ link_to _('My accont'), { :controller => 'account' } ],
95   - [ link_to_profile _('My home page') ],
96   - [ link_to_cms _('Manage content') ],
  94 + [ link_to(_('My accont'), { :controller => 'account' }) ],
  95 + [ link_to_profile(_('My home page')) ],
  96 + [ link_to_cms(_('Manage content')) ],
97 97 ].join("\n")
98 98 content_tag('div', links, :id => 'user_links')
99 99 end
... ...
public/designs/templates/default/stylesheets/1024px.css
  Diff comments   View file @eaa9dbd
1   -/* 1024px - a free xhtml/css website template by Andreas Viklund - http://andreasviklund.com/ - that may be used for any purpose as long as the proper credits are given to the original designer.
2   -
3   -Version: 2.0 (Jan 29, 2007)
4   -
5   -Screen layout: */
6   -
7   -/*** General tags ***/
8   -
9   -body {
10   -background:url(../images/background.gif) repeat-y top center #fff;
11   -color:#404040;
12   -font:76% Verdana,Tahoma,Arial,sans-serif;
13   -line-height:1.2em;
14   -margin:0 auto;
15   -padding:0;
16   -}
17   -
18   -a {
19   -color:#4088b8;
20   -font-weight:700;
21   -text-decoration:none;
22   -}
23   -
24   -a:hover {
25   -text-decoration:underline;
26   -}
27   -
28   -a img {
29   -border:0;
30   -}
31   -
32   -p {
33   -margin:0 0 18px 10px;
34   -}
35   -
36   -ul,ol,dl {
37   -font-size:0.9em;
38   -margin:2px 0 16px 35px;
39   -}
40   -
41   -ul ul,ol ol {
42   -margin:4px 0 4px 35px;
43   -}
44   -
45   -blockquote {
46   -border:1px solid #dadada;
47   -font-size:0.9em;
48   -margin:20px 10px;
49   -padding:8px;
50   -}
51   -
52   -h1 {
53   -color:#4088b8;
54   -font-size:4.2em;
55   -letter-spacing:-5px;
56   -margin:0 0 30px 25px;
57   -}
58   -
59   -h1 a {
60   -color:#4088b8;
61   -text-transform:none;
62   -}
63   -
64   -h2 {
65   -border-bottom:4px solid #dadada;
66   -color:#4088b8;
67   -font-size:1.4em;
68   -letter-spacing:-1px;
69   -margin:0 0 10px;
70   -padding:0 2px 2px 5px;
71   -}
72   -
73   -h3 {
74   -border-bottom:1px solid #dadada;
75   -color:#4088b8;
76   -font-size:1.2em;
77   -font-weight:700;
78   -margin:10px 0 8px;
79   -padding:1px 2px 2px 3px;
80   -}
81   -
82   -/*** Main wrap and header ***/
83   -
84   -#wrap {
85   -color:#404040;
86   -margin:10px auto;
87   -padding:0;
88   -width:970px;
89   -}
90   -
91   -#header {
92   -margin:0;
93   -}
94   -
95   -#menu {
96   -font-size:0.9em;
97   -padding:5px 2px 2px 3px;
98   -text-align:right;
99   -}
100   -
101   -#menu a {
102   -color:gray;
103   -}
104   -
105   -#slogan {
106   -color:gray;
107   -font-size:1.5em;
108   -font-weight:700;
109   -letter-spacing:-1px;
110   -line-height:1.2em;
111   -margin:15px 0 20px 35px;
112   -}
113   -
114   -/*** Sidebar and menu ***/
115   -
116   -#box_1 {
117   -float:left;
118   -line-height:1.4em;
119   -padding:1px 0 0;
  1 +/* 1024px - a free xhtml/css website template by Andreas Viklund - http://andreasviklund.com/ - that may be used for any purpose as long as the proper credits are given to the original designer.
  2 +
  3 +Version: 2.0 (Jan 29, 2007)
  4 +
  5 +Screen layout: */
  6 +
  7 +/*** General tags ***/
  8 +
  9 +body {
  10 +background:url(../images/background.gif) repeat-y top center #fff;
  11 +color:#404040;
  12 +font:76% Verdana,Tahoma,Arial,sans-serif;
  13 +line-height:1.2em;
  14 +margin:0 auto;
  15 +padding:0;
  16 +}
  17 +
  18 +a {
  19 +color:#4088b8;
  20 +font-weight:700;
  21 +text-decoration:none;
  22 +}
  23 +
  24 +a:hover {
  25 +text-decoration:underline;
  26 +}
  27 +
  28 +a img {
  29 +border:0;
  30 +}
  31 +
  32 +p {
  33 +margin:0 0 18px 10px;
  34 +}
  35 +
  36 +ul,ol,dl {
  37 +font-size:0.9em;
  38 +margin:2px 0 16px 35px;
  39 +}
  40 +
  41 +ul ul,ol ol {
  42 +margin:4px 0 4px 35px;
  43 +}
  44 +
  45 +blockquote {
  46 +border:1px solid #dadada;
  47 +font-size:0.9em;
  48 +margin:20px 10px;
  49 +padding:8px;
  50 +}
  51 +
  52 +h1 {
  53 +color:#4088b8;
  54 +font-size:4.2em;
  55 +letter-spacing:-5px;
  56 +margin:0 0 30px 25px;
  57 +}
  58 +
  59 +h1 a {
  60 +color:#4088b8;
  61 +text-transform:none;
  62 +}
  63 +
  64 +h2 {
  65 +border-bottom:4px solid #dadada;
  66 +color:#4088b8;
  67 +font-size:1.4em;
  68 +letter-spacing:-1px;
  69 +margin:0 0 10px;
  70 +padding:0 2px 2px 5px;
  71 +}
  72 +
  73 +h3 {
  74 +border-bottom:1px solid #dadada;
  75 +color:#4088b8;
  76 +font-size:1.2em;
  77 +font-weight:700;
  78 +margin:10px 0 8px;
  79 +padding:1px 2px 2px 3px;
  80 +}
  81 +
  82 +/*** Main wrap and header ***/
  83 +
  84 +#wrap {
  85 +color:#404040;
  86 +margin:10px auto;
  87 +padding:0;
  88 +width:970px;
  89 +}
  90 +
  91 +#header {
  92 +border: 1px solid blue;
  93 +padding-left: 5em;
  94 +}
  95 +
  96 +#menu {
  97 +font-size:0.9em;
  98 +padding:5px 2px 2px 3px;
  99 +text-align:right;
  100 +border: 1px solid red;
  101 +float: right;
  102 +}
  103 +
  104 +#menu a {
  105 +color:gray;
  106 +}
  107 +
  108 +#slogan {
  109 +color:gray;
  110 +font-size:1.5em;
  111 +font-weight:700;
  112 +letter-spacing:-1px;
  113 +line-height:1.2em;
  114 +margin:15px 0 20px 35px;
  115 +}
  116 +
  117 +/*** Sidebar and menu ***/
  118 +
  119 +#box_1 {
  120 +float:left;
  121 +line-height:1.4em;
  122 +padding:1px 0 0;
120 123 width:20%;
121   -}
122   -
123   -#box_1 ul {
124   -font-size:0.9em;
125   -list-style:none;
126   -margin:0;
127   -padding:0 0 15px 10px;
128   -}
129   -
130   -#box_1 li {
131   -list-style:none;
132   -margin:0 0 4px;
133   -padding:0;
134   -}
135   -
136   -#box_1 li a {
137   -font-size:1.2em;
138   -font-weight:700;
139   -padding:2px;
140   -}
141   -
142   -#box_1 ul ul {
143   -line-height:1.2em;
144   -margin:4px 0 3px 15px;
145   -padding:0;
146   -}
147   -
148   -#box_1 ul ul li a {
149   -font-weight:400;
150   -}
151   -
152   -#box_1 h2 {
153   -margin:3px 0 8px;
154   -}
155   -
156   -/*** Box 3 ***/
157   -
158   -#box_3 {
159   -float:left;
160   -line-height:1.4em;
161   -padding:1px 0 0;
  124 +}
  125 +
  126 +#box_1 ul {
  127 +font-size:0.9em;
  128 +list-style:none;
  129 +margin:0;
  130 +padding:0 0 15px 10px;
  131 +}
  132 +
  133 +#box_1 li {
  134 +list-style:none;
  135 +margin:0 0 4px;
  136 +padding:0;
  137 +}
  138 +
  139 +#box_1 li a {
  140 +font-size:1.2em;
  141 +font-weight:700;
  142 +padding:2px;
  143 +}
  144 +
  145 +#box_1 ul ul {
  146 +line-height:1.2em;
  147 +margin:4px 0 3px 15px;
  148 +padding:0;
  149 +}
  150 +
  151 +#box_1 ul ul li a {
  152 +font-weight:400;
  153 +}
  154 +
  155 +#box_1 h2 {
  156 +margin:3px 0 8px;
  157 +}
  158 +
  159 +/*** Box 3 ***/
  160 +
  161 +#box_3 {
  162 +float:left;
  163 +line-height:1.4em;
  164 +padding:1px 0 0;
162 165 width:20%;
163   -}
164   -
165   -#box_3 ul {
166   -font-size:0.9em;
167   -list-style:none;
168   -margin:0;
169   -padding:0 0 15px 10px;
170   -}
171   -
172   -#box_3 li {
173   -list-style:none;
174   -margin:0 0 4px;
175   -padding:0;
176   -}
177   -
178   -#box_3 li a {
179   -font-size:1.2em;
180   -font-weight:700;
181   -padding:2px;
182   -}
183   -
184   -#box_3 ul ul {
185   -line-height:1.2em;
186   -margin:4px 0 3px 15px;
187   -padding:0;
188   -}
189   -
190   -#box_3 ul ul li a {
191   -font-weight:400;
192   -}
193   -
194   -#box_3 h2 {
195   -margin:3px 0 8px;
196   -}
197   -
198   -
199   -/*** Main content ***/
200   -
201   -
202   -#box_2 {
203   -float:left;
204   -line-height:1.5em;
205   -margin:0px 20px 0px 20px;
206   -padding:0;
207   -text-align:left;
208   -width: 540px;
209   -}
210   -
211   -#box_2 h3 {
212   -margin:10px 0 8px;
213   -}
214   -
215   -/*** Footer ***/
216   -
217   -#footer {
218   -border-top:4px solid #dadada;
219   -clear:both;
220   -color:gray;
221   -font-size:0.9em;
222   -line-height:1.6em;
223   -margin:0 auto;
224   -padding:8px 0;
225   -text-align:right;
226   -}
227   -
228   -#footer p {
229   -margin:0;
230   -padding:0;
231   -}
232   -
233   -#footer a {
234   -color:#808080;
235   -}
236   -
237   -/*** Various classes ***/
238   -
239   -.box {
240   -background:#4088b8;
241   -border:1px solid #c8c8c8;
242   -color:#fff;
243   -font-size:0.9em;
244   -line-height:1.4em;
245   -padding:10px 10px 10px 13px;
246   -}
247   -
248   -.box a {
249   -color:#f0f0f0;
250   -}
251   -
252   -.left {
253   -float:left;
254   -margin:0 15px 4px 0;
255   -}
256   -
257   -.right {
258   -float:right;
259   -margin:0 0 4px 15px;
260   -}
261   -
262   -.readmore {
263   -margin:-10px 10px 12px 0;
264   -text-align:right;
265   -}
266   -
267   -.timestamp {
268   -font-size:1.2em;
269   -margin:-5px 0 15px 10px;
270   -}
271   -
272   -.timestamp a {
273   -font-weight:normal;
274   -}
275   -
276   -.blue {
277   -color:#4088b8;
278   -}
279   -
280   -.clear {
281   -clear:both;
282   -}
283   -
284   -.fade {
285   -color:#c8c8c8;
286   -}
287   -
288   -.gray {
289   -color:gray;
290   -}
291   -
292   -.photo {
293   -background:#fff;
294   -border:1px solid #bababa;
295   -margin:6px 18px 2px 5px;
296   -padding:2px;
  166 +}
  167 +
  168 +#box_3 ul {
  169 +font-size:0.9em;
  170 +list-style:none;
  171 +margin:0;
  172 +padding:0 0 15px 10px;
  173 +}
  174 +
  175 +#box_3 li {
  176 +list-style:none;
  177 +margin:0 0 4px;
  178 +padding:0;
  179 +}
  180 +
  181 +#box_3 li a {
  182 +font-size:1.2em;
  183 +font-weight:700;
  184 +padding:2px;
  185 +}
  186 +
  187 +#box_3 ul ul {
  188 +line-height:1.2em;
  189 +margin:4px 0 3px 15px;
  190 +padding:0;
  191 +}
  192 +
  193 +#box_3 ul ul li a {
  194 +font-weight:400;
  195 +}
  196 +
  197 +#box_3 h2 {
  198 +margin:3px 0 8px;
  199 +}
  200 +
  201 +
  202 +/*** Main content ***/
  203 +
  204 +
  205 +#box_2 {
  206 +float:left;
  207 +line-height:1.5em;
  208 +margin:0px 20px 0px 20px;
  209 +padding:0;
  210 +text-align:left;
  211 +width: 540px;
  212 +}
  213 +
  214 +#box_2 h3 {
  215 +margin:10px 0 8px;
  216 +}
  217 +
  218 +/*** Footer ***/
  219 +
  220 +#footer {
  221 +border-top:4px solid #dadada;
  222 +clear:both;
  223 +color:gray;
  224 +font-size:0.9em;
  225 +line-height:1.6em;
  226 +margin:0 auto;
  227 +padding:8px 0;
  228 +text-align:right;
  229 +}
  230 +
  231 +#footer p {
  232 +margin:0;
  233 +padding:0;
  234 +}
  235 +
  236 +#footer a {
  237 +color:#808080;
  238 +}
  239 +
  240 +/*** Various classes ***/
  241 +
  242 +.box {
  243 +background:#4088b8;
  244 +border:1px solid #c8c8c8;
  245 +color:#fff;
  246 +font-size:0.9em;
  247 +line-height:1.4em;
  248 +padding:10px 10px 10px 13px;
  249 +}
  250 +
  251 +.box a {
  252 +color:#f0f0f0;
  253 +}
  254 +
  255 +.left {
  256 +float:left;
  257 +margin:0 15px 4px 0;
  258 +}
  259 +
  260 +.right {
  261 +float:right;
  262 +margin:0 0 4px 15px;
  263 +}
  264 +
  265 +.readmore {
  266 +margin:-10px 10px 12px 0;
  267 +text-align:right;
  268 +}
  269 +
  270 +.timestamp {
  271 +font-size:1.2em;
  272 +margin:-5px 0 15px 10px;
  273 +}
  274 +
  275 +.timestamp a {
  276 +font-weight:normal;
  277 +}
  278 +
  279 +.blue {
  280 +color:#4088b8;
  281 +}
  282 +
  283 +.clear {
  284 +clear:both;
  285 +}
  286 +
  287 +.fade {
  288 +color:#c8c8c8;
  289 +}
  290 +
  291 +.gray {
  292 +color:gray;
  293 +}
  294 +
  295 +.photo {
  296 +background:#fff;
  297 +border:1px solid #bababa;
  298 +margin:6px 18px 2px 5px;
  299 +padding:2px;
297 300 }
... ...
vendor/plugins/design/test/design_editor_test.rb 0 → 100644
  Diff comments   View file @eaa9dbd
... ... @@ -0,0 +1,17 @@
  1 +require File.join(File.dirname(__FILE__), 'test_helper')
  2 +
  3 +class DesignEditorTest < Test::Unit::TestCase
  4 +
  5 + def setup
  6 + @controller = DesignHelperTestController.new
  7 + @request = ActionController::TestRequest.new
  8 + @response = ActionController::TestResponse.new
  9 +
  10 + Design.public_filesystem_root = File.join(File.dirname(__FILE__))
  11 + end
  12 +
  13 + def teardown
  14 + Design.public_filesystem_root = nil
  15 + end
  16 +
  17 +end
... ...