typo 5.4.1 → 5.4.2

data/app/models/resource.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'mini_magick'
 
 class Resource < ActiveRecord::Base
   validates_uniqueness_of :filename
@@ -31,6 +32,7 @@ class Resource < ActiveRecord::Base
       end
     end
   end
+  
   def fullpath(file = nil)
     "#{RAILS_ROOT}/public/files/#{file.nil? ? filename : file}"
   end
@@ -59,6 +61,18 @@ class Resource < ActiveRecord::Base
     end
   end
 
+  def create_thumbnail
+    return unless self.mime =~ /image/ or File.exists?(fullpath("thumb_#{self.filename}"))
+    return unless File.exists?(fullpath("#{self.filename}"))
+    begin
+      img_orig = MiniMagick::Image.from_file(fullpath(self.filename))
+      img_orig = img_orig.resize('125x125')
+      img_orig.write(fullpath("thumb_#{self.filename}"))
+    rescue
+      nil
+    end
+  end
+
 
   protected
   def uniq_filename_on_disk

data/app/models/user.rb

@@ -165,6 +165,7 @@ class User < ActiveRecord::Base
       user = self.class.find(self.id)
       self.password = user.password
     else
+      send_create_notification
       write_attribute "password", self.class.sha1(password(true))
       @password = nil
     end

data/app/views/accounts/login.html.erb

@@ -25,7 +25,8 @@
 </p>
 
     <p>
-    <small><%= link_to "&laquo; #{_('Back to ')} #{this_blog.blog_name}", this_blog.base_url %></small>
+    <small><%= link_to "&laquo; #{_('Back to ')} #{this_blog.blog_name}", this_blog.base_url %></small><br />
+    <small><%= link_to "#{_("I've lost my password")} &raquo;", :action => 'recover_password' %></small>
     </p>
     <% end %>
   </div>

data/app/views/accounts/recover_password.html.erb

@@ -0,0 +1,18 @@
+<%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
+
+<p id="flash"><%= render_flash rescue nil %></p>
+
+<% form_tag :action=> "recover_password" do %>
+<div>
+  <h2><label for="user_login"><%= _("Username or email") %>:</label></h2>
+  <p class='input_text_title'>
+    <%= text_field(:user, :login, {:class => 'title large'})%>
+  </p>
+</div>
+<p><input type="submit" id="submit" class='save large' value="<%= _('Submit')%>" /></p>
+<p>
+<small><%= link_to "&laquo; #{_('Back to ')} #{this_blog.blog_name}", this_blog.base_url %></small>
+</p>
+
+<% end %>
+

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

@@ -50,13 +50,16 @@
     </span>
   </div>
   <div id="editor">
+    <%= render(:partial => 'images', :object => @images) unless @images.empty? %>
     <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' style='display: none;'></div>
-    <div id='<%= "#{current_user.editor}_editor" %>'>
-      <%= t_textarea('article', 'body_and_extended', {:height => '300px', :class => 'large', :height => '300px', :rows => '15'}) %>
-      <%= render_macros(@macros) if current_user.editor == 'simple' %>
+    <div id ='visual_editor' <%= "style='display: none;'" if current_user.editor == 'simple'%> >
+      <%= ckeditor_textarea('article', 'body_and_extended', {:height => '300px', :class => 'large', :height => '300px', :rows => '15'}) if current_user.editor == 'visual' %>
+    </div>
+    <div id='simple_editor' <%= "style='display: none;'" if current_user.editor == 'visual'%> >
+      <%= text_area('article', 'body_and_extended', {:height => '300px', :class => 'large', :height => '300px', :rows => '15'}) %>
+      <%= render_macros(@macros) if current_user.editor == 'simple' %>  
     </div>
   </div>
   <div class='editor_bottom'>
@@ -72,7 +75,7 @@
 
   <h3><label for='article_excerpt'><%= _("Excerpt") %></label></h3>
   <div class='blue_block'>
