typo 3.99.0

data/app/views/admin/comments/show.rhtml

@@ -0,0 +1,10 @@
+  <% @page_heading = "Comments for #{ link_to h(@article.title), :controller => 'content', :action => 'show', :id => @article }" %>
+
+  <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 Address:</label> <span class="static"><%=h @comment.ip %></span><br/>
+    <label>Created at:</label> <span class="static"><%=h @comment.created_at %></span><br/>
+  </div>

data/app/views/admin/content/_articles.rhtml

@@ -0,0 +1,20 @@
+<table cellspacing="1" cellpadding="0">
+<tr>
+  <th>Post title</th>
+  <th>Posted</th>
+  <th>Comments</th>
+  <th>Trackbacks</th>
+  <th>Edit</th>
+  <th>Delete</th>
+</tr>
+<% for article in @articles %>
+<tr <%= alternate_class %>>
+  <td><%= (article.published?) ? image_tag('checked.gif') : image_tag('x-ed.gif') %> <%= link_to h(article.title), {:action => "show", :id => article.id} %> <%= article_link(image_tag('go'), article) %> </td>
+  <td><%= distance_of_time_in_words_to_now article.published_at %> ago</td>
+  <td><%= link_to pluralize(article.comments.size, 'comment'), :controller => 'comments', :article_id => article, :action => 'list' %></td>
+  <td><%= link_to pluralize(article.trackbacks.size, 'trackback'), :controller => 'trackbacks', :article_id => article, :action => 'list' %></td>
+  <td class="operation"><%= link_to_edit article %></td>
+  <td class="operation"><%= link_to_destroy article %></td>
+</tr>
+<% end %>
+</table>

data/app/views/admin/content/_attachment.rhtml

@@ -0,0 +1,17 @@
+<% str = update_element_function('attachments', :position => :bottom) do -%>
+  <div id="attachment_<%= attachment_num -%>">
+    <%= file_field 'attachments', "filename_#{attachment_num}" -%>
+    <%= link_to_remote 'Remove',
+	:url => { :action => "attachment_box_remove", :id => attachment_num },
+	:update => "attachment_#{attachment_num}",
+	:confirm => "Really delete attachment #{attachment_num}?" -%>
+    <br />
+  </div>
+  <div id="attachment_<%= attachment_num.succ -%>">
+    <%= link_to_remote 'Add Another Attachment',
+	:url => { :action => "attachment_box_add", :id => attachment_num.succ },
+	:update => "attachment_#{attachment_num.succ}",
+	:asynchronus => false -%>
+  </div>
+<% end -%>
+<%= javascript_tag(str) -%>

data/app/views/admin/content/_form.rhtml

@@ -0,0 +1,51 @@
+<%= error_messages_for 'article' %>
+<!--[form:articles]-->
+<p>
+  <label for="article_title">Title:</label><br />
+  <%= text_field 'article', 'title'  %>
+  (<%= link_to_function "&raquo; edit permalink", "Toggle.display('permalink')" %>)<br/>
+</p>
+<p id="permalink" style="display: none">
+  <label for="article_permalink">Permalink:</label><br />
+  <%= text_field 'article', 'permalink'  %>
+</p>
+<p>
+  <label for="article_body">Body:</label><br />
+  <%= text_area 'article', 'body', :rows => 25, :style => 'width: 48%;'  %>
+</p>
+<p>
+  <label for="categories">Categories:</label><br />
+  <select id="categories" name="categories[]" multiple="multiple" size="10" style="width:250px;">
+  <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
+  </select>
+</p>
+<p>
+  <label for="article_keywords">Keywords:</label><br/>
+  <%= text_field 'article', 'keywords'  %>
+</p>
+<p>
+  <a href="#" onclick="Element.toggle('extended'); return false">Add Extended Content</a><br />
+  <div id="extended" style="display:none;">
+  <label for="article_extended">Extended:</label><br />
+  <%= text_area 'article', 'extended', :rows => 30, :style => 'width: 48%;'  %>
+  </div>
+</p>
+
+<a href="#" onclick="Element.toggle('advanced'); return false;">Toggle Advanced Options (+/-)</a>
+<div id="advanced" style="display:none;">
+<label for="article_allow_comments">Allow comments: </label><%= check_box 'article', 'allow_comments'  %><br />
+<label for="article_allow_pings">Allow pings: </label><%= check_box 'article', 'allow_pings'  %><br />
+<label for="article_published">Published:</label><%= check_box 'article', 'published'  %><br />
+<label for="article_text_filter">Textfilter: </label><%= select 'article', 'text_filter', text_filter_options %><br />
+<label for="article_published_at">Publish at:</label><%= datetime_select 'article', 'published_at', :include_blank => true  %><br />
+</div>
+<br clear="all"/>
+
+<p>
+<a href="#" onclick="Element.toggle('attachments'); return false;">Attachments (+/-)</a>
+<div id="attachments" style="display:none;">
+<%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1 } -%>
+</div>
+</p>
+
+<!--[eoform:articles]-->

