typo 3.99.0

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

@@ -0,0 +1,9 @@
+<div class="user">
+  <h4><%= link_to h(user.login), {:action => "show", :id => user.id} %></h4>
+	<p>Number of Articles: <%= Article.count "user_id = #{user.id}"  %></p>
+	<p>Number of Comments: <%= Comment.count "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/destroy.rhtml

@@ -0,0 +1,14 @@
+  <% @page_heading = 'Users' %>
+
+  <% content_for('tasks') do %>
+    <%= task_show 'Show this user', @user.id %>
+  <% end %> 
+
+  <h3>Really delete user "<%= @user.name || @user.login %>" ?</h3>
+  <br/>
+
+
+  <%= start_form_tag %>
+  <%= hidden_field "user", "id" %>
+  <%= confirm_delete("Yes...") %>
+  <%= end_form_tag %>

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

@@ -0,0 +1,14 @@
+  <% @page_heading = 'Users' %>
+
+  <%= start_form_tag :action=>"edit", :id => @user.id %>
+
+  <h3>Editing user</h3>
+  <div class="form">	
+    <%= render_partial "form" %>
+  </div>
+
+  <div id="operations">
+    <%= save %> or <%= cancel %>
+  </div>
+
+  <%= end_form_tag %>

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

@@ -0,0 +1,9 @@
+  <% @page_heading = '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

@@ -0,0 +1,15 @@
+  <% @page_heading = 'Users' %>
+
+  <h3>Creating user</h3>
+
+  <%= start_form_tag :action=>"new" %>
+
+  <div class="form">	
+    <%= render_partial "form" %>
+  </div>
+
+  <div id="operations">
+    <%= save %> or <%= cancel %>  
+  </div>
+
+  <%= end_form_tag %>

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

@@ -0,0 +1,18 @@
+  <% @page_heading = 'Users' %>
+
+  <% 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>

data/app/views/articles/_article.rhtml

@@ -0,0 +1,4 @@
+<h2><%= article_link article.title, article %></h2>
+<p class="auth">Posted by <%= author_link(article) %>
+<%= js_distance_of_time_in_words_to_now article.published_at %></p>
+<%= article.body_html %>

data/app/views/articles/_comment.rhtml

@@ -0,0 +1,7 @@
+<li id="comment-<%= comment.id %>" <%= 'class="author_comment"' if comment.user %> <%= 'style="display:none"' if controller.request.xhr? %><%= onhover_show_admin_tools(:comment, comment.id) %>>
+  <%= admin_tools_for comment %>
+  <a name="comment-<%= comment.id %>"></a>
+  <%= gravatar_tag(comment.email) if this_blog.use_gravatar and comment.email %>
+  <cite><strong><%= link_to_unless(comment.url.blank?, h(comment.author), comment.url) %></strong> </cite> said <%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:<br />
+  <%= comment.full_html %>
+</li>

data/app/views/articles/_comment_box.rhtml

@@ -0,0 +1,43 @@
+<%= 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;
+      <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/_comment_error.rhtml

@@ -0,0 +1 @@
+<%= error_messages_for("comment") %>

data/app/views/articles/_trackback.rhtml

@@ -0,0 +1,7 @@
+<li id="trackback-<%= trackback.id %>"<%= onhover_show_admin_tools(:trackback, trackback.id) %>>
+  <%= admin_tools_for trackback %>
+  <a name="trackback-<%= trackback.id %>"></a>
+  From <strong><%= trackback.blog_name %></strong><br />
+  <a href="<%= trackback.url %>" rel="nofollow"><%=h trackback.title %></a><br/>
+  <%= trackback.excerpt %>
+</li>

data/app/views/articles/archives.rhtml