-    <%= t_textarea 'article', 'excerpt', {:height => '150', :class => 'large', :rows => '4'} %>
+    <%= text_area 'article', 'excerpt', {:height => '150', :class => 'large', :rows => '5'} %>
     <p><%=_("Excerpts are posts summaries that are shown on your blog homepage only but won’t appear on the post itself")%></p>
   </div>
 

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

@@ -0,0 +1,14 @@
+<a href="javascript:" class="carousel-control" rel="prev">Previous</a>
+<div id="carousel-wrapper">
+    <div id="carousel-content">
+      <% @images.each do |image| %>
+        <div class="slide">
+          <%= show_thumbnail_for_editor(image) %>
+        </div>
+      <% 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,11 @@
   $('f').className = 'active';
   $('text_filter').value = 'none';
   html = $('article_body_and_extended').value;
+  
+  if (CKEDITOR.instances.article__body_and_extended_editor &&
+    typeof(CKEDITOR.instances.article__body_and_extended_editor) == 'object') {
+      delete(CKEDITOR.instances.article__body_and_extended_editor);
+    }
 </script>
 <%= ckeditor_textarea('article', 'body_and_extended', {:height => '300', :class => 'medium'}) %>
 <script type="text/javascript">

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

@@ -4,11 +4,15 @@
   $('visual_editor').style.display = 'block';
   $('s').className = 'inactive';
   $('f').className = 'active';
+  html = $('page_body').value;  
   
-  if (typeof(html2) != 'undefined') {
-    html2 = null;
-  }
-  html2 = $('page_body').innerHTML;
-  
+  if (CKEDITOR.instances.page__body_editor &&
+    typeof(CKEDITOR.instances.page__body_editor) == 'object') {
+      delete(CKEDITOR.instances.page__body_editor);
+    }
+    
 </script>
 <%= ckeditor_textarea('page', 'body', {:height => '300', :class => 'medium'}) %>
+<script type="text/javascript">
+  content = CKEDITOR.instances.page__body_editor.setData(html);
+</script>

data/app/views/admin/resources/_upload.html.erb

@@ -0,0 +1,10 @@
+<%= form_tag_with_upload_progress({:action => 'upload'}, { :begin => "new Effect.Appear('status')", :finish => "$('message').innertHTML = arguments[0]" }) %>
+
+<fieldset>
+  <legend><%= _('Upload a File to your Site') %></legend>
+  <label for="upload_filename"><%= _('File') %>:</label> <%= file_field('upload', 'filename') -%>
+  <%= submit_tag(_('Upload'), {:class => 'save'}) -%>
+  <div id='status' style="display: none"><%= upload_status_tag %></div>
+  <div id="message"><%= @message %></div>
+  </fieldset>
+</form>

data/app/views/admin/resources/get_thumbnails.html.erb

@@ -0,0 +1,5 @@
+<% @resources.each do |image| %>
+  <div class="slide">
+    <%= show_thumbnail_for_editor(image) %>
+  </div>  
+<% end %>

data/app/views/admin/resources/images.html.erb

@@ -0,0 +1,28 @@
+<% @page_heading = _('Images')  %>
+<% subtabs_for(:content) %>
+
+<%= render :partial => 'upload' -%>
+
+<table>
+<tr>
+  <th><%= _("Thumbnail")%> <small>(<%= _('right-click for link')%>)</small></th>
+  <th><%= _("Content Type")%></th>
+  <th><%= _("File Size")%></th>
+  <th><%= _("Date")%></th>
+  <th><%= _("Delete")%></th>
+</tr>
+<%= render_void_table(@resources.size, 6) %>
+<% @resources.each do |image| %>
+<tr>
+  <td>
+    <a href='<%= "#{this_blog.base_url}/files/#{image.filename}" %>' rel='lightbox'>
+      <%= show_thumbnail(image) %>
+    </a>
+  </td>
+  <td><%= image.mime %></td>
+  <td><%=h image.size rescue 0 -%> bytes</td>
+  <td><%=h image.created_at.strftime('%Y-%m-%d %H:%M:%S') -%></td>
+  <td class="operation"><%= link_to _("delete"), {:action => 'destroy', :id => image.id, :search => params[:search], :page => params[:page] },  :confirm => _("Are you sure?"), :method => :post %></td></tr>
+<% end %>
+
+</table>

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

