typo 5.2.98 → 5.3

data/app/controllers/admin/sidebar_controller.rb

@@ -5,7 +5,13 @@ class Admin::SidebarController < Admin::BaseController
     # Reset the staged position based on the active position.
     Sidebar.delete_all('active_position is null')
     flash_sidebars
-    @active = Sidebar.find(:all, :order => 'active_position ASC') unless @active
+    begin
+      @active = Sidebar.find(:all, :order => 'active_position ASC') unless @active
+    rescue
+      # Avoiding the view to crash
+      @active = []
+      flash[:error] = _("It seems something went wrong. Maybe some of your sidebars are actually missing and you should either reinstall them or remove them manually")
+    end
   end
 
   def set_active
@@ -80,8 +86,14 @@ class Admin::SidebarController < Admin::BaseController
 
   def flash_sidebars
     unless flash[:sidebars]
-      active = Sidebar.find(:all, :order => 'active_position ASC')
-      flash[:sidebars] = active.map {|sb| sb.id }
+      begin
+        active = Sidebar.find(:all, :order => 'active_position ASC')
+        flash[:sidebars] = active.map {|sb| sb.id }
+      rescue
+        # Avoiding the view to crash
+        @active = []
+        flash[:error] = _("It seems something went wrong. Maybe some of your sidebars are actually missing and you should either reinstall them or remove them manually")
+      end
     end
     flash[:sidebars]
   end

data/app/helpers/sidebar_helper.rb

@@ -1,9 +1,14 @@
 module SidebarHelper
   def render_sidebars(*sidebars)
