typo 5.1.3 → 5.1.98

data/app/models/feedback/states.rb

@@ -59,6 +59,10 @@ module Feedback::States
     def before_save
       classify_content
     end
+    
+    def to_s
+      _("Unclassified")
+    end
   end
 
   class JustPresumedHam < Base
@@ -67,6 +71,9 @@ module Feedback::States
       content.just_changed_published_status = true
       content.state = :presumed_ham
     end
+    def to_s
+      _("Just Presumed Ham")
+    end    
   end
 
   class PresumedHam < Base
@@ -95,7 +102,7 @@ module Feedback::States
     end
 
     def to_s
-      "Ham?"
+      _("Ham?")
     end
 
     def send_notifications
@@ -110,6 +117,9 @@ module Feedback::States
       content.just_changed_published_status = true
       content.state = :ham
     end
+    def to_s
+      _("Just Marked As Ham")
+    end    
   end
 
   class Ham < Base
@@ -141,6 +151,9 @@ module Feedback::States
       content.really_send_notifications if content.just_changed_published_status?
       true
     end
+    def to_s
+      _("Ham")
+    end   
   end
 
   class PresumedSpam < Base
@@ -169,7 +182,7 @@ module Feedback::States
     end
 
     def to_s
-      "Spam?"
+      _("Spam?")
     end
   end
 
@@ -179,6 +192,9 @@ module Feedback::States
       content.just_changed_published_status = true
       content.state = :spam
     end
+    def to_s
+      _("Just Marked As Spam")
+    end    
   end
 
   class Spam < Base
@@ -197,5 +213,8 @@ module Feedback::States
       content.report_as_spam if content.just_changed_published_status?
       true
     end
+    def to_s
+      _("Spam")
+    end     
   end
 end

data/app/models/feedback.rb

@@ -1,8 +1,10 @@
+require_dependency 'spam_protection'
 class Feedback < Content
   # Empty, for now, ready to hoist up methods from Comment & Trackback
   set_table_name "feedback"
 
   include TypoGuid
+
   validates_age_of :article_id
 
   before_create :create_guid, :article_allows_this_feedback

data/app/models/page.rb

@@ -9,6 +9,13 @@ class Page < Content
     'name ASC'
   end
 
+  def self.search_paginate(search_hash, paginate_hash)
+    list_function = ["Page"] + function_search_no_draft(search_hash)
+    paginate_hash[:order] = 'title ASC'
+    list_function << "paginate(paginate_hash)"
+    eval(list_function.join('.'))
+  end
+
   typo_deprecate :location => :permalink_url
   
   def permalink_url(anchor=nil, only_path=true)

data/app/models/page_cache.rb

@@ -19,7 +19,7 @@ class PageCache
                      comments comments.*
                      category categories.* xml
                      *.rss *.atom
-                     tag tags.* category archive.*})
+                     tag tags.* category archives.*})
 
       self.zap_pages((1990..2020))
       self.zap_pages([*1990..2020].collect { |y| "#{y}.*" })

data/app/models/profile.rb

@@ -1,6 +1,8 @@
 class Profile < ActiveRecord::Base
   serialize :modules
   validates_uniqueness_of :label
+
+  ADMIN = 'admin'
   
   def modules
     read_attribute(:modules) || []

data/app/models/tag.rb

@@ -1,7 +1,9 @@
 class Tag < ActiveRecord::Base
   has_and_belongs_to_many :articles, :order => 'created_at DESC'
   validates_uniqueness_of :name
- 
+  attr_reader :description
+  attr_reader :keywords
+  
   def self.get(name)
     tagname = name.tr(' ', '').downcase
     tag = find_by_name_or_display_name(tagname, name)

data/app/models/theme.rb

@@ -9,7 +9,7 @@ class Theme
   end
 
   def layout
-    "../../themes/#{name}/layouts/default"
+    "../../themes/#{name}/layouts/default.html.erb"
   end
 
   def description

data/app/models/user.rb

@@ -1,6 +1,5 @@
 require 'digest/sha1'
 
-# this model expects a certain database layout and its based on the name/login pattern.
 class User < CachedModel
   belongs_to :profile
   has_many :notifications, :foreign_key => 'notify_user_id'
@@ -22,16 +21,42 @@ class User < CachedModel
   @@salt = '20ac4d290c2293702c64b3b287ae5ea79b26a5c1'
   cattr_accessor :salt
 
