typo 5.1.98 → 5.2

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

@@ -5,7 +5,7 @@
   <% else %>
     <ul>
       <% if @typo_links.size == 0 %>
-        <li <%= alternate_class %>><%= _("Oh no, nothing new") %></li>
+        <li><%= _("Oh no, nothing new") %></li>
       <% else %>
         <% @typo_links.each do |link| -%>
           <li <%= alternate_class %>>

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

@@ -6,4 +6,5 @@
   <%= 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'"}%>
 </p>

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

@@ -1,7 +1,7 @@
 
 <%= error_messages_for 'comment' %>
 <%= hidden_field_tag 'article_id', @article.id %>
-<ul class="set admin" id="comment">
+<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") %>

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

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

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 %>
+      <%= simple_format(h(comment.body)) %>
       <p>
         <%= comment.created_at.strftime("%m/%d/%Y %H:%M") %> – [ 
         <%= link_to_edit _("Edit"), comment %> | 

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

@@ -2,7 +2,7 @@
 
 <% form_tag :action => "update", :id => @comment.id do %>
 
-  <div class="admin set">
+  <div class="admin">
     <%= render :partial => "form" %>
   </div>
 

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

@@ -1,6 +1,6 @@
 <%= error_messages_for 'page' %>
 <!--[form:pages]-->
-<ul class="set admin">
+<ul class="admin">
   <li>
     <label for="page_title" class="block title"><%= _("Title")%></label>
     <%= text_field 'page', 'title', :class => 'large'  %>
@@ -8,7 +8,7 @@
   <li>
     <div style="float: right; width: 230px;">
       <label class="block content"><%= _("Options") %></label>
-      <p class="paginate r paginate_1">
+      <p class="paginate r">
           <label for="page_name"><%= _("Permalink")%>:</label><br />
           <%= text_field 'page', 'name', :size => 25  %>
           <label for="page_published"><%= _("Online")%>:</label>

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

@@ -3,7 +3,7 @@
 
 <% form_tag :action => 'update' do %>
 <div class="admin">
-  <fieldset id="discuss" class="set">
+  <fieldset id="discuss">
     <legend><%= _("Feedback")%></legend>
     <ul>
       <li class="checkbox">
@@ -43,7 +43,7 @@
     </ul>
   </fieldset>
 
-  <fieldset id="notification" class="set">
+  <fieldset id="notification">
     <legend><%= _("Notification")%></legend>
     <ul>
       <li><%= _("Typo can notify you when new articles or comments are posted")%></li>
@@ -55,7 +55,7 @@
     </ul>
   </fieldset>
 
-  <fieldset id="spam" class="set">
+  <fieldset id="spam">
     <legend><%= _("Spam")%></legend>
     <ul>
       <li><%= _("Enabling spam protection will make typo compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots")%>.</li>

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

@@ -4,8 +4,8 @@
 <% form_tag :action => 'update' do %>
 
 <div class="admin">
-  <fieldset id="gensettings" class="set">
-    <legend><%= _("General options")%></legend>
+  <fieldset>
+    <legend><%= _("Your blog")%></legend>
     <ul>
       <li>
         <label for="blog_name" class="float"><%= _("Blog name")%>:</label>
@@ -38,7 +38,7 @@
     </ul>
   </fieldset>
 
-  <fieldset id="Cache" class="set">
+  <fieldset id="Cache">
     <legend><%= _("Cache")%></legend>
     <ul>
       <li>

data/app/views/admin/settings/read.html.erb

@@ -3,7 +3,7 @@
 	<% form_tag :action => 'update' do %>
 
 <div class="admin">
-	<fieldset id="read" class="set">
+	<fieldset id="read">
 		<ul>
 			<li>
 				<label for="limit_article_display" class="float"><%= _("Display")%> </label>

data/app/views/admin/settings/seo.html.erb

@@ -3,7 +3,7 @@
 
 <% form_tag :action => 'update' do %>
 <div class="admin">
-  <fieldset class="set">
+  <fieldset>
     <legend><%= _("Search Engine Optimisation")%></legend>
     <ul>
       <li>

data/app/views/admin/settings/update_database.html.erb

@@ -2,7 +2,7 @@
 <% subtabs_for(:settings) %>
 
 <div id="settings">
-  <div id="gensettings" class="set">
+  <div id="gensettings">
     <h3><%= _("Information")%></h3>
     <p>
       <label><%= _("Current database version")%>:</label>
@@ -19,7 +19,7 @@
   </div>
 
   <% unless @needed_migrations.blank? %>
-  <div id="need" class="set">
+  <div id="need">
     <h3><%= _("Needed migrations")%></h3>
     <ul>
       <% for migration in @needed_migrations %>

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

@@ -13,18 +13,18 @@
 
   <div id="sidebar-config">
     <div id="available" class="dropbox">
-      <h3><%= _("Available Items")%></h3>
+      <h2><%= _("Available Items")%></h2>
       <div id="available_box">
         <%= render :partial => 'availables', :object => @available %>
       </div>
     </div>
 
     <div id="cnt-active">
-      <h3 id="hdr-active">
+      <h2 id="hdr-active">
         <%= _("Active Sidebar items")%>
         <%= image_tag "spinner-blue.gif", :id => 'update_spinner',
                       :style => 'display:none;' -%>
-      </h3>
+      </h2>
       <div id="active" class="dropbox">
         <%= render :partial => 'actives', :object => @active %>
       </div>
@@ -37,8 +37,8 @@
 
   </div>
   
-<h2><%= _("Get more themes") %></h2>
-  <p>You can download and install sidebar plugins from our official <a href="http://typosphere.org/wiki/typo/Finding_Typo_Plugins">plugin repository</a>. All you have to do is upload the theme directory in your vendor/plugins directory. You can aso run</p> 
+<h2><%= _("Get more plugins") %></h2>
+  <p>You can download and install sidebar plugins from our official <a href="http://wiki.github.com/fdv/typo/typo-plugins-list">plugin repository</a>. All you have to do is upload the theme directory in your vendor/plugins directory. You can aso run</p> 
   
   <p><code>script/plugins install http://svn.typosphere.org/plugins/myplugin.</code></p>
   

data/app/views/admin/themes/catalogue.html.erb

@@ -0,0 +1,25 @@
+<% @page_heading = _('Theme catalogue') %>
+<% subtabs_for(:themes) %>
+
+<% if @error %>
+  <p><%= _("Sorry the theme catalogue is not available") %></p>
+<% end %>
+
+<% i = 0 %>
+<% for theme in @themes %>
+  <% i = i+1 %>
+
+    <div class="theme">
+      <div>
+        <%= link_to(image_tag(theme.image), theme.url) %>
+        <h3><%= theme.name %> created by <%= theme.author %></h3>
+        <p><%= theme.description %></p>
+      </div>
+    </div>
+  <% if i == 3 %>
+    <% i = 0%>
+    <hr class="clear" />
+  <% end %>
+
+<% end %>
+<hr class="clear" />

data/app/views/admin/themes/editor.html.erb

@@ -1,8 +1,5 @@
 <% @page_heading = _('Theme editor') %>
-<% content_for('tasks') do %>
-	<%= subtab _("Choose themes"), "", {:controller=>"themes", :action=>"index"} %>
-	<%= subtab _("Theme editor"), "current", {:controller=>"themes", :action=>"editor"} %>
-<% end %> 
+<% subtabs_for(:themes) %>
 
 <div id="theme_list">	
 	<h3>Stylesheets</h3>

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

@@ -4,7 +4,7 @@
 <% i = 0 %>
 <% for theme in @themes %>
 <% i = i+1 %>
-<div class="set theme">
+<div class="theme">
   <div>
     <% if theme.path == @active.path -%>
       <%= image_tag(url_for(:action => 'preview', :theme => theme.name, :skip_relative_url_root => true)) %>

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

@@ -16,12 +16,12 @@
     </tr>
     <% for user in @users -%>
     <tr <%= alternate_class %>>
-      <td class="field"><%= link_to_edit user.login, user%></td>
-      <td class="field"> <%= user.name %></td>
-      <td class="field"><%= mail_to user.email, user.login%></td>
-      <td class="field"><%= _(user.profile.nicename) %></td>
-      <td class="field"><%= Article.count :conditions => "user_id = #{user.id}"  %></td>
-      <td class="field"><%= Comment.count :conditions => "user_id = #{user.id}"  %></td>
+      <td><%= link_to_edit user.login, user%></td>
+      <td> <%= user.name %></td>
+      <td><%= mail_to user.email, user.login%></td>
+      <td><%= _(user.profile.nicename) %></td>
+      <td><%= Article.count :conditions => "user_id = #{user.id}"  %></td>
+      <td><%= Comment.count :conditions => "user_id = #{user.id}"  %></td>
     </tr>  
     <% end -%>
     <tr><td colspan="8" class="paginate"><%= will_paginate @users %></td></tr>

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

@@ -1,4 +1,4 @@
 <h2><%= link_to_permalink article,article.title %></h2>
 <p class="auth"><%= _("Posted by")%> <%= author_link(article) %>
 <%= js_distance_of_time_in_words_to_now article.published_at %></p>
-<%= html article, :body %>
+<%= simple_format(html(article, :body)) %>

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

@@ -3,7 +3,7 @@
   <a name="comment-<%= comment.id %>"></a>
   <%= gravatar_tag(comment.email) if this_blog.use_gravatar and comment.email %>
   <cite><strong><%= link_to_unless(comment.url.blank?, h(comment.author), comment.url) %></strong> </cite> <%= _("said")%> <%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:<br />
-  <%= comment.generate_html(:body) %>
+  <%= simple_format comment.generate_html(:body) %>
   <% unless comment.published -%>
     <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.  It won't appear on this blog until the author approves it")%>.</div>
   <% end -%>

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

@@ -1,3 +1,3 @@
 <%= gravatar_tag(@comment.email) if this_blog.use_gravatar and @comment.email %>
 <cite><strong><%=h @comment[:author] %></strong></cite>  <%= _("is about to say")%>:<br />
-<%= @comment.html %>
+<%= simple_format @comment.html %>

data/app/views/layouts/administration.html.erb

@@ -33,7 +33,6 @@
     </div>
     <% end %>
 
-
     <div id="overall">
       <% if flash[:notice] or flash[:error] %>
       <div id="flash">

data/app/views/trackbacks/trackback.xml.builder

@@ -0,0 +1,4 @@
+xml.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
+xml.response do |res|
+  res.error 0
+end

data/app/views/xml/feed.atom.builder

@@ -1,7 +1,7 @@
 xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
 xml.feed "xml:lang" => "en-US", "xmlns" => 'http://www.w3.org/2005/Atom' do
   xml.title feed_title
-  if(not this_blog.blog_subtitle.blank?)
+  unless this_blog.blog_subtitle.blank?
     xml.subtitle this_blog.blog_subtitle, "type"=>"html"
   end
   xml.id "tag:#{@controller.request.host},2005:Typo"

data/config/environment.rb

@@ -47,6 +47,8 @@ Rails::Initializer.run do |config|
   # Declare the gems in vendor/gems, so that we can easily freeze and/or
   # install them.
   config.gem 'coderay'
+  config.gem 'htmlentities'
+  config.gem 'json'
 
   # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)

data/config/initializers/access_rules.rb

@@ -83,6 +83,7 @@ AccessControl.map :require => [ :admin, :publisher, :contributor ]  do |map|
     project.menu    "Design",                { :controller => "admin/themes", :action => "index"  }
     project.submenu "Theme editor",          { :controller => "admin/themes", :action => "editor" }
     project.submenu "Sidebar",               { :controller => "admin/sidebar", :action => "index" }
+    project.submenu "Theme catalogue",       { :controller => "admin/themes", :action => "catalogue" }
   end
   
   map.project_module :settings, nil do |project|

data/lang/fr_FR.rb

@@ -446,6 +446,10 @@ Localization.define('fr_FR') do |l|
   l.store "Active theme", "Thème actif"
   l.store "You can download third party themes from officially supported %s ", "Vous pouvez télécharger des thèmes officiellement supportés sur %s "
   l.store "dev 411 Typo themes viewer", "le visualisateur de thèmes de dev411"
+
+  #admin/themes/catalogue.html.erb
+  l.store "Theme catalogue", "Catalogue de thème"
+  l.store "Sorry the theme catalogue is not available", "Désolé le catalogue de thème n'est pas disponible"
   
   #admin/trackbacks/edit.rhtml
   l.store "Trackbacks for", "Rétroliens pour"

data/lib/spam_protection.rb

@@ -10,15 +10,6 @@ class SpamProtection
     self.this_blog = a_blog
   end
 
-  def article_closed?(record)
-    return false if this_blog.sp_article_auto_close.zero? or not record.new_record?
-
-    if record.article.published_at.to_i < this_blog.sp_article_auto_close.days.ago.to_i
-      logger.info("[SP] Blocked interaction with #{record.article.title}")
-      return true
-    end
-  end
-
   def is_spam?(string)
     return false unless this_blog.sp_global
     return false if string.blank?
@@ -124,15 +115,6 @@ module ActiveRecord
           record.errors.add(attr_name, configuration[:message]) if SpamProtection.new(record.blog).is_spam?(value)
         end
       end
-      def validates_age_of(*attr_names)
-        configuration = { :on => :create, :message => "points to an item that is no longer available for interaction"}
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-        validates_each(attr_names, configuration) do |record, attr_name, value|
-          next unless value.to_i > 0
-          record.errors.add(attr_name, configuration[:message]) if SpamProtection.new(record.blog).article_closed?(record)
-        end
-      end
     end
   end
 end

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.1.98"
+PKG_VERSION = "5.2"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'
@@ -36,6 +36,8 @@ spec = Gem::Specification.new do |s|
   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")
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/lib/typo_version.rb

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

data/public/javascripts/fckeditor/fckconfig.js

@@ -50,9 +50,9 @@ FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCK
 
 FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
 
-//FCKConfig.Plugins.Add( 'autogrow' ) ;
-//FCKConfig.Plugins.Add( 'dragresizetable' );
-// FCKConfig.AutoGrowMax = 400 ;
+// FCKConfig.Plugins.Add( 'autogrow' ) ;
+// FCKConfig.Plugins.Add( 'dragresizetable' );
+FCKConfig.AutoGrowMax = 400 ;
 
 // FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ;	// ASP style server side code <%...%>
 // FCKConfig.ProtectedSource.Add( /<\?[\s\S]*?\?>/g ) ;	// PHP style server side code
@@ -97,13 +97,20 @@ FCKConfig.TemplateReplaceCheckbox = true ;
 FCKConfig.ToolbarLocation = 'In' ;
 
 FCKConfig.ToolbarSets["Default"] = [
-	['FontFormat','Bold', 'Italic', 'StrikeThrough'],
-	['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], 
-    ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],
-    ['Link','Unlink'],
-    ['Image','Flash', 'Smiley'],
-    ['FitWindow','SpellCheck'],
-    ['RemoveFormat', '-', 'Source']
+	['Source','DocProps','-','Save','NewPage','Preview','-','Templates'],
+	['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
+	['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+	['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
+	'/',
+	['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
+	['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],
+	['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
+	['Link','Unlink','Anchor'],
+	['Image','Flash','Table','Rule','Smiley','SpecialChar','PageBreak'],
+	'/',
+	['Style','FontFormat','FontName','FontSize'],
+	['TextColor','BGColor'],
+	['FitWindow','ShowBlocks','-','About']		// No comma for the last row.
 ] ;
 
 FCKConfig.ToolbarSets["Basic"] = [
@@ -141,8 +148,8 @@ FCKConfig.BrowserContextMenuOnCtrl = false ;
 FCKConfig.EnableMoreFontColors = true ;
 FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ;
 
-FCKConfig.FontFormats	= 'p;h1;h2;h3;h4;h5;pre;address;div' ;
-FCKConfig.FontNames		= 'Arial;Courier New;Tahoma;Times New Roman;Verdana' ;
+FCKConfig.FontFormats	= 'p;h1;h2;h3;h4;h5;h6;pre;address;div' ;
+FCKConfig.FontNames		= 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
 FCKConfig.FontSizes		= 'smaller;larger;xx-small;x-small;small;medium;large;x-large;xx-large' ;
 
 FCKConfig.StylesXmlPath		= FCKConfig.EditorPath + 'fckstyles.xml' ;
@@ -261,8 +268,8 @@ FCKConfig.JustifyClasses = [] ;
 // inline when creating the editor instance. In that cases you must set the
 // values of LinkBrowserURL, ImageBrowserURL and so on.
 // Custom implementations should just ignore it.
-var _FileBrowserLanguage	= 'perl' ;	// asp | aspx | cfm | lasso | perl | php | py
-var _QuickUploadLanguage	= 'perl' ;	// asp | aspx | cfm | lasso | perl | php | py
+var _FileBrowserLanguage	= 'php' ;	// asp | aspx | cfm | lasso | perl | php | py
+var _QuickUploadLanguage	= 'php' ;	// asp | aspx | cfm | lasso | perl | php | py
 
 // Don't care about the following two lines. It just calculates the correct connector
 // extension to use for the default File Browser (Perl uses "cgi").