-    (sidebars.blank? ? Sidebar.find(:all, :order => 'active_position ASC') : sidebars).inject('') do |acc, sb|
-      @sidebar = sb
-      sb.parse_request(contents, params)
-      acc + render_sidebar(sb)
+    begin
+      (sidebars.blank? ? Sidebar.find(:all, :order => 'active_position ASC') : sidebars).inject('') do |acc, sb|
+        @sidebar = sb
+        sb.parse_request(contents, params)
+        acc + render_sidebar(sb)
+      end
+    rescue
+      _("It seems something went wrong. Maybe some of your sidebars are actually missing and you should either reinstall them or remove them manually
+        ")
     end
   end
 

data/app/models/feedback.rb

@@ -140,12 +140,20 @@ class Feedback < Content
 
   def report_as_spam
     return if blog.sp_akismet_key.blank?
-    Timeout.timeout(defined?($TESTING) ? 5 : 3600) { akismet.submitSpam(akismet_options) }
+    begin
+      Timeout.timeout(defined?($TESTING) ? 5 : 3600) { akismet.submitSpam(akismet_options) }
+    rescue Timeout::Error => e
+      nil
+    end
   end
 
   def report_as_ham
     return if blog.sp_akismet_key.blank?
-    Timeout.timeout(defined?($TESTING) ? 5 : 3600) { akismet.submitHam(akismet_options) }
+    begin
+      Timeout.timeout(defined?($TESTING) ? 5 : 3600) { akismet.submitHam(akismet_options) }
+    rescue Timeout::Error => e
+      nil
+    end
   end
 
   def withdraw!

data/app/models/page_cache.rb

@@ -14,7 +14,11 @@ class PageCache
   # Delete all file save in path_cache by page_cache system
   def self.sweep_all
     logger.debug "PageCache - sweep_all called by #{caller[1].inspect}"
-    CacheInformation.all.each{|c| c.destroy}
+    begin
+      CacheInformation.all.each{|c| c.destroy}
+    rescue
+      logger.debug "PageCache - OOOOPS table is missing"
+    end
   end
 
 

data/app/views/admin/blacklist/_blacklist_patterns.html.erb

@@ -2,11 +2,13 @@
   <tr>
     <th><%= _("Pattern") %></th>
     <th><%= _("Type") %></th>
+    <th><%= _("Delete")%></th>
   </tr>
   <% for blacklist_pattern in @blacklist_patterns -%>
   <tr <%= alternate_class -%>>  
     <td><%= link_to h(blacklist_pattern.pattern), :action => "edit", :id => blacklist_pattern.id %></td>
     <td><%= blacklist_pattern.class %></td>
+    <td><%= link_to _("Delete"), :action => 'destroy',  :id => blacklist_pattern.id %></td>
   </tr>  
 <% end -%>
   <tr class="paginate"><td colspan="3"><%= will_paginate @blacklist_patterns %></td></tr>

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

@@ -1,4 +1,4 @@
-  <% @page_heading = _("#{controller.action_name.capitalize} Category") %>
+  <% @page_heading = _("%s Category", controller.action_name.capitalize) %>
   <% subtabs_for(:content) %>
   <% form_tag :action=>"edit", :id => @category.id do %>
   <div class="admin">

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

@@ -13,7 +13,7 @@
       <div id="categories" style="height: 170px;">
         <%= checkboxes_from_collection(@categories, "id", "name", @selected) %>        
       </div>
-      <p class="paginate r">
+      <p class='paginate r' id='saveblock'>
           <label for="article_allow_comments"><%= _("Allow comments") %>: </label>
           <%= check_box 'article', 'allow_comments'  %><br />
           <label for="article_allow_pings"><%= _("Allow trackbacks")%>: </label>
@@ -38,11 +38,11 @@
       <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
         <script type="text/javascript">edToolbar('article_body_and_extended');</script>
       </div>
-      <div id='<%= alternate_editor %>_editor'></div>
+      <div id='<%= alternate_editor %>_editor' style='display: none;'></div>
       <div id='<%= "#{current_user.editor}_editor" %>'>
         <%= t_textarea('article', 'body_and_extended', {:height => '300', :class => 'medium'}) %>
         <%= render_macros(@macros) if current_user.editor == 'simple' %>
-      <div>
+      </div>
     </div>
   </li>
   <li>

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

@@ -1,5 +1,6 @@
 <script type="text/javascript">
   $('quicktags').style.display = 'block';
+  $('simple_editor').style.display = 'block';
   $('s').className = 'active';
   $('f').className = 'inactive';
   html = FCKeditorAPI.GetInstance('article__body_and_extended_editor').GetHTML();
@@ -8,5 +9,6 @@
 <script type="text/javascript">
   $('article_body_and_extended').innerHTML = html;
   $('visual_editor').innerHTML = "";
+  $('visual_editor').style.display = 'none';
   html = null;
 </script>

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

@@ -1,5 +1,7 @@
 <script type="text/javascript">
   $('quicktags').style.display = 'none';
+  $('simple_editor').style.display = 'none';
+  $('visual_editor').style.display = 'block';
   $('s').className = 'inactive';
   $('f').className = 'active';
   if (typeof(html2) != 'undefined') {

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

@@ -8,9 +8,9 @@
   <li>
     <div style="float: right; width: 230px;">
       <label class="block content"><%= _("Options") %></label>
-      <p class="paginate r">
+      <p class="paginate r" id="saveblock">
           <label for="page_name"><%= _("Permalink")%>:</label><br />
-          <%= text_field 'page', 'name', :size => 25  %>
+          <%= text_field 'page', 'name', :size => 25  %><br />
           <label for="page_published"><%= _("Online")%>:</label>
           <%= check_box 'page', 'published'  %><br />
         <%= link_to_destroy_with_profiles @page%>
@@ -29,11 +29,11 @@
       <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'></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>
     <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
   </li>
@@ -41,7 +41,7 @@
     <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;'" unless @page.published.blank? %>>
+    <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">

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

@@ -2,6 +2,7 @@
   $('quicktags').style.display = 'block';
   $('s').className = 'active';
   $('f').className = 'inactive';
+  $('simple_editor').style.display = 'block';
   html = FCKeditorAPI.GetInstance('page__body_editor').GetHTML();
 </script>
 <%= text_area('page', 'body', {:class => 'medium', :height => '300'}) %>
@@ -9,5 +10,6 @@
 <script type="text/javascript">
   $('page_body').innerHTML = html;
   $('visual_editor').innerHTML = "";
+  $('visual_editor').style.display = 'none';
   html = null;
 </script>

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

@@ -1,5 +1,7 @@
 <script type="text/javascript">
   $('quicktags').style.display = 'none';
+  $('simple_editor').style.display = 'none';
+  $('visual_editor').style.display = 'block';
   $('s').className = 'inactive';
   $('f').className = 'active';
   

data/app/views/articles/_comment_box.html.erb

@@ -16,7 +16,7 @@
   <table cellpadding="4" cellspacing="0" class="frm-tbl">
     <tr>
       <td><p><label for="comment_author"><%= _("Your name")%></label></p></td>
-      <td> <%= text_field "comment", "author", :size => 20 %> <small><%= link_to_function("(leave url/email &#187;)", "Element.toggle('guest_url'); Element.toggle('guest_email')") %></small></td>
+      <td> <%= text_field "comment", "author", :size => 20 %> <small><%= link_to_function(_("(leave url/email &#187;)"), "Element.toggle('guest_url'); Element.toggle('guest_email')") %></small></td>
     </tr>
     <tr id="guest_url" style="display:none;">
       <td><p><label for="comment_url"><%= _("Your blog")%></label></p></td>

data/app/views/articles/_comment_failed.html.erb

@@ -1,4 +1,4 @@
 <%= error_messages_for 'comment' %>
 <li>
-  <%= _("Opps, something wrong happened, the comment could not be saved")%>
+  <%= _("Oops, something wrong happened, the comment could not be saved")%>
 </li>

data/app/views/articles/read.html.erb

@@ -27,7 +27,7 @@
   <%= article_links @article %>
 </p>
 <% if @article.allow_comments? or @article.published_comments.size > 0 -%>
-  <a name="comments"></a><h4 class="blueblk">Comments</h4>
+  <a name="comments"></a><h4 class="blueblk"><%= _('Comments') %></h4>
   <% unless @article.comments_closed? -%>
     <p class="postmetadata alt">
       <small><a href="#respond"><%= _("Leave a response")%></a></small>

data/config/environment.rb

@@ -64,8 +64,9 @@ Rails::Initializer.run do |config|
   config.gem 'calendar_date_select'
 
   # Declare needed (github) gems
-  config.gem 'datanoise-actionwebservice', :version => '2.2.2', :lib => 'actionwebservice', :source => 'http://gems.github.com'
-  config.gem 'mislav-will_paginate', :version => '2.3.7', :lib => 'will_paginate', :source => 'http://gems.github.com'
+  # This is for legacy documentation, these gems are vendored for release.
+  # config.gem 'datanoise-actionwebservice', :version => '2.2.2', :lib => 'actionwebservice', :source => 'http://gems.github.com'
+  # config.gem 'mislav-will_paginate', :version => '2.3.7', :lib => 'will_paginate', :source => 'http://gems.github.com'
   # Rails 2.2.2 bug : decommenting this line forces the use of the test database regardless of the RAILS_ENV
   # config.gem 'rspec-rails', :lib => 'spec/rails', :version => '~> 1.1.11'
 

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.2.98"
+PKG_VERSION = "5.3"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'
@@ -30,14 +30,13 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY 
   s.executables = ['typo']
   
-  s.add_dependency("rails", ">= 2.2.2")
+  s.add_dependency("rails", "= 2.2.2")
   s.add_dependency("mongrel", ">= 1.1.5")
   s.add_dependency("mongrel_cluster", ">= 1.0.5")
   s.add_dependency("rails-app-installer", ">= 0.2.0")
   s.add_dependency("ruby-debug", ">= 0.10.3")
   s.add_dependency("flexmock", ">= 0.8.3")
-  s.add_dependency("htmlentities", "4.0.0")
-  s.add_dependency("json", ">=1.1.3")
+  s.add_dependency("rspec-rails", "= 1.1.11")
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '5.2'
+TYPO_VERSION = '5.3'

data/public/stylesheets/administration.css

@@ -172,11 +172,14 @@ small {
 }
 
 #overall {
-  padding: 10px 0 20px 20px;
 	width: 1000px;
 	background: #fff;
 }
 
+#main {
+	padding: 10px 0 20px 20px;
+}
+
 #footer {
 	float: left;
 	width: 100%;
