typo 5.0.2 → 5.0.3.98

data/test/mocks/themes/typographic/stylesheets/reset.css

@@ -0,0 +1,5 @@
+/* RESET */
+html,*{
+  margin: 0;
+  padding: 0;
+}

data/test/mocks/themes/typographic/stylesheets/style.css

@@ -0,0 +1,36 @@
+/* CSS Document */
+/*------------------------------------------------------------------
+[Master Stylesheet]
+
+Project:	TypoGraphic 
+Version:	1.0
+Last change:	04/06/08 [fixed Float bug, vf]
+Assigned to:	Helene Douchet (hdo)
+
+[Table of contents]
+
+1. Body
+	2. Wrapper
+		3. Header / #header
+		4. Page
+			4.1. Content / #content
+				4.1.1. Post / .atomentry
+			4.2. Sidebar / #sidebar
+				4.2.1. Search / #search
+				4.2.2. Loading / #loading
+				4.2.4. Results / #results
+				4.2.5. Categories / #categories
+		5. Footer / #footer
+-------------------------------------------------------------------*/
+
+@import "reset.css";
+@import "layout.css";
+@import "colors.css";
+/* @import "debugging.css"; */
+
+
+
+
+
+
+

data/test/mocks/themes/typographic/views/articles/_article.html.erb

@@ -0,0 +1,41 @@
+<div class="atomentry" id="article-<%= article.id %>">
+  <div class="title">
+    <h2 class="title"><%= (controller.action_name.include? 'permalink') ? article.title : link_to_permalink(article,article.title) %></h2>
+    <div class="meta">
+      <%= _("Posted by") %> <cite><%= author_link(article) %></cite> <abbr class="published" title="<%= article.published_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now article.published_at %></abbr>
+    </div>
+  </div>
+  <div class="content">
+    <%= article.html(:body) %>
+
+    <% if article.extended? -%>
+      <div class="extended">
+        <% if controller.action_name == 'index' -%>
+          <p><%= link_to_permalink article,_("Continue reading...") %></p>
+        <% else -%>
+          <%= article.html(:extended) %>
+        <% end -%>
+      </div>
+    <% end -%>  
+  </div>
+  <% if controller.controller_name == "articles" and controller.action_name == "show" %>
+  <div class="meta">
+    <p class="infos"><small>
+      <%= _("This entry was posted on %s", content_tag(:abbr, js_distance_of_time_in_words_to_now (@article.published_at), {:class => 'published', :title => @article.published_at.xmlschema})) %>
+      <%= _("and %s", category_links(@article)) unless @article.categories.empty? %>. 
+      <%= _("You can follow any any response to this entry through the %s", link_to(_("Atom feed"), @auto_discovery_url_atom)) %>. 
+      <%= _("You can leave a %s", link_to_permalink(article, _('comment'), 'comments')) if @article.allow_comments? %> 
+      <%= _("or a %s from your own site", link_to_permalink(@article, _('trackback'), 'trackbacks')) if @article.allow_pings? %>.
+    </small></p>
+    <p class="tags">
+      <%= tag_links(@article) unless @article.tags.empty? %>
+    </p>
+  </div>    
+  <% else %>
+	<p class="links">
+		<%= link_to_permalink(article, _("Read full article"), nil, 'more') if controller.action_name != 'permalink' %>
+		<%= link_to_permalink(article,pluralize(article.published_comments.size, _('comment')),'comments', 'comments') %>
+	</p>    
+  <% end %>
+  <br style="clear:both;" />
+</div>

data/test/mocks/themes/typographic/views/articles/_comment.html.erb

@@ -0,0 +1,14 @@
+<li 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="commentContent">
+    <%= comment.html %>
+  </div>
+  <% unless comment.published -%>
+  <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.") %></div>
+  <% end -%>
+</li>
+

data/test/mocks/themes/typographic/views/articles/_comment_form.html.erb

