typo 5.0.3.98.1 → 5.1

data/app/models/blog.rb

@@ -69,6 +69,7 @@ class Blog < CachedModel
   setting :email_from,                 :string, 'typo@example.com'
   setting :editor,                     :integer, 2
   setting :cache_option,               :string, 'caches_page'
+  setting :allow_signup,               :integer, 0
 
   #deprecation warning for plugins removal
   setting :deprecation_warning,        :integer, 1

data/app/models/blog_sweeper.rb

@@ -6,14 +6,12 @@ class BlogSweeper < ActionController::Caching::Sweeper
   end
 
   def run_pending_page_sweeps
-    logger.debug "Running pending page_sweeps: #{pending_sweeps.to_a.inspect}"
     pending_sweeps.each do |each|
       self.send(each)
     end
   end
 
   def after_comments_create
-    logger.debug 'BlogSweeper#after_comments_create'
     expire_for(controller.send(:instance_variable_get, :@comment))
   end
 
@@ -21,29 +19,24 @@ class BlogSweeper < ActionController::Caching::Sweeper
   alias_method :after_articles_comment, :after_comments_create
 
   def after_comments_destroy
-    logger.debug 'BlogSweeper#after_comments_destroy'
     expire_for(controller.send(:instance_variable_get, :@comment), true)
   end
 
   alias_method :after_articles_nuke_comment, :after_comments_destroy
 
   def after_articles_trackback
-    logger.debug 'BlogSweeper#after_articles_trackback'
     expire_for(controller.send(:instance_variable_get, :@trackback))
   end
 
   def after_articles_nuke_trackback
-    logger.debug 'BlogSweeper#after_articles_nuke_trackback'
     expire_for(controller.send(:instance_variable_get, :@trackback), true)
   end
 
   def after_save(record)
-    logger.info "Expiring #{record}, with controller: #{controller}"
     expire_for(record)
   end
 
   def after_destroy(record)
-    logger.info "Caught #{record.title rescue record.inspect}, with controller: #{controller}"
     expire_for(record, true)
   end
 
@@ -77,8 +70,14 @@ class BlogSweeper < ActionController::Caching::Sweeper
   def sweep_articles
     expire_fragment(%r{.*/articles/.*})
     unless Blog.default && Blog.default.cache_option == "caches_action_with_params"
-      PageCache.zap_pages %w{index.* articles.* articles feedback
-                             comments comments.* categories categories.* tags tags.* }
+      PageCache.zap_pages(%w{index.* articles.* page
+                     pages.* feedback feedback.*
+                     comments comments.*
+                     category categories.* xml
+                     tag tags.* category archive.* *.rss *.atom  })
+
+      PageCache.zap_pages((1990..2020))
+      PageCache.zap_pages([*1990..2020].collect { |y| "#{y}.*" })
     end
   end
 

data/app/models/page_cache.rb

@@ -18,6 +18,7 @@ class PageCache
                      pages.* feedback feedback.*
                      comments comments.*
                      category categories.* xml
+                     *.rss *.atom
                      tag tags.* category archive.*})
 
       self.zap_pages((1990..2020))

data/app/models/tag.rb

@@ -25,8 +25,8 @@ class Tag < ActiveRecord::Base
     if self.display_name.blank? or self.display_name != self.name
       self.display_name = self.name
     end
-    self.name = self.name.tr('.', '-')
-    self.name = self.name.tr(' ', '').downcase
+    self.name = self.name.gsub('.', '-')
+    self.name = self.name.gsub(' ', '').downcase
   end
 
   before_save :ensure_naming_conventions

data/app/models/user.rb

@@ -136,7 +136,11 @@ class User < CachedModel
   before_validation :set_default_profile
 
   def set_default_profile
-    self.profile ||= Profile.find_by_label('admin')
+    if User.count.zero?
+      self.profile ||= Profile.find_by_label('admin')
+    else
+      self.profile ||= Profile.find_by_label('contributor')
+    end
   end
 
   validates_uniqueness_of :login, :on => :create

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

@@ -1,7 +1,7 @@
   <% @page_heading = _('Blacklist Patterns') %>
 
   <% content_for('tasks') do %>
-    <%= task_show _('Show this pattern'), @blacklist_pattern.id %>
+    <%= task_overview %>
   <% end %>
 
   <p><%= _("Are you sure you want to delete this item?")%></p>

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

@@ -1,7 +1,7 @@
   <% @page_heading = _('Categories') %>
 
   <% content_for('tasks') do %>
