Download as
Browse Code »

Commit 98b93583df7777daef4ee850d75ada0464f51e70

Authored by AntonioTerceiro
1 parent 0386fbf5
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

ActionItem0: integrating comatose with the design 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@360 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 130 additions and 97 deletions   Show diff stats
app/views/comatose_admin
View file @0386fbf
... ... @@ -1 +0,0 @@
1   -../../vendor/plugins/comatose/views/comatose_admin
2 0 \ No newline at end of file
app/views/layouts/application.rhtml
  Diff comments   View file @98b9358
1   -<html>
  1 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  2 + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  3 +<html class="noscript" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
2 4 <head>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=<%= Comatose.config.content_type %>"/>
  6 + <title>Comatose Admin</title>
  7 + <%= stylesheet_link_tag 'comatose_admin' %>
3 8 <%= javascript_include_tag :defaults %>
4   - <%= stylesheet_link_tag 'common' %>
5   - <%= design_all_header_tags %>
6 9 <%= javascript_include_tag 'comatose_admin' %>
7   - <% if params[:controller] == 'comatose_admin' %>
8   - <%= stylesheet_link_tag 'comatose_admin' %>
9   - <% end %>
10   -
11 10 </head>
12   -
13 11 <body>
14   - <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;" %>
15   - <div id="wrap">
16   - <div id="frame">
17   - <div id="menu">
18   - <%= _('Skip to:') %>
19   - <a href="#main_content"><%= _('Content') %></a> |
20   - <a href="#sidebar"><%= _('Navigation') %></a> |
21   - <a href="#footer"><%= _('Footer') %></a>
22   - </div>
23   -
24   - <div id="header">
25   - <%= header %>
26   - </div>
27   -
28   - <% unless flash[:notice].nil? %>
29   - <div id='notice'>
30   - <%= flash[:notice] %>
31   - </div>
32   - <% end %>
33   -
34   - <div id='content'>
35   - <!-- <a name='main_content'/></a> -->
36   - <div id='header_content'>
37   - <!-- Aqui entra um conteudo tipo o titulo da pagina do usuário e os botoes do comatose? -->
38   - </div>
39   - <% if params[:controller] == 'comatose_admin' %>
40   - <%= yield %>
41   - <% else %>
42   - <%= design_display(yield) %>
43   - <% end %>
44   - </div>
45   -
46   - <div id="footer">
47   - <!-- <a name='footer'/></a> -->
48   - <%= footer %>
49   - <%= design_display_icon('back', _('Back') , :action => 'list')%>
  12 + <div id="page-container">
  13 + <div id="header">
  14 + <h1><%= link_to Comatose.config.admin_title, :controller=>controller.controller_name, :action=>'index' %></h1>
  15 + <div id="flash">
  16 + <span id="flash-content"><%= flash[:notice] %></span>
50 17 </div>
  18 + <h5><%= Comatose.config.admin_sub_title %></h5>
  19 + </div>
  20 + <div id="content">
  21 + <%= yield %>
  22 + </div>
  23 + <div id="footer">
  24 + Powered by <a href="http://comatose.rubyforge.org" target="_new_window">Comatose <%= Comatose::VERSION %></a>, created by <a href="http://www.mattmccray.com" target="_new_window">M@ McCray</a>.
51 25 </div>
52 26 </div>
53   -
54 27 </body>
55   -
56 28 </html>
... ...
public/javascripts/comatose_admin.js
View file @0386fbf
... ... @@ -1 +0,0 @@
1   -../../vendor/plugins/comatose/resources/public/javascripts/comatose_admin.js
2 0 \ No newline at end of file
public/stylesheets/comatose_admin.css
  Diff comments   View file @98b9358
  1 +BODY {
  2 + background: #DDD;
  3 + margin: 0px 100px;
  4 + padding: 0px;
  5 + font-family: "Lucida Grande", Tahoma, Verdana, Arial, Sans-Serif;
  6 + font-size: 12px;
  7 + min-width: 450px;
  8 +}
  9 +/* General Layout and Header Area */
  10 +#page-container {
  11 + margin: 0px;
  12 + padding: 0px;
  13 +}
  14 +#header {
  15 + background: #0053C2;
  16 + padding: 5px;
  17 + border-bottom: 4px solid #00398B;
  18 +}
  19 +#header A {
  20 + text-decoration: none;
  21 + color: white;
  22 +}
  23 +#header A:hover {
  24 + color: white;
  25 +}
  26 +#header h1 {
  27 + margin: 0px;
  28 + padding: 0px;
  29 + padding-left: 10px;
  30 +}
  31 +#header h5 {
  32 + margin: 0px;
  33 + padding: 0px;
  34 + padding-left: 15px;
  35 + color: silver;
  36 +}
  37 +#header #flash {
  38 + float: right;
  39 + color: #4BA8FF;
  40 + font-weight: bold;
  41 + margin-right: 5px;
  42 +}
  43 +/* Content Area */
  44 +#content {
  45 + padding: 15px;
  46 + background: white;
  47 + border-left: 1px solid silver;
  48 + border-right: 1px solid silver;
  49 +}
  50 +#content h1 {
  51 + margin: 0px;
  52 + padding: 0px;
  53 + font-size: 135%;
  54 + color: gray;
  55 +}
  56 +#content .action {
  57 + float: right;
  58 + color: gray;
  59 +}
  60 +#content .action A {
  61 + font-weight: bold;
  62 + text-decoration: none;
  63 + color: darkgreen;
  64 + border-bottom: 1px solid black;
  65 +}
  66 +#content .action A:hover {
  67 + color: red;
  68 + border-bottom: 1px solid red;
  69 +}
  70 +#content .page-header {
  71 + color: gray;
  72 +}