@@ -330,7 +333,6 @@ tr.menubar {
 .admin {
   padding: 0 10px 5px 10px;
   margin-bottom: 10px;
-  position: relative;
 }
 
 
@@ -846,12 +848,35 @@ div.auto_complete ul strong.highlight {
 #visual_editor {
 	background: #464646;
 	padding: 10px;
+	border-radius: 3px;
+}
+
+#simple_editor {
+	border-radius: 3px;
+	-moz-border-bottom-left-radius: 3px;
+	-moz-border-bottom-right-radius: 3px;
+	-webkit-border-bottom-left-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+}
+
+#visual_editor {
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 4px;
 }
 
 #quicktags {
 	background: #464646;
 	padding-top: 10px;
 	padding-left: 10px;
+	border-radius: 3px 0 0 0;
+	-moz-border-top-left-radius: 3px 0 0 0;
+	-webkit-border-top-left-radius: 4px;
+}
+
+#saveblock {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 4px;
 }
 
 #editor-menu {
@@ -861,9 +886,19 @@ div.auto_complete ul strong.highlight {
 #editor-menu span.active {
 	background: #464646;
 	padding: 5px;
+	border-radius: 3px 0 0 0;
+	-moz-border-top-left-radius: 3px 0 0 0;
+	-moz-border-top-right-radius: 3px 0 0 0;
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
 }
 
 #editor-menu span.inactive {
 	background: #f9f9f9;
 	padding: 0px;
 }
+
+ul.admin {
+	margin-left: 0;
+	padding-left: 0;
+}

data/public/stylesheets/administration_rtl.css

@@ -1,224 +1,201 @@
-/* @group General/Master Containers */
-
-/* OK */
 html, body {
   height: 100%;
 }
 
-/* OK */
 body {
-  direction: rtl;
-  margin:0;
-  padding:0;
-/*  font: 12px Tahoma, Helvetica, sans-serif; */
-	font: 0.75em "HelveticaNeue", Helvetica, Arial, sans-serif;
-  line-height: 1.8em;
-  color: #000;
-  background: #fff;
-}
-
-/* Top Navbar */
-/* OK */
-#topnav {
-  height: 36px;
   margin: 0;
-  background: transparent url("../images/admin/bgoff.png") repeat-x top right;
-  font: 12px Tahoma, Helvetica, sans-serif;
+  padding: 0;
+	font: 12px/18px "Helvetica Neue", "Lucida Grande", Arial, sans-serif;
+  line-height: 1.6em;
+  color: #222;
+	background: #f9f9f9;
+	direction: rtl;
 }
 