-    <%= task_show _('Show this category'), @category.id %>
+    <%= task_overview %>
   <% end %>
 
   <p><%= _("Are you sure you want to delete the category ")%> '<%= @category.name %>'?</p>

data/app/views/admin/comments/destroy.html.erb

@@ -1,7 +1,7 @@
   <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
 
   <% content_for('tasks') do %>
-    <%= task_show _('Show this comment'), @comment.id %>
+    <%= task_overview %>
   <% end %>
 
   <p><%= _("Are you sure you want to delete this item?")%></p>

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

@@ -33,14 +33,14 @@
 <% for article in @articles %>
 <tr <%= alternate_class %>>
   <td> <%= link_to_permalink article, h(article.title) %></td>
-  <td><%= article.categories.map { |c| link_to h(c.name), {:controller => 'admin/categories', :action => 'show', :id => c.id}}.join(", ") %></td>
+  <td><%= article.categories.map { |c| link_to h(c.name), {:controller => 'content', :action => 'list', "search[category]" => c.id}}.join(", ") %></td>
   <td><%= link_to _(pluralize(article.comments.size, 'comments')), :controller => '/admin/comments', :article_id => article.id, :action => 'list' %></td>
   <td><%= article.published_at.strftime("%d/%m/%Y at %H:%M") %></td>
   <td><%= author_link(article)%></td>
   <td class="operation"><%= (article.published?) ? image_tag('admin/checked.png', :alt => "online", :title => _("Online")) : image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline")) %></td>
-  <td class="operation"><%= link_to_show article %></td>
-  <td class="operation"><%= link_to_edit article %></td>
-  <td class="operation"><%= link_to image_tag('admin/delete.png'), {:action => 'destroy', :id => article.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
+  <td class="operation"><%= link_to_show article if article.published? %></td>
+  <td class="operation"><%= link_to_edit_with_profiles article %></td>
+  <td class="operation"><%= link_to_destroy_with_profiles article %></td>
 </tr>
 <% end %>
 </table>

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

@@ -1,4 +1,4 @@
-<div id="attachment_<%= attachment_num -%>"<% if hidden %> style="display: none;"<% end %>>
+<li id="attachment_<%= attachment_num -%>"<% if hidden %> style="display: none;"<% end %>>
   <%= file_field 'attachments', "filename_#{attachment_num}" -%>
   <%= link_to_function(_("Remove"),
       update_page do |page|
@@ -6,16 +6,15 @@
         page.visual_effect(:toggle_appear, "attachment_#{attachment_num}", :afterFinish => "function(obj){Element.remove(obj.element);}")
         page << "}"
       end) -%>
-  <br />
-</div>
-<div id="attachment_add_<%= attachment_num.succ %>">
+</li>
+<li id="attachment_add_<%= attachment_num.succ %>">
   <%= link_to_remote _('Add Another Attachment'),
     :url => { :action => "attachment_box_add", :id => attachment_num.succ },
     :asynchronus => false -%>
-</div>
+</li>
 
 <% if @article and @article.id %>
-<div id="resources">
+<li id="resources">
   <% if  @article.resources.count > 0 %>
     <h3><%= _("Currently this article has the following resources")%></h3>
     <% for resource in @article.resources %>
@@ -27,5 +26,5 @@
   <% for resource in @resources - @article.resources %>
     <%= link_to_remote "+ #{resource.filename}", :url => { :action => "resource_add", :id => @article.id, :resource_id => resource.id}, :update => 'resources' %><br />
   <% end %>
-</div>
+</li>
 <% end %>

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

@@ -0,0 +1,6 @@
+<div class="paginate l">
+  Drafts: 
+  <% for draft in @drafts %>
+    <%= link_to(draft.title, :action => 'edit', :id => draft.id) %>
+  <% end %>
+</div>

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

@@ -1,5 +1,6 @@
 <%= error_messages_for 'article' %>
 <!--[form:articles]-->
+<div id="autosave"></div>
 <div id="article_keywords_auto_complete" class="auto_complete"></div>
 <ul class="set admin">
   <li>
@@ -22,10 +23,13 @@
   </li>
   <li style="margin-bottom: 20px;">
     <label class="block tags" for="article_keywords"><%= _("Tags") %></label>
-        <%= text_field 'article', 'keywords', {:autocomplete => 'off', :class => 'large'} %>
-        <%= auto_complete_field 'article_keywords', { :url => { :action => "auto_complete_for_article_keywords"}, :tokens => ','}%>
+    <%= text_field 'article', 'keywords', {:autocomplete => 'off', :class => 'large'} %>
+    <%= auto_complete_field 'article_keywords', { :url => { :action => "auto_complete_for_article_keywords"}, :tokens => ','}%>
   </li>
-  <li class="paginate l">
+</ul>
+
+<ul class="admin set">
+  <li class="paginate l " style="width: 100%">
     <label for="categories" class="block">
       <%= link_to_function _("Categories") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "categories", :duration => 0.2) } %>
     </label>
