typo 5.3 → 5.4

data/app/models/user.rb

@@ -1,6 +1,6 @@
 require 'digest/sha1'
 
-class User < CachedModel
+class User < ActiveRecord::Base
   belongs_to :profile
   belongs_to :text_filter
   has_many :notifications, :foreign_key => 'notify_user_id'
@@ -21,12 +21,19 @@ class User < CachedModel
   # echo "typo" | sha1sum -
   @@salt = '20ac4d290c2293702c64b3b287ae5ea79b26a5c1'
   cattr_accessor :salt
+  attr_accessor :last_venue
 
   def self.authenticate(login, pass)
     find(:first,
          :conditions => ["login = ? AND password = ? AND state = ?", login, sha1(pass), 'active'])
   end
 
+  def update_connection_time
+    self.last_venue = last_connection
+    self.last_connection = Time.now
+    self.save
+  end
+
   # These create and unset the fields required for remembering users between browser closes
   def remember_me
     remember_me_for 2.weeks
@@ -174,11 +181,14 @@ class User < CachedModel
   end
 
   validates_uniqueness_of :login, :on => :create
-  validates_length_of :password, :within => 5..40, :on => :create
+  validates_length_of :password, :within => 5..40, :if => Proc.new { |user|
+    user.read_attribute('password').nil? or user.password.to_s.length > 0
+  }
+
   validates_presence_of :login
   validates_presence_of :email
 
-  validates_confirmation_of :password, :if=> Proc.new { |u| u.password.size > 0}
+  validates_confirmation_of :password
   validates_length_of :login, :within => 3..40
 
 

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

@@ -0,0 +1,16 @@
+<%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
+
+<h3 class='mt20'><%= _("Congratulation!") %></h3>
+<p class='input_text_title'><%= _("You have successfully signed up") %></p>  
+<p class='input_text_title'>
+  <%= _("<strong>Login:</strong> %s", current_user.login)%>
+</p>
+<p class='input_text_title'>
+  <%= _("<strong>Password:</strong> %s", session[:tmppass]) %>
+</p>
+<p class='input_text_title'>
+  <%= _("Don't lose the mail sent at %s or you won't be able to login anymore", current_user.email)%>
+</p>
+<p class='input_text_title right'>
+  <%= _("Proceed to %s",  link_to(_("admin"), :controller => 'admin/settings')) %>
+</p>

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

@@ -1,9 +1,32 @@
-<div id="loginform">
-	<%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
-  <div class="form admin">
-    <div id="flash">
-      <%= render_flash rescue nil %>
-    </div>
-    <%= render :partial => "shared/loginform" %>
+<%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
+
+<div id="flash"><%= render_flash rescue nil %></div>
+    
+<% form_tag :action=> "login" do %>
+<div>
+  <h2><label for="user_login"><%= _('Login')%></label></h2>
+  <p class='input_text_title'>
+    <%= text_field(:user, :login, {:class => 'title large'})%>
+  </p>
+</div>
+<div>
+  <h2><label for="user_password"><%= _('Password')%></label></h2>
+  <p class='input_text_title'>
+    <%= password_field(:user, :password, {:class => 'title large'})%>
+  </p>
+</div>
+<div>
+  <label for="remember_me"><%= _('Remember me')%>
+    <%= check_box_tag 'remember_me' %>  
+  </label>
+</div>
+<p>
+  <input type="submit" name="login" value= "<%= _('Submit') %>" class="save large" id="submit" />
+</p>
+
+    <p>
+    <small><%= link_to "&laquo; #{_('Back to ')} #{this_blog.blog_name}", this_blog.base_url %></small>
+    </p>
+    <% end %>
   </div>
 </div>

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

@@ -1,36 +1,21 @@
-<% form_tag :action=> "signup" do %>
+<%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
+
+<div id="flash"><%= error_messages_for 'user' %></div>
 
-<div title="Account signup" id="loginform">
-  <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
-  <div  class="form admin">
-	<%= error_messages_for 'user' %>
-	<ul>
-		<li>
-			<label for="user_login"><%= _("Desired login") %>:</label>
-			<%= text_field "user", "login" %>
-		</li>
-		<li>
-		  <label for="user_login"><%= _("Display name")%>:</label>
-		  <%= text_field "user", "name", :size => 30 %>			
-		</li>
-		<li>
-			<label for="user_login"><%= _("Email")%>:</label>
-  		<%= text_field "user", "email", :size => 30 %>
-		</li>
-		<li>
-			<label for="user_password"><%= _("Choose password")%>:</label>
-		  <%= password_field "user", "password", :size => 30 %>
-		</li>
-		<li>
-			<label for="user_password_confirmation"><%= _("Confirm password")%>:</label>
-		  <%= password_field "user", "password_confirmation", :size => 30 %>
-		</li>
-		<li class="r">
-	  	<input type="submit" id="submit" value="<%= _('Signup') + " &raquo;" %>" />
-		</li>
-	</ul>
-  </div>
+<% form_tag :action=> "signup" do %>
+<div>
+  <h2><label for="user_login"><%= _("Username") %>:</label></h2>
+  <p class='input_text_title'>
+    <%= text_field(:user, :login, {:class => 'title large'})%>
+  </p>
+</div>
+<div>
+  <h2><label for="user_email"><%= _("Email")%>:</label></h2>
+  <p class='input_text_title'>
+    <%= text_field(:user, :email, {:class => 'title large'})%>
+  </p>
 </div>