data/app/views/admin/content/_pages.rhtml

@@ -0,0 +1,3 @@
+    <%= link_to "Previous page", { :id => pages.current.previous } if pages.current.previous -%>
+    <%= pagination_links pages, :name => 'id' -%>
+    <%= link_to "Next page", { :id => pages.current.next } if pages.current.next -%>

data/app/views/admin/content/_quick_post.rhtml

@@ -0,0 +1,20 @@
+  <%= start_form_tag :action=>"new" %>
+<p>
+  <label for="articles_title">Title:</label><br />
+  <%= text_field 'article', 'title'  %>
+</p>
+<p>
+<p>
+  <label for="categories[]">Categories:</label><br />
+  <select name="categories[]" multiple="multiple" size="3" style="width:250px;">
+  <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
+  </select>
+</p>
+<p>
+  <label for="articles_body">Article:</label><br />
+  <%= text_area 'article', 'body', :rows => 10  %>
+</p>
+<div id="operations">
+  <%= save("Save Post") %> or <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >Cancel</a>
+</div>
+<%= end_form_tag %>

data/app/views/admin/content/_show_categories.rhtml

@@ -0,0 +1,9 @@
+  <h4>Currently this article is listed in following categories:</h4>
+  <% for category in @article.categories %>
+    <%= link_to_remote "- #{category.name}", :url => { :action => "category_remove", :id => @article.id, :category_id => category.id }, :update => 'categories' %><br/>
+  <% end %>
+
+  <h4>You can add it to the following categories:</h4>
+  <% for category in @categories - @article.categories %>
+    <%= link_to_remote "+ #{category.name}", :url => { :action => "category_add", :id => @article.id, :category_id => category.id }, :update => 'categories' %><br/>
+  <% end %>

data/app/views/admin/content/_show_resources.rhtml

@@ -0,0 +1,9 @@
+    <h4>Currently this article has the following resources</h4>
+    <% for resource in @article.resources %>
+      <%= link_to_remote "- #{resource.filename}", :url => { :action => "resource_remove", :id => @article.id, :resource_id => resource.id}, :update => 'resources' %><br/>
+    <% end %>
+
+    <h4>You can associate the following resources</h4>
+    <% 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 %>

data/app/views/admin/content/destroy.rhtml

@@ -0,0 +1,11 @@
+  <% @page_heading = 'Articles' %>
+
+  <% content_for('tasks') do %>
+    <%= task_show "Show this article", @article.id %>
+  <% end %> 
+
+  <p>Are you sure you want to delete this article ( <%=h @article.title -%> )?</p>
+  <%= start_form_tag :controller => 'content', :action => 'destroy' %>
+  <%= hidden_field "article", "id" %>
+  <%= confirm_delete("Delete this article") %>
+  <%= end_form_tag %>

data/app/views/admin/content/edit.rhtml

@@ -0,0 +1,28 @@
+  <% @page_heading = 'Articles' %>
+  
+  <% content_for('tasks') do %>
+    <%= task_new 'Create new article' %>
+    <li><%= link_to 'View article on your blog', article_url(@article) %></li>
+  <% end %> 
+
+  <%= start_form_tag({ :action => "edit", :id => @article }, :id => "article_form", :enctype => "multipart/form-data") %>
+  <h3>Editing article</h3>
+
+  <div class="form">
+    <!-- LIVE PREVIEW -->
+    <div id="preview" class="post" style="display:none;"></div>
+    <!-- /LIVE PREVIEW -->	
+    <%= render_partial "form" %>
+  </div>
+
+  <div id="operations">
+    <%= save %> or <%= cancel %>  
+  </div>
+
+  <%= end_form_tag %>
+
+  <%= observe_form "article_form", 
+        :frequency => 2, 
+        :update => "preview",
+        :complete => "Element.show('preview')",
+        :url => { :action => "preview" } %>      

data/app/views/admin/content/list.rhtml

