typo 5.3 → 5.4

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

@@ -3,12 +3,12 @@
   $('simple_editor').style.display = 'block';
   $('s').className = 'active';
   $('f').className = 'inactive';
-  html = FCKeditorAPI.GetInstance('article__body_and_extended_editor').GetHTML();
+  $('text_filter').value = $('user_textfilter').value;
+  content = CKEDITOR.instances.article__body_and_extended_editor.getData();
 </script>
-<%= text_area('article', 'body_and_extended', {:height => '300', :class => 'medium'}) %>
+<%= text_area('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '15'}) %>
 <script type="text/javascript">
-  $('article_body_and_extended').innerHTML = html;
   $('visual_editor').innerHTML = "";
   $('visual_editor').style.display = 'none';
-  html = null;
+  $('article_body_and_extended').innerHTML = content;
 </script>

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

@@ -4,9 +4,10 @@
   $('visual_editor').style.display = 'block';
   $('s').className = 'inactive';
   $('f').className = 'active';
-  if (typeof(html2) != 'undefined') {
-    html2 = null;
-  }
-  html2 = $('article_body_and_extended').innerHTML;
+  $('text_filter').value = 'none';
+  html = $('article_body_and_extended').value;
 </script>
-<%= fckeditor_textarea('article', 'body_and_extended', {:height => '300', :class => 'medium'}) %>
+<%= ckeditor_textarea('article', 'body_and_extended', {:height => '300', :class => 'medium'}) %>
+<script type="text/javascript">
+  content = CKEDITOR.instances.article__body_and_extended_editor.setData(html);
+</script>

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

@@ -1,8 +1,6 @@
 <% @page_heading = _('Manage articles') %>
 <% subtabs_for(:content) %>
 
-<%= render :partial => "drafts" %>
-
 <div class="list" id="articles">	
   <% form_remote_tag  :url      => {:action => 'index'},
   :method   => :get,
@@ -12,9 +10,9 @@
   :complete => "Element.hide('spinner')" \
   do %>
 
-  <label for="search"><%= _("Search articles that contains...")%></label><br />  
-  <input id="search" type="text" name="search[searchstring]" size="30" />
-  <%= submit_tag _("Search") %>
+  <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>

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

@@ -1,3 +1,3 @@
 <% subtabs_for(:write) %>
-<%= render :partial => "drafts" %>
+
 <%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "new", :id => @article.id , :class => ('autosave')} } %>

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

@@ -1,4 +1,4 @@
-<div class="dashboard">
+<div class="bordered">
   <h3><%= _("Latest Comments") %></h3>
   <ul>
     <% if @comments.size == 0 %>
@@ -6,10 +6,9 @@
     <% else %>
       <% for comment in @comments -%>
         <li>
-          <%= link_to_permalink comment, h(_("by %s on %s", comment.author, comment.article.title)) %>
+          <%= link_to_permalink comment, h(_("By %s on %s", comment.author, comment.article.title)) %>
         </li>
       <% end %>
     <% end %>
   </ul>
-  <hr />
 </div>

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

@@ -1,5 +1,4 @@
-<div class="dashboard">
-  <h3><%= _("Inbound links") %></h3>
+<h3><%= _("Inbound links") %></h3>
   <% if @inbound_links.nil? %>
     <%= _('You have no internet connection') %>
   <% else %>
@@ -9,11 +8,9 @@
       <% else %>
         <% for link in @inbound_links -%>
           <li>
-            <%= link_to(link.author, link.link) + _(" made a link to you saying ") + link.description.slice(0, 50) %> 
+            <%= link_to(link.author, link.link) + _(" made a link to you saying ") + link.description.slice(0, 100) + "[...]"%> 
           </li>
         <% end %>
       <% end %>
     </ul>
   <% end %>
-  <hr />
-</div>

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

@@ -1,4 +1,4 @@
-<div class="dashboard">
+<div class="bordered">
   <h3><%= _("Most popular") %></h3>
   <ul>
     <% if @bestof.size == 0 %>

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

@@ -1,4 +1,4 @@
-<div class="dashboard">
+<div class="bordered">
   <h3><%= _("Latest posts") %></h3>
   <ul>
 	<% if @recent_posts.size == 0 %>
@@ -11,5 +11,4 @@
       <% end %> 
     <% end %>
   </ul>
-  <hr />
 </div>

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