-  # Authenticate a user.
-  #
-  # Example:
-  #   @user = User.authenticate('bob', 'bobpass')
-  #
   def self.authenticate(login, pass)
     find(:first,
          :conditions => ["login = ? AND password = ?", login, sha1(pass)])
   end
 
+  # These create and unset the fields required for remembering users between browser closes
+  def remember_me
+    remember_me_for 2.weeks
+  end
+
+  def remember_me_for(time)
+    remember_me_until time.from_now.utc
+  end
+
+  def remember_me_until(time)
+    self.remember_token_expires_at = time
+    self.remember_token            = Digest::SHA1.hexdigest("#{email}--#{remember_token_expires_at}")
+    save(false)
+  end
+
+  def forget_me
+    self.remember_token_expires_at = nil
+    self.remember_token            = nil
+    save(false)
+  end
+
+  def permalink_url(anchor=nil, only_path=true)
+    blog = Blog.default # remove me...
+
+    blog.url_for(
+      :controller => 'users',
+      :action => 'show',
+      :id => permalink
+    )
+  end
+  
   def self.authenticate?(login, pass)
     user = self.authenticate(login, pass)
     return false if user.nil?
@@ -96,6 +121,10 @@ class User < CachedModel
     permalink
   end
 
+  def admin?
+    profile.label == Profile::ADMIN
+  end
+
   protected
 
   # Apply SHA1 encryption to the supplied password.

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

@@ -1,11 +1,9 @@
-<div title="Account login" id="loginform">
-	<%= 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] %>
-        <h4><%= flash[:notice] %></h4>
-      <% end %>
-
-      <%= render :partial => "shared/loginform" %>
+<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" %>
+  </div>
 </div>

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.gif", :alt=>"Typo website", :style => "height: 24px"), "http://typosphere.org") + _(" Signup") %>
+  <%= 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>

data/app/views/admin/base/_recent_comments.html.erb

@@ -2,9 +2,9 @@
 <ul class="recent">
 <% for comment in Comment.find(:all, :limit => 5, :order => 'id DESC' ) %>
   <li>
-    <h4><%= truncate(comment.author, 20) %></h4>
-    <div><%= link_to truncate(comment.body, 20), :controller => "/admin/comments", :action => "show", :id => comment.id, :article_id => comment.article_id %></div>
+  <h4><%= truncate(comment.author, :length => 20) %></h4>
+  <div><%= link_to truncate(comment.body, :length => 20), :controller => "/admin/comments", :action => "show", :id => comment.id, :article_id => comment.article_id %></div>
     <p class="right"><%= time_ago_in_words(comment.created_at) %> ago</p>
   </li>
 <% end %>
-</ul>
+</ul>

data/app/views/admin/base/_recent_trackbacks.html.erb

@@ -2,9 +2,9 @@
 <ul class="recent">
 <% for trackback in Trackback.find(:all, :limit => 5, :order => 'id DESC' ) %>
   <li>
-    <%= link_to truncate(trackback.excerpt, 20), :controller => "/admin/trackbacks", :action => "show", :id => trackback.id, :article_id => trackback.article_id %><br />
-    by <%= truncate(trackback.blog_name, 20) %><br />
+  <%= link_to truncate(trackback.excerpt, :length => 20), :controller => "/admin/trackbacks", :action => "show", :id => trackback.id, :article_id => trackback.article_id %><br />
+  by <%= truncate(trackback.blog_name, :length => 20) %><br />
     <%= time_ago_in_words(trackback.created_at) %> ago
   </li>
 <% end %>
-</ul>
+</ul>

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

@@ -1,16 +1,13 @@
 <table cellspacing="1" cellpadding="0">
-<tr class="first">
+<tr>
   <th><%= _("Pattern") %></th>
   <th><%= _("Type") %></th>
