typo 5.4.3 → 5.4.4

data/app/views/admin/content/_images.html.erb

@@ -1,4 +1,6 @@
+<!--
 <a href="javascript:" class="carousel-control" rel="prev">Previous</a>
+-->
 <div id="carousel-wrapper">
     <div id="carousel-content">
       <% @images.each do |image| %>
@@ -8,7 +10,9 @@
       <% end %>
     </div>
 </div>
+<!--
 <a href="javascript:" class="carousel-control" rel="next">Next</a>
+-->
 <script type='text/javascript'>
 new Carousel('carousel-wrapper', $$('#carousel-content .slide'), $$('a.carousel-control', 'a.carousel-jumper'), {duration: 0.4, circular: false});
 </script>

data/app/views/admin/content/_visual_editor.html.erb

@@ -6,6 +6,7 @@
   $('f').className = 'active';
   $('text_filter').value = 'none';
   html = $('article_body_and_extended').value;
+  $('simple_editor').innerHTML = '';
   
   if (CKEDITOR.instances.article__body_and_extended_editor &&
     typeof(CKEDITOR.instances.article__body_and_extended_editor) == 'object') {

data/app/views/admin/content/index.html.erb

@@ -1,8 +1,9 @@
 <% @page_heading = _('Manage articles') %>
+<% @link_to_new = link_to(_("New Article"), {:controller => 'content', :action => 'new'}, :id => 'dialog-link', :class => 'ui-state-default ui-corner-all') %>
+
 <% subtabs_for(:content) %>
 
-<div class="list" id="articles">
-  <% form_remote_tag  :url      => {:action => 'index'},
+<% form_remote_tag  :url      => {:action => 'index'},
   :method   => :get,
   :name     => 'article',
   :update   => {:success => 'articleList'},
@@ -10,41 +11,37 @@
   :complete => "Element.hide('spinner')" \
   do %>
 
-  <h4 class='mt30'><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>
-
-  <table>
-    <tr>
-      <th><%= _("Title") %></th>
-      <th><%= _("Categories") %></th>
-      <th><%= _("Date") %></th>
-      <th><%= _("Author")%></th>
-      <th><%= _("Status") %></th>
-      <th><%= _("Feedback")%></th>
-    </tr>
-    <tr class="menubar">
-      <td>&nbsp;</td>
-      <td><%= collection_select_with_current('search', 'category', Category.all, "id", "name", @search[:category].to_i, true)
-      %></td>
-      <td>
-        <%= collection_select_with_current(:search, :published_at, Article.find_by_published_at, "publication", "publication", @search[:published_at], true) %>
-      </td>
-      <td><%= collection_select_with_current(:search, :user_id, User.find(:all), "id", "name", @search[:user_id].to_i, true) %></td>
-      <td>
-        <select name="search[published]">
-          <option value="">Please select</option>
-          <option value="0">Unpublished</option>
-          <option value="1">Published</option>
-        </select>
-      </td>
-      <td><input type="submit" value='<%= _("Filter") %>' />
-      </tr>
-      <tbody id="articleList">
-        <%= render :partial => 'article_list', :object => @articles -%>
-      </tbody>
-    </table>
+<%= render :partial => 'drafts' unless Article.drafts.empty? %>
 
-    <%end%>
+<div class='settings'>
+  <h4><label for="search"><%= _("Search articles that contains...")%></label></h4>
+  <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>
+
+<table>
+  <tr>
+    <th><%= _("Title") %></th>
+    <th><%= _("Categories") %></th>
+    <th><%= _("Author")%></th>
+    <th><%= _("Date") %></th>
+    <th><%= _("Feedback")%></th>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><%= collection_select_with_current('search', 'category', Category.all, "id", "name", @search[:category].to_i, true)
+    %></td>
+    <td><%= collection_select_with_current(:search, :user_id, User.find(:all), "id", "name", @search[:user_id].to_i, true) %></td>
+    <td>
+      <%= collection_select_with_current(:search, :published_at, Article.find_by_published_at, "publication", "publication", @search[:published_at], true) %>
+    </td>
+    <td><input type="submit" value='<%= _("Filter") %>' class='ed_button' />
+  </tr>
+  <tbody id="articleList">
+    <%= render :partial => 'article_list', :object => @articles -%>
+  </tbody>
+</table>
+<%end%>

data/app/views/admin/dashboard/_comments.html.erb

@@ -1,14 +1,19 @@
-<div class="bordered">
-  <h3><%= _("Latest Comments") %></h3>
-  <ul>
-    <% if @comments.size == 0 %>
-      <li><%= _("No comments yet") %></li>
-    <% else %>
-      <% for comment in @comments -%>
-        <li>
-          <%= link_to_permalink comment, h(_("By %s on %s", comment.author, comment.article.title)) %>
-        </li>
+<div class='dashboard-left ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
+    <span class='ui-icon ui-icon-comment'> </span>
+    <%= _("Latest Comments") %>
+  </h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <ul>
+      <% if @comments.size == 0 %>
+        <li><%= _("No comments yet") %></li>
+      <% else %>
+        <% for comment in @comments -%>
+          <li>
+            <%= link_to_permalink comment, h(_("By %s on %s", comment.author, comment.article.title)) %>
+          </li>
+        <% end %>
       <% end %>
-    <% end %>
-  </ul>
+    </ul>
+  </div>
 </div>

data/app/views/admin/dashboard/_inbound.html.erb

@@ -1,7 +1,12 @@
-<h3><%= _("Inbound links") %></h3>
-  <% if @inbound_links.nil? %>
-    <%= _('You have no internet connection') %>
-  <% else %>
+<div class='dashboard ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
+    <span class='ui-icon ui-icon-link'> </span>
+    <%= _("Inbound links") %>
+  </h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <% if @inbound_links.nil? %>
+      <%= _('You have no internet connection') %>
+    <% else %>
     <ul>
       <% if @inbound_links.size == 0 %>
         <li><%= _("No one made a link to you yet") %></li>
@@ -14,3 +19,5 @@
       <% end %>
     </ul>
   <% end %>
+  </div>
+</div>

data/app/views/admin/dashboard/_overview.html.erb

@@ -1,9 +1,19 @@
-<div class="dashboard">
-  <p> <%= _("This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s, %s or %s." , 
-            link_to(_('write a post'), :controller => 'content', :action => 'new'), 
-            link_to(_('write a page'), :controller => 'page', :action => 'new') , 
-            link_to(_("update your profile or change your password"), :controller => 'users', :action => 'edit', :id => session[:user_id]) ) -%>.</p>
-  <p> <%= _("You can also do a bit of design, %s or %s." ,
-            link_to(_("change your blog presentation"), :controller => 'themes') , 
-            link_to(_("enable plugins"), :controller => 'sidebar') ) -%></p>
+<div class='ui-widget ui-widget ui-helper-reset' >
+  <div class='ui-state-highlight ui-corner-all' style='padding: 0pt 0.7em;'>
+    <p>
+      <span class='ui-icon ui-icon-info' style='float: left; margin-right: 0.3em;'></span>
+       <%= _("This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s, %s or %s." , 
+              link_to(_('write a post'), :controller => 'content', :action => 'new'), 
+              link_to(_('write a page'), :controller => 'page', :action => 'new') , 
+              link_to(_("update your profile or change your password"), :controller => 'users', :action => 'edit', :id => session[:user_id]) ) -%>.</p>
+    <p> <%= _("You can also do a bit of design, %s or %s." ,
+              link_to(_("change your blog presentation"), :controller => 'themes') , 
+              link_to(_("enable plugins"), :controller => 'sidebar') ) -%></p>
+              
+    <p>
+      If you need help, <a href="http://typosphere.org">read our documentation</a>. You can also browse our 
+      <a href="http://typogarden.org">theme catalogue</a> 
+      or <a href='http://plugins.typosphere.org'>download some plugins</a> to customize your Typo blog.
+    </p>
+  </div>
 </div>

data/app/views/admin/dashboard/_popular.html.erb

@@ -1,12 +1,17 @@
-<div class="bordered">
-  <h3><%= _("Most popular") %></h3>
-  <ul>
-    <% if @bestof.size == 0 %>
-      <li><%= _("Nothing to show yet") %> !</li>
-    <% else %>
-      <% for article in @bestof -%>
-        <li><%= link_to_permalink article, article.title  %> (<%= link_to_permalink article, article.comment_count %>)</li>
-      <% end %>
-    <% end -%>
-  </ul>
-</div>
+<div class='dashboard-left ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
+    <span class='ui-icon ui-icon-star'> </span>
+    <%= _("Most popular") %>
+  </h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <ul>
+      <% if @bestof.size == 0 %>
+        <li><%= _("Nothing to show yet") %> !</li>
+      <% else %>
+        <% for article in @bestof -%>
+          <li><%= link_to_permalink article, article.title  %> (<%= link_to_permalink article, article.comment_count %>)</li>
+        <% end %>
+      <% end -%>
+    </ul>
+  </div>
+</div>

data/app/views/admin/dashboard/_posts.html.erb

@@ -1,14 +1,19 @@
-<div class="bordered">
-  <h3><%= _("Latest posts") %></h3>
-  <ul>
-	<% if @recent_posts.size == 0 %>
-      <li> <%= link_to _("No posts yet, why don't you start and write one"), :controller => 'content', :action => 'new' %> ?</li>
-    <% else %>
-      <% for post in @recent_posts -%>
-        <li>
-          <%= link_to_permalink post, post.title %> (<%= link_to_permalink(post, post.published_comments.size) %>)
-        </li>
-      <% end %> 
-    <% end %>
-  </ul>
+<div class='dashboard ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
+    <span class='ui-icon ui-icon-note'> </span>
+    <%= _("Latest Posts") %>
+  </h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <ul>
+	    <% if @recent_posts.size == 0 %>
+        <li> <%= link_to _("No posts yet, why don't you start and write one"), :controller => 'content', :action => 'new' %> ?</li>
+      <% else %>
+        <% for post in @recent_posts -%>
+          <li>
+            <%= link_to_permalink post, post.title %> (<%= link_to_permalink(post, post.published_comments.size) %>)
+          </li>
+        <% end %> 
+      <% end %>
+    </ul>
+  </div>
 </div>

data/app/views/admin/dashboard/_typo_dev.html.erb

@@ -1,8 +1,12 @@
-<div class="bordered-orange">
-  <h3><%= _("Latest news from the Typo development blog") %></h3>
-  <% if @typo_links.nil? %>
-    <%= _('You have no internet connection') %>
-  <% else %>
+<div class='dashboard ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
+    <span class='ui-icon ui-icon-signal-diag'> </span>
+    <%= _("Latest news from the Typo development blog") %>
+  </h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <% if @typo_links.nil? %>
+      <%= _('You have no internet connection') %>
+    <% else %>
     <ul>
       <% if @typo_links.size == 0 %>
         <li><%= _("Oh no, nothing new") %></li>
@@ -17,5 +21,5 @@
       <% end %>
     </ul>
   <% end %>
-  <hr />
+  </div>
 </div>

data/app/views/admin/dashboard/_welcome.html.erb

@@ -1,3 +1,17 @@
-<h2><%= _("Welcome back, %s!" ,current_user.name ) -%></h2>
-
-<p><%= _("%d articles and %d comments were posted since your last connexion", @newposts, @newcomments) %></p>
+<div class='dashboard-left ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
+    <span class='ui-icon ui-icon-person'> </span>
+    <%= _("Welcome back, %s!" ,current_user.name ) -%>
+  </h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <p><%= _("%d articles and %d comments were posted since your last connexion", @newposts, @newcomments) %></p>
+    <p><%= _("You're running Typo %s", TYPO_VERSION) %></p>
+    <ul> 
+      <li> <%= _("Total posts : %d", @statposts) %></li>
+      <li> <%= _("Your posts : %d" , @statuserposts) %></li>
+      <li> <%= _("Total comments : %d" , @statcomments) %></li>
+      <li> <%= _("Spam comments : %d" , @statspam) %></li>
+    </ul>
+    
+  </div>
+</div>

data/app/views/admin/dashboard/index.html.erb

@@ -1,20 +1,13 @@
 <% content_for('tasks') do %>
-    <li><a href="http://typosphere.org">Documentation</a></li>
-    <li><a href="http://typogarden.org">Themes</a></li>
+    <li><a href='#'>&nbsp;</a></li>
 <% end %>
 
-<div id='dashboard-left'>
-  <%= render :partial => "welcome" %>
-  <%= render :partial => "sysinfo" %>
-</div>
-
-<div id='dashboard-right'>
-  <%= render :partial => "overview" %>
-  <%= render :partial => "inbound" %>
-  <%= render :partial => "comments" %>
-  <%= render :partial => "posts" %>
-  <%= render :partial => "popular" %>
-  <%= render :partial => "typo_dev" %>  
-</div>
-
+<%= render :partial => "overview" %>
+<%= render :partial => "welcome" %>
+<%= render :partial => "inbound" %>
+<%= render :partial => "comments" %>
+<%= render :partial => "posts" %>
+<%= render :partial => "popular" %>
+<%= render :partial => "typo_dev" %>  
 
+<br class='clear' />

data/app/views/admin/feedback/_button.html.erb

@@ -1,10 +1,10 @@
-<p>
+<div class='settings'>
   <%= hidden_field_tag "confirmed", params[:confirmed] %>
   <%= hidden_field_tag "published", params[:published] %>
   <%= hidden_field_tag "bulkop_#{position}", "",{:id=>"bulkop"} %>
-  <%= submit_tag _("Delete Checked Items"), {:class => 'delete',:onclick=>"getElementById('bulkop').value='Delete Checked Items'"} %> &nbsp;
-  <%= submit_tag _("Delete all spam"), {:class => 'delete', :onclick=>"getElementById('bulkop').value='Delete all spam'"}%>
-  <%= submit_tag _("Mark Checked Items as Spam"), {:class => 'delete',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Spam'"} %>
-  <%= submit_tag _("Mark Checked Items as Ham"), {:class => 'confirm',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Ham'"} %>
-  <%= submit_tag _("Confirm Classification of Checked Items"), {:class => 'confirm', :onclick=>"getElementById('bulkop').value='Confirm Classification of Checked Items'"} %>
-</p>
+  <%= submit_tag _("Delete Checked Items"), {:class => 'ed_button',:onclick=>"getElementById('bulkop').value='Delete Checked Items'"} %> &nbsp;
+  <%= submit_tag _("Delete all spam"), {:class => 'ed_button', :onclick=>"getElementById('bulkop').value='Delete all spam'"}%>
+  <%= submit_tag _("Mark Checked Items as Spam"), {:class => 'ed_button',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Spam'"} %>
+  <%= submit_tag _("Mark Checked Items as Ham"), {:class => 'ed_button',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Ham'"} %>
+  <%= submit_tag _("Confirm Classification of Checked Items"), {:class => 'ed_button', :onclick=>"getElementById('bulkop').value='Confirm Classification of Checked Items'"} %>
+</div>

data/app/views/admin/feedback/_form.html.erb

@@ -1,32 +1,32 @@
-
 <%= error_messages_for 'comment' %>
 <%= hidden_field_tag 'article_id', @article.id %>
 
-<fieldset>
-  <legend><%= _("Add a comment") %></legend>
-
-  <div>
-    <label for="comment_author" class='float'><%= _("Author")%></label>
-    <p class='input_text_title'>
-      <%= text_field 'comment', 'author', :class => 'small medium', :value => current_user.display_name %>
-    </p>
-  </div>
-  <div>
-    <label for="comment_email" class='float'><%= _("Email")%></label>
-    <p class='input_text_title'>
-      <%= text_field 'comment', 'email', :class => 'small medium', :value => current_user.email %>
-    </p>
-  </div>
-  <div>
-    <label for="comment_url" class='float'><%= _("Url") %></label>
-    <p class='input_text_title'>
-      <%= text_field 'comment', 'url', :class => 'small medium', :value => current_user.url %>
-    </p>
+<div id='comment' class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-default ui-corner-top'><span class='ui-icon ui-icon-gear'></span> <%= _("Add a comment")%></h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <div class='setting'>
+      <label for="comment_author" class='float'><%= _("Author")%></label>
+      <p class='input_text'>
+        <%= text_field 'comment', 'author', :class => 'medium', :value => current_user.display_name %>
+      </p>
+    </div>
+    <div class='setting clear'>
+      <label for="comment_email" class='float'><%= _("Email")%></label>
+      <p class='input_text'>
+        <%= text_field 'comment', 'email', :class => 'medium', :value => current_user.email %>
+      </p>
+    </div>
+    <div class='setting clear'>
+      <label for="comment_url" class='float'><%= _("Url") %></label>
+      <p class='input_text'>
+        <%= text_field 'comment', 'url', :class => 'medium', :value => current_user.url %>
+      </p>
+    </div>
+    <div class='setting clear'>
+      <label for="comment_body" class='float'><%= _("Content")%></label>
+      <p class='input_text'>
+        <%= text_area 'comment', 'body', { :rows => '10', :class => 'small medium'} %>
+      </p>
+    </div>
   </div>
-  <div>
-    <label for="comment_body" class='float'><%= _("Content")%></label>
-    <p class='input_text_title'>
-      <%= text_area 'comment', 'body', { :rows => '10', :class => 'small medium'} %>
-    </p>
-  </div>    
-</fieldset>
+</div>

data/app/views/admin/feedback/_item.html.erb

@@ -1,12 +1,19 @@
 <tr <%= alternate_class %>>
   <td><input class= "feedback_check" type="checkbox" name="feedback_check[<%= item.id %>]"/></td>
   <td class='<%= comment_class item.state %>'><%= item.state %></td>
+  <td>
+    <div id="feedback_<%=item.id%>">
+      <%= link_to_remote(h(truncate(item.body, :length => 100)), :url => { :action => 'preview', :id => item.id })%>
+    </div>
+    <%= show_actions item %>
+  </td>
   <td><%= link_to item.article.title, :controller => 'feedback', :action => 'article', :id => item.article_id %></td>
   <td>
     <%= link_to_unless item.url.blank?, ((h(item.author) || '(unknown)').slice(0,40)), item.url %><br />
     <%=h item.email.to_s.slice(0,40) %>
   </td>
-  <td id="feedback_<%=item.id%>">
-    <%=link_to_remote(h(truncate(item.body, :length => 100)), :url => { :action => 'preview', :id => item.id })%></td>
-  <td><%=h item.ip %></td>
+  <td>
+    <%= format_date item.created_at %>
+    <%= published_or_not item %>
+  </td>
 </tr>

data/app/views/admin/feedback/article.html.erb

@@ -1,9 +1,10 @@
-<% @page_heading = _("Comments for %s (%s)","#{ link_to h(@article.title), :controller => '/admin/content', :action => 'new', :id => @article.id }","#{ link_to _('add a comment'), '#comment' }") %>
+<% @page_heading = _("Comments for %s", @article.title) %>
+<% @link_to_new = link_to(_("Add a comment"), '#comment', {:id => 'dialog-link', :class => 'ui-state-default ui-corner-all'}) %>
 
 <% content_for (:tasks) do %>
-  <%= subtab(_('All comments'),'', {:action => :article, :id => @article.id, :ham => 'y', :spam => 'y'} ) %>
-  <%= subtab(_('Limit to ham'), '', {:action => :article, :id => @article.id, :ham => 'y'}) %>
-  <%= subtab(_('Limit to spam'), '', {:action => :article, :id => @article.id, :spam => 'y'}) %>
+  <%= subtab(_('All comments'), {:action => :article, :id => @article.id, :ham => 'y', :spam => 'y'} ) %>
+  <%= subtab(_('Limit to ham'), {:action => :article, :id => @article.id, :ham => 'y'}) %>
+  <%= subtab(_('Limit to spam'), {:action => :article, :id => @article.id, :spam => 'y'}) %>
 <% end %>
 
 <div class="list">
@@ -15,7 +16,7 @@
       IP: <%=h comment.ip %></p>
       <%= h(comment.body) %>
       <p>
-        <%= comment.created_at.strftime("%m/%d/%Y %H:%M") %> – [ 
+        <%= format_date comment.created_at %> – [ 
         <%= link_to_edit _("Edit"), comment %> | 
         <%= link_to _("Delete") , {:action => 'delete', :id => comment.id, :search => params[:search], :page => params[:page] },  :confirm => _("Are you sure?"), :method => :post %> |
         <%= comment.state %> ]