typo 5.5 → 6.0.4

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

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

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

@@ -1,6 +0,0 @@
-<% @page_heading = _('Edit User') %>
-<% subtabs_for(:settings) %>
-
-<% form_tag :action=>"edit", :id => @user.id do %>
-  <%= render :partial => "form" %>
-<% end %>

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

@@ -1,27 +0,0 @@
-<% @page_heading = _('Users')  %>
-<% @link_to_new = link_to(_("New User"), {:action => 'new'}, :id => 'dialog-link', :class => 'ui-state-default ui-corner-all') %>
-<% subtabs_for(:settings) %>
-
-<table>
-  <tr>
-    <th><%= _("Username") %></th>
-    <th><%= _("Name") %></th>
-    <th><%= _("Email") %></th>
-    <th><%= _("Profile") %></th>
-    <th><%= _("Articles") %></th>
-    <th><%= _("Comments") %></th>
-    <th><%= _("State") %></th>
-  </tr>
-  <% for user in @users -%>
-  <tr <%= alternate_class %>>
-    <td><%= link_to_edit user.login, user%></td>
-    <td> <%= user.name %></td>
-    <td><%= mail_to user.email, user.email%></td>
-    <td><%= _(user.profile.nicename) %></td>
-    <td><%= Article.count :conditions => "user_id = #{user.id}"  %></td>
-    <td><%= Comment.count :conditions => "user_id = #{user.id}"  %></td>
-    <td class='<%= user.state %>'><%= _("%s user", user.state)%></td>
-  </tr>  
-  <% end -%>
-  <%= display_pagination(@users, 7)%>
-</table>

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

@@ -1,6 +0,0 @@
-<% @page_heading = _('Add User') %>
-<% subtabs_for(:settings) %>
-
-<% form_tag :action=>"new" do %>
-  <%= render :partial => "admin/users/form" %>
-<% end %>

data/app/views/articles/_article.html.erb

@@ -1,24 +0,0 @@
-<h2><%= link_to_permalink article,article.title %></h2>
-<p class="auth"><%= _("Posted by")%> <%= author_link(article) %>
-<%= js_distance_of_time_in_words_to_now article.published_at %></p>
-<% if article.password.nil? or article.password.empty? %>
-  <% unless controller.action_name == 'redirect' %>
-    <% if article.excerpt? %>
-      <%= article.excerpt %>
-    <% else %>
-      <%= article.html(:body) %>
-      <% if article.extended? %>
-        <div class="extended">
-          <p><%= link_to_permalink article, _("Continue reading") + "..." %></p>
-        </div>
-      <% end %>
-    <% end %>
-  <% else %>
-    <%= article.html(:body) %>
-    <div class="extended">
-      <%= article.html(:extended) %>
-    </div>
-  <% end %>
-<% else %>
-  <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
-<% end %>

data/app/views/articles/_article_content.html.erb

@@ -1 +0,0 @@
-<%= @article.html(:all) %>

data/app/views/articles/_atom_feed.atom.builder

@@ -1,12 +0,0 @@
-atom_feed do |feed|
-  feed.title(feed_title)
-  unless this_blog.blog_subtitle.blank?
-    feed.subtitle(this_blog.blog_subtitle, "type" => "html")
-  end
-  feed.updated atom_feed.first.updated_at if atom_feed.first
-  feed.generator "Typo", :uri => "http://www.typosphere.org", :version => '5.x'
-
-  atom_feed.each do |value|
-    value.to_atom(feed)
-  end
-end

data/app/views/articles/_comment.html.erb

@@ -1,9 +0,0 @@
-<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) %>>
-  <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.generate_html(:body) %>
-  <% unless comment.published -%>
-    <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.  It won't appear on this blog until the author approves it")%>.</div>
-  <% end -%>
-</li>

data/app/views/articles/_comment_box.html.erb

