From 0d6b3f132480589068ba6cd5b5d9024198de9557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20de=20Villamil?=
 <frederic@de-villamil.com>
Date: Sat, 27 Mar 2010 19:26:48 +0100
Subject: [PATCH] Finishes article listing, better table presentation

---
 .../admin/content/_article_list.html.erb      |  2 +-
 app/views/admin/content/_drafts.html.erb      | 12 +++++++-----
 app/views/admin/content/_form.html.erb        |  2 +-
 app/views/admin/content/index.html.erb        | 14 ++++++++------
 public/stylesheets/administration.css         | 19 +++++++++++++++++++
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/app/views/admin/content/_article_list.html.erb b/app/views/admin/content/_article_list.html.erb
index 7a2bc7fc65..ee053fed18 100644
--- a/app/views/admin/content/_article_list.html.erb
+++ b/app/views/admin/content/_article_list.html.erb
@@ -6,7 +6,7 @@
   <td><%= article.published_at.strftime("%m/%d/%Y") %></td>
   <td><%= author_link(article)%></td>
   <td><%= link_to_published article %></td>
-  <td class="operation"><%= (article.allow_comments?) ? link_to(article.comments.ham.size.to_s, :controller => '/admin/feedback', :id => article.id, :action => 'article') : '-' %></td>
+  <td><%= (article.allow_comments?) ? link_to(article.comments.ham.size.to_s, :controller => '/admin/feedback', :id => article.id, :action => 'article') : '-' %></td>
 </tr>
 <% end %>
 <%= display_pagination(@articles, 7)%>
diff --git a/app/views/admin/content/_drafts.html.erb b/app/views/admin/content/_drafts.html.erb
index 841d1bb826..4bdacb64dd 100644
--- a/app/views/admin/content/_drafts.html.erb
+++ b/app/views/admin/content/_drafts.html.erb
@@ -1,6 +1,8 @@
-<div class='bordered'>
-  <h3><label class="block content"><%= _("Drafts:") %></label></h3>
-  <% Article.drafts.all.each do |draft| %>
-    <%= link_to("#{draft.title}<br />", :action => 'edit', :id => draft.id) %>
-  <% end %>
+<div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><%= _("Drafts")%></h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <% Article.drafts.all.each do |draft| %>
+      <%= link_to("#{draft.title},", :action => 'edit', :id => draft.id) %>
+    <% end %>
+  </div>
 </div>
diff --git a/app/views/admin/content/_form.html.erb b/app/views/admin/content/_form.html.erb
index 02ff3d661d..c1fe9b086a 100644
--- a/app/views/admin/content/_form.html.erb
+++ b/app/views/admin/content/_form.html.erb
@@ -63,7 +63,7 @@
         <%= ckeditor_textarea('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '20'}) if current_user.editor == 'visual' %>
       </div>
       
-      <div id='simple_editor' <%= "style='display: none;'" if current_user.editor == 'visual'%> >
+      <div id='simple_editor' class='input_text' <%= "style='display: none;'" if current_user.editor == 'visual'%> >
         <%= text_area('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '20'}) %>
         <%= render_macros(@macros) if current_user.editor == 'simple' %>  
       </div>
diff --git a/app/views/admin/content/index.html.erb b/app/views/admin/content/index.html.erb
index e18602485b..9dd77e4ffe 100644
--- a/app/views/admin/content/index.html.erb
+++ b/app/views/admin/content/index.html.erb
@@ -1,5 +1,5 @@
 <% @page_heading = _('Manage articles') %>
-<% @link_to_new = link_to(_("New Article"), {:controller => 'contents', :action => 'new'}, :id => 'dialog-link', :class => 'ui-state-default ui-corner-all') %>
+<% @link_to_new = link_to(_("New Article"), {:controller => 'content', :action => 'new'}, :id => 'dialog-link', :class => 'ui-state-default ui-corner-all') %>
 
 <% subtabs_for(:content) %>
 
@@ -11,15 +11,17 @@
   :complete => "Element.hide('spinner')" \
   do %>
 
+<%= render :partial => 'drafts'%>
+
 <div class='settings'>
   <h4><label for="search"><%= _("Search articles that contains...")%></label></h4>
-  <input id="search" type="text" name="search[searchstring]" class='small medium' />
-  <%= submit_tag(_("Search"), {:class => 'search'}) %>
-  <span id='spinner' style="display:none;"><%= image_tag('spinner.gif') %></span>  
+  <div class='input_text'>
+    <input id="search" type="text" name="search[searchstring]" class='small medium' />
+    <%= submit_tag(_("Search"), {:class => 'ed_button'}) %>
+    <span id='spinner' style="display:none;"><%= image_tag('spinner.gif') %></span>  
+  </div>
 </div>
 
-<%= render :partial => 'drafts'%>
-
 <table>
   <tr>
     <th><%= _("Title") %></th>
diff --git a/public/stylesheets/administration.css b/public/stylesheets/administration.css
index 1a25e352a6..2f55ffa047 100644
--- a/public/stylesheets/administration.css
+++ b/public/stylesheets/administration.css
@@ -505,6 +505,7 @@ div.setting { float: left; margin-bottom: 12px;}
 .right { text-align: right;}
 .save { background: #FB7C00; border: #FB7C00 1px solid; color: #fff; -moz-border-radius:3px 3px 3px 3px; -webkit-border-radius:3px 3px 3px 3px; font-weight: bold;}
 .unpublished, a.unpublished { color: #c00;}
+.published, a.published { color: #6eac2c;}
 
 /* Footer */
 #footer { clear: both;}
@@ -544,6 +545,14 @@ td {
 	color:#362B36;
 }
 
+tr.shade td {
+	background: #F0F0F6;
+}
+
+td.paginate {
+	text-align: center;
+}
+
 /* Éditeur */
 
 #editor-left { margin-right: 320px; }
@@ -603,4 +612,14 @@ td {
 .page_new a {
 	padding: 0.4em 1em 0.4em 1em;
 	
+}
+
+.ed_button {
+	-moz-border-radius: 3px;
+	-webkit-border-radius : 3px;
+	background:url("../../images/admin/ui-bg_glass_80_d7ebf9_1x400.png") repeat-x scroll 50% 50% #D7EBF9;
+	border:1px solid #AED0EA;
+	color:#2779AA;
+	font-weight:bold;
+	margin-right: 0.2em;
 }
\ No newline at end of file