ActionItem0: integrating comatose with the design

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@360 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem0: integrating comatose with the design
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@360 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 0386fbf5
Showing 4 changed files with 130 additions and 97 deletions Show diff stats
app/views/comatose_admin
app/views/layouts/application.rhtml
public/javascripts/comatose_admin.js
public/stylesheets/comatose_admin.css
@@ -1 +0,0 @@
-../../vendor/plugins/comatose/views/comatose_admin
 \ No newline at end of file
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html class="noscript" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=<%= Comatose.config.content_type %>"/>
+    <title>Comatose Admin</title>
+    <%= stylesheet_link_tag 'comatose_admin' %>
     <%= javascript_include_tag :defaults %>
-    <%= stylesheet_link_tag 'common' %>
-    <%= design_all_header_tags %>
     <%= javascript_include_tag 'comatose_admin' %>
-    <% if params[:controller] == 'comatose_admin' %>
-      <%= stylesheet_link_tag 'comatose_admin' %>
-    <% end %>
-
   </head>
-
   <body>
-    <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;" %>
-    <div id="wrap">
-      <div id="frame">
-        <div id="menu">
-          <%= _('Skip to:') %>
-          <a href="#main_content"><%= _('Content') %></a> | 
-          <a href="#sidebar"><%= _('Navigation') %></a> | 
-          <a href="#footer"><%= _('Footer') %></a>
-        </div>
-
-        <div id="header">
-          <%= header %>
-        </div>
-
-        <% unless flash[:notice].nil? %>
-          <div id='notice'>
-            <%= flash[:notice] %>
-          </div>
-        <% end %>
-
-        <div id='content'>
-	<!-- <a name='main_content'/></a> -->
-	<div id='header_content'>
-	 <!-- Aqui entra um conteudo tipo o titulo da pagina do usuário e os botoes do comatose? -->
-        </div>
-          <% if params[:controller] == 'comatose_admin' %>
-            <%= yield %>
-          <% else %>
-            <%= design_display(yield) %>
-          <% end %>
-        </div>
-
-        <div id="footer">
-          <!-- <a name='footer'/></a> -->
-          <%= footer %>
-          <%= design_display_icon('back', _('Back') , :action => 'list')%>
+    <div id="page-container">
+      <div id="header">
+        <h1><%= link_to Comatose.config.admin_title, :controller=>controller.controller_name, :action=>'index' %></h1>
+        <div id="flash">
+          <span id="flash-content"><%= flash[:notice] %></span>
         </div>
+        <h5><%= Comatose.config.admin_sub_title %></h5>
+      </div>
+      <div id="content">
+        <%= yield %>
+      </div>
+      <div id="footer">
+        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>.
       </div>
     </div>
-
   </body>
-
 </html>
@@ -1 +0,0 @@
-../../vendor/plugins/comatose/resources/public/javascripts/comatose_admin.js
 \ No newline at end of file
+BODY {
+  background: #DDD;
+  margin: 0px 100px;
+  padding: 0px;
+  font-family: "Lucida Grande", Tahoma, Verdana, Arial, Sans-Serif;
+  font-size: 12px;
+  min-width: 450px;
+}
+/* General Layout and Header Area */
+#page-container {
+  margin: 0px;
+  padding: 0px;
+}
+#header {
+  background: #0053C2;
+  padding: 5px;
+  border-bottom: 4px solid #00398B;
+}
+#header A {
+  text-decoration: none;
+  color: white;
+}
+#header A:hover {
+  color: white;
+}
+#header h1 {
+  margin: 0px;
+  padding: 0px;
+  padding-left: 10px;
+}
+#header h5 {
+  margin: 0px;
+  padding: 0px;
+  padding-left: 15px;
+  color: silver;
+}
+#header #flash {
+  float: right;
+  color: #4BA8FF;
+  font-weight: bold;
+  margin-right: 5px;
+}
+/* Content Area */
+#content {
+  padding: 15px;
+  background: white;
+  border-left: 1px solid silver;
+  border-right: 1px solid silver;
+}
+#content h1 {
+  margin: 0px;
+  padding: 0px;
+  font-size: 135%;
+  color: gray;
+}
+#content .action {
+  float: right;
+  color: gray;
+}
+#content .action A {
+  font-weight: bold;
+  text-decoration: none;
+  color: darkgreen;
+  border-bottom: 1px solid black;
+}
+#content .action A:hover {
+  color: red;
+  border-bottom: 1px solid red;
+}
+#content .page-header {
+  color: gray;
+}
 /* Page Listing */
 #content .tree-controller {