-/* OK */
-#topnav ul {
+form {
   margin: 0;
   padding: 0;
-  list-style-type: none;
-  width: auto;
 }
 
-/* OK */
-#topnav ul li {
-  display: block;
-  float: right;
-  margin: 0;
+a, a:visited {
+	color: #38b;
+	text-decoration: none;
+	font-weight: bold;
 }
 
-/* OK */
-#topnav  ul li a {
-  display: block;
-  float: left;
-  padding: 11px 20px 0 20px;
-  height: 25px;
-  text-decoration: none;
-  color: #333;
-  text-transform: capitalize;
-  background: transparent url("../images/admin/bgdivider.png") no-repeat top left;
+a:hover, a:visited:hover {
+	text-decoration: underline;
+	color: #333;
 }
 
-/* OK */
-#topnav  ul li a:hover {
-  color: #fff;
-  background: #fff url("../images/admin/bgover.png") repeat-x top right;
+h2 {
+	font-size: 16px;
+	letter-spacing: 2px;
+	color: #464646;
+	margin: 0 0 20px 0;
+	padding-top: 20px;
 }
 
-/* OK */
-#topnav ul li a.current {
-  color: #fff;
-  background: #fff url("../images/admin/bgselected.png") repeat-x top right;
+h2 span {
+	font-size: 12px;
 }
 
-/* OK */
-#topnav ul li img {
-	border: none;
-	float: right;
-	padding-left: 3px;
-	margin-top: -4px;
+h2 span a,
+h2 span a:visited {
+	text-decoration: underline;
 }
-/* End of Top navigation */
 
-/* OK */
-#container {
+fieldset {
+	margin-top: 10px;
+}
+
+label {
+	font-weight: normal;
+	color: #464646;
+}
+
+label.float {
+  display: block;
+  float: left;
+  width: 200px;
+  margin-left: 0;
+  margin-right: 12px;
+  padding: 0;
   text-align: right;
-  margin: 0 auto;
 }
 
-/* OK */
-#overall {
-  background: #fff;
-  margin: 0 20px;
+label.block {
+  display: block;
+	margin-bottom: 10px;
 }
 
-/* OK */
-#footer {
-float: right;
-width: 100%;
-margin-top: 30px;
-padding-top: 10px;
-padding-bottom: 0;
-text-align: center;
-color: #000;
-border-top: #ccc 1px solid;
+label.title {
+	font-size: 16px;
 }
 
-/* @group Utility */
+label.content {
+	font-size: 14px;
+	margin-top: 6px;
+}
 
-/* OK */
-form {
+legend {
+	font-size: 14px;
+	color: #464646;
+	font-weight: bold;
+}
+
+small {
+	font-size: 11px;
+}
+
+/* Top navigation */
+#topnav {
+  height: 36px;
+  margin: 0;
+	background: #282826;
+}
+
+#topnav ul {
   margin: 0;
   padding: 0;
+  list-style-type: none;
+  width: auto;
 }
 
-/* OK */
-img {
-  border: none;
+#topnav ul li {
+  float: left;
+  margin: 0;
+	font-size: 15px;
 }
 
-a:link, a:visited {
-color:#224272;
-text-decoration:none;
+#topnav ul li.right {
+	float: right;
+	font-size: 11.5px;
 }
 
-a:hover {
-text-decoration: underline;
-color: #aaa;
+#topnav ul li.current {
+  color: #fff;
+  background: #464646;
 }
-/* @end */
 
-/* @group Tasks Links */
-/* OK */
-.tasks {
-  background: #525251;
-  border-bottom: #000 1px solid;
+#topnav ul li a {
+  display: block;
+  padding: 11px 20px 0;
+  height: 25px;
+  color: #fff;
+  text-transform: capitalize;
+	border-right: #525251 1px solid;
+}
+
+#topnav  ul li a:hover {
+  color: #fff;
+  background: #464646;
+}
+/* End of Top navigation */
+
+/* Sub navigation */
+#subtabs {
+  background: #464646;
   padding: 5px 20px;
-  margin-bottom: 15px;
 }
 
-/* OK */
-.tasks ul {
+#subtabs ul {
   list-style: none;
   margin: 0;
   padding: 0;
 }
 
-/* OK */
-.tasks ul li {
-	float: right;
+#subtabs ul li {
+	float: left;
 	padding: 2px 20px 2px 0;
-  	line-height: normal;
+	font-size: 12px;
 }
 
-/* OK */
-.tasks li a {
-  text-decoration: none;
+#subtabs li a {
   color: #fff;
 }
 
-/* OK */
-.tasks li a:hover {
+#subtabs li a:hover {
   color: #fff;
   text-decoration: underline;
 }
 
-/* OK */
-.tasks li a.current {
+#subtabs li a.current {
   color: #fff;
   text-decoration: underline;
-  font-weight: bold;
 }
-/* @end */
 
-/* @group Headings */
+/* End of sub navigation */
 