@@ -1,15 +1,46 @@
 <% @page_heading = _('Uploads') %>
 <% subtabs_for(:content) %>
 
-<%= form_tag_with_upload_progress({:action => 'upload'}, { :begin => "new Effect.Appear('status')", :finish => "$('message').innertHTML = arguments[0]" }) %>
+<%= render :partial => 'upload' -%>
 
-<fieldset>
-  <legend><%= _('Upload a File to your Site') %></legend>
-  <label for="upload_filename"><%= _('File') %>:</label> <%= file_field('upload', 'filename') -%>
-  <%= submit_tag(_('Upload'), {:class => 'save'}) -%>
-  <div id='status' style="display: none"><%= upload_status_tag %></div>
-  <div id="message"><%= @message %></div>
-  </fieldset>
-  </form>
-
-  <%= render :partial => 'resources' -%>
+<table>
+<tr>
+  <th><%= _("Filename")%> <small>(<%= _('right-click for link')%>)</small></th>
+  <th><%= _("Content Type")%></th>
+  <th><%= _("MetaData")%></th>
+  <th><%= _("File Size")%></th>
+  <th><%= _("Date")%></th>
+  <th><%= _("Delete")%></th>
+</tr>
+<%= render_void_table(@resources.size, 6) %>
+<% for upload in @resources -%>
+<tr <%= alternate_class -%>>
+  <td><%= link_to ("#{upload.filename}", "#{this_blog.base_url}/files/#{upload.filename}", {:rel => 'lightbox'}) -%></td>
+  <td>
+    <%= task_edit_resource_mime(upload.mime, upload.id) %>
+    <div id="edit-resource-mime-<%= upload.id %>" style="display:none;position:absolute;">
+      <%= render :partial => "mime_edit", :locals => {:id => upload.id, :mime => upload.mime} %>
+    </div>
+  </td>
+  <% if upload.itunes_metadata? %>
+  <td>
+    <%= task_edit_resource_metadata(_("Edit MetaData") + ' (+/-)', upload.id) %>
+    <div id="edit-resource-metadata-<%= upload.id%>" style="display:none;position:absolute;">
+      <%= render :partial => "metadata_edit" , :locals => {:id => upload.id, :resource => upload}%>
+    </div>
+  </td>
+  <% else -%>
+  <td>
+    <%= task_add_resource_metadata(_("Add MetaData") + ' (+/-)', upload.id) %>
+    <div id="add-resource-metadata-<%= upload.id%>" style="display:none;position:absolute;">
+      <%= render :partial => "metadata_add", :locals => {:id => upload.id} %>
+    </div>
+  </td>
+  <% end -%>
+  <td><%=h upload.size rescue 0 -%> bytes</td>
+  <td><%=h upload.created_at.strftime('%Y-%m-%d %H:%M:%S') -%></td>
+  <td class="operation"><%= link_to _("delete"), {:action => 'destroy', :id => upload.id, :search => params[:search], :page => params[:page] },  :confirm => _("Are you sure?"), :method => :post %></td>
+</tr>  
+<% end -%>
+  <%= display_pagination(@resources, 6)%>
+</table>

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

@@ -7,7 +7,7 @@
   <meta http-equiv="imagetoolbar" content="no" />
   <%= stylesheet_link_tag "growler", "administration", "lightbox" %>
   <%= stylesheet_link_tag "administration_rtl" if ( _("Localization.rtl") == "1") %>