@@ -15,10 +87,10 @@
   display: none;
 }
 #content .page-list {
-  /* background: white; */
+  background: white;
   clear: both;
   list-style: none;
-  border-left: none;
+  border-left: 0px dotted silver;
   margin: 0px;
   padding: 0px;
   padding-left: 15px;
@@ -35,29 +107,30 @@
 #content .page-list .commands {
   font-size: 90%;
   padding-left: 5px;
+  color: silver;
 }
 #content .page-list .commands A {
-  /* color: gray; */
+  color: gray;
 }
 #content .page-list .commands A.add-page:hover {
-  /* color: blue; */
+  color: blue;
 }
 #content .page-list .commands A.reorder-children:hover {
-/*   color: black; */
+  color: black;
 }
 #content .page-list .commands A.delete-page:hover {
-/*   color: white; */
+  color: white;
 }
 #content .page-list .commands A.reordering {
-/*   background: navy; */
-/*   color: white; */
+  background: navy;
+  color: white;
 }
 #content .page-list .commands A.reordering:hover {
-/*   color: white; */
+  color: white;
 }
 #content .page-list A.page {
   text-decoration: none;
-/*   color: black; */
+  color: black;
   margin-left: 3px;
   font-size: 150%;
   display: block;
@@ -71,29 +144,29 @@
 }
 #content .page-list .hover {
-/*   background: #F1F0DB; */
+  background: #F1F0DB;
 }
 #content .page-list .hover-delete {
   background: red;
-/*   color: #FF8E90; */
+  color: #FF8E90;
 }
 #content .page-list .hover-delete A,
 #content .page-list .hover-delete .commands A {
-/*   color: #FF8E90; */
+  color: #FF8E90;
 }
 #content .page-list .hover-delete A.page {
-/*   color: white; */
+  color: white;
   border-bottom: 0px;
 }
 #content .page-list .hover-delete UL LI A.page {
-/*   color: red; */
+  color: red;
   border-bottom: 0px;
 }
 #content .do-reorder LI .handle {
   display: inline;
-/*   background: gray; */
-/*   color: white; */
+  background: gray;
+  color: white;
   padding: 1px 3px;
   cursor: move;
 }
@@ -108,10 +181,10 @@
 }
 #content .page-form LABEL {
   font-weight: bold;
-/*   color: #555; */
+  color: #555;
 }
 #content .page-form .meta-info LABEL {
-/*   color: #999 !important; */
+  color: #999 !important;
 }
 #content .page-form .label { 
   padding-top: 5px;
@@ -127,29 +200,28 @@
   padding-top: 5px;  
 }
 #content .page-form .field-help { 
-/*   color: gray; */
+  color: gray;
 }
 #content .page-form #page_title {
   font-size: 125%;
   font-weight: bold;
 }
 #content .page-form #page_slug {
-/*   color: gray; */
+  color: gray;
 }
 #content .page-form #page_body {
   font-family: monospace;
   font-size: 110%;
 }
-
 #content #button-group {
   padding: 10px;
   text-align: right;
-/*   background-color: #EAEAEA; */
+  background-color: #EAEAEA;
   margin-top: 10px;
 }
 #content #button-group .last-update {
   float: left;