-  <th><%= _("Edit") %></th>
-  <th><%= _("Delete")%></th>
 </tr>
 <% for blacklist_pattern in @blacklist_patterns -%>
 <tr <%= alternate_class -%>>  
   <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 image_tag('admin/delete.png'), {:action => 'destroy', :id => blacklist_pattern.id, :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
 </tr>  
 <% end -%>
+<tr class="paginate"><td colspan="3"><%= will_paginate @blacklist_patterns %></td></tr>
 </table>

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

@@ -1,6 +1,6 @@
 <% form_tag :action=>"new" do %>
 
-  <%= render_partial "form" %>
+  <%= render :partial => "form" %>
 
   <p class="paginate r">
     <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" ><%= _("Cancel")%></a> <%= _("or")%> <%= save(_("Save") + "&raquo;") %> 

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

@@ -5,7 +5,6 @@
 <% end %>
   
 <% form_tag :action=>"edit", :id => @blacklist_pattern.id do %>
-    <%= render_partial "form" %>
-
-    <%= cancel_or_save %>
+  <%= render :partial => "form" %>
+  <%= cancel_or_save %>
 <% end %>

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

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

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

@@ -1,20 +1,18 @@
 <table>
-  <tr class="first">
+  <tr>
     <th><%= _("Title") %></th>
     <th><%= _("Posts") %></th>
-    <th><%= _("View") %></th>
-    <th><%= _("Edit") %></th>
-    <th><%= _("Delete") %></th>
   </tr>
-  <%= render_void_table(@categories.size, 5)  %>
+  <tr class="menubar">
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+  </tr>
+  <%= render_void_table(@categories.size, 2)  %>
   
   <% for category in @categories -%>
   <tr <%= alternate_class -%> id="category_<%= category.id -%>">
-    <td><%= link_to_permalink category, category.name %></td>
-    <td><%= pluralize(category.articles.size, 'article') %></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"><%= 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>
+    <td><%= link_to_edit category.name, category %></td>
+    <td><%= link_to_permalink category, pluralize(category.articles.size, _('no articles') , _('1 article'), __('%d articles')) %></td>
   </tr>  
   <% end -%>
 </table>

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

@@ -1,9 +1,18 @@
 <%= error_messages_for 'category' %>
-<ul>
+<ul class="set admin" id="article_form">
   <li>
-    <label for="category_name" class="content block"><%= _("Name")%></label> 
-    <%= text_field 'category', 'name', :class => 'large'  %>
+    <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>
   

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

@@ -1,10 +1,6 @@
-  <% @page_heading = _('Categories') + ' <span>&raquo; ' + task_quickpost(_('add new')) + '</span>' %>
+  <% @page_heading = _('Categories') +  "<span>&raquo; #{link_to(_('add new'), :controller => 'categories', :action => '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>                      

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

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

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

@@ -0,0 +1,16 @@
+<%= render_void_table(@articles.size, 7)  %>
+<% for article in @articles %>
+<tr <%= alternate_class %>>
+  <td> <%= link_to h(article.title), :action => 'edit', :id => article.id %></td>
+  <td><%= article.categories.map { |c| link_to h(c.name), {:controller => 'content', :action => 'index', "search[category]" => c.id}}.join(", ") %></td>
+  <td><%= article.published_at.strftime("%m/%d/%Y") %></td>
+  <td><%= author_link(article)%></td>
+  <td><%= link_to_published article %></td>
+  <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>

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

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

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

@@ -1,5 +1,4 @@
 <%= error_messages_for 'article' %>
-<!--[form:articles]-->
 <div id="autosave"></div>
 <div id="article_keywords_auto_complete" class="auto_complete"></div>
 <ul class="set admin">
@@ -8,20 +7,33 @@
     <%= text_field 'article', 'title', :class => 'large' %>
   </li>
   <li>
-    <label for="article_body" class="block content"><%= _("Content")%></label>
-    <%= t_textarea 'article', 'body', {:height => '300', :class => 'large'} %>
+    <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 paginate_1">
+          <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 %>
+        <%= link_to_destroy_with_profiles @article%>
+        <%= save( _("Publish") + " &raquo;") %>
+      </p>
+    </div>
+    <div id="editor">
+      <label for="article_body_and_extended" class="block content"><%= _("Content")%></label>
+      <% unless current_user.editor == 2 -%>
+        <script type="text/javascript">edToolbar('article_body_and_extended');</script>
+      <% end -%>
+      <%= t_textarea 'article', 'body_and_extended', {:height => '300', :class => 'medium'} %>
+      <%= render_macros(@macros) unless current_user.editor == 2 %>
+    </div>
   </li>
   <li>
-    <label class="block r" for="article_extended">
-      <%= link_to_function _("Add Extended Content") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "extended", :duration => 0.2) } %>
-    </label>
-    <ul>
-      <li id="extended" <%= "style='display: none;'" if @article.extended.blank? %>>
-        <%= t_textarea 'article', 'extended', :height => '450', :class => 'large' %>
-      </li>
-    </ul>
-  </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 => ','}%>
@@ -29,15 +41,7 @@
 </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>
