typo 4.1.1 → 5.0

data/app/views/admin/users/_user.rhtml

@@ -1,9 +0,0 @@
-<div class="user">
-  <h4><%= link_to h(user.login), {:action => "show", :id => user.id} %></h4>
-        <p><%= _("Number of Articles")%>: <%= Article.count :conditions => "user_id = #{user.id}"  %></p>
-        <p><%= _("Number of Comments")%>: <%= Comment.count :conditions => "user_id = #{user.id}"  %></p>
-        <p><%= _("Notified") %> <% if user.notify_via_email? %> <%= _("via email") %> <% end %>:
-          <%= "new articles" if user.notify_on_new_articles? %>
-          <%= "comments" if user.notify_on_comments? %></p>
-  <p><%= link_to _('Edit'), :action => 'edit', :id => user  %><strong> |</strong> <%= link_to _('Delete'), :action => 'destroy', :id => user %></p>
-</div>

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

@@ -1,18 +0,0 @@
-  <% @page_heading = _('Edit User') %>
-  <% content_for('tasks') do %>
-  <%= tab _("New User"), :controller=>"users", :action=>"new"%>
-  <%= task_overview %>
-  <% end%>
-
-  <% form_tag :action=>"edit", :id => @user.id do %>
-
-  <h3><%= _("Editing user")%></h3>
-  <div class="form">
-    <%= render_partial "form" %>
-  </div>
-
-  <div id="operations">
-    <%= save %> or <%= cancel %>
-  </div>
-
-  <% end %>

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

@@ -1,9 +0,0 @@
-  <% @page_heading = _('Manage Users') %>
-
-  <% content_for('tasks') do %>
-    <%= task_new _('Add new user') %>
-  <% end %> 
-  <div id="users">	
-    <%= render :partial => 'user', :collection => @users  %>
-    <br clear="all" />
-  </div>

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

@@ -1,17 +0,0 @@
-  <% @page_heading = _('New User') %>
-  <% content_for('tasks') do %>
-  <%= task_overview %>
-  <% end%>
-  <h3><%= _("Creating user")%></h3>
-
-  <% form_tag :action=>"new" do %>
-
-  <div class="form">
-    <%= render_partial "form" %>
-  </div>
-
-  <div id="operations">
-    <%= save %> or <%= cancel %>
-  </div>
-
-  <% end %>

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

@@ -1,24 +0,0 @@
-  <% @page_heading = _("User") + ": #{@user.name}" %>
-
-  <% content_for('tasks') do %>
-    <%= task_new 'Create new user' %>
-    <%= task_edit 'Edit this user', @user.id %>
-  <% end %> 
-
-  <div class="form">	
-    <label><%= _("Name")%>:</label> <span class="static"><%=h @user.name %></span><br/>
-    <label><%= _("Login")%>:</label> <span class="static"><%=h @user.login %></span><br/>
-    <label><%= _("Email")%>:</label> <span class="static"><%=h @user.email %></span><br/>
-    <label><%= _("Jabber")%>:</label> <span class="static"><%=h @user.jabber %></span><br/>
-    <label><%= _("Notify via email")%>:</label> <span class="static"><%= @user.notify_via_email? ? _("yes") : _("no") %></span><br/>
-    <label><%= _("Notify via jabber")%>:</label> <span class="static"><%= @user.notify_via_jabber? ? _("yes") : _("no") %></span><br/>
-    <label><%= _("Notify on new articles")%>:</label> <span class="static"><%= @user.notify_on_new_articles? ? _("yes") : _("no") %></span><br/>
-    <label><%= _("Notify on new comments")%>:</label> <span class="static"><%= @user.notify_on_comments? ? _("yes") : _("no") %></span><br/>
-    
-  </div>
-
-
-  <div class="list">
-    <h2><%= _("User's articles")%></h2>
-    <%= render :partial => 'admin/content/articles' %>
-  </div>

data/app/views/articles/_comment_box.rhtml