@@ -0,0 +1,48 @@
+<% form_remote_tag :url      => comments_path(@article),
+                    :position => :bottom,
+                    :update   => {:success => 'commentList'},
+                    :loading  => "loading()",
+                    :complete => "complete(request)",
+                    :failure  => "failure(request)",
+                    :html     => {:id => 'commentform', :class => 'comments' } \
+    do %>
+
+<div id="preview" style="display:none"></div>
+
+<h2 id="formComments-title"><%= _("Leave a comment")%></h2>
+<div id="respond" class="post">
+  <p>
+		<label for="comment_author"><%= _("Name %s", content_tag(:small, '('+_('required')+')' ))%></label>
+		<%= text_field "comment", "author" %> 
+  </p>
+
+  <p>
+		<label for="comment_email"><%= _("Email")%> <%= content_tag('small', "(#{link_to('gravatar', 'http://gravatar.com')} "+ _("enabled") + ")") if this_blog.use_gravatar %> <small>(<%= _("never displayed") %>)</small></label>
+		<%= text_field "comment", "email" %>
+	</p>
+	<p>
+		<label><%= _("Website")%></label>
+		<%= text_field "comment", "url" %>
+	</p>
+
+  <p>
+    <label>
+      <%= _("Comments")%>:
+      <%= content_tag('small', link_to(_("Textile enabled"), "http://hobix.com/textile/")) if this_blog.comment_text_filter.include? 'textile' %>
+      <%= content_tag('small', link_to(_("Markdown enabled"), "http://daringfireball.net/projects/markdown/")) if this_blog.comment_text_filter.include? 'markdown' %>
+      <br />
+    </label>
+    <%= text_area 'comment', 'body', :rows => 10 %>
+  </p>
+
+  <p class="buttons">
+    <%= submit_to_remote('preview', _('Preview') + '!',
+                         :update => 'preview',
+                         :complete => "Element.show('preview')",
+                         :url    => preview_new_comment_path(@article),
+												 :html => {:class => 'submit', :id => 'form-preview-button'}) %>
+    <%= submit_tag _('Submit'), :id => 'form-submit-button', :class => 'submit', :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>
+    <%= image_tag '/images/theme/spinner.gif', :id => 'comment_loading', :style => 'display:none' %>
+  </p>
+</div>
+<% end %>

data/test/mocks/themes/typographic/views/articles/_comment_list.html.erb

@@ -0,0 +1,7 @@
+<ol id="commentList" class="comments">
+  <% if @article.published_comments.any? -%>
+    <%= render(:partial => "comment", :collection => @article.published_comments) %>
+  <% else -%>
+    <li class="dummy_comment" style="display:none"><%= _("No comments")%></li>
+  <% end -%>
+</ol>

data/test/mocks/themes/typographic/views/articles/_trackback.html.erb

@@ -0,0 +1,9 @@
+<li class="trackback" id="trackback-<%= trackback.id %>">
+  <div class="author">
+    <a href="<%= trackback.url %>" rel="nofollow"><%= trackback.title %></a>
+    <abbr><%_("From")%> <cite><%= trackback.blog_name %></cite></abbr>
+  </div>
+  <div class="content">
+    <%= trackback.excerpt %>
+  </div>
+</li>

data/test/mocks/themes/typographic/views/articles/comment_preview.html.erb

@@ -0,0 +1,10 @@
+<div class="comment preview">
+  <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><%= _("is about to say")%></abbr>
+  </div>
+  <div class="content">
+    <%= @comment.html %>
+  </div>
+</div>

data/test/mocks/themes/typographic/views/articles/index.html.erb

@@ -0,0 +1,5 @@
+<%= render :partial => 'articles/article', :collection => @articles %>
+
+<% unless @pages.item_count <= this_blog.limit_article_display -%>
+<p class="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
+<% end -%>

data/test/mocks/themes/typographic/views/articles/read.html.erb

@@ -0,0 +1,42 @@
+<!--
+<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=""
+  trackback:ping="<%= @article.trackback_url %>"
+  dc:title="<%=h @article.title.gsub(/-+/, '-') %>"
+  dc:identifier="<%= @article.permalink_url %>"
+  dc:description="<%=h (@article.html.strip_html[0..255]).gsub(/-+/, '-') %>"
+  dc:creator="<%= h @article.author %>"
+  dc:date="<%= @article.updated_at.xmlschema %>" />
+</rdf:RDF>
+-->
+
+<%= render :partial => 'article', :object => @article %>
+
+
+<% if @article.allow_pings? -%>
+  <h2 id="trackbacks-title"><a id="trackbacks"><%= _("Trackbacks")%></a></h2>
+  <p class="trackbackurl">
+    <%= _("Use the following link to trackback from your own site")%>:<br />
+    <%= @article.trackback_url %>
+  </p>
+
+  <% unless @article.published_trackbacks.blank? -%>
+  <ol id="trackbacks" class="comments">
+    <%= render(:partial => "trackback", :collection => @article.published_trackbacks) %>
+  </ol>
+  <% end -%>
+<% end -%>
+
+<% if @article.allow_comments? or @article.published_comments.size > 0 -%>
+  <h2 id="comments-title"><a id="comments"><%= _("Comments")%></a></h2>
+
+  <div id="comments_div">
+    <%= render :partial => "comment_list" %>
+  </div>
+<% end -%>
+
+<%= render :partial => 'comment_form' if @article.allow_comments? %>

data/test/mocks/themes/typographic/views/shared/_search.html.erb

