typo 5.1.3 → 5.1.98

data/CHANGES-5.1.3

@@ -1,21 +0,0 @@
-Typo 5.1.3 is the fourth release of the "Cartier-Bresson" series and released on sunday August the 31th. It is mostly a bugfix and behaviour fix version, so don't expect many changes.
-
-Bug #1244: error with postgresql database on admin/content
-Bug #1251: Documentation on dashboard is 404
-Bug #1252: migrations alter updated_at timestamps of articles and comments, affects RSS feeds
-Bug #1253: Twice redirect in admin/user#list if no admin
-Bug #1254: Fix little error when you use bad id in AdminUser#edit
-Bug #1255: Doesn't autosave if no define title
-Bug #1256: /article/ 301 redirect hits the default buffer which is not the expected behaviour
-Bug #1257: Articles redirect doesn't work with non-nil relative_url_root
-
-
-Rev #1784: Fixed requirements and added our official Typo mascot
-Rev #1786: Fixes a stupid behaviour that forces tags display name to be the same as the name in the url. IE : "web 2.0" would display on a page as web2-0 after transformation, which is stupid. Adds a migration that changes '.' into '-' in tag already in the database. Otherwise, it makes typo crash when accessing that tag. Allows edition of tag display name in the admin.
-Rev #1787:Removes database dependencies from installer. Now we assume you already have MySQL, PgSQL or SQLLite adater installed. Deletes 2 themes from FCKEditor, about 300k lighter now. Suppress caching from development environment
-Rev #1789: Fixes a stupid bug that allows a non administrative user to change his profile
-Rev #1792: Removing tmcode textfilter. It now has its own life at http://svn.typosphere.org/plugins/typo_textfilter_tmcode/. Removing amazon textfilter. It now has its own life at http://svn.typosphere.org/plugins/typo_textfilter_amazon/. Removing sparkline textfilter. It now has its own life at http://svn.typosphere.org/plugins/typo_textfilter_sparkline/
-Rev #1795: Fixes 2 nasty bugs with autosave. The first one broke autosave when no title was set. We now set a default title. The second one was overriding permalink with a void string when post was autosaved because the permalink field was empty after autosave. For autosave: If no title is given, Typo gives it a title like "Article Draft + post_id". When publishing, every article-draft-something permalink is just replaced with the article title crafted permalink.
-Rev #1796: Enables in admin database migration back, gets rid of the old pre 4.1 general controller, sets the CHANGELOG for 5.1.3.
-
-Many thanks to Cyril Mougel, Matijs van Zuijlen and Frédéric Logier for submitting patches.

data/app/controllers/admin/comments_controller.rb

@@ -1,57 +0,0 @@
-class Admin::CommentsController < Admin::BaseController
-
-  before_filter :get_article
-
-  def list
-    index
-    render :action => 'index'
-  end
-
-  def index
-    @comments = @article.comments.find(:all, :order => "id ASC")
-  end
-
-  def show
-    @comment = @article.comments.find(params[:id])
-  end
-
-  def new
-    @comment = @article.comments.build(params[:comment])
-
-    if request.post? and @comment.save
-      # We should probably wave a spam filter over this, but for now, just mark it as published.
-      @comment.mark_as_ham!
-      flash[:notice] = 'Comment was successfully created.'
-      redirect_to :controller => '/admin/comments', :article_id => @article.id, :action => 'list'
-    end
-  end
-
-  def edit
-    @comment = @article.comments.find(params[:id])
-    @comment.attributes = params[:comment]
-
-    if request.post? and @comment.save
-      flash[:notice] = 'Comment was successfully updated.'
-      redirect_to :action => 'show', :id => @comment.id
-    end
-  end
-
-  def destroy
-    @comment = @article.comments.find(params[:id])
-    if request.post?
-      @comment.destroy
-      redirect_to :action => 'list'
-    end
-  end
-
-  private
-
-    def get_article
-      @article = Article.find(params[:article_id])
-
-      if @article.nil?
-        redirect_to '/admin'
-      end
-    end
-
-end

data/app/controllers/admin/trackbacks_controller.rb