@@ -1,44 +0,0 @@
-<%= form_remote_tag :url => {:action => "comment", :id => @article}, 
-                    :position=> :bottom, 
-                    :update => {:success => 'commentList'},
-                    :loading => "loading()", 
-                    :complete => "complete(request)",
-                    :failure => "failure(request)",
-                    :html => {:id=>"commentform",:class=>"commentform"} %>
-
-
-<div class="comment-box">
-  <div id="errors"></div>
-  <div id="preview" style="display: none"></div>
-
-  <a name="respond"></a>
-  <table cellpadding="4" cellspacing="0" class="frm-tbl">
-    <tr>
-      <td><p><label for="comment_author"><%= _("Your name")%></label></p></td>
-      <td> <%= text_field "comment", "author", :size => 20 %> <small><%= link_to_function("(leave url/email &#187;)", "Element.toggle('guest_url'); Element.toggle('guest_email')") %></small></td>
-    </tr>
-    <tr id="guest_url" style="display:none;">
-      <td><p><label for="comment_url"><%= _("Your blog")%></label></p></td>
-      <td> <%= text_field "comment", "url" %></td>
-    </tr>
-    <tr id="guest_email" style="display:none;">
-      <td><p><label for="comment_email"><%= _("Your email")%></label></p></td>
-      <td> <%= text_field "comment", "email" %></td>
-    </tr>
-    <tr>
-      <td><p><label for="comment_body"><%= _("Your message")%></label></p></td>
-      <td valign="top" colspan="2">
-        <%= text_area "comment", "body" %>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2" id="frm-btns">
-      <span id="comment_loading" style="display:none;"><%= image_tag "spinner.gif" %></span>&nbsp;&nbsp;
-      <%= markup_help_popup TextFilter.find_by_name(this_blog.comment_text_filter), _("Comment Markup Help") %>
-      <a href="#" onclick="new Ajax.Updater('preview', '<%= url_for :action => 'comment_preview' %>',  {asynchronous:true, evalScripts:true, parameters:Form.serialize('commentform'), onComplete:function(request){Element.show('preview')}}); return false;"><%= _("Preview comment")%></a>      
-      <input type="submit" name="submit" id="form-submit-button" value="submit" class="button" />
-      </td>
-    </tr>
-  </table>
-</div>
-<%= end_form_tag %>

data/app/views/articles/index.rhtml

@@ -1,11 +0,0 @@
-<% for article in @articles -%>
- <div class="post">
-  <%= render_partial "article", article %>
-  <%= link_to_permalink article, _("Read more") + "..." if article.extended? %>
-  <p class="meta"><%= article_links article %></p>
-  </div>
-<% end -%>
-
-<% unless @pages.item_count <= this_blog.limit_article_display %>
-  <p id="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
-<% end -%>

data/app/views/articles/read.rhtml