-  <%= javascript_include_tag "prototype", "effects", "builder", "dragdrop", "controls", "typo", "lightbox", "quicktags", "growler", "administration", :ckeditor %>
+  <%= javascript_include_tag "prototype", "effects", "builder", "dragdrop", "controls", "typo", "lightbox", "quicktags", "growler", "typo_carousel", "administration", :ckeditor %>
   <%= calendar_date_select_includes %>  
 </head>
 

data/app/views/notification_mailer/notif_user.html.erb

@@ -9,4 +9,4 @@
   <li>Password : <%= h @user.password %></li>
 </ul>
 
-<%= render :partial => 'mail_footer' %>
+</div>

data/config/environment.rb

@@ -47,7 +47,7 @@ Rails::Initializer.run do |config|
   config.gem 'RedCloth', :version => '~> 4.2.2'
   config.gem 'panztel-actionwebservice', :version => '2.3.5', :lib => 'actionwebservice'
   config.gem 'addressable', :version => '~> 2.1.0', :lib => 'addressable/uri'
-
+  config.gem 'mini_magick', :version => '~> 1.2.5', :lib => 'mini_magick'
   
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake create_sessions_table')

data/config/initializers/access_rules.rb

@@ -65,7 +65,8 @@ AccessControl.map :require => [ :admin, :publisher, :contributor ]  do |map|
     project.submenu "Comments",         { :controller => "admin/feedback" }
 	  project.submenu "Pages",            { :controller => "admin/pages",      :action => "index" }
 	  project.submenu "Categories",       { :controller => "admin/categories", :action => "index" }
-	  project.submenu "Uploads",          { :controller => "admin/resources",  :action => "index" }
+	  project.submenu "Files",            { :controller => "admin/resources",  :action => "index" }
+	  project.submenu "Images",           { :controller => "admin/resources",  :action => "images"}
 	  project.submenu "Tags",             { :controller => "admin/tags",       :action => "index" }
 	  project.submenu "",                      { :controller => "admin/comments", :action => "show" }
     project.submenu "",                      { :controller => "admin/comments", :action => "new" }

data/config/initializers/inflector.rb

@@ -1 +1,4 @@
-ActiveSupport::Inflector.inflections {|i| i.uncountable %w(feedback)}
+ActiveSupport::Inflector.inflections {|i|
+  i.uncountable %w(feedback)
+  i.singular "page_caches", "page_cache"
+}

data/db/schema.rb

@@ -17,10 +17,12 @@ ActiveRecord::Schema.define(:version => 86) do
   end
 
   create_table "blacklist_patterns", :force => true do |t|
-    t.string "type",    :limit => 15
+    t.string "type"
     t.string "pattern"
   end
 
+  add_index "blacklist_patterns", ["pattern"], :name => "index_blacklist_patterns_on_pattern"
+
   create_table "blogs", :force => true do |t|
     t.text   "settings"
     t.string "base_url"
@@ -36,14 +38,14 @@ ActiveRecord::Schema.define(:version => 86) do
 
   create_table "categories", :force => true do |t|
     t.string  "name"
-    t.integer "position",    :default => 0, :null => false
+    t.integer "position"
     t.string  "permalink"
     t.text    "keywords"
     t.text    "description"
     t.integer "parent_id"
   end
 
-  add_index "categories", ["permalink"], :name => "categories_permalink_index"
+  add_index "categories", ["permalink"], :name => "index_categories_on_permalink"
 
   create_table "categorizations", :force => true do |t|
     t.integer "article_id"
@@ -75,8 +77,8 @@ ActiveRecord::Schema.define(:version => 86) do
     t.integer  "parent_id"
   end
 
-  add_index "contents", ["published"], :name => "contents_published_index"
-  add_index "contents", ["text_filter_id"], :name => "contents_text_filter_id_index"
+  add_index "contents", ["published"], :name => "index_contents_on_published"
+  add_index "contents", ["text_filter_id"], :name => "index_contents_on_text_filter_id"
 
   create_table "feedback", :force => true do |t|
     t.string   "type"
@@ -101,8 +103,8 @@ ActiveRecord::Schema.define(:version => 86) do
     t.boolean  "status_confirmed"
   end
 