@@ -1,45 +0,0 @@
-class Admin::TrackbacksController < Admin::BaseController
-
-  before_filter :get_article
-
-  def list
-    index
-    render :action => 'index'
-  end
-
-  def index
-    @trackbacks = @article.trackbacks.find(:all, :order => "id DESC")
-  end
-
-  def show
-    @trackback = @article.trackbacks.find(params[:id])
-  end
-
-  def edit
-    @trackback = @article.trackbacks.find(params[:id])
-    @trackback.attributes = params[:trackback]
-    if request.post? and @trackback.save
-      flash[:notice] = 'Trackback was successfully updated.'
-      redirect_to :action => 'show', :id => @trackback.id
-    end
-  end
-
-  def destroy
-    @trackback = @article.trackbacks.find(params[:id])
-    if request.post?
-      @trackback.destroy
-      redirect_to :action => 'list'
-    end
-  end
-
-  private
-
-    def get_article
-      @article = Article.find(params[:article_id])
-
-      if @article.nil?
-        redirect_to '/admin'
-      end
-    end
-
-end

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

@@ -1,12 +0,0 @@
-<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") + _("Login") %>
-    <div class="form admin">
-
-	  <h4><%= _("Successfully logged out") %>.</h4>
-      <% if flash[:notice] %>
-        <h4><%= flash[:notice] %></h4>
-      <% end %>
-
-      <%= render :partial => "shared/loginform" %>
-    </div>
-</div>

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

@@ -1,13 +0,0 @@
-
-<div class="memo">
-    <h3>Welcome</h3>
-
-    <p>You are now logged into the system...</p>
-    <p>
-    Since you are here it's safe to assume the application never called store_location, otherwise
-    you would have been redirected somewhere else after a successful login.
-    </p>
-      
-    <%= link_to "&#171; logout", :action=>"logout"%>  
-      
-</div>

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

@@ -1,11 +0,0 @@
-<% form_tag :action=>"new" do %>
-
-<p>
-  <label for="category_name"><%= _("Title")%>:</label><br/>
-  <%= text_field 'category', 'name'  %>
-</p>
-
-<div id="operations">
-  <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,11 +0,0 @@
-  <% @page_heading = _('Edit Category') %>
-  <% content_for('tasks') do %>
-    <%= task_overview %>
-  <% end %>
-  <% form_tag :action=>"edit", :id => @category.id do %>
-  <div class="admin set">
-    <%= render_partial "form" %>
-  </div>
-
-  <%= cancel_or_save %>
-  <% end %>

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

@@ -1,11 +0,0 @@
-  <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
-
-  <% content_for('tasks') do %>
-    <%= task_overview %>
-  <% end %>
-
-  <p><%= _("Are you sure you want to delete this item?")%></p>
-  <% form_tag do %>
-  <%= hidden_field "comment", "id" %>
-  <%= confirm_delete %>
-  <% end %>

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

@@ -1,14 +0,0 @@
-  <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
-
-  <% content_for('tasks') do %>
-    <li><%= task_overview %></li>
-  <% end %>
-
-  <% form_tag :action=>"edit", :id => @comment.id do %>
-
-  <div class="admin set">
-    <%= render_partial "form" %>
-  </div>
-
-  <%= cancel_or_save %>
-  <% end %>

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

@@ -1,30 +0,0 @@
-  <% @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

@@ -1,28 +0,0 @@
-  <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
-  <% content_for('tasks') do %>
-	<%= task_overview %>
-  <% end %>
-  <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,47 +0,0 @@
-<% form_tag({:action => 'index'}, :method => :get, :name => 'article') do %>
-<table>
-<tr class="first">
-  <th><%= _("Title") %></th>
-  <th><%= _("Categories") %></th>
-  <th><%= _("Feedback")%></th>
-  <th><%= _("Date") %></th>
-  <th><%= _("Author")%></th>
-  <th><%= _("Status") %></th>
-  <th><%= _("Preview")%></th>
-  <th><%= _("Edit")%></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> <%= link_to_permalink article, h(article.title) %></td>
-  <td><%= article.categories.map { |c| link_to h(c.name), {:controller => 'content', :action => 'list', "search[category]" => c.id}}.join(", ") %></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_with_profiles article %></td>
-  <td class="operation"><%= link_to_destroy_with_profiles article %></td>
-</tr>
-<% end %>
-</table>
-<%end%>

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

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

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

@@ -1,3 +0,0 @@
-<% subtabs_for(:write) %>
-<%= render :partial => "drafts" %>
-<%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "edit", :id => @article.id } } %>

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

@@ -1,21 +0,0 @@
-<% form_tag :action=>"new" do %>
-<p>
-  <label for="page_title">Location:</label><br/>
-   /pages/<%= text_field 'page', 'name', :size => 16  %>
-</p>
-<p>
-  <label for="page_title">Title:</label><br />
-  <%= text_field 'page', 'title', :size => 20  %>
-</p>
-<p>
-  <label for="page_body">Content:</label><br />
-  <%= text_area 'page', 'body', :rows => 10  %>
-</p>
-<p>
-<label for="page_text_filter">Textfilter: </label><%= select 'page', 'text_filter', text_filter_options %><br/>
-</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 %>