+<p><input type="submit" id="submit" class='save large' value="<%= _('Signup')%>" /></p>
 
 <% end %>
 

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

@@ -4,6 +4,7 @@
     <th><%= _("Type") %></th>
     <th><%= _("Delete")%></th>
   </tr>
+  <%= render_void_table(@blacklist_patterns.size, 3)  %>
   <% for blacklist_pattern in @blacklist_patterns -%>
   <tr <%= alternate_class -%>>  
     <td><%= link_to h(blacklist_pattern.pattern), :action => "edit", :id => blacklist_pattern.id %></td>
@@ -11,5 +12,5 @@
     <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>
+<%= display_pagination(@blacklist_patterns, 3)%>
 </table>

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

@@ -3,7 +3,7 @@
 <ul class="admin">
   <li>
     <label for="blacklist_pattern_pattern" class="block"><%= _("Pattern")%></label> 
-    <%= text_field 'blacklist_pattern', 'pattern'  %>    
+    <%= text_field :blacklist_pattern, :pattern  %>    
   </li>
   <li>  
     <label for="blacklist_pattern_type" class="block"><%= _("Type")%></label>

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

@@ -1,10 +1,10 @@
-  <% @page_heading = _('Blacklist Patterns') %>
+<% @page_heading = _('Blacklist Patterns') %>
 
-  <% content_for('tasks') do %>
-    <%= task_overview %>
-  <% end %>
+<% content_for('tasks') do %>
+  <%= task_overview %>
+<% end %>
 
-  <p><%= _("Are you sure you want to delete this item?")%></p>
-  <% form_tag :action => "destroy", :id => @blacklist_pattern.id do %>
+<p><%= _("Are you sure you want to delete this item?")%></p>
+<% form_tag :action => "destroy", :id => @blacklist_pattern.id do %>
   <%= confirm_delete %>
-  <% end %>
+<% end %>

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

@@ -3,10 +3,6 @@
     <th><%= _("Title") %></th>
     <th><%= _("Posts") %></th>
   </tr>
-  <tr class="menubar">
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
   <%= render_void_table(@categories.size, 2)  %>
   
   <% for category in @categories -%>

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

@@ -1,21 +1,19 @@
 <%= error_messages_for 'category' %>
-<ul class="admin" id="article_form">
-  <li>
-    <label for="category_name" class="title block"><%= _("Name")%></label> 
-    <%= text_field 'category', 'name', :class => 'medium'  %>
-  </li>
-  <li>
-    <label for="category_keywords" class="content block"><%= _("Keywords") %></label>
-    <%= text_field 'category', 'keywords', :class => 'large' %>
-  </li>
-  <li>
-    <label for="category_description" class="content block"><%= _("Description") %></label>
-    <%= text_area 'category', 'description', :class => 'large' %>
-  </li>
-  
-</ul>
-<p>
-  
-  
-</p>
-<!--[eoform:cateogry]-->
+<div>
+  <h2><label for="category_name"><%= _("Name")%></label> </h2>
+  <p class='input_text_title'>
+    <%= text_field :category, :name, :class => 'large title'  %>
+  </p>
+</div>
+<div>
+  <h3><label for="category_keywords" class="content block"><%= _("Keywords") %></label></h3>
+  <p class='input_text_title'>
+    <%= text_field :category, :keywords, :class => 'large small' %>
+  </p>
+</div>
+<div>
+  <h3><label for="category_description" class="content block"><%= _("Description") %></label></h3>
+  <p class='input_text_title'>
+    <%= text_area :category, :description, :rows => 5, :class => 'large small' %>
+  </p>
+</div>

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

@@ -1,9 +1,6 @@
-  <% @page_heading = _("%s Category", controller.action_name.capitalize) %>
-  <% subtabs_for(:content) %>
-  <% form_tag :action=>"edit", :id => @category.id do %>
-  <div class="admin">
-    <%= render :partial => "form" %>
-  </div>
-
+<% @page_heading = _("%s Category", controller.action_name.capitalize) %>
+<% subtabs_for(:content) %>
+<% form_tag :action=>"edit", :id => @category.id do %>
+  <%= render :partial => "form" %>
   <%= cancel_or_save %>