@@ -0,0 +1,22 @@
+<% if @articles.to_a.empty? -%>
+<div class="post">
+<p>No articles found...</p>
+</div>
+<% else
+     currentmonth = 0
+     currentyear = 0
+     for article in @articles
+       if (article.published_at.month != currentmonth || article.published_at.year != currentyear)
+         currentmonth = article.published_at.month
+         currentyear = article.published_at.year -%>
+          <h3 class="archivemonth"><%= Date::MONTHNAMES[article.published_at.month] %> <%= article.published_at.year %></h3>
+           <% end -%>
+  <div class="archivepost">
+  <%= article.published_at.mday %> -
+  <%= article_link h(article.title), article %>
+  <% if !article.categories.empty? %> posted in
+  <%= article.categories.collect {|c| link_to c.name, :controller=>"articles", :action=>"category", :id=>c.name }.join(", ") -%>
+  <% end -%>
+ </div>
+<% end
+  end -%>

data/app/views/articles/comment_preview.rhtml

@@ -0,0 +1,3 @@
+<%= gravatar_tag(@comment.email) if this_blog.use_gravatar and @comment.email %>
+<cite><strong><%=h @comment[:author] %></strong></cite>  is about to say:<br />
+<%= @comment.full_html %>

data/app/views/articles/error.rhtml

@@ -0,0 +1,3 @@
+<div class="post">
+  <p><%= @message %></p>
+</div>

data/app/views/articles/groupings.rhtml

@@ -0,0 +1,14 @@
+<div class="entry">
+<% unless @groupings.empty? -%>
+<% max_counter = @groupings[0].article_counter -%>
+<%= ul_tag_for @grouping_class %>
+<% for grp in @groupings.sort_by{|grp|grp.display_name} -%>
+  <li class="<%= calc_distributed_class(grp.article_counter, max_counter, @grouping_class, 0, 10) %>">
+    <%= link_to_grouping(grp) %>
+  </li>
+<% end -%>
+</ul>
+<% else -%>
+<p>There are <%= @grouping_class.to_s.underscore.pluralize %>.</p>
+<% end -%>
+</div>

data/app/views/articles/index.rhtml

@@ -0,0 +1,11 @@
+<% for article in @articles -%>
+ <div class="post">
+  <%= render_partial "article", article %>
+  <%= article_link "Read more...", article 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

@@ -0,0 +1,70 @@
+<!--
+<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="<%= server_url_for :controller=>"articles", :action=>"trackback", :id=>@article %>"
+<% end -%>
+    dc:title="<%=h @article.title.gsub(/-+/, '-') %>"
+    dc:identifier="<%= article_url(@article, false) %>"
+    dc:description="<%=h strip_html(@article.full_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>
+  <%= @article.full_html %>
+</div>
+<p class="meta">
+  <%= article_links @article %>
+</p>
+
+<% if @article.allow_comments? or @article.comments.size > 0 -%>
+  <a name="comments"></a><h4 class="blueblk">Comments</h4>
+  <% if @article.allow_comments? -%>
+    <p class="postmetadata alt">
+      <small><a href="#respond">Leave a response</a></small>
+    </p>
+  <% end -%>
+  <ol class="comment-list" id="commentList">
+  <% if @article.comments.blank? %>
+    <li id="dummy_comment" style="display: none"></li>
+  <% else %>
+    <%= render(:partial => "comment", :collection => @article.comments.to_a.select {|c| c.published? }) %>
+  <% 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"><%= server_url_for :controller=>"articles", :action=>"trackback", :id=>@article.id %></span>
+    </p>
+  <%= content_tag(:ol,
+        render(:partial => "trackback", :collection => @article.trackbacks),
+        :id => 'trackbackList', :class => 'trackback-list') unless @article.trackbacks.blank? %>
+<% end -%>
+
+<p class="postmetadata alt">
+  <small>
+  <a href="<%= xml_url :action=>'feed', :type=>'article', :format => 'rss20', :id => @article %>" title="RSS Feed">RSS feed for this post</a>
+<% if @article.allow_pings? -%>
+  <a href="<%= server_url_for :controller=>"articles", :action=>"trackback", :id => @article.id %>" >trackback uri</a>
+<% end -%>
+  </small>
+</p>
+
+<% if @article.allow_comments? -%>
+  <%= render :partial => 'comment_box' %>
+<% else -%>
+  <p>Comments are disabled</p>
+<% end -%>

data/app/views/articles/trackback.rxml

@@ -0,0 +1,5 @@
+xml.instruct! :xml, :version=>"1.0", :encoding=>"iso-8859-1"
+xml.response do
+  xml.error(@error_message.blank? ? 0 : 1)
+  xml.message(@error_message) if @error_message
+end