data/app/views/admin/settings/podcast.html.erb

@@ -1,44 +0,0 @@
-<% @page_heading = _('Podcast') %>
-<% subtabs_for(:settings) %>
-<% form_tag :action => 'podcast' do %>
-
-<div class="admin">
-  <fieldset id="resources" class="set">
-    <ul>
-      <li><%= _("The below settings act as defaults when you choose to publish an enclosure with iTunes metadata")%>.</li>
-      <li>
-        <label for="itunes_author" class="float"><%= _("Author")%>:</label>
-        <input name="setting[itunes_author]" size="25" id="itunes_author" type="text" value="<%= this_blog.itunes_author %>" />
-      </li>
-      <li>
-        <label for="itunes_subtitle" class="float"><%= _("Subtitle")%>: <span class="mandatory">*</span></label>
-        <input name="setting[itunes_subtitle]" size="25" id="itunes_subtitle" type="text" value="<%= this_blog.itunes_subtitle %>" />
-      </li>
-      <li>
-        <label class="float" for="itunes_summary"><%= _("Summary")%>: <span class="mandatory">*</span></label>
-        <textarea name="setting[itunes_summary]" cols="40" rows="3"><%=h this_blog.itunes_summary %></textarea>
-        <span class="float mandatory">* <%= _("Setting for channel")%></span>
-      </li>
-      <li>
-        <label class="float" for="itunes_email"><%= _("Email")%>: <span class="mandatory">**</span></label>
-        <input name="setting[itunes_email]" size="25" id="itunes_email" type="text" value="<%= this_blog.itunes_email %>" />
-      </li>
-      <li>
-        <label class="float" for="itunes_name"><%= _("Optional Name")%>: <span class="mandatory">**</span></label>
-        <input name="setting[itunes_name]" size="25" id="itunes_name" type="text" value="<%= this_blog.itunes_name %>" />
-        <span class="float mandatory">** <%= _("Not published by Apple")%></span>
-      </li>
-      <li>
-        <label class="float" for="itunes_copyright"><%= _("Copyright Information")%>:</label>
-        <input name="setting[itunes_copyright]" size="25" id="itunes_copyright" type="text" value="<%= this_blog.itunes_copyright %>" />
-      </li>
-      <li class="checkbox">
-        <label class="float" 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" />
-      </li>
-    </ul>
-  </fieldset>
-<%= render :partial => 'submit' %>
-</div>
-  <% end %>

data/app/views/admin/settings/spam.html.erb

@@ -1,42 +0,0 @@
-	<% @page_heading = _('Spam') %>
-  <% subtabs_for(:settings) %>
-	<% form_tag :action => 'spam' do %>
-
-<div class="admin">
-	<fieldset id="spam" class="set">
-		<ul>
-			<li><%= _("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")%>.</li>
-			<li class="checkbox">
-				<label for="sp_global" class="float"><%= _("Enable spam protection")%>:</label>
-				<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" />
-			</li>
-			<li><%= _("Typo can (optionally) use the %s spam-filtering service.  You need to register with Akismet and receive an API key before you can use their service.  If you have an Akismet key, enter it here", '<a href="http://akismet.com">Akismet</a>')%> .
-			</li>
-			<li>
-				<label class="float" for="sp_akismet_key"><%= _("Akismet Key")%>:</label>
-				<input name="setting[sp_akismet_key]" id="sp_akismet_key" type="text" value="<%=h this_blog.sp_akismet_key %>" />
-			</li>
-      <li>
-          <%= _("You can optionally disable non-Ajax comments. Typo will always use Ajax for comment submission if Javascript is enabled, so non-Ajax comments are either from spammers or users without Javascript.")%>
-      </li>
-      <li class="checkbox">
-          <label for="sp_allow_non_ajax_comments" class="float"><%= _("Allow non-ajax comments") %>:</label>
-          <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" />
-      </li>
-      <li>
-          <label for="sp_article_auto_close" class="float"><%= _("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") %>
-          <span class="float"><%= _("Set to 0 to never disable comments")%></span>
-      </li>
-      <li>
-          <p><%= _("Typo will automatically reject comments and trackbacks which contain over a certain amount of links in them")%>.</p>
-          <label class="float" for="sp_url_limit"><%= _("Max Links")%>:</label>
-          <input name="setting[sp_url_limit]" size="4" id="sp_url_limit" type="text" value="<%= this_blog.sp_url_limit %>" />
-          <span class="float"><%= _("Set to 0 to never reject comments")%></span>
-      </li>
-		</ul>
-	</fieldset>
-<%= render :partial => 'submit' %>
-</div>
-  <% end %>

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