@@ -1,70 +0,0 @@
-<!--
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-       xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
-       xmlns:dc="http://purl.org/dc/elements/1.1/">
-<rdf:Description
-    rdf:about=""
-<% if @article.allow_pings? -%>
-    trackback:ping="<%= @article.trackback_url %>"
-<% end -%>
-    dc:title="<%=h @article.title.gsub(/-+/, '-') %>"
-    dc:identifier="<%= @article.permalink_url %>"
-    dc:description="<%=h (html(@article).strip_html[0..255]).gsub(/-+/, '-') %>"
-    dc:creator="<%= h @article.author %>"
-    dc:date="<%= @article.updated_at.xmlschema %>" />
-</rdf:RDF>
--->
-
-<div class="post"<%= onhover_show_admin_tools(:article) %>>
-  <%= link_to("edit", { :controller => "admin/content", :action => "edit", :id => @article },
-        :class => "admintools", :style => "display: none", :id => "admin_article") %>
-  <h2><%=h @article.title %></h2>
-  <p class="auth"><%= _("Posted by")%> <%= author_link(@article) %>
-  <%= js_distance_of_time_in_words_to_now @article.published_at.utc %></p>
-  <%= html(@article) %>
-</div>
-<p class="meta">
-  <%= article_links @article %>
-</p>
-
-<% if @article.allow_comments? or @article.published_comments.size > 0 -%>
-  <a name="comments"></a><h4 class="blueblk">Comments</h4>
-  <% unless @article.comments_closed? -%>
-    <p class="postmetadata alt">
-      <small><a href="#respond"><%= _("Leave a response")%></a></small>
-    </p>
-  <% end -%>
-  <ol class="comment-list" id="commentList">
-  <% if @article.published_comments.blank? %>
-    <li id="dummy_comment" style="display: none"></li>
-  <% else %>
-    <%= render(:partial => "comment", :collection => @article.published_comments) %>
-  <% end %>
-  </ol>
-<% end -%>
-
-<% if @article.allow_pings? -%>
-  <a name="trackbacks"></a><h4 class="blueblk"><%= _("Trackbacks")%></h4>
-  <p>
-    <%= _("Use the following link to trackback from your own site")%>:<br/>
-    <span class="light-bg"><%= @article.trackback_url %></span>
-    </p>
-  <%= content_tag(:ol,
-        render(:partial => "trackback", :collection => @article.published_trackbacks),
-        :id => 'trackbackList', :class => 'trackback-list') unless @article.published_trackbacks.blank? %>
-<% end -%>
-
-<p class="postmetadata alt">
-  <small>
-  <a href="<%= url_for :controller => 'xml', :action=>'feed', :type=>'article', :format => 'rss20', :id => @article %>" title="RSS Feed"><%= _("RSS feed for this post")%></a>
-<% if @article.allow_pings? -%>
-  <a href="<%= @article.trackback_url %>" ><%= _("trackback uri")%></a>
-<% end -%>
-  </small>
-</p>
-
-<% unless @article.comments_closed? -%>
-  <%= render :partial => 'comment_box' %>
-<% else -%>
-  <p><%= _("Comments are disabled")%></p>
-<% end -%>

data/app/views/layouts/administration.rhtml

@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-        <head>
-                <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-                <title>Typo Administration:  <%= controller.controller_name %></title>
-                <meta http-equiv="imagetoolbar" content="no" />
-				<%= javascript_include_tiny_mce_if_used if this_blog.editor == 2 and (controller.action_name == 'new' or controller.action_name == 'edit') %>
-				<%= tiny_mce if this_blog.editor == 2 and (controller.action_name == 'new' or controller.action_name == 'edit') %>
-                <%= stylesheet_link_tag "administration.css" %>
-                <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo" %>
-        </head>
-
-        <body>
-        <div id="container">
-
-        <!-- HEADER -->
-          <div id="header">
-
-          <div id="info">
-            <%= current_user_notice rescue nil %> |
-            <%= link_to _('your blog') + '&raquo;', :controller => "/articles" %>
-
-          </div>
-            <h1><%= link_to _("Typo admin") + " - #{this_blog.blog_name rescue nil}", :controller => "/admin/general" %></h1>
-          </div>
-        <!-- /HEADER -->
-
-
-        <div id="tabs-container">
-          <ul id="tabs">
-            <%= tab _("Publish"), :controller=>"/admin/content", :action => 'new' %>
-            <%= tab _("Manage"), :controller=>"/admin/content/list", :action => 'index' %>
-            <%= tab _("Feedback"), :controller=>"/admin/feedback", :action => 'index' %>
-            <%= tab _("Design"), :controller=>"/admin/sidebar", :action => 'index' %>
-            <%= tab _("Users"), :controller=>"/admin/users", :action => 'index' %>
-            <%= tab _("Settings"), :controller=>"/admin/", :action => 'index' %>
-            <%= tab _("Statistics"), :controller=>"/stats", :action => 'index' %>
-          </ul>
-        </div>
-
-
-        <div id="overall">
-          <% if flash[:notice] or flash[:error] %>
-        <div id="flash">
-          <%= render_flash rescue nil %>
-        </div>
-        <% end %>
-
-        <div id="content">
-          <div id="main">
-            <h2><%= @page_heading %></h2>
-
-            <% if not first_render =~ /general|login|signup|logout/ %>
-       <div class="tasks">
-              <h3><%= _("Things you can do") %></h3>
-              <ul>
-                <%= @content_for_tasks %>
-         </ul>
-         <div style="clear:both;"></div>
-            </div>
-       <% end %>
-       <%= @content_for_layout %>
-          </div>
-          </div>
-        </div>
-        <div id="footer">
-            Typo <%=h TYPO_VERSION %> <%= _("with %s Famfamfam iconset %s", '<a href="http://famfamfam.com/">', '</a>') %>
-        </div>
-        </div>
-        </body>
-</html>
-