-  <% end %>
+<% end %>

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

@@ -9,8 +9,4 @@
   <td class="operation"><%= (article.allow_comments?) ? link_to(article.comments.ham.size.to_s, :controller => '/admin/feedback', :id => article.id, :action => 'article') : '-' %></td>
 </tr>
 <% end %>
-<tr>
-  <td class="paginate" colspan="7">
-    <%= will_paginate @articles -%>
-  </td>
-</tr>
+<%= display_pagination(@articles, 7)%>

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

@@ -1,6 +1,6 @@
-<p class="paginate l">
-  <%= _("Drafts:") %>
+<div class='bordered'>
+  <h3><label class="block content"><%= _("Drafts:") %></label></h3>
   <% for draft in @drafts %>
-    <%= link_to(draft.title, :action => 'edit', :id => draft.id) %>
+    <%= link_to("#{draft.title}<br />", :action => 'edit', :id => draft.id) %>
   <% end %>
-</p>
+</div>

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

@@ -1,98 +1,108 @@
-<%= error_messages_for 'article' %>
 <input type="hidden" name="current_editor" id="current_editor" value="<%= current_user.editor %>" />
+<input type="hidden" name="user_textfilter" id="user_textfilter" value="<%= current_user.text_filter.name %>" />
 <div id="autosave"></div>
 <div id="article_keywords_auto_complete" class="auto_complete"></div>
-<ul class="admin">
-  <li>
-    <label for="article_title" class="block title"><%= _("Title")%></label>
-    <%= text_field 'article', 'title', :class => 'large' %>
-  </li>
-  <li>
-    <div style="float: right; width: 230px;">
-      <label class="block content"><%= _("Categories") %></label>
-      <div id="categories" style="height: 170px;">
-        <%= checkboxes_from_collection(@categories, "id", "name", @selected) %>        
-      </div>
-      <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>
-          <%= check_box 'article', 'allow_pings'  %><br />
-          <label for="article_published"><%= _("Published")%>:</label>
-          <%= check_box 'article', 'published'  %><br />
-        <%= link_to_destroy_draft @article %>
-        <input class="submit" type="submit" value="<%= _('Save as draft') %> &raquo;" name="article[draft]"/>&nbsp;
-        <%= save( _("Publish") + " &raquo;") %><br />
-        <%= link_to_destroy_with_profiles @article%>
-      </p>
+
+<%= error_messages_for 'article' %>
+<div id='editor-right'>
+  <h3>Publish settings</h3>
+  <div id='publishing'>
+    <%= check_box 'article', 'allow_comments' %>
+    <label for="article_allow_comments"><%= _("Allow comments") %></label><br />
+    <%= check_box 'article', 'allow_pings' %>
+    <label for="article_allow_pings"><%= _("Allow trackbacks")%></label><br />
+    <%= check_box 'article', 'published'  %>  
+    <label for="article_published"><%= _("Published")%></label><br />
+    <p class='right'>
+      <input id='save_draft' type="submit" value="<%= _('Save as draft') %> &raquo;" name="article[draft]"/>&nbsp;
+      <%= save( _("Publish") + " &raquo;") %><br />
+      <%= link_to_destroy_with_profiles(@article) unless @article.id.nil? %>
+      <%= link_to_destroy_draft @article %>      
+    </p>
+    <span id='preview_link'><%= link_to(_("Preview"), {:controller => '/previews', :id => @article.id}, {:target => 'new'}) if @article.id %></span>
+  </div>
+  <div class='editor_bottom'>
+    <div class='editor_bottom_right'></div>
+  </div>
+  <div id="categories">
+    <h3><%= _("Categories") %></h3>
+    <%= checkboxes_from_collection(@categories, "id", "name", @selected) %>        
+  </div>
+  <%= render :partial => 'drafts'%>
+</div>
+
+<div id='editor-left'>
+  <div>
+    <h2><label for="article_title"><%= _("Title")%></label></h2>
+    <p class='input_text_title'>
+      <%= text_field 'article', 'title', :class => 'large title' %>
+    </p>
+  </div>
+  <div id='editor-menu'>
+    <span id="f" class="<%= 'active' if current_user.editor == 'visual' %>">
+      <%= build_editor_link("Visual", 'insert_editor', 'fck', 'visual_editor', 'visual') %>
+    </span>
+    <span id="s" class="<%= 'active' if current_user.editor == 'simple' %>">
+      <%= build_editor_link("HTML", 'insert_editor', 'simple', 'simple_editor', 'simple') %>
+    </span>
+  </div>
+  <div id="editor">
+    <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
+      <script type="text/javascript">edToolbar('article_body_and_extended');</script>
     </div>