-h2 {
-	font: normal 1.7em Tahoma, Helvetica, sans-serif;
-	letter-spacing: 3px;
-	color: #224272;
-	margin: 20px 0;
-	margin-right: 3px;
+#container {
+  text-align: left;
+  margin: 0 auto;
 }
 
-h2 span a {
-	text-decoration: underline;
+#overall {
+	width: 1000px;
+	background: #fff;
 }
 
-h2 a:visited {
-	color: #666;
+#main {
+	padding: 10px 0 20px 20px;
 }
 
-h2 a:hover {
-	text-decoration: none;
-	color: #993333;
+#footer {
+	float: left;
+	width: 100%;
+	margin-top: 30px;
+	padding: 10px 0 0 0;
+	text-align: center;
+	border-top: #ccc 1px solid;
 }
 
-h2 span {
-	font-size: 0.7em;
-}
+/* @group Headings */
 
 h3 {
-  font-size: 130%;
+  font-size: 13px;
   padding: 5px;
   margin-bottom: 0;
-}
-
-.form h3,  h3 {
-  background: #637987;
-  color: #fff;
-  font-weight: normal;
-}
-
-.form h4 {
-  padding: 2px;
-  margin: 0;
-  font-size: 120%;
-}
-
-.tasks h3 {
-  font: normal 120%/normal "Trebuchet MS", Arial, Verdana;
-  background: transparent;
-  margin: 0 0 5px 0;
-  padding: 0;
-  color: #4A611C;
-}
-
-.set h3 {
   background: none;
   margin: 0 0 5px 0;
   color: #1F273F;
@@ -228,53 +205,38 @@ h3 {
 
 /* @group Table Listings */
 
-td.operation {
-  width: 25px;
-  text-align: center;
-}
-
-th.operation {
-	text-align: center;
-}
-
-.list {
-  clear: right;
-}
-
-.list table {
+table {
   width: 100%;
 	border-spacing: 0;
-	border-bottom: #ddd 1px solid;
-	border-collapse: collapse
-}
-
-.list table tr.first {
-	border-bottom: #324e79 1px solid;
-	padding-bottom: 5px;
+	border-bottom: #444 1px solid;
+	border-collapse: collapse;
+	background: #fff;
 }
 
-.list table th {
-  text-align: right;
+th {
+  text-align: left;
   padding: 2px 5px;
-  color: #324e79;
+  color: #464646;
 	font-size: 12px;
+	background: none;
 }
 
-.list table th a {
-	color: #324e79;
-	text-decoration: underline;
+td {
+  padding: 12px 3px;
+	border-bottom: #eee 1px solid;
 }
 
-.list table tr td {
-  padding: 3px;
+td.operation {
+  width: 25px;
+  text-align: center;
 }
 
-.list table tr td a {
-	color: #224272;
+th.operation {
+	text-align: center;
 }
 
-tr.shade {
-  background: #f0f0f0;
+.list {
+  clear: left;
 }
 
 li.shade {
@@ -282,20 +244,24 @@ li.shade {
 }
 
 .paginate {
-  background: url("../images/admin/bc-bg.gif") #e7e7e7 repeat-x top right;
-  padding: 5px 20px;
+  background: #dfdfdf;
+  padding: 10px;
   margin-bottom: 15px;
-	border-right: #ddd 1px solid;
-	border-left: #ddd 1px solid;
-	border-left: #ddd 1px solid;
 	text-align: center;
-
 }
 
 td.paginate {
 	text-align: center;
 }
 
+tr.menubar td {
+	padding: 5px 3px;
+}
+
+tr.menubar {
+	background : #dfdfdf;
+}
+
 /* @end */
 
 /* @group Form Elements */
@@ -312,25 +278,13 @@ td.paginate {
 }
 
 #blog_name {
-  font-size: 130%;
-}
-
-/* @end */
-
-/* @group Popups/Tooltips */
-
-.tip-catlist {
-  width: 200px;
-  background: #EEF1FE;
-  border: 2px solid #C2D2E7;
-  padding: 5px;
+  font-size: 1.3em;
 }
 
 /* @end */
 
 /* Article forms */
 
-/* OK */
 #article_form input,
 #article_form textarea,
 #article_form select,
@@ -346,6 +300,11 @@ td.paginate {
 	padding: 3px;	
 }
 
+#article_form textarea.medium,
+#page_form textarea.medium {
+	width: 670px;
+}
+
 #article_form input.large,
 #article_form textarea.large ,
 #article_form select.large,
@@ -360,46 +319,24 @@ td.paginate {
 	font-size: 1.7em;
 }
 
-#article_form label,
-#page_form label,
-.admin label {
-	color: #224272;
-}
+
 
 #article_form select.large option {
 	padding: 3px;
 }
 
-legend {
-        font-size: 16px;
-        color: #224272;
-}
 
-/* OK */
-#preview {
-  background: #fff;
-  border-right: 1px dashed #ccc;
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
-  padding: 0 0 0 5px;
-  width: 50%;
-  height: 430px;
-  float: left;
-	margin-top: 10px;
-  margin-bottom: 10px;
-}
 
 /* @end */
 
 /* @group General Settings Screen */
 
-.set {
+.admin {
   padding: 0 10px 5px 10px;
   margin-bottom: 10px;
-  position: relative;
 }
 
+
 .admin ul {
   margin: 0;
   padding: 0;
@@ -420,121 +357,90 @@ legend {
   line-height: 1.4em;
 }
 
-.admin label.float {
-  display: block;
-  float: right;
-  width: 200px;
-  margin-right: 0;
-  margin-left: 12px;
-  padding: 0;
-  text-align: left;
-	color: #224272;
-}
-
-.admin label.block {
-  display: block;
-}
-
-.admin label.title {
-	font-size: 1.7em;
-}
-
-.admin label.content {
-	font-size: 1.4em;
-	margin-top: 0.5em;
-}
-
-.admin label.tags {
-	font-size: 1.4em;
-	margin-top: 0;
-}
-
 .admin input.float {
   width: auto;
   border:1px solid #999;
 }
 
 .admin span.float {
-  margin-right: 212px;
+  margin-left: 212px;
   padding: 0;
   display: block;
   clear: both;
 }
 
 .mandatory {
-  color: #f00;
+  color: #f17;
+	font-weight: bold;
 }
 
 /* @end */
 
 /* @group Sidebar */
 
-/* OK */
 #sidebar-config p {
   margin: 0;
-  padding-right: 5px;
 }
 
-/* OK */
 #active, #cnt-active {
   width: 325px;
   min-height: 200px;
   padding-bottom: 10px;
 }
 
-/* OK */
+#active {
+	background: #ffb;
+	padding: 5px;
+}
+
 #cnt-active {
-  margin-right: 360px;
-  border: #ccc 1px solid;
+  margin-left: 360px;
 }
 
-/* OK */
 #available {
   padding-bottom: 10px;
-  border: #ccc 1px solid;
-  float: right;
+  float: left;
   width: 325px;
 }
 
-/* OK */
-#available h3, #active h3, #cnt-active h3 {
-  background: url("../images/admin/bc-bg.gif") #b5b5b5 top right repeat-x;
-  color: #000;
-  margin: 0 0 10px 0;
-  padding: 2px 5px;
+#available_box h4 {
+	color: #f17;
+	font-weight: bold;
+}
+
+#active h4 {
+	color: #6a0;
+	font-weight: bold;
 }
 
