typo 5.0.2 → 5.0.3.98

data/app/models/user.rb

@@ -46,6 +46,19 @@ class User < CachedModel
     end
   end
 
+  # The current project_modules
+  def project_modules
+    profile.modules.collect { |m| AccessControl.project_module(profile.label, m) }.uniq.compact rescue []
+  end
+  
+  # Generate Methods takes from AccessControl rules
+  # Example:
+  #
+  #   def publisher?
+  #     profile.label == :publisher
+  #   end
+  AccessControl.roles.each { |r| define_method("#{r.to_s.downcase.to_sym}?") { profile.label.to_s.downcase.to_sym == r.to_s.downcase.to_sym } }
+
   # Let's be lazy, no need to fetch the counters, rails will handle it.
   def self.find_all_with_article_counters(ignored_arg)
     find(:all)
@@ -97,7 +110,10 @@ class User < CachedModel
   # Before saving the record to database we will crypt the password
   # using SHA1.
   # We never store the actual password in the DB.
+  # But before the encryption, we send an email to user for he can remind his
+  # password
   def crypt_password
+    send_create_notification
     write_attribute "password", self.class.sha1(password(true))
     @password = nil
   end
@@ -126,7 +142,21 @@ class User < CachedModel
   validates_uniqueness_of :login, :on => :create
   validates_length_of :password, :within => 5..40, :on => :create
   validates_presence_of :login
+  validates_presence_of :email
 
   validates_confirmation_of :password, :if=> Proc.new { |u| u.password.size > 0}
   validates_length_of :login, :within => 3..40
+
+
+  private
+
+  # Send a mail of creation user to the user create
+  def send_create_notification
+    begin
+      email_notification = NotificationMailer.create_notif_user(self)
+      EmailNotify.send_message(self,email_notification)
+    rescue => err
+      logger.error "Unable to send notification of create user email: #{err.inspect}"
+    end
+  end
 end

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

@@ -1,5 +1,5 @@
 <div title="Account login" id="loginform">
-	<%= content_tag :h3, link_to(image_tag("/images/admin/typologo.png", :alt=>"Typo website", :style => "height: 24px"), "http://typosphere.org") + _(" Administration") %>
+	<%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website", :style => "height: 24px"), "http://typosphere.org") + _(" Administration") %>
 
     <div class="form admin">
       <% if flash[:notice] %>

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

@@ -1,5 +1,5 @@
 <div title="Account login" id="loginform">
-  <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.png", :alt=>"Typo website", :style => "height: 24px"), "http://typosphere.org") + _(" Signup") %>
+  <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website", :style => "height: 24px"), "http://typosphere.org") + _("Login") %>
     <div class="form admin">
 
 	  <h4><%= _("Successfully logged out") %>.</h4>

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

@@ -1,7 +1,7 @@
 <% form_tag :action=> "signup" do %>
 
 <div title="Account signup" id="loginform">
-  <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.png", :alt=>"Typo website", :style => "height: 24px"), "http://typosphere.org") + _(" Signup") %>
+  <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website", :style => "height: 24px"), "http://typosphere.org") + _(" Signup") %>
   <div  class="form admin">
 	<%= error_messages_for 'user' %>
 	<ul>

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

@@ -1,5 +1,5 @@
 <table cellspacing="1" cellpadding="0">
-<tr>
+<tr class="first">
   <th><%= _("Pattern") %></th>
   <th><%= _("Type") %></th>
   <th><%= _("Edit") %></th>
@@ -10,7 +10,7 @@
   <td class="field"><%= link_to h(blacklist_pattern.pattern), :action => "edit", :id => blacklist_pattern.id %></td>
   <td class="field"><%= blacklist_pattern.class %></td>
   <td class="operation"><%= link_to_edit blacklist_pattern %></td>