@@ -0,0 +1,20 @@
+  <% @page_heading = 'Articles' %>
+
+  <% content_for('tasks') do %>
+    <%= task_quickpost('Quick Post') %>
+    <%= task_new 'Create new article' %>
+    <%= task_quicknav('Navigate') %>
+  <% end %> 
+  <div id="quick-navigate" style="display:none;position:absolute;">
+    <%= render :partial => 'admin/content/pages', :object => @articles_pages -%>
+  </div>
+
+  <div id="quick-post" style="display:none;position:absolute;">
+    <%= render :partial => "quick_post" %>
+  </div>
+  <div class="list" id="articles">	
+    <%= render :partial => 'articles' %>
+  </div>                      
+  <div class="tasks">
+    <%= render :partial => 'admin/content/pages', :object => @articles_pages -%>
+  </div>

data/app/views/admin/content/new.rhtml

@@ -0,0 +1,27 @@
+  <% @page_heading = 'Articles' %>
+
+  <h3>Creating article</h3>
+
+  <%= start_form_tag({ :action => "new" }, :id => "article_form", :enctype => "multipart/form-data") %>
+  
+  
+  <div class="form">	
+    <!-- LIVE PREVIEW --> 
+    <div id="preview" class="post" style="display: none;"></div>
+    <!-- /LIVE PREVIEW -->
+    <%= render_partial "form" %>
+  </div>
+
+  <div id="operations">
+    <%= save("Save this article") %> or <%= cancel %>  
+  </div>
+
+  <%= end_form_tag %>
+
+  <%= observe_form "article_form", 
+        :frequency => 2, 
+        :update => "preview",
+        :complete => "Element.show('preview')",
+        :url => { :action => "preview" } %>      
+
+      

data/app/views/admin/content/preview.rhtml

@@ -0,0 +1,3 @@
+<h4><%= @article[:title] %></h4>
+
+<%= @article.full_html %>

data/app/views/admin/content/show.rhtml

@@ -0,0 +1,25 @@
+  <% @page_heading = 'Articles' %>
+
+  <% content_for('tasks') do %>
+    <%= task_edit 'Edit this article', @article.id %>
+    <li><%= link_to 'View article on your blog', article_url(@article) %></li>
+  <% end %>
+
+  <h3><%=h @article.title %></h3>
+
+  <div class="form">
+    <div><%= @article.full_html %></div>
+    <p class="meta"><label>Posted:</label> <%=h @article.published_at.to_formatted_s(:long_weekday) %> by <%=h @article.author %></p>
+    <p class="meta"><label>Last updated:</label> <%=h @article.updated_at.to_formatted_s(:long_weekday) %></p>
+    <p class="meta"><label>Published:</label> <%=h (@article.published? ? "Yes" : "No") %></p>
+  </div>
+
+  <h3>Categories</h3>
+  <div id="categories" class="form">
+    <%= render :partial => 'show_categories' -%>
+  </div>
+
+  <h3>Attachments</h3>
+  <div id="resources" class="form">
+    <%= render :partial => 'show_resources' -%>
+  </div>

data/app/views/admin/general/index.rhtml

