0
@@ -1,5 +1,15 @@
0
 * SVN *
0
 
0
+* Enhanced the theme preview slightly
0
+
0
+* Changed some wording on moderate comments area 
0
+
0
+* Added linked_section_list(article, separator)
0
+  
0
+  Pass in an article and it will return that articles sections all linked up.
0
+  {{ article | linked_section_list }}
0
+  {{ article | linked_section_list: ' and ' }}
0
+
0
 * Removed archive.liquid and index.liquid fallbacks
0
 
0
 * NEW FEATURE: Redirections (see environment.rb)

0
@@ -12,6 +12,10 @@ module DropFilters
0
     path = path_or_section.is_a?(SectionDrop) ? path_or_section['path'] : path_or_section
0
     @context['site'].find_descendant_sections(path)
0
   end
0
+  
0
+  def linked_section_list(article, seperator = ', ')
0
+    article.sections.collect {|s| link_to_section s }.join(seperator)
0
+  end
0
 
0
   def latest_articles(site_or_section, limit = nil)
0
     site_or_section.latest_articles(limit || site_or_section['articles_per_page'])

0
@@ -2,7 +2,7 @@
0
 <!-- begin action nav -->
0
 <div id="page-nav">
0
   <ul id="act-nav" class="clear">
0
-    <li><%= link_to_remote 'Clear Comments', :confirm => "Are you sure you wish to clear all visible comments?",
0
+    <li><%= link_to_remote 'Delete these comments', :confirm => "Are you sure you wish to delete all of these comments?",
0
         :url  => { :controller => 'articles', :action => 'destroy_comment' }, 
0
         :with => "ArticleForm.getAvailableComments().toQueryString('comment')"
0
       %></li>
0
@@ -11,7 +11,7 @@
0
 <!-- /end action nav -->
0
 <% end %>
0
 
0
-<h2>Unapproved Comments</h2>
0
+<h3><%= pluralize(@comments.size, 'Unapproved Comment') %></h3>
0
 
0
 <ul class="pagelist commentlist">
0
   <% @comments.reverse.each_with_index do |comment, i| -%>

0
@@ -1,20 +1,25 @@
0
-<div id="theme-info">
0
+<div id="theme-info" class="clearfix">
0
   <h3>
0
     <%= @theme.title %> (v<%= @theme.version %>)by <% if @theme.author %><a href="<%= @theme.homepage %>"><%= @theme.author %></a><% else %>Unknown<% end %>
0
     <%= link_to_function 'close', 'Dialog.close()', :id => 'close-dialog' %>
0
   </h3>
0
-<ul>
0
-<% unless @theme.current? -%>
0
-  <li><%= link_to 'Use theme', :action => 'change_to', :id => @theme %></li>
0
-  <li><%= link_to 'Edit theme', :controller => 'design', :action => 'index', :theme => @theme %></li>
0
-<% else -%>
0
-  <li><%= link_to 'Edit theme', :controller => 'design', :action => 'index' %></li>
0
-<% end -%>
0
-  <!--li><a href="#" title="title">Change info</a></li-->
0
-  <li><%= link_to 'Download theme', :action => 'export', :id => @theme %></li>
0
-<% unless @theme.current? -%>
0
-  <li><%= link_to_remote 'Remove theme', :url => {:action => 'destroy', :id => @theme}, :method => :delete,
0
-            :confirm => "Are you sure you wish to remove this theme stored at 'others/#{@theme.path.relative_path_from(site.other_themes_path).to_s}'?" %></li>
0
-<% end -%>
0
-</ul>
0
+  <div id="screenshot">
0
+    <img src="<%= url_for(:controller => '/admin/themes', :action => 'preview_for', :id => @theme) %>" alt="Theme preview" title="<%=h @theme.title %> (v<%=h @theme.version %>)" />
0
+    <p><%= @theme.summary %></p>
0
+  </div>
0
+  <div id="theme-options">
0
+    <ul>
0
+    <% unless @theme.current? -%>
0
+      <li><%= link_to 'Use theme', :action => 'change_to', :id => @theme %></li>
0
+      <li><%= link_to 'Edit theme', :controller => 'design', :action => 'index', :theme => @theme %></li>
0
+    <% else -%>
0
+      <li><%= link_to 'Edit theme', :controller => 'design', :action => 'index' %></li>
0
+    <% end -%>
0
+      <li><%= link_to 'Download theme', :action => 'export', :id => @theme %></li>
0
+    <% unless @theme.current? -%>
0
+      <li><%= link_to_remote 'Delete theme', :url => {:action => 'destroy', :id => @theme}, :method => :delete,
0
+                :confirm => "Are you sure you wish to delete this theme stored at 'others/#{@theme.path.relative_path_from(site.other_themes_path).to_s}'?" %></li>
0
+    <% end -%>
0
+    </ul>
0
+  </div>
0
 </div>
0
\ No newline at end of file

0
@@ -80,8 +80,8 @@ ActiveRecord::Schema.define(:version => 66) do
0
     t.column "author_email",   :string
0
     t.column "author_ip",      :string,   :limit => 100
0
     t.column "comments_count", :integer,                 :default => 0
0
-    t.column "updater_id",     :integer
0
     t.column "version",        :integer
0
+    t.column "updater_id",     :integer
0
     t.column "site_id",        :integer
0
     t.column "approved",       :boolean,                 :default => false
0
     t.column "comment_age",    :integer,                 :default => 0
0
@@ -92,11 +92,11 @@ ActiveRecord::Schema.define(:version => 66) do
0
 
0
   create_table "events", :force => true do |t|
0
     t.column "mode",       :string
0
-    t.column "user_id",    :integer
0
     t.column "article_id", :integer
0
     t.column "title",      :text
0
     t.column "body",       :text
0
     t.column "created_at", :datetime
0
+    t.column "user_id",    :integer
0
     t.column "author",     :string,   :limit => 100
0
     t.column "comment_id", :integer
0
     t.column "site_id",    :integer

0
@@ -1553,6 +1553,21 @@ li.current img {
0
   border: none;
0
 }
0
 
0
+#screenshot {
0
+  float: left;
0
+  width: 300px;
0
+  padding: 0 10px;
0
+}
0
+
0
+#screenshot p {
0
+  margin: 10px;
0
+  color: #777;
0
+}
0
+
0
+#theme-options {
0
+  margin-left: 300px;
0
+}
0
+
0
 #dialog {
0
   background-color: #000;
0
   opacity: 0.15;
0
@@ -1560,7 +1575,7 @@ li.current img {
0
 }
0
 
0
 #dialog-box {
0
-  width: 400px;
0
+  width: 500px;
0
   background: #eee;
0
   border: 5px solid #fff;
0
 }