data/app/views/articles/view_page.rhtml

@@ -0,0 +1,3 @@
+<div id="viewpage" >
+  <%= @page.full_html %>
+</div>

data/app/views/layouts/accounts.rhtml

@@ -0,0 +1,22 @@
+<!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" />
+		<%= stylesheet_link_tag "administration.css" %>
+		<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo" %>
+	</head>
+
+	<body>
+	<div id="container">
+
+  	<div id="content">
+  	  <h2><%= @page_heading %></h2>
+      <%= @content_for_layout %>
+  	</div>
+  </div>
+	</body>
+</html>
+

data/app/views/layouts/administration.rhtml

@@ -0,0 +1,75 @@
+<!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" />
+                <%= 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">
+            <%= link_to "settings", :controller=>"/admin/general", :action => 'index' %> |
+            <%= current_user_notice rescue nil %> |
+            <%= link_to 'your blog &raquo;', :controller => "/" %>
+
+          </div>
+            <h1><%= link_to "Typo admin - #{this_blog.blog_name rescue nil}", :controller => "/admin/" %></h1>
+          </div>
+        <!-- /HEADER -->
+
+
+        <div id="tabs-container">
+          <ul id="tabs">
+            <%= tab "Articles", :controller=>"/admin/content", :action => 'index' %>
+            <%= tab "Pages", :controller=>"/admin/pages", :action => 'index' %>
+            <%= tab "Categories", :controller=>"/admin/categories", :action => 'index' %>
+            <%= tab "Blacklist", :controller=>"/admin/blacklist", :action => 'index' %>
+            <%= tab "Sidebar", :controller=>"/admin/sidebar", :action => 'index' %>
+            <%= tab "Themes", :controller=>"/admin/themes", :action => 'index' %>
+            <%= tab "Users", :controller=>"/admin/users", :action => 'index' %>
+            <%= tab "Resources", :controller=>"/admin/resources", :action => 'index' %>
+            <%= tab "Filters", :controller=>"/admin/textfilters", :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|sidebar|themes/ %>
+       <div class="tasks">
+              <h3>Things you can do</h3>
+              <ul>
+                <%= @content_for_tasks %>
+          <%= task_overview unless first_render =~ /\/list$/ %>
+         </ul>
+         <div style="clear:both;"></div>
+            </div>
+       <% end %>
+       <%= @content_for_layout %>
+          </div>
+          </div>
+        </div>
+        <div id="footer">
+            Typo <%=h TYPO_VERSION %>
+        </div>
+        </div>
+        </body>
+</html>
+

data/app/views/layouts/sidebar.rhtml

@@ -0,0 +1,40 @@
+<!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>
+  <title>Sidebar Preview</title>
+  <%= page_header %>
+  <%= stylesheet_link_tag "/stylesheets/theme/azure" %>
+  <%= stylesheet_link_tag "/stylesheets/user-styles", :media => 'all' %>
+</head>
+<body>
+  <div id="container" class="clearfix">
+    <div id="header">
+      <div id="logo">
+        <h1 id="sitename"><%= link_to "Sidebar Preview", '#' %></h1>
+        <h2 id="subtitle">How your sidebar will look</h2>
+      </div>
+    </div>
+    <div id="search">&nbsp;</div>
+    <div id="content">
+      <div id="main">
+        <div class="post">
+          <h2><%= link_to "Lorem Ipsum", "#"%></h2>
+          <p class="auth">Posted by an invisible demon moments ago</p>
+          <p>Dolor sit amet...</p>
+          <p><%= link_to "Return to sidebar admin", :controller => '/admin/sidebar', :action => 'index' %>
+        </div>
+      </div>
+    </div>
+
+
+    <div id=sidebar>
+      <div id="search-results"></div>
+      <% benchmark "BENCHMARK: layout/sidebars" do %>
+        <%= yield %>
+      <% end %>
+
+      <%= link_to image_tag("powered.gif"),  "http://www.typosphere.org/", {:class => "powered" } %>
+    </div>
+  </div>
+</body>
+</html>