@@ -1,9 +1,7 @@
-<div class="dashboard-small">
-  <h3><%= _("System information") %></h3>
-  <ul> 
-    <li><%= _("You're running Typo %s", TYPO_VERSION) %></li>
-  </ul>
-  <h3><%= _("Statistics") %></h3>
+<div class="bordered">
+  <h3><%= _("About your blog") %></h3>
+
+  <p><%= _("You're running Typo %s", TYPO_VERSION) %></p>
   <ul> 
     <li> <%= _("Total posts : %d", @statposts) %></li>
     <li> <%= _("Your posts : %d" , @statuserposts) %></li>

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

@@ -1,4 +1,4 @@
-<div class="dashboard">
+<div class="bordered-orange">
   <h3><%= _("Latest news from the Typo development blog") %></h3>
   <% if @typo_links.nil? %>
     <%= _('You have no internet connection') %>
@@ -9,9 +9,9 @@
       <% else %>
         <% @typo_links.each do |link| -%>
           <li <%= alternate_class %>>
-            <%= link_to("<strong>#{link.title}</strong><br /", link.link) %>
-            <%= "#{link.date}<br />" %>
-            <%= link.description.strip_html.slice(0, 200) %>
+            <h4><%= link_to("<strong>#{link.title}</strong><br />", link.link) %></h4>
+            <small><%= "#{link.date}<br />" %></small>
+            <%= link.description.strip_html.slice(0, 400) %>[...]
           </li>
         <% end %>
       <% end %>

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

@@ -1,3 +1,3 @@
-<div class="dashboard-small">
-  <%=  _("Welcome back, %s!" ,current_user.name ) -%>
-</div>
+<h2><%= _("Welcome back, %s!" ,current_user.name ) -%></h2>
+
+<p><%= _("%d articles and %d comments were posted since your last connexion", @newposts, @newcomments) %></p>

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

@@ -1,14 +1,20 @@
-<div id="dashboard">
-  <%= render :partial => "welcome" %>
-  <%= render :partial => "overview" %>
-
-  <hr />
+<% content_for('tasks') do %>
+    <li><a href="http://typosphere.org">Documentation</a></li>
+    <li><a href="http://typogarden.org">Themes</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" %>
-  <hr />
-</div>
+  <%= render :partial => "typo_dev" %>  
+</div>
+
+

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

@@ -1,10 +1,10 @@
 <p>
   <%= hidden_field_tag "confirmed", params[:confirmed] %>
   <%= hidden_field_tag "published", params[:published] %>