@@ -1,45 +0,0 @@
-<% form_remote_tag :url => @article.comment_url,
-                    :position=> :bottom,
-                    :update => {:success => 'commentList'},
-                    :loading => "loading()",
-                    :complete => "complete(request)",
-                    :failure => "failure(request)",
-                    :html => {:id=>"commentform",:class=>"commentform"} \
-   do %>
-
-
-<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', '<%= @article.preview_comment_url %>',  {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 %>

data/app/views/articles/_comment_error.html.erb

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

data/app/views/articles/_comment_failed.html.erb

@@ -1,4 +0,0 @@
-<%= error_messages_for 'comment' %>
-<li>
-  <%= _("Oops, something wrong happened, the comment could not be saved")%>
-</li>

data/app/views/articles/_password_form.html.erb

@@ -1,10 +0,0 @@
-<div id='content-<%= article.id %>'>
-  <p>This post is password protected. Please fill in your password or login to view the content</p>
-  <% remote_form_for :articles, article, :url => { :action => 'check_password'}, :update => "content-#{article.id}" do |f| %>
-    <%= password_field(:article, :password) %>
-    <input type='hidden' name='article[id]' value='<%= article.id %>' />
-    <%= submit_to_remote('check_password', _('Submit') + '!',
-                         :update => "content-#{article.id}",
-                         :url    => {:action => 'check_password'}) %>
-  <% end %>
-</div>

data/app/views/articles/_rss20_feed.rss.builder

@@ -1,19 +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:atom" => "http://www.w3.org/2005/Atom",
-        "xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
-  xml.channel do
-    xml.title feed_title
-    xml.link this_blog.base_url
-    xml.atom :link, :href => this_blog.url_for(params), :rel => 'self', :type => 'application/rss+xml'
-    xml.language this_blog.lang.gsub("_", "-").downcase
-    xml.ttl "40"
-    xml.description this_blog.blog_subtitle
-
-    rss20_feed.each do |value|
-      value.to_rss(xml)
-    end
-  end
-end

data/app/views/articles/_trackback.html.erb

@@ -1,6 +0,0 @@
-<li id="trackback-<%= trackback.id %>"<%= onhover_show_admin_tools(:trackback, trackback.id) %>>
-  <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.html.erb

@@ -1,22 +0,0 @@
-<% 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 %> -
-  <%= link_to_permalink(article,h(article.title)) %>
-  <% if !article.categories.empty? %> <%= _("posted in") %>
-  <%= article.categories.collect {|c| link_to_permalink c,c.name }.join(", ") -%>
-  <% end -%>
- </div>
-<% end
-  end -%>

data/app/views/articles/comment_preview.html.erb

@@ -1,3 +0,0 @@
-<%= 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.html %>

data/app/views/articles/error.html.erb

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

data/app/views/articles/groupings.html.erb

@@ -1,15 +0,0 @@
-<div class="post">
-  <h2 class="title"><%= _(controller.controller_name.capitalize) %></h2>
-<% unless @groupings.empty? -%>
-<%= ul_tag_for @grouping_class %>
-<% for grp in @groupings.sort_by{|grp|grp.display_name} -%>
-  <li>
-    <%= link_to_permalink(grp, grp.display_name) %>
-  </li>
-<% end -%>
-</ul>
-<% else -%>
-<p><%= _("There are")%> <%= @grouping_class.to_s.underscore.pluralize %>.</p>
-<% end -%>
-</div>
-<p><%= will_paginate :next_label => "#{_("Next page")} &raquo;", :previous_label => "&laquo; #{_('Previous page')}" %></p>

data/app/views/articles/index.html.erb

@@ -1,8 +0,0 @@
-<% for article in @articles -%>
-  <div class="post">
-    <%= render :partial => "articles/article", :object => article %>
-    <p class="meta"><%= article_links article %></p>
-  </div>
-<% end -%>
-
-<%= will_paginate @articles, :next_label => "#{_("Next page")} &raquo;", :previous_label => "&laquo; #{_('Previous page')}" %>

data/app/views/articles/live_search.html.erb

