typo 5.5 → 6.0.4

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

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

data/app/views/admin/dashboard/_comments.html.erb

@@ -1,19 +0,0 @@
-<div class='dashboard-left ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
-  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
-    <span class='ui-icon ui-icon-comment'> </span>
-    <%= _("Latest Comments") %>
-  </h3>
-  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-    <ul>
-      <% if @comments.size == 0 %>
-        <li><%= _("No comments yet") %></li>
-      <% else %>
-        <% for comment in @comments -%>
-          <li>
-            <%= link_to_permalink comment, h(_("By %s on %s", comment.author, comment.article.title)) %>
-          </li>
-        <% end %>
-      <% end %>
-    </ul>
-  </div>
-</div>

data/app/views/admin/dashboard/_inbound.html.erb

@@ -1,23 +0,0 @@
-<div class='dashboard ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
-  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
-    <span class='ui-icon ui-icon-link'> </span>
-    <%= _("Inbound links") %>
-  </h3>
-  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-    <% if @inbound_links.nil? %>
-      <%= _('You have no internet connection') %>
-    <% else %>
-    <ul>
-      <% if @inbound_links.size == 0 %>
-        <li><%= _("No one made a link to you yet") %></li>
-      <% else %>
-        <% for link in @inbound_links -%>
-          <li>
-            <%= link_to(link.author, link.link) + _(" made a link to you saying ") + link.description.slice(0, 100) + "[...]"%> 
-          </li>
-        <% end %>
-      <% end %>
-    </ul>
-  <% end %>
-  </div>
-</div>

data/app/views/admin/dashboard/_overview.html.erb

@@ -1,19 +0,0 @@
-<div class='ui-widget ui-widget ui-helper-reset' >
-  <div class='ui-state-highlight ui-corner-all' style='padding: 0pt 0.7em;'>
-    <p>
-      <span class='ui-icon ui-icon-info' style='float: left; margin-right: 0.3em;'></span>
-       <%= _("This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s, %s or %s." ,
-              link_to(_('write a post'), :controller => 'content', :action => 'new'),
-              link_to(_('write a page'), :controller => 'pages', :action => 'new') ,
-              link_to(_("update your profile or change your password"), :controller => 'users', :action => 'edit', :id => session[:user_id]) ) -%>.</p>
-    <p> <%= _("You can also do a bit of design, %s or %s." ,
-              link_to(_("change your blog presentation"), :controller => 'themes') ,
-              link_to(_("enable plugins"), :controller => 'sidebar') ) -%></p>
-
-    <p>
-      If you need help, <a href="http://typosphere.org">read our documentation</a>. You can also browse our
-      <a href="http://typogarden.org">theme catalogue</a>
-      or <a href='http://plugins.typosphere.org'>download some plugins</a> to customize your Typo blog.
-    </p>
-  </div>
-</div>

data/app/views/admin/dashboard/_popular.html.erb

@@ -1,17 +0,0 @@
-<div class='dashboard-left ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
-  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
-    <span class='ui-icon ui-icon-star'> </span>
-    <%= _("Most popular") %>
-  </h3>
-  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-    <ul>
-      <% if @bestof.size == 0 %>
-        <li><%= _("Nothing to show yet") %> !</li>
-      <% else %>
-        <% for article in @bestof -%>
-          <li><%= link_to_permalink article, article.title  %> (<%= link_to_permalink article, article.comment_count %>)</li>
-        <% end %>
-      <% end -%>
-    </ul>
-  </div>
-</div>

data/app/views/admin/dashboard/_posts.html.erb

@@ -1,19 +0,0 @@
-<div class='dashboard ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
-  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
-    <span class='ui-icon ui-icon-note'> </span>
-    <%= _("Latest Posts") %>
-  </h3>
-  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-    <ul>
-	    <% if @recent_posts.size == 0 %>
-        <li> <%= link_to _("No posts yet, why don't you start and write one"), :controller => 'content', :action => 'new' %> ?</li>
-      <% else %>
-        <% for post in @recent_posts -%>
-          <li>
-            <%= link_to_permalink post, post.title %> (<%= link_to_permalink(post, post.published_comments.size) %>)
-          </li>
-        <% end %> 
-      <% end %>
-    </ul>
-  </div>
-</div>

data/app/views/admin/dashboard/_typo_dev.html.erb