-    <div id="editor">
-      <div id="editor-menu">
-        <span id="f" class="<%= 'active' if current_user.editor == 'visual' %>">
-          <%= build_editor_link("Visual", 'insert_editor', 'fck', 'visual_editor', 'visual') %>
-        </span>
-        <span id="s" class="<%= 'active' if current_user.editor == 'simple' %>">
-          <%= build_editor_link("HTML", 'insert_editor', 'simple', 'simple_editor', 'simple') %>
-        </span>
-      </div>
-      <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 => '300', :class => 'medium'}) %>
-        <%= render_macros(@macros) if current_user.editor == 'simple' %>
-      </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>
-  </li>
-  <li>
-    <label class="block content" for="article_keywords"><%= _("Tags") %></label>
-    <%= text_field 'article', 'keywords', {:autocomplete => 'off', :class => 'large'} %>
+  </div>
+  <div class='editor_bottom'>
+    <div class='editor_bottom_right'></div>
+  </div>
+  <div>
+    <h3><label for="article_keywords"><%= _("Tags") %></label></h3>
+    <p class='input_text_title'>
+      <%= text_field 'article', 'keywords', {:autocomplete => 'off', :class => 'large small'} %>
+    </p>
     <%= auto_complete_field 'article_keywords', { :url => { :action => "auto_complete_for_article_keywords"}, :tokens => ','}%>
-  </li>
-</ul>
+  </div>
 
-<ul class="admin">
-  <li class="paginate l">
-    <label class="block">
-      <%= link_to_function _("Excerpt") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "excerpt", :duration => 0.2) } %>
-    </label>
-    <ul id="excerpt" <%= "style='display: none;'" if @article.excerpt.blank? %>>
-      <li>
-        <%= t_textarea 'article', 'excerpt', {:height => '150', :class => 'medium', :rows => '8'} %>
-      </li>     
-    </ul>
-  </li>
-    
-  <li class="paginate l">
-    <label class="block">
-      <%= link_to_function _("Uploads") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "attachments", :duration => 0.2) } %>
-    </label>
-    <ul id="attachments" <%= 'style="display: none"' unless @article.resources.count > 0 %>>
-      <li><small>Uploads will be displayed as attachments in your RSS feed, but won't appear in your articles.</small></li>
+  <h3><label for='article_excerpt'><%= _("Excerpt") %></label></h3>
+  <div class='blue_block'>
+    <%= t_textarea 'article', 'excerpt', {:height => '150', :class => 'large', :rows => '4'} %>
+    <p><%=_("Excerpts are posts summaries that are shown on your blog homepage only but won’t appear on the post itself")%></p>
+  </div>
+
+  <h3><label class="block"><%= _("Uploads") %></label></h3>
+  <div class='blue_block'>
+    Uploads will be displayed as attachments in your RSS feed, but won't appear in your articles.
+    <ul id='attachments'>
       <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
     </ul>
-  </li>
+  </div>
 
-  <li class="paginate l">
-    <label class="block">
-      <%= link_to_function _("Post settings") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "publishing_options", :duration => 0.2) } %>
-    </label>
-    <ul id="publishing_options" <%= "style='display: none;'" unless @article.published.blank? %>>
-      <li>
-        <label class="float"><%= _("Publish at")%>:</label>
+  <h3><label class="block"><%= _("Post settings") %></label></h3>
+  <div class='blue_block'>
+    <div>
+      <label class='float'><%= _("Publish at")%></label>
+      <p class='input_text_title'>
         <%= calendar_date_select 'article', 'published_at' %>
-      </li>
-      <li>
-        <label for="article_permalink" class="float"><%= _("Permalink") %></label>
-        <span id="permalink"><%= text_field 'article', 'permalink' %></span>
-      </li>
-      <li>
-          <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
-          <select name="article[text_filter]" id="text_filter">
-            <%= options_for_select text_filter_options, @article.text_filter %>
-          </select>
-      </li>
-    </ul>
-  </li>  
-</ul>
+      </p>
+    </div>
+    <div>
+      <label class='float' for="article_permalink"><%= _("Permalink") %></label>
+      <p class='input_text_title' id='permalink'>
+        <%= text_field 'article', 'permalink', {:class => 'small medium'} %>
+      </p>
+    </div>
+    <div>
+      <label class='float' for="text_filter"><%= _("Article filter")%></label>
+      <p class='input_text_title'>
+        <select name="article[text_filter]" id="text_filter">
+          <%= options_for_select text_filter_options, @article.text_filter %>
+        </select>
+      </p>
+    </div>
+  </div>
+
+</div>