data/app/views/notification_mailer/article.rhtml

@@ -1,6 +0,0 @@
-<p>A new article has been posted on <%=h @blog_name %>:</p>
-
-<%= render :partial => './mail_header' %>
-<h2><%=h @article.title %></h2>
-<%= html @article, :body %>
-<%= render :partial => './mail_footer' %>

data/app/views/notification_mailer/comment.rhtml

@@ -1,11 +0,0 @@
-<p>A new comment has been posted on
-    <a href="<%= @blog.base_url%>"><%= @blog_name %></a>, responding to
-    <a href="<%= @comment.article.permalink_url %>"><%=h(@comment.article.title) %></a>.</p>
-
-<%= render :partial => './mail_header' %>
-<h2><%=h @comment.title %></h2>
-<cite><strong><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></strong> </cite>
- <%= link_to('said', @comment.permalink_url) %>
- <%= distance_of_time_in_words @article.published_at, @comment.created_at %> later:<br />
-<%= html @comment %>
-<%= render :partial => './mail_footer' %>

data/app/views/shared/_search.rhtml

@@ -1,10 +0,0 @@
-<% form_tag({:controller => 'articles',  :action => 'search'}, {:method => 'get', :id => 'sform'}) do %>
- <label for="q">Live Search:</label><input type="text" id="q" name="q" value="" size="15" />
-<%= image_tag "spinner-blue.gif", :id => 'search_spinner', :style => 'display:none;' %>
-<% end %>
-<%= observe_field "q", :frequency => 1,
-    :url => { :controller => "live", :action => "search" },
-    :loading => "Element.show('search_spinner')",
-    :complete => "Element.hide('search_spinner')",
-    :update => "search-results",
-    :with => "'q=' + escape($F('q'))" -%>

data/app/views/xml/atom10_feed.rxml

@@ -1,18 +0,0 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-xml.feed "xml:lang" => "en-US", "xmlns" => 'http://www.w3.org/2005/Atom' do
-  xml.title @feed_title
-  if(not this_blog.blog_subtitle.blank?)
-    xml.subtitle this_blog.blog_subtitle, "type"=>"html"
-  end
-  xml.id "tag:#{@controller.request.host},2005:Typo"
-  xml.generator "Typo", :uri => "http://www.typosphere.org", :version => '4.0'
-  xml.link "rel" => "self", "type" => "application/atom+xml", "href" => url_for(:only_path => false)
-  xml.link "rel" => "alternate", "type" => "text/html", "href" => @link
-
-  xml.updated @items.first.updated_at.xmlschema unless @items.empty?
-
-  @items.each do |item|
-    render :partial => "atom10_item_#{item.class.name.to_s.downcase}",
-      :locals => {:item => item, :xm => xml}
-  end
-end

data/app/views/xml/itunes_feed.rxml