1 73  
2 74 /* Page Listing */
3 75 #content .tree-controller {
... ... @@ -15,10 +87,10 @@
15 87 display: none;
16 88 }
17 89 #content .page-list {
18   - /* background: white; */
  90 + background: white;
19 91 clear: both;
20 92 list-style: none;
21   - border-left: none;
  93 + border-left: 0px dotted silver;
22 94 margin: 0px;
23 95 padding: 0px;
24 96 padding-left: 15px;
... ... @@ -35,29 +107,30 @@
35 107 #content .page-list .commands {
36 108 font-size: 90%;
37 109 padding-left: 5px;
  110 + color: silver;
38 111 }
39 112 #content .page-list .commands A {
40   - /* color: gray; */
  113 + color: gray;
41 114 }
42 115 #content .page-list .commands A.add-page:hover {
43   - /* color: blue; */
  116 + color: blue;
44 117 }
45 118 #content .page-list .commands A.reorder-children:hover {
46   -/* color: black; */
  119 + color: black;
47 120 }
48 121 #content .page-list .commands A.delete-page:hover {
49   -/* color: white; */
  122 + color: white;
50 123 }
51 124 #content .page-list .commands A.reordering {
52   -/* background: navy; */
53   -/* color: white; */
  125 + background: navy;
  126 + color: white;
54 127 }
55 128 #content .page-list .commands A.reordering:hover {
56   -/* color: white; */
  129 + color: white;
57 130 }
58 131 #content .page-list A.page {
59 132 text-decoration: none;
60   -/* color: black; */
  133 + color: black;
61 134 margin-left: 3px;
62 135 font-size: 150%;
63 136 display: block;
... ... @@ -71,29 +144,29 @@
71 144 }
72 145  
73 146 #content .page-list .hover {
74   -/* background: #F1F0DB; */
  147 + background: #F1F0DB;
75 148 }
76 149 #content .page-list .hover-delete {
77 150 background: red;
78   -/* color: #FF8E90; */
  151 + color: #FF8E90;
79 152 }
80 153 #content .page-list .hover-delete A,
81 154 #content .page-list .hover-delete .commands A {
82   -/* color: #FF8E90; */
  155 + color: #FF8E90;
83 156 }
84 157 #content .page-list .hover-delete A.page {
85   -/* color: white; */
  158 + color: white;
86 159 border-bottom: 0px;
87 160 }
88 161 #content .page-list .hover-delete UL LI A.page {
89   -/* color: red; */
  162 + color: red;
90 163 border-bottom: 0px;
91 164 }
92 165  
93 166 #content .do-reorder LI .handle {
94 167 display: inline;
95   -/* background: gray; */
96   -/* color: white; */
  168 + background: gray;
  169 + color: white;
97 170 padding: 1px 3px;
98 171 cursor: move;
99 172 }
... ... @@ -108,10 +181,10 @@
108 181 }
109 182 #content .page-form LABEL {
110 183 font-weight: bold;
111   -/* color: #555; */
  184 + color: #555;
112 185 }
113 186 #content .page-form .meta-info LABEL {
114   -/* color: #999 !important; */
  187 + color: #999 !important;
115 188 }
116 189 #content .page-form .label {
117 190 padding-top: 5px;
... ... @@ -127,29 +200,28 @@
127 200 padding-top: 5px;
128 201 }
129 202 #content .page-form .field-help {
130   -/* color: gray; */
  203 + color: gray;