-  <td class="operation"><%= link_to_destroy blacklist_pattern %></td>    
+  <td class="operation"><%= link_to image_tag('admin/delete.png'), {:action => 'destroy', :id => blacklist_pattern.id, :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
 </tr>  
 <% end -%>
 </table>

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

@@ -1,15 +1,14 @@
 <%= error_messages_for 'blacklist_pattern' %>
-<!--[form:blacklist_pattern]-->
-<p>
-  <label for="blacklist_pattern_pattern"><%= _("Pattern")%>:</label> 
-  <%= text_field 'blacklist_pattern', 'pattern'  %>
-</p>
-<p>
-  <% if @controller.action_name == "new" %>
-  <label for="blacklist_pattern_type"><%= _("Type")%>:</label> 
-  <select name="blacklist_pattern[type]">
-  <%= options_for_select [ [_('String'), 'StringPattern'], [_('Regex'), 'RegexPattern' ] ]  %>
-</select>
-<% end %>
-</p>
-<!--[eoform:blacklist_pattern]-->
+
+<ul class="admin set">
+  <li>
+    <label for="blacklist_pattern_pattern" class="block"><%= _("Pattern")%></label> 
+    <%= text_field 'blacklist_pattern', 'pattern'  %>    
+  </li>
+  <li>  
+    <label for="blacklist_pattern_type" class="block"><%= _("Type")%></label>
+    <select name="blacklist_pattern[type]">
+    <%= options_for_select [ [_('String'), 'StringPattern'], [_('Regex'), 'RegexPattern' ] ]  %>
+  </select>
+  </li>
+</ul>

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

@@ -1,17 +1,8 @@
 <% form_tag :action=>"new" do %>
 
-<p>
-  <label for="blacklist_pattern_pattern"><%= _("Pattern")%>:</label>
-  <%= text_field 'blacklist_pattern', 'pattern'  %>
-</p>
-<p>
-  <label for="blacklist_pattern_type"><%= _("Type")%>:</label>
-  <select name="blacklist_pattern[type]">
-  <%= options_for_select [ [_('String'), 'StringPattern'], [_('Regex'), 'RegexPattern' ] ]  %>
-</select>
+  <%= render_partial "form" %>
 
-<div id="operations">
-  <%= save(_("Add pattern")) %> <%= _("or")%> <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" ><%= _("Cancel")%></a>
-</div>
-</p>
+  <p class="paginate r">
+    <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" ><%= _("Cancel")%></a> <%= _("or")%> <%= save(_("Save") + "&raquo;") %> 
+  </p>
 <% end %>

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

@@ -1,14 +1,11 @@
-  <% @page_heading = _('Blacklist Patterns') %>
+<% @page_heading = _('Editing pattern') %>
 
-  <% form_tag :action=>"edit", :id => @blacklist_pattern.id do %>
-
-  <h3><%= _("Editing pattern")%></h3>
-  <div class="form">
+<% content_for('tasks') do %>
+    <%= task_overview %>
+<% end %>
+  
+<% form_tag :action=>"edit", :id => @blacklist_pattern.id do %>
     <%= render_partial "form" %>
-  </div>
-
-  <div id="operations">
-    <%= save %> or <%= cancel %>
-  </div>
 
-  <% end %>
+    <%= cancel_or_save %>
+<% end %>

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

@@ -0,0 +1,10 @@
+  <% @page_heading = _('Blacklist Patterns') + ' <span>&raquo; ' + task_quickpost(_('add new') + '</span>')  %>
+  <% subtabs_for(:feedback) %>
+  
+  <div id="quick-post" style="display:none;position:absolute;">
+    <%= render :partial => "quick_post" %>
+  </div>
+
+  <div class="list">	
+    <%= render_partial 'blacklist_patterns' %>  
+  </div>                      

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

@@ -1,20 +1,20 @@
 <table>
-  <tr>
-    <th class="first"><%= _("Title") %></th>
+  <tr class="first">
+    <th><%= _("Title") %></th>
     <th><%= _("Posts") %></th>
-    <th><%= _("Published") %></th>
     <th><%= _("View") %></th>
     <th><%= _("Edit") %></th>
-    <th class="last"><%= _("Delete") %></th>
+    <th><%= _("Delete") %></th>
   </tr>
+  <%= render_void_table(@categories.size, 5)  %>
+  
   <% for category in @categories -%>
   <tr <%= alternate_class -%> id="category_<%= category.id -%>">
-    <td class="first"><%= link_to category.name, {:controller => 'articles', :action => 'category', :id => category.permalink} %></td>
+    <td><%= link_to_permalink category, category.name %></td>
     <td><%= pluralize(category.articles.size, 'article') %></td>
-    <td class="operation"><%= image_tag 'admin/checked.png' %></td>
-    <td class="operation"><%= link_to_show category %></td>
+    <td class="operation"><%= link_to image_tag('admin/show.png'), {:controller => 'content', :action => 'list', "search[category]" => category.id} %></td>
     <td class="operation"><%= link_to_edit category %></td>
-    <td class="operation last"><%= link_to_destroy category %></td>
+    <td class="operation"><%= link_to image_tag('admin/delete.png'), {:action => 'destroy', :id => category.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
   </tr>  
   <% end -%>
 </table>

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

@@ -1,7 +1,12 @@
 <%= error_messages_for 'category' %>
-<!--[form:category]-->
+<ul>
+  <li>
+    <label for="category_name" class="content block"><%= _("Name")%></label> 
+    <%= text_field 'category', 'name', :class => 'large'  %>
+  </li>
+</ul>
 <p>
-  <label for="category_name"><%= _("Name")%>:</label> 
-  <%= text_field 'category', 'name'  %>
+  
+  
 </p>
 <!--[eoform:cateogry]-->

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

@@ -6,6 +6,6 @@
 </p>
 
 <div id="operations">
-  <%= save(_("Add category")) %> <%= _("or")%> <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" ><%= _("Cancel")%></a>
+  <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" ><%= _("Cancel") %></a> <%= _("or")%> <%= save(_("Save")) %> 
 </div>
 <% end %>

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

@@ -1,15 +1,11 @@
-  <% @page_heading = _('Categories') %>
+  <% @page_heading = _('Edit Category') %>
   <% content_for('tasks') do %>
     <%= task_overview %>
   <% end %>
   <% form_tag :action=>"edit", :id => @category.id do %>
-  <h3><% _("Editing category")%></h3>
-  <div class="form">
+  <div class="admin set">
     <%= render_partial "form" %>
   </div>
 
-  <div id="operations">
-    <%= save %> or <%= cancel %>
-  </div>
-
+  <%= cancel_or_save %>
   <% end %>

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

@@ -0,0 +1,15 @@
+  <% @page_heading = _('Categories') + ' <span>&raquo; ' + task_quickpost(_('add new')) + '</span>' %>
+  <% subtabs_for(:content) %>
+
+  <div id="quick-post" style="display:none;position:absolute;">
+    <%= render :partial => "quick_post" %>
+  </div>
+  
+  <div id="category_container" class="list">	
+    <%= render :partial => 'categories' %>  
+  </div>                      
+
+  <div class="paginate">
+    <%= link_to_remote(_('Reorder'), :update => 'category_container', :url => { :action => 'reorder' }) %> |
+  	<%= link_to_remote(_('Sort alphabetically'), :update => 'category_container', :url => { :action => 'asort' }) %>
+  </div>

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

@@ -1,19 +1,20 @@
+
 <%= error_messages_for 'comment' %>
-<!--[form:comment]-->
-<p>
-  <label for="comment_author"><%= _("Author")%>:</label><br/>
-  <%= text_field 'comment', 'author', "value" => (current_user.name if controller.action_name == "list") %>
-</p>
-<p>
-  <label for="comment_url"><%= _("Url") %>:</label><br/>
-  <%= text_field 'comment', 'url', "value" => (this_blog.base_url if controller.action_name == "list")  %>
-</p>
-<p>
-  <label for="comment_email"><%= _("Email")%>:</label><br/>
-  <%= text_field 'comment', 'email', "value" => (current_user.email if controller.action_name == "list") %>
-</p>
-<p>
-  <label for="comment_body"><%= _("Body")%>:</label><br/>
-  <%= text_area 'comment', 'body'  %>
-</p>
-<!--[eoform:comment]-->
+<ul class="set 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>

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

@@ -1,18 +1,14 @@
   <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
 
   <% content_for('tasks') do %>
-    <li><%= link_to_permalink @comment, _('View comment on your blog') %></li>
+    <li><%= task_overview %></li>
   <% end %>
 
   <% form_tag :action=>"edit", :id => @comment.id do %>
 
-  <h3><%= _("Editing comment")%></h3>
-  <div class="form">
+  <div class="admin set">
     <%= render_partial "form" %>
   </div>
 
-  <div id="operations">
-    <%= save %> or <%= cancel %>
-  </div>
-
+  <%= cancel_or_save %>
   <% end %>

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

@@ -0,0 +1,30 @@
+  <% @page_heading = "Comments for #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article } (#{ link_to 'add a comment', '#comment' })" %>
+
+  <% content_for('tasks') do %>
+    <li><%= link_to _('Manage articles'), :controller => '/admin/content', :action => 'list' %></li>
+  <% end %> 
+
+  <div class="list">
+	<ol>
+	<% for comment in @comments -%>
+	  <li <%= alternate_class %>>
+	    <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 %>
+		<p><%=comment.created_at.strftime("%m/%d/%Y at %H:%M") %> – [ 
+		   <%= link_to_edit comment %> | 
+		   <%= link_to image_tag('admin/delete.png'), {:action => 'destroy', :id => comment.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %> |
+		   <%= comment.state %> ]
+		</p>
+	  </li>
+	<% end -%>
+	</ol>
+  </div>
+<hr />  
+  <% form_tag :action=>"new" do %>
+    <%= render_partial "form" %>
+
+    <%= cancel_or_save %>
+  <% end %>
+  

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

@@ -2,11 +2,27 @@
   <% content_for('tasks') do %>
 	<%= task_overview %>
   <% end %>
-  <div class="form">	
-    <label><%= _("Author")%>:</label> <span class="static"><%=h @comment.author %></span><br/>
-    <label><%= _("URL")%>:</label> <span class="static"><%=h @comment.url %></span><br/>
-    <label><%= _("Email")%>:</label> <span class="static"><%=h @comment.email %></span><br/>
-    <label><%= _("Body")%>:</label> <span class="static"><%=h @comment.body %></span><br/>
-    <label><%= _("IP")%>:</label> <span class="static"><%=h @comment.ip %></span><br/>
-    <label><%= _("Posted date")%>:</label> <span class="static"><%=h @comment.created_at %></span><br/>
-  </div>
+  <ul class="admin set">	
+    <li>
+      <label class="content">
+        <%= _("By") %> <%=h @comment.author %> 
+        <%= _("on") %> <%= @comment.created_at.strftime("%m/%d/%Y at %H:%M") %>
+      </label>
+    </li>
+    <li>
+      <label><%= _("URL")%>:</label> 
+      <%=h @comment.url %>
+    </li>
+    <li>
+      <label><%= _("Email")%>:</label> 
+      <%=h @comment.email %>
+    </li>
+    <li>
+      <label><%= _("IP")%>:</label> 
+      <%=h @comment.ip %></span>
+    </li>
+    <li>
+      <label class="block"><%= _("Body")%></label>
+      <%=h @comment.body %>  
+    </li>
+  </ul>

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

@@ -1,26 +1,47 @@
+<% form_tag({:action => 'index'}, :method => :get, :name => 'article') do %>
 <table>
-<tr>
-  <th class="first"><%= order_link "Title", 'admin/content', 'list', 'title' %></th>
+<tr class="first">
+  <th><%= _("Title") %></th>
   <th><%= _("Categories") %></th>
-  <th><%= _("Comments")%></th>
-  <th><%= order_link "Date", 'admin/content', 'list', 'created_at' %></th>
+  <th><%= _("Feedback")%></th>
+  <th><%= _("Date") %></th>
   <th><%= _("Author")%></th>
-  <th><%= order_link "Published", 'admin/content', 'list', 'state' %></th>
-  <th><%= _("View")%></th>
+  <th><%= _("Status") %></th>
+  <th><%= _("Preview")%></th>
   <th><%= _("Edit")%></th>
-  <th class="last"><%= _("Delete")%></th>
+  <th><%= _("Delete")%></th>
 </tr>
+<tr class="menubar">
+  <td>&nbsp;</td>
+   <td><%= collection_select_with_current('search', 'category', @categories, "id", "name", @search[:category].to_i, true)
+  %></td>
+  <td></td>
+  <td>
+    <%= collection_select_with_current(:search, :published_at, Article.find_by_published_at, "publication", "publication", @search[:published_at], true) %>
+  </td>
+  <td><%= collection_select_with_current(:search, :user_id, User.find(:all), "id", "name", @search[:user_id].to_i, true) %></td>
+  <td>
+    <select name="search[published]">
+      <option value="">Please select</option>
+      <option value="0">Unpublished</option>
+      <option value="1">Published</option>
+    </select>
+  </td>
+  <td colspan="3"><input type="submit" value="Filter" />
+</tr>
+  <%= render_void_table(@articles.size, 9)  %>
 <% for article in @articles %>
 <tr <%= alternate_class %>>
-  <td class="first"> <%= link_to_permalink article, h(article.title) %></td>
+  <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><%= link_to _(pluralize(article.comments.size, 'comment')), :controller => '/admin/comments', :article_id => article.id, :action => 'list' %></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 last"><%= link_to_destroy 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>
 </tr>
 <% end %>
 </table>
+<%end%>