@@ -33,47 +37,56 @@
       <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
     </select>
   </li>
-  <li class="paginate l">
+  <li class="paginate l"  style="float: left; width: 100%">
     <label class="block">
       <%= link_to_function _("Uploads") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "attachments", :duration => 0.2) } %>
     </label>
-    <ul>
-      <li id="attachments" <%= 'style="display: none"' unless @article.resources.count > 0 %>>
-        <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
-      </li>
+    <ul id="attachments" <%= 'style="display: none"' unless @article.resources.count > 0 %>>
+      <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
     </ul>
   </li>
-  <li class="paginate l">
+  
+  <li class="paginate l" style="float: left; width: 100%;">
     <label class="block">
       <%= link_to_function _("Post settings") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "publishing_options", :duration => 0.2) } %>
     </label>
-    <ul>
-      <li id="publishing_options" <%= "style='display: none;'" unless @article.published.blank? %> >
-        <ul>
-          <li>
-            <label for="article_published_at" class="float"><%= _("Publish at")%>:</label>
-            <%= datetime_select 'article', 'published_at', :include_blank => true  %>            
-          </li>
-          <li>
-            <label for="article_published" class="float"><%= _("Online")%>:</label>
-            <%= check_box 'article', 'published'  %>
-          </li>
-          <li>
-            <label for="article_permalink" class="float"><%= _("Permalink") %></label>
-            <%= text_field 'article', 'permalink' %>
-          </li>     
-          <li class="checkbox">
-            <label for="article_allow_comments" class="float"><%= _("Allow comments") %>: </label>
-            <%= check_box 'article', 'allow_comments'  %>
-          </li>
-          <li class="checkbox">
-            <label for="article_allow_pings" class="float"><%= _("Allow trackbacks")%>: </label>
-            <%= check_box 'article', 'allow_pings'  %>
-          </li>
-        </ul>
+    <ul id="publishing_options" <%= "style='display: none;'" unless @article.published.blank? %>>
+      <li>
+        <label class="float"><%= _("Publish at")%>:</label>
+        <%= datetime_select 'article', 'published_at', :include_blank => true  %>            
+      </li>
+      <li class="checkbox">
+        <label for="article_published" class="float"><%= _("Online")%>:</label>
+        <%= check_box 'article', 'published'  %>
+      </li>
+      <li>
+        <label for="article_permalink" class="float"><%= _("Permalink") %></label>
+        <%= text_field 'article', 'permalink' %>
+      </li>     
+      <li class="checkbox">
+        <label for="article_allow_comments" class="float"><%= _("Allow comments") %>: </label>
+        <%= check_box 'article', 'allow_comments'  %>
+      </li>
+      <li class="checkbox">
+        <label for="article_allow_pings" class="float"><%= _("Allow trackbacks")%>: </label>
+        <%= check_box 'article', 'allow_pings'  %>
         <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
       </li>
     </ul>
   </li>
 </ul>
-<!--[eoform:articles]-->
+
+<br />
+
+<p class="paginate r">
+  <input type="submit" name="article[draft]" class="submit" value="<%= _('Save as draft')%> &raquo;" />
+  <%= save("Publish" + " &raquo;") %>
+</p>
+
+<% if this_blog.editor == 0 %>
+  <%= hidden_field_tag 'id', @article.id unless @article.id.nil? %>
+  <%= observe_form "article_form",
+      :frequency => 5,
+      :update => 'autosave',
+      :url => { :action => "autosave" }  %>
+<% end %>

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

@@ -1,7 +1,7 @@
   <% @page_heading = _('Articles') %>
 
   <% content_for('tasks') do %>
-    <%= task_show _("Show this article"), @article.id %>
+    <%= task_overview %>
   <% end %>
 
   <p><%= _("Are you sure you want to delete this article")%> ( <%=h @article.title -%> )?</p>

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

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

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

@@ -1,13 +1,8 @@
   <% @page_heading = _('Manage posts') %>
   <% subtabs_for(:content) %>
 
-  <div id="quick-navigate" style="display:none;position:absolute;">
-    <%= render :partial => 'admin/content/pages', :object => @articles_pages -%>
-  </div>
+  <%= render :partial => "drafts" %>
 