-  add_index "feedback", ["article_id"], :name => "feedback_article_id_index"
-  add_index "feedback", ["text_filter_id"], :name => "feedback_text_filter_id_index"
+  add_index "feedback", ["article_id"], :name => "index_feedback_on_article_id"
+  add_index "feedback", ["text_filter_id"], :name => "index_feedback_on_text_filter_id"
 
   create_table "notifications", :force => true do |t|
     t.integer  "content_id"
@@ -112,10 +114,10 @@ ActiveRecord::Schema.define(:version => 86) do
   end
 
   create_table "page_caches", :force => true do |t|
-    t.string "name", :null => false
+    t.string "name"
   end
 
-  add_index "page_caches", ["name"], :name => "name"
+  add_index "page_caches", ["name"], :name => "index_page_caches_on_name"
 
   create_table "pings", :force => true do |t|
     t.integer  "article_id"
@@ -123,7 +125,7 @@ ActiveRecord::Schema.define(:version => 86) do
     t.datetime "created_at"
   end
 
-  add_index "pings", ["article_id"], :name => "article_id"
+  add_index "pings", ["article_id"], :name => "index_pings_on_article_id"
 
   create_table "profiles", :force => true do |t|
     t.string "label"
@@ -164,20 +166,19 @@ ActiveRecord::Schema.define(:version => 86) do
   end
 
   create_table "sessions", :force => true do |t|
-    t.string   "sessid",     :limit => 32
+    t.string   "sessid"
     t.text     "data"
+    t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "sessions", ["sessid"], :name => "sessid", :unique => true
-  add_index "sessions", ["sessid"], :name => "sessions_sessid_index"
+  add_index "sessions", ["sessid"], :name => "index_sessions_on_sessid"
 
   create_table "sidebars", :force => true do |t|
-    t.integer  "active_position"
-    t.text     "config"
-    t.integer  "staged_position"
-    t.datetime "updated_at"
-    t.string   "type"
+    t.integer "active_position"
+    t.text    "config"
+    t.integer "staged_position"
+    t.string  "type"
   end
 
   create_table "sitealizer", :force => true do |t|
@@ -205,11 +206,6 @@ ActiveRecord::Schema.define(:version => 86) do
     t.text   "params"
   end
 
-  create_table "text_link_ads_rss", :force => true do |t|
-    t.string  "html",    :limit => 1024
-    t.integer "post_id"
-  end
-
   create_table "triggers", :force => true do |t|
     t.integer  "pending_item_id"
     t.string   "pending_item_type"
@@ -218,10 +214,10 @@ ActiveRecord::Schema.define(:version => 86) do
   end
 
   create_table "users", :force => true do |t|
-    t.string   "login",                     :limit => 80
-    t.string   "password",                  :limit => 40
-    t.string   "name",                      :limit => 80
-    t.string   "email",                     :limit => 80
+    t.string   "login"
+    t.string   "password"
+    t.text     "email"
+    t.text     "name"
     t.boolean  "notify_via_email"
     t.boolean  "notify_on_new_articles"
     t.boolean  "notify_on_comments"
@@ -230,9 +226,9 @@ ActiveRecord::Schema.define(:version => 86) do
     t.integer  "profile_id"
     t.string   "remember_token"
     t.datetime "remember_token_expires_at"
-    t.string   "text_filter_id",                          :default => "1"
-    t.string   "editor",                                  :default => "simple"
-    t.string   "state",                                   :default => "active"
+    t.string   "text_filter_id",            :default => "1"
+    t.string   "editor",                    :default => "simple"
+    t.string   "state",                     :default => "active"
     t.string   "firstname"
     t.string   "lastname"
     t.string   "nickname"
@@ -251,6 +247,4 @@ ActiveRecord::Schema.define(:version => 86) do
     t.datetime "last_connection"
   end
 
-  add_index "users", ["login"], :name => "login", :unique => true
-
 end