@@ -1,29 +0,0 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-xml.instruct! 'xml-stylesheet', :type=>"text/css", :href => url_for("/stylesheets/rss.css")
-
-xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
-        "xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/",
-        "xmlns:itunes" => "http://www.itunes.com/dtds/podcast-1.0.dtd" do
-
-  xml.channel do
-    xml.title @feed_title
-    xml.link @link
-    xml.language "en-us"
-    xml.ttl "40"
-    xml.description this_blog.blog_subtitle
-
-    xml.itunes :author,(this_blog.itunes_author)
-    xml.itunes :subtitle,(this_blog.itunes_subtitle)
-    xml.itunes :summary,(this_blog.itunes_summary)
-    xml.itunes :owner do
-      xml.itunes :name,(this_blog.itunes_name)
-      xml.itunes :email,(this_blog.itunes_email)
-    end
-    xml.copyright(this_blog.itunes_copyright)
-
-    @items.each do |item|
-      render :partial => "itunes_item_resource",
-        :locals => {:item => item, :xm => xml}
-    end
-  end
-end

data/app/views/xml/rss20_feed.rxml

@@ -1,18 +0,0 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-xml.instruct! 'xml-stylesheet', :type=>"text/css", :href => url_for("/stylesheets/rss.css")
-
-xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
-        "xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
-  xml.channel do
-    xml.title @feed_title
-    xml.link @link
-    xml.language "en-us"
-    xml.ttl "40"
-    xml.description this_blog.blog_subtitle
-
-    @items.each do |item|
-      render :partial => "rss20_item_#{item.class.name.to_s.downcase}",
-        :locals => {:item => item, :xm => xml}
-    end
-  end
-end

data/lib/sanitize.rb

@@ -1,107 +0,0 @@
-#
-# $Id: sanitize.rb 3 2005-04-05 12:51:14Z dwight $
-#
-# Copyright (c) 2005 Dwight Shih
-# A derived work of the Perl version:
-# Copyright (c) 2002 Brad Choate, bradchoate.com
-# 
-# Permission is hereby granted, free of charge, to
-# any person obtaining a copy of this software and
-# associated documentation files (the "Software"), to
-# deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify,
-# merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to
-# whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission
-# notice shall be included in all copies or
-# substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY
-# OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-# LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-# OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-
-def sanitize( html, okTags='a href, b, br, i, p' )
-  # no closing tag necessary for these
-  soloTags = ["br","hr"]
-
-  # Build hash of allowed tags with allowed attributes
-  tags = okTags.downcase().split(',').collect!{ |s| s.split(' ') }
-  allowed = Hash.new
-  tags.each do |s|
-    key = s.shift
-    allowed[key] = s
-  end
-
-  # Analyze all <> elements
-  stack = Array.new
-  result = html.gsub( /(<.*?>)/m ) do | element |
-    if element =~ /\A<\/(\w+)/ then
-      # </tag>
-      tag = $1.downcase
-      if allowed.include?(tag) && stack.include?(tag) then
-        # If allowed and on the stack
-        # Then pop down the stack
-        top = stack.pop
-        out = "</#{top}>"
-        until top == tag do
-          top = stack.pop
-          out << "</#{top}>"
-        end
-        out
-      end
-    elsif element =~ /\A<(\w+)\s*\/>/
-      # <tag />
-      tag = $1.downcase
-      if allowed.include?(tag) then
-        "<#{tag} />"
-      end
-    elsif element =~ /\A<(\w+)/ then
-      # <tag ...>
-      tag = $1.downcase
-      if allowed.include?(tag) then
-        if ! soloTags.include?(tag) then
-          stack.push(tag)
-        end
-        if allowed[tag].length == 0 then
-          # no allowed attributes
-          "<#{tag}>"
-        else
-          # allowed attributes?
-          out = "<#{tag}"
-          while ( $' =~ /(\w+)=("[^"]+")/ )
-            attr = $1.downcase
-            valu = $2
-            if allowed[tag].include?(attr) then
-              out << " #{attr}=#{valu}"
-            end
-          end
-          out << ">"
-        end
-      end
-    end
-  end
-  
-  # eat up unmatched leading >
-  while result.sub!(/\A([^<]*)>/m) { $1 } do end
-  
-  # eat up unmatched trailing <
-  while result.sub!(/<([^>]*)\Z/m) { $1 } do end
-  
-  # clean up the stack
-  if stack.length > 0 then
-    result << "</#{stack.reverse.join('></')}>"
-  end
-
-  result
-end