@@ -1,60 +0,0 @@
-<%= error_messages_for 'textfilter' %>
-<!--[form:textfilter]-->
-<fieldset class="list">
-	<legend>Description</legend>
-<ul>
-	<li>
-  	<label class="float" for="textfilter_name"><%= _("Name") %>:</label>
-  	<%= text_field 'textfilter', 'name', :size => 40  %>
-	</li>
-	<li>
-  	<label class="float" for="textfilter_description"><%= _("Description") %>:</label>
-  	<%= text_field 'textfilter', 'description', :size => 40  %>
-	</li>
-	<li>
-		<label class="float" for="markup"><%= _("Markup type")%>:</label>
-		<select name="textfilter[markup]">
-		<% @markup_options.each do |filter| -%>
-		  <option value="<%=h filter[0] %>" <% if @textfilter.markup == filter[0] %>selected<% end %>><%= filter[1] %></option>
-		<% end -%>
-		</select>
-	</li>
-</ul>
-</fieldset>
-
-<fieldset class="list set">
-	<legend><%= _("Post-processing filters")%></legend>
-<table style="margin-top: 15px">
-	<th colspan="2" class="first"><%= _("Name") %></th>
-	<th class="last">Description</th>
-<% @postprocess_options.sort_by {|f| f[1]}.each do |filter| %>
-  <tr <%= alternate_class %>>
-  <td class="first"><input name="filter[<%= filter[0] %>]" type="checkbox" value="1" <% if (filter[3]) %>checked="true"<% end %>/></td>
-  <td><label title="<%=h filter[2] %>"><%= filter[1]%></label></td>
-  <td class="last"><em><%= filter[2]%></em></td>
-  </tr>
-<% end -%>
-</table>
-</fieldset>
-
-<fieldset class="set">
-	<legend><%= _("Parameters")%></legend>
-	<ul>
-		<% @filterparams.keys.sort.each do |key| -%>
-		<li>
-			<label class="float" for="params[<%= key %>]"  title="<%=h @filterhelp[key] %>"><%= @filterdescriptions[key] %></label>
-			<% if @filteroptions[key].nil? -%>
-			<input name="params[<%= key %>]" value="<%=h @filterparams[key] %>"/>
-			<% else -%>
-			<select name="params[<%= key %>]">
-				<% for opt in @filteroptions[key] -%>
-		    <option value="<%= opt.downcase.gsub(' ','_') %>"<%= %{ selected="selected"} if opt.downcase.gsub(' ','_') == @filterparams[key] %>><%= opt %></option>
-				<% end -%>
-			<% end -%>		
-		  </select>
-		</li>
-		<% end -%>
-	</ul>
-</fieldset>
-
-<!--[eoform:pages]-->

data/app/views/admin/textfilters/_macros.html.erb

@@ -1,16 +0,0 @@
-<table>
-<tr>
-  <th class="first"><%= _("Name")%></th>
-  <th><%= _("Description")%></th>
-  <th><%= _("Tag")%></th>
-  <th class="last"><%= _("Help")%></th>
-</tr>
-<% for macro in @macros.sort_by { |f| f.short_name } %>
-<tr <%= alternate_class %>>
-  <td class="first"><%=h macro.display_name %> </td>
-  <td><%=h macro.description %></td>
-  <td><code>&lt;typo:<%=h macro.short_name %>&gt;</code></td>
-  <td class="operation last"><%= link_to image_tag('admin/show.png'), :action => 'macro_help', :id => macro.short_name %></td>    
-</tr>  
-<% end %>
-</table>

data/app/views/admin/textfilters/_textfilters.html.erb