@@ -0,0 +1,216 @@
+  <% @page_heading = 'Blog settings' %>
+
+  <%= start_form_tag :action => 'update'%>
+
+  <div class="tasks">
+    <h3>Which settings group would you like to edit?</h3>
+    <ul>
+      <li><a href="#gensettings" onclick="new Effect.ScrollTo('gensettings'); return false">General Settings</a></li>
+      <li><a href="#textfilter" onclick="new Effect.ScrollTo('textfilter'); return false">Text Filter</a></li>
+      <li><a href="#spam" onclick="new Effect.ScrollTo('spam'); return false">Spam Protection</a></li>
+      <li><a href="#resources" onclick="new Effect.ScrollTo('resources'); return false">Resource Defaults</a></li>
+      <li><a href="#misc" onclick="new Effect.ScrollTo('misc'); return false">Cache</a></li>
+    </ul>
+    <div style="clear:both;"></div>
+  </div>
+
+  <div id="settings">
+  <div id="gensettings" class="set" style="margin-top:10px;">
+  <h3>General Settings</h3>
+    <p>
+      <label for="blog_name">Blog name:</label>
+      <input name="setting[blog_name]" id="blog_name" type="text" value="<%=h this_blog.blog_name %>" />
+    </p>
+    <p>
+      <label for="blog_subtitle">Blog subtitle:</label>
+      <input name="setting[blog_subtitle]" id="blog_subtitle" type="text" value="<%=h this_blog.blog_subtitle %>" />
+    </p>
+  <p>
+    <label for="canonical_server_url">Canonical Server Url:</label>
+    <input name="setting[canonical_server_url]" id="canonical_server_url" type="text" value="<%= this_blog.canonical_server_url %>" />
+  </p>
+    <p>
+      <input name="setting[default_allow_comments]" id="default_allow_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.default_allow_comments%> />
+      <input name="setting[default_allow_comments]" type="hidden" value="0"/>
+        <label for="default_allow_comments">Enable comments by default</label>
+    </p>
+    <p>
+      <input name="setting[default_allow_pings]" id="default_allow_pings" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.default_allow_pings%> />
+      <input name="setting[default_allow_pings]" type="hidden" value="0"/>
+        <label for="default_allow_pings">Enable Trackbacks by default</label>
+    </p>
+    <p>
+      <label for="limit_article_display">Display </label>
+      <input name="setting[limit_article_display]" size="4" id="limit_article_display" type="text" value="<%= this_blog.limit_article_display %>" /> articles on my homepage by default.
+    </p>
+    <p>
+      <label for="limit_rss_display">Display </label>
+      <input name="setting[limit_rss_display]" size="4" id="limit_rss_display" type="text" value="<%= this_blog.limit_rss_display %>" /> articles in my rss feed by default.
+    </p>
+    <p>
+      <input name="setting[show_extended_on_rss]" id="show_extended_on_rss" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.show_extended_on_rss%> />
+      <input name="setting[show_extended_on_rss]" type="hidden" value="0"/>
+        <label for="show_extended_on_rss">Show full article on rss feed</label>
+    </p>
+
+    <hr />
+
+    <p>Should the blog show mailto: links to your email address?</p>
+    <p><input name="setting[link_to_author]" id="link_to_author" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.link_to_author%> /><input name="setting[link_to_author]" type="hidden" value="0"/> <label for="link_to_author">Enable E-Mail public display</label></p>
+
+    <hr />
+
+    <p>Should the blog use of the <a href="http://www.gravatar.com/">Globally Recognized Avatar (Gravatar)</a> service in comments?</p>
+    <p>
+      <input name="setting[use_gravatar]" id="use_gravatar" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.use_gravatar %> />
+      <input name="setting[use_gravatar]" type="hidden" value="0"/>
+      <label for="use_gravatar">Enable Gravatar integration</label>
+    </p>
+
+    <hr />
+
+    <p>Would you like to include your latitude and longitude in your blog's HTML pages? See <a href="http://geourl.org">GeoURL</a> for details.  <br/>Example: <tt>47.774,-122.201</tt></p>
+
+    <p>
+      <label for="geourl_location">Latitude, Longitude:</label>
+      <input name="setting[geourl_location]" size="20" id="geourl_location" type="text" value="<%= this_blog.geourl_location %>" />
+    </p>
+
+    <hr/>
+
+    <p>Should Typo send trackbacks to websites that you link to?  This should be disabled
+       for private blogs, as it will leak non-public information to sites that you're discussing.
+       For public blogs, there's no real point in disabling this.</p>
+    <p>
+      <input name="setting[send_outbound_pings]" id="send_outbound_pings" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.send_outbound_pings%> />
+         <input name="setting[send_outbound_pings]" type="hidden" value="0"/>
+           <label for="send_outbound_pings">Send trackbacks to external sites</label>
+
+    </p>
+
+    <p>
+      <label for="ping_urls">URLs to ping automatically:</label><br/>
+      <textarea name="setting[ping_urls]" id="ping_urls" rows="5" cols="50"><%=h this_blog.ping_urls %></textarea>
+    </p>
+
+    <p class="r"><%= save("Save My Settings") %></p>
+  </div>
+
+
+  <div id="textfilter" class="set">
+  <h3>Text Filter</h3>
+        <p class="note">Typo supports a number of text filtering options.  To add new filters, see the "filters" tab on the toolbar above.</p>
+      <p>
+        <select name="setting[text_filter]" id="text_filter">
+          <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.text_filter) %>
+        </select>
+        <label for="text_filter">Article filter</label>
+      </p>
+      <p>
+        <select name="setting[comment_text_filter]" id="comment_text_filter">
+        <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
+        </select>
+        <label for="comment_text_filter">Comments filter</label>
+      </p>
+      <p class="r"><%= save("Save My Settings") %></p>
+    </div>
+
+    <div id="notification" class="set">
+    <h3>Notification</h3>
+    <p>Typo can notify you when new articles or comments are posted</p>
+    <p>
+      <label for="email_from">Email address to use in From: field when Typo sends mail:</label>
+      <input name="setting[email_from]" size="20" id="email_from" type="text" value="<%= this_blog.email_from %>" />
+    </p>
+    <p>
+      <label for="jabber_address">Jabber account to use when sending Jabber notifications:</label>
+      <input name="setting[jabber_address]" size="20" id="jabber_address" type="text" value="<%= this_blog.jabber_address %>" />
+    </p>
+    <p>
+      <label for="jabber_password">Password for Jabber account:</label>
+      <input name="setting[jabber_password]" size="20" id="jabber_password" type="password" value="<%= this_blog.jabber_password %>" />
+    </p>
+      <p class="r"><%= save("Save My Settings") %></p>
+    </div>
+
+
+    <div id="spam" class="set">
+        <h3>Spam Protection</h3>
+        <p>Enabling spam protection will make typo compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots.</p>
+        <p>
+          <input name="setting[sp_global]" id="sp_global" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.sp_global%> /><input name="setting[sp_global]" type="hidden" value="0"/>
+          <label for="sp_global">Enable spam protection</label>
+        </p>
+        <p>
+          <input name="setting[sp_allow_non_ajax_comments]" id="sp_allow_non_ajax_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.sp_allow_non_ajax_comments%> />
+          <input name="setting[sp_allow_non_ajax_comments]" type="hidden" value="0" />
+          <label for="sp_allow_non_ajax_comments">Allow non-ajax comments</label>
+          <br /><small>(Spam bots usually don't know anything about ajax comments)</small>
+        </p>
+        <p>
+          <label for="sp_article_auto_close">Disable comments after</label>
+          <input name="setting[sp_article_auto_close]" size="4" id="sp_article_auto_close" type="text" value="<%= this_blog.sp_article_auto_close %>" /> days
+          <br /><small>(Set to 0 to never disable comments)</small>
+        </p>
+        <p>Typo will automatically reject comments and trackbacks which contain over a certain amount of links in them.</p>
+        <p>
+          <label for="sp_url_limit">Max URLs:</label>
+          <input name="setting[sp_url_limit]" size="4" id="sp_url_limit" type="text" value="<%= this_blog.sp_url_limit %>" /> links
+          <br /><small>(Set to 0 to never reject comments)</small>
+        </p>
+        <p class="r"><%= save("Save My Settings") %></p>
+    </div>
+    <div id="resources" class="set">
+        <h3>Resource Defaults</h3>
+        <p>
+          The below settings act as defaults when you choose to publish an enclosure with iTunes metadata.
+        </p>
+        <p>
+          <label for="itunes_author">Author:</label>
+          <input name="setting[itunes_author]" size="25" id="itunes_author" type="text" value="<%= this_blog.itunes_author %>" />
+        </p>
+        <p>
+          <label for="itunes_subtitle">Subtitle:</label>
+          <input name="setting[itunes_subtitle]" size="25" id="itunes_subtitle" type="text" value="<%= this_blog.itunes_subtitle %>" /><small>(setting for channel)</small>
+        </p>
+        <p>
+        <label for="itunes_summary">Summary:<small>(setting for channel)</small>
+</label> <br />
+          <textarea name="setting[itunes_summary]" cols="40" rows="3"><%= this_blog.itunes_summary %></textarea>
+        </p>
+        <p>
+          <label for="itunes_email">Email:</label>
+          <input name="setting[itunes_email]" size="25" id="itunes_email" type="text" value="<%= this_blog.itunes_email %>" /> <small> Not Published by Apple</small>
+        </p>
+        <p>
+          <label for="itunes_name">Optional Name:</label>
+          <input name="setting[itunes_name]" size="25" id="itunes_name" type="text" value="<%= this_blog.itunes_name %>" /> <small> Not Published by Apple</small>
+
+        </p>
+        <p>
+          <label for="itunes_copyright">Copyright Information:</label>
+          <input name="setting[itunes_copyright]" size="25" id="itunes_copyright" type="text" value="<%= this_blog.itunes_copyright %>" />
+        </p>
+        <p>
+          <label for="itunes_explicit">Explicit:</label>
+          <input name="setting[itunes_explicit]" id="itunes_explicit" type="checkbox"  value="1" <%= 'checked="checked"' if this_blog.itunes_explicit%> /><input name="setting[itunes_explicit]" type="hidden" value="0" />
+        </p>
+        <p class="r"><%= save("Save My Settings") %></p>
+    </div>
+ </div>
+
+ <div id="misc" class="set">
+   <h3>Cache</h3>
+   <%= link_to 'Empty Fragment Cache', :controller => 'cache', :action => 'sweep' %><br />
+   <%= link_to 'Rebuild cached HTML', :controller => 'cache', :action => 'sweep_html' %><br />
+   <div id="users">
+     <p>There are <%= @page_cache_size %> entries in the cache</p>
+   </div>
+</div>
+
+
+  <div id="operations" class="tasks">
+    <%= save("Save My Settings") %>
+  </div>
+
+  <%= end_form_tag %>