-    <select id="categories" class="large" name="categories[]" multiple="multiple" size="10" <%= "style='display:none;'" if @article.categories.blank? %>>
-      <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
-    </select>
-  </li>
-  <li class="paginate l"  style="float: left; width: 100%">
+  <li class="paginate l paginate_1">
     <label class="block">
       <%= link_to_function _("Uploads") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "attachments", :duration => 0.2) } %>
     </label>
@@ -45,8 +49,8 @@
       <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
     </ul>
   </li>
-  
-  <li class="paginate l" style="float: left; width: 100%;">
+
+  <li class="paginate l paginate_1">
     <label class="block">
       <%= link_to_function _("Post settings") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "publishing_options", :duration => 0.2) } %>
     </label>
@@ -55,39 +59,11 @@
         <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>
         <span id="permalink"><%= text_field 'article', 'permalink' %></span>
       </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>
-
-<br />
-
-<p class="paginate r">
-  <%= link_to_destroy_draft @article %>
-  <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? %>
-<%   #      :update => 'autosave', %>
-  <%= observe_form "article_form",
-      :frequency => 60,
-      :url => { :action => "autosave" }  %>
-<% end %>
+<%= hidden_field_tag 'text_filter', this_blog.text_filter %>

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

@@ -1,12 +1,52 @@
-  <% @page_heading = _('Manage posts') %>
-  <% subtabs_for(:content) %>
+<% @page_heading = _('Manage articles') %>
+<% subtabs_for(:content) %>
 
-  <%= render :partial => "drafts" %>
+<%= render :partial => "drafts" %>
 
-  <div class="list" id="articles">	
-    <%= render :partial => 'articles' %>
+<div class="list" id="articles">	
+  <% form_remote_tag  :url      => {:action => 'index'},
+  :method   => :get,
+  :name     => 'article',
+  :update   => {:success => 'articleList'},
+  :before   => "Element.show('spinner')",
+  :complete => "Element.hide('spinner')" \
+  do %>
+
+  <label><%= _("Search articles that contains...")%></label><br />  
+  <input type="text" name="search[searchstring]" size="30" />
+  <%= submit_tag _("Search") %>
+  <span id='spinner' style="display:none;"><%= image_tag('spinner.gif') %></span>
+
+  <table>
+    <tr>
+      <th><%= _("Title") %></th>
+      <th><%= _("Categories") %></th>
+      <th><%= _("Date") %></th>
+      <th><%= _("Author")%></th>
+      <th><%= _("Status") %></th>
+      <th><%= _("Feedback")%></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>
+        <%= 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><input type="submit" value='<%= _("Filter") %>' />
+      </tr>
+      <tbody id="articleList">
+        <%= render :partial => 'article_list', :object => @articles -%>
+      </tbody>
+    </table>
+
+    <%end%>
   </div>                      
-  <div class="paginate">
-    <%= render :partial => 'admin/content/pages', :object => @articles_pages -%>
-  </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" } } %>
+<%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "new", :id => @article.id , :class => ('autosave' if current_user.editor == 0)} } %>

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

@@ -6,9 +6,7 @@
     <% else %>
       <% for comment in @comments -%>
         <li <%= alternate_class %>>
-          <% title = ''; title << 'by ' + comment.author -%>
-          <% title << ' on ' + comment.article.title -%>
-          <%= link_to_permalink comment,h(title) %>
+          <%= link_to_permalink comment,h( _("by %s on %s", comment.author , comment.article.title) ) %>
         </li>
       <% end %>
     <% end %>

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

@@ -0,0 +1,19 @@
+<div class="dashboard">
+  <h3><%= _("Inbound links") %></h3>
+  <% if @inbound_links.nil? %>
+    <%= _('You have no internet connection') %>
+  <% else %>
+    <ul>
+      <% if @inbound_links.size == 0 %>
+        <li <%= alternate_class %>><%= _("No one made a link to you yet") %></li>
+      <% else %>
+        <% for link in @inbound_links -%>
+          <li <%= alternate_class %>>
+            <%= link_to(link.author, link.link) + _(" made a link to you saying ") + link.description.slice(0, 50) %> 
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
+  <% end %>
+  <hr />
+</div>