@@ -1,25 +0,0 @@
-<div class='dashboard ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
-  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
-    <span class='ui-icon ui-icon-signal-diag'> </span>
-    <%= _("Latest news from the Typo development blog") %>
-  </h3>
-  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-    <% if @typo_links.nil? %>
-      <%= _('You have no internet connection') %>
-    <% else %>
-    <ul>
-      <% if @typo_links.size == 0 %>
-        <li><%= _("Oh no, nothing new") %></li>
-      <% else %>
-        <% @typo_links.each do |link| -%>
-          <li <%= alternate_class %>>
-            <h4><%= link_to("<strong>#{link.title}</strong><br />", link.link) %></h4>
-            <small><%= "#{link.date}<br />" %></small>
-            <%= link.description.strip_html.slice(0, 400) %>[...]
-          </li>
-        <% end %>
-      <% end %>
-    </ul>
-  <% end %>
-  </div>
-</div>

data/app/views/admin/dashboard/_welcome.html.erb

@@ -1,17 +0,0 @@
-<div class='dashboard-left ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
-  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
-    <span class='ui-icon ui-icon-person'> </span>
-    <%= _("Welcome back, %s!" ,current_user.name ) -%>
-  </h3>
-  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-    <p><%= _("%d articles and %d comments were posted since your last connexion", @newposts, @newcomments) %></p>
-    <p><%= _("You're running Typo %s", TYPO_VERSION) %></p>
-    <ul> 
-      <li> <%= _("Total posts : %d", @statposts) %></li>
-      <li> <%= _("Your posts : %d" , @statuserposts) %></li>
-      <li> <%= _("Total comments : %d" , @statcomments) %></li>
-      <li> <%= _("Spam comments : %d" , @statspam) %></li>
-    </ul>
-    
-  </div>
-</div>

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

@@ -1,13 +0,0 @@
-<% content_for('tasks') do %>
-    <li><a href='#'>&nbsp;</a></li>
-<% end %>
-
-<%= render :partial => "overview" %>
-<%= render :partial => "welcome" %>
-<%= render :partial => "inbound" %>
-<%= render :partial => "comments" %>
-<%= render :partial => "posts" %>
-<%= render :partial => "popular" %>
-<%= render :partial => "typo_dev" %>  
-
-<br class='clear' />

data/app/views/admin/feedback/_button.html.erb