@@ -0,0 +1,17 @@
+<div id="search" class="search">
+    <% form_tag({ :controller => 'articles', :action => 'search' },
+                { :method => 'get', :id => 'sform' }) do -%>
+			<h3><%= _("Search")%></h3>
+      <p><input type="text" id="q" name="q" value="" /></p>
+    <% end -%>
+
+    <div id="loading" class="loading" style="display:none;"><%= _("Searching")%>...</div>
+    <div id="results" class="results"></div>
+  <%= observe_field 'q',
+                    :url        => { :controller => 'live', :action => 'search' },
+                    :frequency  => 1,
+                    :loading    => "Element.show('loading')",
+                    :complete   => "Element.hide('loading')",
+                    :update     => 'results',
+                    :with       => "'q=' + encodeURIComponent($F('q'))" %>
+</div>

data/test/mocks/themes/typographic/views/theme/static_view_test.html.erb

@@ -0,0 +1 @@
+<!-- Static View Test from typographic -->

data/test/test_helper.rb

@@ -14,6 +14,10 @@ class Test::Unit::TestCase
   # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
   self.use_instantiated_fixtures  = false
 
+  fixtures %w{ blacklist_patterns blogs categories categorizations contents
+               feedback notifications page_caches profiles redirects resources sidebars
+               tags text_filters triggers users }
+
   def run(result)
     yield(STARTED, name)
     @_result = result

data/themes/scribbish/layouts/default.html.erb

@@ -33,8 +33,10 @@
     <hr />
     <p><%= link_to this_blog.blog_name, this_blog.base_url %></p>
     <ul>
-      <li>powered by <%= link_to 'typo', 'http://typosphere.org' %> /
-          styled with <%= link_to 'scribbish', 'http://quotedprintable.com/pages/scribbish' %></li>
+      <li>
+        <%= _("Powered by %s", link_to ('typo', 'http://typosphere.org')) %> /
+        <%= _("styled with %s", link_to ('scribbish', 'http://quotedprintable.com/pages/scribbish'))%>
+      </li>
     </ul>
   </div>
 </div>

data/themes/scribbish/stylesheets/content.css

@@ -396,3 +396,4 @@
 	margin: 0; padding: 0 0 0 1em;
 	display: inline; 
 }
+

data/themes/scribbish/views/articles/_article.html.erb

@@ -5,7 +5,7 @@
   </h2>
 
   <p class="author">
-    Posted by <cite><%= author_link(article) %></cite>
+    <%= _("Posted by")%> <cite><%= author_link(article) %></cite>
     <abbr class="published" title="<%= article.published_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now article.published_at %></abbr>
   </p>
 
@@ -15,7 +15,7 @@
     <% if article.extended? -%>
       <div class="extended">
         <% if controller.action_name == 'index' -%>
-          <p><%= link_to_permalink article,"Continue reading..." %></p>
+          <p><%= link_to_permalink article, _("Continue reading...") %></p>
         <% else -%>
           <%= article.html(:extended) %>
         <% end -%>
@@ -26,12 +26,12 @@
   <ul class="meta">
     <%= content_tag(:li, category_links(article), :class => 'categories') unless article.categories.empty? %>
     <%= content_tag(:li, tag_links(article), :class => 'tags') unless article.tags.empty? %>
-    <li>Meta
+    <li><%= _("Meta") %>
       <%= trackbacks_link(article) << ',' if article.allow_pings? %>
       <%= comments_link(article) << ',' if article.allow_comments? %>
-      <a href="<%= article.permalink_url %>" rel="bookmark">permalink</a>,
-      <a href="<%= url_for :controller => 'xml', :action=>'feed', :type=>'article', :format => 'rss',  :id => article %>">rss</a>,
-      <a href="<%= url_for :controller => 'xml', :action=>'feed', :type=>'article', :format => 'atom', :id => article %>">atom</a>
+      <a href="<%= article.permalink_url %>" rel="bookmark"><%=_("permalink")%></a>,
+      <a href="<%= @auto_discovery_url_rss %>">rss</a>,
+      <a href="<%= @auto_discovery_url_atom %>">atom</a>
     </li>
   </ul>
 </div>

data/themes/scribbish/views/articles/_comment.html.erb

@@ -2,7 +2,7 @@
   <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>
+    <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 %>

data/themes/scribbish/views/articles/_comment_form.html.erb

@@ -10,22 +10,22 @@
 <div id="preview" style="display:none"></div>
 
 <fieldset>
-  <legend>Comments</legend>
+  <legend><%= _("Comments") %></legend>
   <p>
-    <label>Name:<br />
+    <label><%= _("Name")%>:<br />
       <%= text_field "comment", "author" %>
-      <small>(<%= link_to_function("leave url/email &#187;", "Effect.toggle('extra_fields', 'blind', {duration: .3})") %>)</small>
+      <small>(<%= link_to_function(_("leave url/email") + " &#187;", "Effect.toggle('extra_fields', 'blind', {duration: .3})") %>)</small>
     </label>
   </p>
 
   <div id="extra_fields" style="display:none;">
       <p>