-/*   color: gray; */
+  color: gray;
   padding-top: 4px;
   font-weight: bold;
 }
@@ -157,20 +229,19 @@
   font-weight: normal;
 }
 #content #button-group .last-update A {
-/*   color: gray; */
+  color: gray;
 }
 #content #button-group A {
-/*   color: maroon; */
+  color: maroon;
 }
 #content #button-group A:hover {
-/*   color: red; */
+  color: red;
 }
-
 #content #preview-area {
   margin-top: 10px;
 }
 #content #preview-area FIELDSET {
-/*   border: 1px solid silver; */
+  border: 1px solid silver;
 }
 #content #preview-area LEGEND {
   font-size: 125%;
@@ -179,18 +250,18 @@
   padding: 10px;
 }
 #content #preview-area .preview-note {
-/*   background: #FFFFD9; */
+  background: #FFFFD9;
   padding: 15px;
 }
 #content #preview-area .commands {
   text-align: right;
-/*   color: gray; */
+  color: gray;
 }
-#content #preview-area .commands A {
-/*   color: gray; */
+#content #preview-area .commands A{
+  color: gray;
 }
-#content #preview-area .commands A:hover {
-/*   color: black; */
+#content #preview-area .commands A:hover{
+  color: black;
 }
 #content .revisions {
   padding: 10px;
@@ -199,16 +270,16 @@
 #content .current-content {
 }
 #content .older-content {
-/*   background: #E9E9E9; */
+  background: #E9E9E9;
   float: right;
 }
 #content .revisions label {
   display: block;
-/*   color: #000; */
+  color: #000;
 }
 #content .revisions label span {
-/*   color: #999; */
+  color: #999;
   font-weight: normal !important;
 }
 #content .revisions .title {
@@ -224,7 +295,7 @@
   float: right;
   font-size: 90%;
   font-weight: normal;
-/*   color: #999; */
+  color: #999;
 }
 #content .revisions .meta {
   margin-bottom: 15px;
@@ -239,14 +310,14 @@
 /* Errors */
 #errorExplanation {
   border: 1px solid red;
-/*   background: #FFEAEB; */
+  background: #FFEAEB;
   padding: 10px;
   margin-top: 10px;
 }
 #errorExplanation h2 {
   margin: 0px;
   padding: 0px;
-/*   color: maroon; */
+  color: maroon;
 }
 #errorExplanation p {
   margin: 0px;
@@ -264,9 +335,7 @@
   padding: 0px;  
   padding-top: 5px;
 }
-
 /* Footer Area*/
-/*
 #footer {
   border-top: 4px solid #AAA;
   text-align: center;
@@ -284,7 +353,6 @@
   color: #333;
   text-decoration: underline;
 }
-*/
 /* Modifiers */
@@ -311,8 +379,3 @@
 .noscript #content .revisions #go-btn {
   display: inline;
 }
-
-ul.page-list li table,
-ul.page-list li td {
-  border: none;
-}
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-../../vendor/plugins/comatose/views/comatose_admin
2	\ No newline at end of file	0	\ No newline at end of file
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	<head>	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	<%= javascript_include_tag :defaults %>	8	<%= javascript_include_tag :defaults %>
4	- <%= stylesheet_link_tag 'common' %>
5	- <%= design_all_header_tags %>
6	<%= javascript_include_tag 'comatose_admin' %>	9	<%= javascript_include_tag 'comatose_admin' %>
7	- <% if params[:controller] == 'comatose_admin' %>
8	- <%= stylesheet_link_tag 'comatose_admin' %>
9	- <% end %>
10	-
11	</head>	10	</head>
12	-
13	<body>	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	</div>	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	</div>	25	</div>
52	</div>	26	</div>
53	-
54	</body>	27	</body>
55	-
56	</html>	28	</html>
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-../../vendor/plugins/comatose/resources/public/javascripts/comatose_admin.js
2	\ No newline at end of file	0	\ No newline at end of file