-/* OK */
 .dropbox {
   width: 300px;
 }
 
-/* OK */
 .handle {
-	background: url("../images/admin/table-header-first.png") #324e79 top right no-repeat;
-	color: #fff;
   cursor: move;
   font-size: 13px;
   font-weight: normal;
   margin: 0;
 }
 
-/* OK */
 .dragitem, .dropitem {
-  margin: 0 0 5px 12px;
+	padding: 12px;
+	margin-bottom: 12px;
+	background: #eee;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 4px;
 }
 
-/* OK */
+
 .dragitem {
-	background: url("../images/admin/loginformbg.png") #fff bottom right no-repeat;
   width: 300px;
 }
 
-/* OK */
 .target {
-  background: #F8F7EF;
-  margin: 5px;
   padding: 5px;
+	min-height: 200px;
 }
 /* @end */
 
@@ -545,18 +451,6 @@ legend {
   padding: 0 0 5px;
 }
 
-#info {
-  color: #4A4902;
-}
-
-#info a {
-  color: #4A4902;
-}
-
-#info a:hover {
-  border-bottom: 1px dotted #222;
-}
-
 .form p>small {
   color: gray;
 }
@@ -566,17 +460,14 @@ legend {
   font-size: 90%;
 }
 
-/* OK */
 .l {
-	text-align: right;
+	text-align: left;
 }
 
-/* OK */
 .r {
-  text-align: left;
+  text-align: right;
 }
 
-/* OK */
 .c {
   text-align: center;
 }
@@ -615,7 +506,7 @@ legend {
   height: 232px;
   overflow: hidden;
   margin: 5px;
-  float: left;
+  float: right;
 }
 
 div#users {
@@ -626,10 +517,10 @@ div#users {
 div.user {
   border: 1px solid #9cabba;
   border-top: 1px solid #bacddf;
-  border-right: 1px solid #bacddf;
+  border-left: 1px solid #bacddf;
   background: #fff;
   width: 30%;
-  float: right;
+  float: left;
   margin: 10px;
 }
 
@@ -641,7 +532,7 @@ div.user {
 .user h4 a {
   color: #333;
   background: #f7f7f7;
-  padding-right: 5px;
+  padding-left: 5px;
   display: block;
 }
 
@@ -656,52 +547,33 @@ div.user {
 
 /* @end */
 
-#quick-navigate {
-  background: #F8F7EF;
-  padding: 2px 5px 0px 5px;
-  border: 1px dotted #9cabba;
-  margin-right: 10px;
-  border-top: none;
-}
-
 #quick-post {
 	background: #ffffff;
 	border-top: #333 1px solid;
-	border-right: #333 1px solid;
-	border-left: #333 3px solid;
+	border-left: #333 1px solid;
+	border-right: #333 3px solid;
 	border-bottom: #333 3px solid;
 	padding: 5px;
 }
 