@@ -1,20 +0,0 @@
-<table>
-<tr>
-  <th class="first"><%= _("Name")%></th>
-  <th><% _("Description")%></th>
-  <th><%= _("Markup")%></th>
-  <th><%= _("Filters")%></th>
-  <th><%= _("Edit")%></th>
-	<th class="last"><%= _("Delete") %></th>
-</tr>
-<% for textfilter in @textfilters.sort_by { |f| f.name } %>
-<tr <%= alternate_class %>>
-  <td class="first"><%= link_to textfilter.name, {:action => "show", :id => textfilter.id} %> </td>
-  <td><%=h textfilter.description %></td>
-  <td><%=h @textfilter_map[textfilter.markup].display_name %></td>
-  <td><%= textfilter.filters.collect { |f| h(@textfilter_map[f.to_s].display_name) }.join(" &#8594; ") %></td>
-  <td class="operation"><%= link_to_edit textfilter %></td>
-  <td class="operation last"><%= link_to_destroy textfilter %></td>    
-</tr>  
-<% end %>
-</table>

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

@@ -1,10 +0,0 @@
-  <% @page_heading = _('Text Filters') %>
-  <% content_for('tasks') do %>
-    <%= task_overview %>
-  <% end %>
-
-  <p><%= _("Are you sure you want to delete this filter")%> '<%= @textfilter.name %>'?</p>
-  <% form_tag :controller => '/admin/textfilters', :action => 'destroy' do %>
-  <%= hidden_field "textfilter", "id" %>
-  <%= confirm_delete(_("Delete this filter")) %>
-  <% end %>

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

@@ -1,14 +0,0 @@
-  <% @page_heading = _('Text Filters') %>
-  <% content_for('tasks') do %>
-    <%= task_overview %>
-  <% end %>
-  
-  <% form_tag({ :action => "edit", :id => @textfilter }, :id => "textfilter_form") do %>
-  <h3><%= _("Editing textfilter")%></h3>
-
-  <div class="form">
-    <%= render :partial => "form" %>
-  </div>
-
-  <%= cancel_or_save %>
-  <% end %>

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

@@ -1,12 +0,0 @@
-  <% @page_heading = _('Text Filters') + ' <span> &raquo; '+ link_to(_('add new'), :action=>'new') +'</span>' %>
-  <% subtabs_for(:settings) %>
-
-  <div class="list" id="textfilters">	
-    <%= render :partial => 'textfilters' %>
-  </div>                      
-
-  <h2><%= _("Macros")%></h2>
-  <div class="list" id="macros">
-    <% reset_alternation -%>
-    <%= render :partial => "macros" %>
-  </div>

data/app/views/admin/textfilters/macro_help.html.erb

@@ -1,3 +0,0 @@
-<% @page_heading = _("Macro Filter Help") + ": #{@macro.display_name}" %>
-  <% subtabs_for(:sidebar) %>
-  <%= @help_text %>

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

@@ -1,12 +0,0 @@
-  <% @page_heading = _('Create Text Filter') %>
-  <% content_for('tasks') do %>
-    <%= task_overview %>
-  <% end %>
-  <% form_tag({ :action => "new" }, :id => "textfilter_form") do %>
-
-  <div class="admin">
-    <%= render_partial "form" %>
-  </div>
-
-  <%= cancel_or_save %>
-  <% end %>

data/app/views/admin/textfilters/preview.html.erb

@@ -1,3 +0,0 @@
-<h3><%= @page[:title] %></h3>
-
-<p><%= TextfilterController.named_filter(@page[:body], @page[:text_filter]) %></p>

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

@@ -1,29 +0,0 @@
-  <% @page_heading = _("Text Filter Details") + ": #{@textfilter.description}" %>
-  <% subtabs_for(:sidebar) %>
-  <h3><%=h @textfilter.description %></h3>
-
-  <div class="form">	
-    <h4><%= _("Markup type")%>:</h4>
-    <%=h @textfilters[@textfilter.markup].display_name %>
-    
-    <% if @textfilter.filters.size > 0 -%>
-    <h4><%= _("Post-processing filters")%></h4>
-      <ul>
-       <% @textfilter.filters.each do |key| -%>
-        <li><%=h @textfilters[key.to_s].display_name %></li>
-       <% end -%>
-      </ul>
-    <% end -%>
-    
-    <% if @textfilter.params.size > 0 -%>
-    <h4><%= _("Parameters")%></h4>
-      <table>
-        <% @textfilter.params.keys.sort.each do |key| -%>
-        <tr>
-          <td><em><%=h key %></em></td>
-          <td><%= @textfilter.params[key] %></td>
-        </tr>
-        <% end -%>
-      </table>
-    <% end -%>
-  </div>

data/app/views/admin/textfilters/show_help.html.erb

@@ -1,4 +0,0 @@
-  <% @page_heading = _("Text Filter Help") + ": #{@textfilter.description}" %>
-  <% subtabs_for(:sidebar) %>
-  
-  <%= @help_text %>