-        <label>Email: <%= content_tag('small', "(#{link_to('gravatar', 'http://gravatar.com')} enabled)") if this_blog.use_gravatar %><br />
+        <label><%= _("Email") %>: <%= content_tag('small', "(#{link_to('gravatar', 'http://gravatar.com')} "+ _("enabled") + ")") if this_blog.use_gravatar %><br />
           <%= text_field "comment", "email" %>
         </label>
       </p>
       <p>
-        <label>Url:<br />
+        <label><%= _("Url")%>:<br />
           <%= text_field "comment", "url" %>
         </label>
       </p>
@@ -33,20 +33,20 @@
 
   <p>
     <label>
-      Comments:
-      <%= content_tag('small', link_to("Textile enabled", "http://hobix.com/textile/")) if this_blog.comment_text_filter.include? 'textile' %>
-      <%= content_tag('small', link_to("Markdown enabled", "http://daringfireball.net/projects/markdown/")) if this_blog.comment_text_filter.include? 'markdown' %>
+      <%= _("Comments")%>:
+      <%= content_tag('small', link_to(_("Textile enabled"), "http://hobix.com/textile/")) if this_blog.comment_text_filter.include? 'textile' %>
+      <%= content_tag('small', link_to(_("Markdown enabled"), "http://daringfireball.net/projects/markdown/")) if this_blog.comment_text_filter.include? 'markdown' %>
       <br />
       <%= text_area 'comment', 'body' %>
     </label>
   </p>
 
   <p>
-    <%= submit_to_remote('preview', 'Preview!',
+    <%= submit_to_remote('preview', _('Preview') + '!',
                          :update => 'preview',
                          :complete => "Element.show('preview')",
                          :url    => preview_new_comment_path(@article)) %>
-    <%= submit_tag 'Submit', :id => 'form-submit-button',  :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>
+    <%= submit_tag _('Submit'), :id => 'form-submit-button',  :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>
     <%= image_tag '/images/theme/spinner.gif', :id => 'comment_loading', :style => 'display:none' %>
   </p>
 </fieldset>

data/themes/scribbish/views/articles/_comment_list.html.erb

@@ -2,6 +2,6 @@
   <% if @article.published_comments.any? -%>
     <%= render(:partial => "comment", :collection => @article.published_comments) %>
   <% else -%>
-    <li class="dummy_comment" style="display:none">No comments</li>
+    <li class="dummy_comment" style="display:none"><%= _("No comments")%></li>
   <% end -%>
 </ol>

data/themes/scribbish/views/articles/_trackback.html.erb

@@ -1,7 +1,7 @@
 <li class="trackback" id="trackback-<%= trackback.id %>">
   <div class="author">
     <a href="<%= trackback.url %>" rel="nofollow"><%= trackback.title %></a>
-    <abbr>From <cite><%= trackback.blog_name %></cite></abbr>
+    <abbr><% _("From") %> <cite><%= trackback.blog_name %></cite></abbr>
   </div>
   <div class="content">
     <%= trackback.excerpt %>

data/themes/scribbish/views/articles/comment_preview.html.erb

@@ -2,7 +2,7 @@
   <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>is about to say</abbr>
+    <abbr><%= _("is about to say") %></abbr>
   </div>
   <div class="content">
     <%= @comment.html %>

data/themes/scribbish/views/articles/index.html.erb

@@ -1,5 +1,5 @@
 <%= render :partial => 'articles/article', :collection => @articles %>
 
 <% unless @pages.item_count <= this_blog.limit_article_display -%>
-<p class="pagination">Older posts: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
+<p class="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
 <% end -%>

data/themes/scribbish/views/articles/read.html.erb

@@ -17,9 +17,9 @@
 <%= render :partial => 'article', :object => @article %>
 
 <% if @article.allow_pings? -%>
-  <h5><a name="trackbacks">Trackbacks</a></h5>
+  <h5><a name="trackbacks"><%= _("Trackbacks") %></a></h5>
   <p>
-    Use the following link to trackback from your own site:<br />
+    <%= _("Use the following link to trackback from your own site") %>:<br />
     <%= @article.trackback_url %>
   </p>
 
@@ -31,8 +31,8 @@
 <% end -%>
 
 <% if @article.allow_comments? or @article.published_comments.size > 0 -%>
-  <h5><a name="comments">Comments</a></h5>
-  <p><a href="#commentform">Leave a response</a></p>
+  <h5><a name="comments"><%= _("Comments") %></a></h5>
+  <p><a href="#commentform"><%= _("Leave a comment") %></a></p>
 
   <div id="comments_div">
     <%= render :partial => "comment_list" %>