@@ -1,10 +0,0 @@
-<% if !@search.to_s.blank? -%>
-  <h3>Searched for <em>"<%=h @search %>"</em></h3>
-  <ul>
-  <% for article in @articles.to_a -%>
-    <li><%= link_to_permalink article,h(article.title) %></li>
-  <% end -%>
-	</ul>
-<% else %>
-  &nbsp;
-<% end -%>

data/app/views/articles/read.html.erb

@@ -1,66 +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.id },
-        :class => "admintools", :style => "display: none", :id => "admin_article") %>
-  <%= render :partial => 'articles/article', :locals => { :article => @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 => "/articles/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 => "/articles/trackback", :collection => @article.published_trackbacks),
-        :id => 'trackbackList', :class => 'trackback-list') unless @article.published_trackbacks.blank? %>
-<% end -%>
-
-<p class="postmetadata alt">
-  <small>
-  <a href="<%= @article.feed_url(:rss) %>" 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 => '/articles/comment_box' %>
-<% else -%>
-  <p><%= _("Comments are disabled")%></p>
-<% end -%>

data/app/views/articles/search.html.erb

@@ -1,8 +0,0 @@
-<% for article in @articles -%>
- <div class="post">
-   <h2><%= link_to_permalink article,article.title %></h2>
-   <%= article.html(:body).gsub(/<\/?[^>]*>/, "").slice(0..300) %>...
-  </div>
-<% end -%>
-
-<%= will_paginate @articles, :next_label => "#{_("Next page")} &raquo;", :previous_label => "&laquo; #{_('Previous page')}" %>

data/app/views/articles/trackback.xml.builder

@@ -1,5 +0,0 @@
-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.html.erb

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

data/app/views/authors/show.html.erb

@@ -1,37 +0,0 @@
-<div class="post">
-  <h2><%= @author.name %></h2>
-  <ul>
-    <%= display_profile_item @author.url, @author.show_url, _("Web site:") %>
-    <%= display_profile_item @author.msn, @author.show_msn, _("MSN:") %>
-    <%= display_profile_item @author.yahoo, @author.show_yahoo, _("Yahoo:") %>
-    <%= display_profile_item @author.jabber, @author.show_jabber, _("Jabber:") %>
-    <%= display_profile_item @author.aim, @author.show_aim, _("AIM:") %>
-    <%= display_profile_item @author.twitter, @author.show_twitter, _("Twitter:") %>
-  </ul>
-
-  <h3><%= _("About %s", @author.name)%></h3>
-  <%= @author.description%>
-</div>
-
-<% if @author.articles.to_a.empty? -%>
-<div class="post">
-<p><%= _("This author has not published any article yet")%>...</p>
-</div>
-<% else
-     currentmonth = 0
-     currentyear = 0
-     for article in @author.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 %> -
-  <%= link_to_permalink(article,h(article.title)) %>
-  <% if !article.categories.empty? %> <%= _("posted in") %>
-  <%= article.categories.collect {|c| link_to_permalink c,c.name }.join(", ") -%>
-  <% end -%>
- </div>
-<% end
-  end -%>

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

@@ -1 +0,0 @@
-This space intentionally left blank for now

data/app/views/comments/show.html.erb

@@ -1,13 +0,0 @@
-<div class="comment" id="comment-<%= @comment.id %>">
-  <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
-    <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite>
-    <abbr title="<%= @comment.created_at.xmlschema %>"><%= distance_of_time_in_words @comment.article.published_at, @comment.created_at %> later:</abbr>
-  </div>
-  <div class="content">
-    <%= @comment.html %>
-  </div>
-  <% unless @comment.published -%>
-  <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.") %></div>
-  <% end -%>
-</div>

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

@@ -1,18 +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><%= @page_title %></title>
-		<meta http-equiv="imagetoolbar" content="no" />
-		<%= stylesheet_link_tag "accounts" %>
-	</head>
-  <body>
-    <div id='logincontainer'>
-      <div class='inner'>
-        <%= yield %>
-      </div>
-    </div>
-  </body>
-</html>
-