-  <%= hidden_field_tag "bulkop", "",{:id=>"bulkop"} %>
-  <%= submit_tag _("Delete Checked Items"), {:class => 'submit',:onclick=>"getElementById('bulkop').value='Delete Checked Items'"} %> &nbsp;
-  <%= submit_tag _("Mark Checked Items as Ham"), {:class => 'submit',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Ham'"} %>
-  <%= submit_tag _("Mark Checked Items as Spam"), {:class => 'submit',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Spam'"} %>
-  <%= submit_tag _("Confirm Classification of Checked Items"), {:class => 'submit', :onclick=>"getElementById('bulkop').value='Confirm Classification of Checked Items'"} %>
-  <%= submit_tag _("Delete all spam"), {:class => 'submit', :onclick=>"getElementById('bulkop').value='Delete all spam'"}%>
+  <%= 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>

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

@@ -1,21 +1,32 @@
 
 <%= error_messages_for 'comment' %>
 <%= hidden_field_tag 'article_id', @article.id %>
-<ul class="admin" id="comment">
-  <li>
-    <label for="comment_author" class="block content"><%= _("Author")%></label>
-    <%= text_field 'comment', 'author', "value" => (current_user.name if controller.action_name == "list") %>
-  </li>
-  <li>
-    <label for="comment_url" class="block content"><%= _("Url") %></label>
-    <%= text_field 'comment', 'url', "value" => (this_blog.base_url if controller.action_name == "list")  %>
-  </li>
-  <li>
-    <label for="comment_email" class="block content"><%= _("Email")%></label>
-    <%= text_field 'comment', 'email', "value" => (current_user.email if controller.action_name == "list") %>
-  </li>
-  <li>
-    <label for="comment_body" class="block content"><%= _("Content")%></label>
-    <%= text_area 'comment', 'body', { :height => '300', :cols => '100'} %>
-  </li>
-</ul>
+
+<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' %>
+    </p>
+  </div>
+  <div>
+    <label for="comment_url" class='float'><%= _("Url") %></label>
+    <p class='input_text_title'>
+      <%= text_field 'comment', 'url', :class => 'small medium' %>
+    </p>
+  </div>
+  <div>
+    <label for="comment_email" class='float'><%= _("Email")%></label>
+    <p class='input_text_title'>
+      <%= text_field 'comment', 'email', :class => 'small medium' %>
+    </p>
+  </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>

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

@@ -13,7 +13,7 @@
       <p><strong><%= mail_to h(comment.email), h(comment.author) %></strong> |
       <%= link_to_unless comment.url.blank?, h(comment.url), comment.url %> | 
       IP: <%=h comment.ip %></p>
-      <%= comment.body %>
+      <%= h(comment.body) %>
       <p>
         <%= comment.created_at.strftime("%m/%d/%Y %H:%M") %> – [ 
         <%= link_to_edit _("Edit"), comment %> | 

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

@@ -1,17 +1,15 @@
 <% @page_heading =  _("Feedback for") + " #{ this_blog.settings['blog_name'] }" %>
-<% subtabs_for(:feedback) %>
+<% subtabs_for(:content) %>
 
-<div class="search">
   <% form_tag({:action => 'index'}, :method => :get) do %>
-  <label for="search"><%= _("Search Comments and Trackbacks that contain")%>...:</label><br /> 
-  <input type="text" id="feedback_search" name="search" value="<%=h params[:search] %>" size="30" />
-  <%= submit_tag _("Search") %>
+  <h4><label for="search"><%= _("Search Comments and Trackbacks that contain")%>...:</label></h4>
+  <input type="text" id="feedback_search" name="search" value="<%=h params[:search] %>" class='small medium' />
+  <%= submit_tag(_("Search"), {:class => 'search'}) %>
   <% end %>
-</div>
 
 <div class="list">
   <% form_tag({:action => 'bulkops'}, :method => :post) do %>
-  <%= render :partial => 'button' %>
+  <%= render :partial => 'button', :locals => { :position => 'top' } %>
 
   <%= hidden_field_tag "search", params[:search]%>
   <%= hidden_field_tag "page", params[:page]%>
@@ -25,13 +23,23 @@
       <th><%= _("IP")%></th>
     </tr>
     <tr class="menubar">
-      <td colspan="6">&nbsp;</td>
+      <td>&nbsp;</td>
+      <td colspan="5">
+        <select onchange='window.location=this.options[this.selectedIndex].value;'>
+          <option value=''><%= _("All comments")%></option>
+          <option value='?ham=f' <%= 'selected' if params[:ham] %>><%= _("Limit to ham") %></option>
+          <option value='?confirmed=f' <%= 'selected' if params[:confirmed] %>><%= _("Unapproved comments") %></option>
+          <option value='?published=f' <%= 'selected' if params[:published] %>><%= _("Limit to spam")%></option>
+        </select>
+      </td>
     </tr>
+    <%= render_void_table(@feedback.size, 9) %>
+    
     <%= render :partial => 'item', :collection => @feedback %>
-    <tr><td class="paginate" colspan="9"><%= will_paginate @feedback %></td></tr>
+    <%= display_pagination(@feedback, 6)%>
   </table>
 
-  <%= render :partial => 'button' %>
+  <%= render :partial => 'button', :locals => { :position => 'bottom' } %>
   <% end %>
 </div>
 

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

@@ -1,51 +1,69 @@
 <%= error_messages_for 'page' %>
-<!--[form:pages]-->
-<ul class="admin">
-  <li>
-    <label for="page_title" class="block title"><%= _("Title")%></label>
-    <%= text_field 'page', 'title', :class => 'large'  %>
-  </li>
-  <li>
-    <div style="float: right; width: 230px;">
-      <label class="block content"><%= _("Options") %></label>
-      <p class="paginate r" id="saveblock">
-          <label for="page_name"><%= _("Permalink")%>:</label><br />
-          <%= text_field 'page', 'name', :size => 25  %><br />
-          <label for="page_published"><%= _("Online")%>:</label>
-          <%= check_box 'page', 'published'  %><br />
-        <%= link_to_destroy_with_profiles @page%>
-        <%= save( _("Publish") + " &raquo;") %>
+
+<div id='editor-right'>
+  <h3>Publish settings</h3>
+  <div id='publishing'>
+    <%= check_box 'page', 'published'  %>
+    <label for="page_published"><%= _("Online")%></label><br />
+    <%= link_to_destroy_with_profiles @page%>
+    <%= save( _("Publish") + " &raquo;") %>
+  </div>
+  <div class='editor_bottom'>
+    <div class='editor_bottom_right'></div>
+  </div>
+</div>
+
+<div id='editor-left'>
+  <div>
+    <h2><label for="page_title" class="block title"><%= _("Title")%></label></h2>
+    <p class='input_text_title'>
+      <%= text_field 'page', 'title', :class => 'large title'  %>
+    </p>
+  </div>
+
+  <div id="editor-menu">
+    <span id="f" class="<%= 'active' if current_user.editor == 'visual' %>">
+      <%= build_editor_link("Visual", 'insert_editor', 'fck', 'simple_editor', 'visual') %>
+    </span>
+    <span id="s" class="<%= 'active' if current_user.editor == 'simple' %>">
+      <%= build_editor_link("HTML", 'insert_editor', 'simple', 'simple_editor', 'simple') %>
+    </span>
+  </div>
+  <div id='editor'>
+    <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
+      <script type="text/javascript">edToolbar('page_body');</script>
+    </div>
+    <div id='<%= alternate_editor %>_editor' style='display: none;'></div>
+    <div id='<%= "#{current_user.editor}_editor" %>'>
+      <%= t_textarea 'page', 'body', {:height => '300', :class => 'large'} %> 
+      <%= render_macros(@macros) if current_user.editor == 'visual' %>
+    </div>
+  </div>
+  <div class='editor_bottom'>
+    <div class='editor_bottom_right'></div>
+  </div>
+  <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
+
+  <h3><%= _("Page settings") %></h3>
+  <div class='blue_block'>
+    <div>
+      <label for="page_name" class='float'><%= _("Permanent link")%></label>
+      <p class='input_text_title'>
+        <%= text_field 'page', 'name', :class => 'small medium' %>
       </p>
     </div>
-    <div id="editor">
-      <div id="editor-menu">
-        <span id="f" class="<%= 'active' if current_user.editor == 'visual' %>">
-          <%= build_editor_link("Visual", 'insert_editor', 'fck', 'simple_editor', 'visual') %>
-        </span>
-        <span id="s" class="<%= 'active' if current_user.editor == 'simple' %>">
-          <%= build_editor_link("HTML", 'insert_editor', 'simple', 'simple_editor', 'simple') %>
-        </span>
-      </div>
-      <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
-        <script type="text/javascript">edToolbar('page_body');</script>
-      </div>
-      <div id='<%= alternate_editor %>_editor' style='display: none;'></div>
-      <div id='<%= "#{current_user.editor}_editor" %>'>
-        <%= t_textarea 'page', 'body', {:height => '300', :class => 'large'} %> 
-        <%= render_macros(@macros) if current_user.editor == 'visual' %>
-      </div>
+    <div>
+      <label class="float" for="text_filter"><%= _("Article filter")%></label>
+      <p class='input_text_title'>
+        <select class='small medium' name="page[text_filter]" id="text_filter">
+          <%= options_for_select text_filter_options, @page.text_filter %>
+        </select>
+      </p>
     </div>
-    <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
-  </li>
-  <li class="paginate l">
-    <label class="block">
-      <%= link_to_function _("Page settings") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "publishing_options", :duration => 0.2) } %>
-    </label>
-    <ul id="publishing_options" <%= "style='display: none;'" if @page.published.blank? %>>
-      <li>
-          <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
-          <select name="page[text_filter]" id="text_filter">
-            <%= options_for_select text_filter_options, @page.text_filter %>
-          </select>
-      </li>  
-</ul>
+  </div>
+
+
+        </li>  
+  </ul>
+  </div>  
+</div>

data/app/views/admin/pages/_pages.html.erb

@@ -31,8 +31,6 @@
     <td><%= page.name%></td>
   </tr>
   <% end %>
-  <tr>
-    <td colspan="5"><%= will_paginate @pages %></td>
-  </tr>
+  <%= display_pagination(@pages, 5)%>
   </table>
 <% end %>