-  <div id="quick-post" style="display:none;position:absolute;">
-    <%= render :partial => "quick_post" %>
-  </div>
   <div class="list" id="articles">	
     <%= render :partial => 'articles' %>
   </div>                      

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" } } %>

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

@@ -29,9 +29,10 @@
       </li>
     </ul>
   </li>
-
-
-
 </ul>
 
+<p class="paginate r">
+  <%= save("Publish" + " &raquo") %>
+</p>
+
 <!--[eoform:pages]-->

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

@@ -40,9 +40,9 @@
     <%= image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline"))  %>
     <% end %>
     </td>
-    <td class='operation'><%= link_to_show page  %></td>
-    <td class='operation'><%= link_to_edit page %></td>
-    <td class="operation"><%= link_to image_tag('admin/delete.png'), {:action => 'destroy', :id => page.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
+    <td class='operation'><%= link_to_show page if page.published?  %></td>
+    <td class='operation'><%= link_to_edit_with_profiles page %></td>
+    <td class="operation"><%= link_to_destroy_with_profiles page %></td>
   </tr>
   <% end %>
   </table>

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

@@ -1,7 +1,7 @@
   <% @page_heading = _("Pages") %>
 
   <% content_for('tasks') do %>
-    <%= task_show _("Show this page"), @page.id %>
+    <%= task_overview %>
   <% end %>
 
   <p><%= _("Are you sure you want to delete the page")%> '<%= @page[:name] %>'?</p>

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

@@ -1,7 +1,7 @@
   <% @page_heading = _('File Uploads') %>
 
   <% content_for('tasks') do %>
-    <%= task_new _('Upload a new File') %>
+    <%= task_overview %>
   <% end %>
 
   <p><%= _("Are you sure you want to delete this file")%> ( <%= @file.filename -%> )?</p>

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

@@ -35,6 +35,16 @@
 					<label for="cache_option_1"><%= _("Use semi static caching (default)")%></label>
 				</span>
 			</li>
+			<li><%= _("You can allow users to register to your blog. By default, they will register as contributors, an unpriviledged account level which grant them no rights but own a profile on the site. If you don't want users to register, you can thus add them by yourself in the users part of this admin.") %>.</li>
+			<li>
+				<label class="float" for="allow_signup"><%= _("Allow users to register")%>:</label>
+				<input type="radio" name="setting[allow_signup]" value="0" id="allow_signup_0" <%= 'checked="checked"' if this_blog.allow_signup == 0 %>/>
+				<label for="allow_signup_0"><%= _("No")%></label>
+				<span class="float">
+					<input type="radio" name="setting[allow_signup]" value="1" id="allow_signup_1" <%= 'checked="checked"' if this_blog.allow_signup == 1 %>/>
+					<label for="allow_signup_1"><%= _("Yes")%></label>
+				</span>
+			</li>
 		</ul>
   </fieldset>
 

data/app/views/admin/shared/_edit.html.erb

@@ -1,10 +1,5 @@
 <% form_tag(form_action, :id => "#{form_type}_form", :enctype => "multipart/form-data") do %>
+
   <%= render :partial => "form" %>
 
-  <%= cancel_or_save %>
 <% end %>
-
-<%= observe_form "#{form_type}_form",
-      :frequency => 2,
-      :complete => "$('preview').src = request.responseText; Element.show('preview');",
-      :url => { :action => "preview" } if this_blog.editor == 1  %>

data/app/views/admin/textfilters/destroy.html.erb

@@ -1,4 +1,7 @@
   <% @page_heading = _('Text Filters') %>
+  <% content_for('tasks') do %>
+    <%= task_overview %>
+  <% end %>
 
   <p><%= _("Are you sure you want to delete this filter")%> '<%= @textfilter.name %>'?</p>
   <% form_tag :controller => '/admin/textfilters', :action => 'destroy' do %>

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

@@ -1,5 +1,7 @@
   <% @page_heading = _('Text Filters') %>
-  <% subtabs_for(:sidebar) %>
+  <% content_for('tasks') do %>
+    <%= task_overview %>
+  <% end %>
   
   <% form_tag({ :action => "edit", :id => @textfilter }, :id => "textfilter_form") do %>
   <h3><%= _("Editing textfilter")%></h3>

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

@@ -1,5 +1,5 @@
   <% @page_heading = _('Text Filters') + ' <span> &raquo; '+ link_to(_('add new'), :action=>'new') +'</span>' %>
-  <% subtabs_for(:sidebar) %>
+  <% subtabs_for(:settings) %>
 
   <div class="list" id="textfilters">	
     <%= render :partial => 'textfilters' %>