131 204 }
132 205 #content .page-form #page_title {
133 206 font-size: 125%;
134 207 font-weight: bold;
135 208 }
136 209 #content .page-form #page_slug {
137   -/* color: gray; */
  210 + color: gray;
138 211 }
139 212 #content .page-form #page_body {
140 213 font-family: monospace;
141 214 font-size: 110%;
142 215 }
143   -
144 216 #content #button-group {
145 217 padding: 10px;
146 218 text-align: right;
147   -/* background-color: #EAEAEA; */
  219 + background-color: #EAEAEA;
148 220 margin-top: 10px;
149 221 }
150 222 #content #button-group .last-update {
151 223 float: left;
152   -/* color: gray; */
  224 + color: gray;
153 225 padding-top: 4px;
154 226 font-weight: bold;
155 227 }
... ... @@ -157,20 +229,19 @@
157 229 font-weight: normal;
158 230 }
159 231 #content #button-group .last-update A {
160   -/* color: gray; */
  232 + color: gray;
161 233 }
162 234 #content #button-group A {
163   -/* color: maroon; */
  235 + color: maroon;
164 236 }
165 237 #content #button-group A:hover {
166   -/* color: red; */
  238 + color: red;
167 239 }
168   -
169 240 #content #preview-area {
170 241 margin-top: 10px;
171 242 }
172 243 #content #preview-area FIELDSET {
173   -/* border: 1px solid silver; */
  244 + border: 1px solid silver;
174 245 }
175 246 #content #preview-area LEGEND {
176 247 font-size: 125%;
... ... @@ -179,18 +250,18 @@
179 250 padding: 10px;
180 251 }
181 252 #content #preview-area .preview-note {
182   -/* background: #FFFFD9; */
  253 + background: #FFFFD9;
183 254 padding: 15px;
184 255 }
185 256 #content #preview-area .commands {
186 257 text-align: right;
187   -/* color: gray; */
  258 + color: gray;
188 259 }
189   -#content #preview-area .commands A {
190   -/* color: gray; */
  260 +#content #preview-area .commands A{
  261 + color: gray;
191 262 }
192   -#content #preview-area .commands A:hover {
193   -/* color: black; */
  263 +#content #preview-area .commands A:hover{
  264 + color: black;
194 265 }
195 266 #content .revisions {
196 267 padding: 10px;
... ... @@ -199,16 +270,16 @@
199 270 #content .current-content {
200 271 }
201 272 #content .older-content {
202   -/* background: #E9E9E9; */
  273 + background: #E9E9E9;
203 274 float: right;
204 275 }
205 276  
206 277 #content .revisions label {
207 278 display: block;
208   -/* color: #000; */
  279 + color: #000;
209 280 }
210 281 #content .revisions label span {
211   -/* color: #999; */
  282 + color: #999;
212 283 font-weight: normal !important;
213 284 }
214 285 #content .revisions .title {
... ... @@ -224,7 +295,7 @@
224 295 float: right;
225 296 font-size: 90%;
226 297 font-weight: normal;
227   -/* color: #999; */
  298 + color: #999;
228 299 }
229 300 #content .revisions .meta {
230 301 margin-bottom: 15px;
... ... @@ -239,14 +310,14 @@
239 310 /* Errors */
240 311 #errorExplanation {
241 312 border: 1px solid red;
242   -/* background: #FFEAEB; */
  313 + background: #FFEAEB;
243 314 padding: 10px;
244 315 margin-top: 10px;
245 316 }
246 317 #errorExplanation h2 {
247 318 margin: 0px;
248 319 padding: 0px;
249   -/* color: maroon; */
  320 + color: maroon;
250 321 }
251 322 #errorExplanation p {
252 323 margin: 0px;
... ... @@ -264,9 +335,7 @@
264 335 padding: 0px;
265 336 padding-top: 5px;
266 337 }
267   -
268 338 /* Footer Area*/
269   -/*
270 339 #footer {
271 340 border-top: 4px solid #AAA;
272 341 text-align: center;
... ... @@ -284,7 +353,6 @@
284 353 color: #333;
285 354 text-decoration: underline;
286 355 }
287   -*/
288 356  
289 357 /* Modifiers */
290 358  
... ... @@ -311,8 +379,3 @@
311 379 .noscript #content .revisions #go-btn {
312 380 display: inline;
313 381 }
314   -
315   -ul.page-list li table,
316   -ul.page-list li td {
317   - border: none;
318   -}
... ...