-#advanced {
-  line-height: 1.3em;
-}
-
-#advanced label {
-  clear: right;
-  float: right;
-  width: 15em;
-}
-
 .clear {
 	clear: both;
 }
 
 /* Login */
 #loginform {
-  width: 300px;
-  margin-right: auto;
+  width: 320px;
   margin-left: auto;
+  margin-right: auto;
   margin-top: 100px;
+	border: #464646 1px solid;
 }
 
-/* OK */
 #loginform label {
-	color: #224272;
 	display: block;
 }
 
-/* OK */
+
 #loginform input {
   margin-bottom: 10px;
   border:1px solid #224272;
@@ -709,22 +581,21 @@ div.user {
 	padding: 3px 3px;
 }
 
-/* OK */
 #loginform input,
 #article_form input.submit,
 #page_form input.submit,
 .submit {
 	width: 260px;
-	background: url("../images/admin/bc-bg.gif") #b5b5b5 top right repeat-x;
-	font: 14px "Trebuchet MS", Helvetica, sans-serif;
+	background: #b5b5b5;
+	font: 14px;
 }
 
-/* OK */
+
 #loginform input#submit,
 #article_form input.submit,
 #page_form input.submit,
 input.submit {
-	margin-left: 3px;
+	margin-right: 3px;
 	border-color: #ccc rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204);
 	border-style: double;
 	border-width: 3px;
@@ -733,32 +604,17 @@ input.submit {
 	width: auto;
 }
 
-/* OK */
 #loginform div.form {
   border: none;
-  background: url("../images/admin/loginformbg.png") #fff bottom right no-repeat;
+  background: #fff;
   margin-bottom: 10px;
   padding: 30px 10px 10px;
 }
 
-/* OK */
 #loginform h3 {
-	text-align: right;
-	background: url("../images/admin/bgoff.png") #f00 repeat-x top right;
-}
-
-/* OK */
-#loginform h4 {
-	font-weight: normal;
-	font: 14px Tahoma Helvetica sans-serif;
-	color: #f00;
-	border: #f00 1px solid;
-	padding: 4px;
 	text-align: center;
-	margin-bottom: 20px;
 }
 
-/* OK */
 #loginform .errorExplanation {
 	border: 1px solid #f00;
 	color: #000;
@@ -766,7 +622,6 @@ input.submit {
 	background: #fff;
 }
 
-/* OK */
 #loginform .errorExplanation h2 {
 	font-weight: normal;
 	font: 14px Tahoma Helvetica sans-serif;
@@ -775,133 +630,100 @@ input.submit {
 	margin: 0;
 }
 
-/* OK */
-#loginform .errorExplanation ul {
-	margin-right: 5px;
-}
-
-/* OK */
-#loginform .errorExplanation ul li {
-	list-style: square;
-	line-height: 1.6em;
-}
-
-/* OK */
-#loginform img {
-	float: right;
-	margin-left: 5px;
+#loginform a img {
+	border: none;
 }
 /* End of login form */
 
 /* Notices, infos and errors */
-
 #flash span {
+  background: #fff;
   padding: 5px;
-  margin-top: 10px;
-  color: #0C2504;
+  margin: 10px 20px 0 0;
+  color: #000;
   display: block;
 }
 
 #flash .notice {
-  background: url("../images/admin/bc-bg.gif") #ccc repeat-x;
-  border: 1px solid #336699;
+  border: 2px solid #66AA00;
+	color: #66AA00;
 }
 
 #flash .error {
-  background: #e99;
-  border-top: 1px solid #822;
-  border-bottom: 1px solid #822;
+	border: #FF1177 2px solid;
+	color: #FF1177;
 }
+/* End of notices, infos and errors */
 
 #category_list {
   list-style: none;
   margin: 0;
   padding: 0;
   margin-top: 10px;
-  width: 300px;
+  width: 100%;
 }
 
 #category_list li {
   cursor: move;
   border-bottom: 1px dotted #ccc;
+	padding: 12px 3px;
 }
 