@@ -1,10 +0,0 @@
-<div class='settings'>
-  <%= hidden_field_tag "confirmed", params[:confirmed] %>
-  <%= hidden_field_tag "published", params[:published] %>
-  <%= hidden_field_tag "bulkop_#{position}", "",{:id=>"bulkop"} %>
-  <%= submit_tag _("Delete Checked Items"), {:class => 'ed_button',:onclick=>"getElementById('bulkop').value='Delete Checked Items'"} %> &nbsp;
-  <%= submit_tag _("Delete all spam"), {:class => 'ed_button', :onclick=>"getElementById('bulkop').value='Delete all spam'"}%>
-  <%= submit_tag _("Mark Checked Items as Spam"), {:class => 'ed_button',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Spam'"} %>
-  <%= submit_tag _("Mark Checked Items as Ham"), {:class => 'ed_button',:onclick=>"getElementById('bulkop').value='Mark Checked Items as Ham'"} %>
-  <%= submit_tag _("Confirm Classification of Checked Items"), {:class => 'ed_button', :onclick=>"getElementById('bulkop').value='Confirm Classification of Checked Items'"} %>
-</div>

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

@@ -1,32 +0,0 @@
-<%= error_messages_for 'comment' %>
-<%= hidden_field_tag 'article_id', @article.id %>
-
-<div id='comment' class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
-  <h3 class='ui-accordion-header ui-helper-reset ui-state-default ui-corner-top'><span class='ui-icon ui-icon-gear'></span> <%= _("Add a comment")%></h3>
-  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-    <div class='setting'>
-      <label for="comment_author" class='float'><%= _("Author")%></label>
-      <p class='input_text'>
-        <%= text_field 'comment', 'author', :class => 'medium', :value => current_user.display_name %>
-      </p>
-    </div>
-    <div class='setting clear'>
-      <label for="comment_email" class='float'><%= _("Email")%></label>
-      <p class='input_text'>
-        <%= text_field 'comment', 'email', :class => 'medium', :value => current_user.email %>
-      </p>
-    </div>
-    <div class='setting clear'>
-      <label for="comment_url" class='float'><%= _("Url") %></label>
-      <p class='input_text'>
-        <%= text_field 'comment', 'url', :class => 'medium', :value => current_user.url %>
-      </p>
-    </div>
-    <div class='setting clear'>
-      <label for="comment_body" class='float'><%= _("Content")%></label>
-      <p class='input_text'>
-        <%= text_area 'comment', 'body', { :rows => '10', :class => 'small medium'} %>
-      </p>
-    </div>
-  </div>
-</div>

data/app/views/admin/feedback/_item.html.erb

@@ -1,19 +0,0 @@
-<tr <%= alternate_class %>>
-  <td><input class= "feedback_check" type="checkbox" name="feedback_check[<%= item.id %>]"/></td>
-  <td class='<%= comment_class item.state %>'><%= item.state %></td>
-  <td>
-    <div id="feedback_<%=item.id%>">
-      <%= link_to_remote(h(truncate(item.body, :length => 100)), :url => { :action => 'preview', :id => item.id })%>
-    </div>
-    <%= show_actions item %>
-  </td>
-  <td><%= link_to item.article.title, :controller => 'feedback', :action => 'article', :id => item.article_id %></td>
-  <td>
-    <%= link_to_unless item.url.blank?, ((h(item.author) || '(unknown)').slice(0,40)), item.url %><br />
-    <%=h item.email.to_s.slice(0,40) %>
-  </td>
-  <td>
-    <%= format_date item.created_at %>
-    <%= published_or_not item %>
-  </td>
-</tr>

data/app/views/admin/feedback/article.html.erb

@@ -1,34 +0,0 @@
-<% @page_heading = _("Comments for %s", @article.title) %>
-<% @link_to_new = link_to(_("Add a comment"), '#comment', {:id => 'dialog-link', :class => 'ui-state-default ui-corner-all'}) %>
-
-<% content_for (:tasks) do %>
-  <%= subtab(_('All comments'), {:action => :article, :id => @article.id, :ham => 'y', :spam => 'y'} ) %>
-  <%= subtab(_('Limit to ham'), {:action => :article, :id => @article.id, :ham => 'y'}) %>
-  <%= subtab(_('Limit to spam'), {:action => :article, :id => @article.id, :spam => 'y'}) %>
-<% 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>
-      <%= h(comment.body) %>
-      <p>
-        <%= format_date comment.created_at %> – [ 
-        <%= link_to_edit _("Edit"), comment %> | 
-        <%= link_to _("Delete") , {:action => 'delete', :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 => "create" do %>
-  <%= render :partial => "form" %>
-  <%= cancel_or_save %>
-<% end %>

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

@@ -1,10 +0,0 @@
-<% @page_heading = _("Comments for") + " #{ link_to h(@comment.article.title), :controller => '/admin/content', :action => 'new', :id => @comment.article.id }" %>
-
-<% form_tag :action => "update", :id => @comment.id do %>
-
-  <div class="admin">
-    <%= render :partial => "form" %>
-  </div>
-
-  <%= cancel_or_save %>
-<% end %>

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

@@ -1,44 +0,0 @@
-<% @page_heading =  _("Feedback for") + " #{ this_blog.settings['blog_name'] }" %>
-<% subtabs_for(:content) %>
-
-<% form_tag({:action => 'index'}, :method => :get) do %>
-<div class='settings'>
-  <h4><label for="search"><%= _("Search Comments and Trackbacks that contain")%>...:</label></h4>
-  <div class='input_text'>
-    <input type="text" id="feedback_search" name="search" value="<%=h params[:search] %>" class='medium' />
-    <%= submit_tag(_("Search"), {:class => 'ed_button'}) %>
-  </div>    
-</div>
-<% end %>
-
-<% form_tag({:action => 'bulkops'}, :method => :post) do %>
-<%= render :partial => 'button', :locals => { :position => 'top' } %>
-
-<%= hidden_field_tag "search", params[:search]%>
-<%= hidden_field_tag "page", params[:page]%>
-<div class='settings'>
-  <select onchange='window.location=this.options[this.selectedIndex].value;'>
-    <option value=''><%= _("All comments")%></option>
-    <option value='?ham=f' <%= 'selected' if params[:ham] == 'f' %>><%= _("Limit to ham") %></option>
-    <option value='?confirmed=f' <%= 'selected' if params[:confirmed] == 'f' %>><%= _("Unapproved comments") %></option>
-    <option value='?published=f' <%= 'selected' if params[:published] == 'f' %>><%= _("Limit to spam")%></option>
-  </select>
-</div>
-<table class='settings'>
-  <tr>
-    <th><input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"/></th>
-    <th><%= _("Status")%></th>
-    <th><%= _("Comment Excerpt")%></th>
-    <th><%= _("Article")%></th>
-    <th><%= _("Author")%></th>
-    <th><%= _("Date")%></th>
-  </tr>
-
-  <%= render_void_table(@feedback.size, 9) %>
-
-  <%= render :partial => 'item', :collection => @feedback %>
-  <%= display_pagination(@feedback, 6)%>
-</table>
-
-<%= render :partial => 'button', :locals => { :position => 'bottom' } %>
-<% end %>

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

@@ -1,62 +0,0 @@
-<input type="hidden" name="current_editor" id="current_editor" value="<%= current_user.editor %>" />
-<input type="hidden" name="user_textfilter" id="user_textfilter" value="<%= current_user.text_filter.name %>" />
-<%= error_messages_for 'page' %>
-
-<div id='editor-right'>
-  <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
-    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Publish settings")%></h3>
-    <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-      <%= check_box 'page', 'published'  %>
-      <label for="page_published"><%= _("Online")%></label><br />
-      <%= save( _("Publish") + " &raquo;") %>
-    </div>
-  </div>
-</div>
-
-<div id='editor-left'>
-  <h2><label for="page_title" class="block title"><%= _("Title")%></label></h2>
-  <p class='input_text'>
-    <%= text_field 'page', 'title', :class => 'large'  %>
-  </p>
-  <%= render(:partial => 'images', :object => @images) unless @images.empty? %>
-  <div id="editor-menu">
-    <span id="f" class="<%= 'active' if current_user.editor == 'visual' %>">
-      <%= build_editor_link("Visual", 'insert_editor', 'fck', 'simple_editor', 'visual') %>
-    </span>
-    <span id="s" class="<%= 'active' if current_user.editor == 'simple' %>">
-      <%= build_editor_link("HTML", 'insert_editor', 'simple', 'simple_editor', 'simple') %>
-    </span>
-  </div>
-  <div id='editor' class='settings'>
-    <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
-      <script type="text/javascript">edToolbar('page_body');</script>
-    </div>
-    <div id ='visual_editor' <%= "style='display: none;'" if current_user.editor == 'simple'%> >
-      <%= ckeditor_textarea('page', 'body', {:class => 'large', :height => '300px', :rows => '20'}) if current_user.editor == 'visual' %>
-    </div>
-    <div id='simple_editor' <%= "style='display: none;'" if current_user.editor == 'visual'%> >
-      <%= text_area('page', 'body', {:class => 'large', :height => '300px', :rows => '20'}) if current_user.editor == 'simple' %>
-      <%= render_macros(@macros) if current_user.editor == 'simple' %>  
-    </div>
-    <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
-  </div>
-
-  <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
-    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Page settings")%></h3>
-    <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-      <div class='setting'>
-        <label for="page_name" class='float'><%= _("Permanent link")%></label>
-        <div class='input_text'>
-          <%= text_field 'page', 'name', :class => 'small medium' %>
-        </div>
-      </div>
-      <div class='setting clear'>
-        <label class="float" for="text_filter"><%= _("Article filter")%></label>
-        <div class='input_text'>
-          <select class='small medium' name="page[text_filter]" id="text_filter">
-            <%= options_for_select text_filter_options, @page.text_filter %>
-          </select>
-        </div>
-    </div>
-  </div>
-</div>

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

@@ -1,18 +0,0 @@
-<!--
-<a href="javascript:" class="carousel-control" rel="prev">Previous</a>
--->
-<div id="carousel-wrapper" <%= 'style="display: none;"' if current_user.editor == 'visual' %>>
-    <div id="carousel-content">
-      <% @images.each do |image| %>
-        <div class="slide">
-          <%= show_thumbnail_for_editor(image) %>
-        </div>
-      <% end %>
-    </div>
-</div>
-<!--
-<a href="javascript:" class="carousel-control" rel="next">Next</a>
--->
-<script type='text/javascript'>
-new Carousel('carousel-wrapper', $$('#carousel-content .slide'), $$('a.carousel-control', 'a.carousel-jumper'), {duration: 0.4, circular: false});
-</script>

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

@@ -1,17 +0,0 @@
-<%= render_void_table(@pages.size, 5)  %>
-
-<% for page in @pages %>
-<tr <%= alternate_class %>>
-  <td>
-    <%= link_to_edit_with_profiles page.title, page %>
-    <%= show_actions page %>
-  </td>
-  <td><%= page.name%></td>
-  <td><%= author_link(page) %></td>
-  <td>
-    <%= format_date page.created_at %><br />
-    <%= published_or_not page %>
-  </td>
-</tr>
-<% end %>
-<%= display_pagination(@pages, 5)%>

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

@@ -1,15 +0,0 @@
-<script type="text/javascript">
-  $('quicktags').style.display = 'block';
-  $('simple_editor').style.display = 'block';
-  $('s').className = 'active';
-  $('f').className = 'inactive';
-  $('text_filter').value = $('user_textfilter').value;
-  content = CKEDITOR.instances.page__body_editor.getData();
-</script>
-<%= text_area('page', 'body', {:class => 'large', :height => '300px', :rows => '20'}) %>
-<script type="text/javascript">
-  $('visual_editor').innerHTML = "";
-  $('visual_editor').style.display = 'none';
-  $('page_body').innerHTML = content;
-  $('carousel-wrapper').style.display = 'block';
-</script>