-/* @end */
-
-/* @group Feedback */
-
-.feedbackbody td {
-  border-bottom: 1px dotted #ccc;
+.published,
+a.published,
+td.active {
+	color: #66AA00;
 }
 
-.presumed_ham td {
-  border-bottom: 1px dotted #ccc;
+.unpublished,
+a.unpublished,
+td.inactive {
+	color: #FF1177;
 }
 
-.presumed_spam td {
-  border-bottom: 1px dotted #ccc;
+td.active,
+td.inactive {
+	font-weight: bold;
 }
 
-.ham td {
-  border-bottom: 1px dotted #ccc;
-}
-
-.spam td {
-  border-bottom: 1px dotted #ccc;
-}
-
-.spam .state {
-  font-weight: bold
-}
-
-/* oard */
+/* @end */
 
+/* Dashboard */
 .dashboard-small {
 	width: 23%;
-	float: right;
+	float: left;
 	margin-bottom: 10px;
-	margin-right: 2%;
+	margin-left: 2%;
 	display: inline;
 }
 
 .dashboard {
 	width: 71%;
-	margin-right: 28%;
+	margin-left: 28%;
 	margin-bottom: 10px;
 }
 
-/* OK */
-.dashboard h3, 
-.dashboard-small h3 {
-	padding: 0 0 5px 0;
+#dashboard h3 {
+	padding: 0;
 	margin: 0;
-	background: none;
-	color: #324e79;
-	font-size: 16px;
-	font-weight: normal;
-	border-bottom: #324e79 1px solid;
 }
 
-/* OK */
-.dashboard ul,
-.dashboard-small ul {
+#dashboard ul {
 	margin: 0;
 	padding: 0;
-	padding-top: 10px;
+	padding-top: 5px;
 	padding-bottom: 10px;
 }
 
-.dashboard ul li,
-.dashboard-small ul li {
-	margin-right: 0;
-	padding: 4px 10px 4px 2px;
+#dashboard ul li {
+	margin-left: 0;
+	padding: 12px 3px 12px 3px;
 	list-style: none;
+	font-size: 1.1em;
+	border-bottom: #eee 1px solid;
 }
 
-.dashboard ul li.shade,
-.dashboard-small ul li.shade {
-	background : #d0d0d0;
-}
+/* End of dashboard */
 
 hr {
 	border: medium none;
@@ -916,11 +738,11 @@ hr {
 /* Theme editor */
 #theme_list {
 	width: 300px;
-	float: left;
+	float: right;
 }
 
 #theme_editor {
-	margin-left: 320px;
+	margin-right: 320px;
 	min-height: 500px;
 }
 
@@ -931,7 +753,6 @@ hr {
 
 .theme-filer {
 	width: 300px;
-	background: url('../images/admin/loginformbg.png') no-repeat scroll right bottom;
 	padding: 5px 0;
 	margin-bottom: 15px;
 }
@@ -943,11 +764,11 @@ hr {
 
 .theme-filer ul li {
 	list-style: none;
-	margin-right: 10px;
+	margin-left: 10px;
 }
 
 #theme_list h3 {
-	background: url("../images/admin/table-header-first.png") #324e79 top right  no-repeat;
+	background: #324e79;
 	color: #fff;
   cursor: move;
   font-size: 13px;
@@ -959,7 +780,7 @@ hr {
 
 li.paginate {
   margin-bottom: 15px;
-  border-right: #b0b0b0 5px solid;
+  border-left: #b0b0b0 8px solid;
 }
 
 div.auto_complete {
@@ -995,19 +816,15 @@ div.auto_complete ul strong.highlight {
 	display: none;
 }
 
-tr.menubar {
-	background : #bbb;
-}
-
 .theme {
-	width: 260px;
-	float: right;
-	margin-left: 20px;
+    width: 260px;
+	float: left;
+	margin-right: 20px;
 	overflow: hidden;
 }
 
 .theme img {
-	width: 240px;
+    width: 250px;
 }
 
 .theme hr {
@@ -1018,9 +835,71 @@ tr.menubar {
 	color: green;
 }
 
-/* Menu déroulant */
+#categories {
+	height: 220px; 
+	overflow-y: scroll; 
+	border: #ddd 1px solid;
+}
 
-.paginate1 {
-  float: right; 
-  width: 100%;
+#editor {
+	width: 700px;
+}
+
+#simple_editor,
+#visual_editor {
+	background: #464646;
+	padding: 10px;
+	border-radius: 3px;
+}
+
+#simple_editor {
+	border-radius: 3px;
+	-moz-border-bottom-left-radius: 3px;
+	-moz-border-bottom-right-radius: 3px;
+	-webkit-border-bottom-left-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+}
+
+#visual_editor {
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 4px;
+}
+
+#quicktags {
+	background: #464646;
+	padding-top: 10px;
+	padding-left: 10px;
+	border-radius: 3px 0 0 0;
+	-moz-border-top-left-radius: 3px 0 0 0;
+	-webkit-border-top-left-radius: 4px;
+}
+
+#saveblock {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 4px;
+}
+
+#editor-menu {
+	text-align: right;
+}
+
+#editor-menu span.active {
+	background: #464646;
+	padding: 5px;
+	border-radius: 3px 0 0 0;
+	-moz-border-top-left-radius: 3px 0 0 0;
+	-moz-border-top-right-radius: 3px 0 0 0;
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+}
+
+#editor-menu span.inactive {
+	background: #f9f9f9;
+	padding: 0px;
+}
+
+ul.admin {
+	margin-left: 0;
+	padding-left: 0;
 }