typo 5.0.2 → 5.0.3.98

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

@@ -2,7 +2,7 @@
   <%= file_field 'attachments', "filename_#{attachment_num}" -%>
   <%= link_to_function(_("Remove"),
       update_page do |page|
-        page << "if (confirm(_(Really delete attachment) +' #{attachment_num}?')){"
+        page << "if (confirm(_('Really delete attachment') +' #{attachment_num}?')){"
         page.visual_effect(:toggle_appear, "attachment_#{attachment_num}", :afterFinish => "function(obj){Element.remove(obj.element);}")
         page << "}"
       end) -%>
@@ -12,4 +12,20 @@
   <%= link_to_remote _('Add Another Attachment'),
     :url => { :action => "attachment_box_add", :id => attachment_num.succ },
     :asynchronus => false -%>
-</div>
+</div>
+
+<% if @article and @article.id %>
+<div id="resources">
+  <% if  @article.resources.count > 0 %>
+    <h3><%= _("Currently this article has the following resources")%></h3>
+    <% for resource in @article.resources %>
+      <%= link_to_remote "- #{resource.filename}", :url => { :action => "resource_remove", :id => @article.id, :resource_id => resource.id}, :update => 'resources' %><br/>
+    <% end %>
+  <% end %>
+  
+  <h3><%= _("You can associate the following resources")%></h3>
+  <% for resource in @resources - @article.resources %>
+    <%= link_to_remote "+ #{resource.filename}", :url => { :action => "resource_add", :id => @article.id, :resource_id => resource.id}, :update => 'resources' %><br />
+  <% end %>
+</div>
+<% end %>

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

@@ -1,89 +1,79 @@
 <%= error_messages_for 'article' %>
 <!--[form:articles]-->
-<fieldset class="set admin" style="display: block">
-  <div <%='style="width: 48%; float: left;"' if this_blog.editor == 1 %>>
-     <ul>
-       <li>
-          <label for="article_title" class="block"><%= _("Title")%>:</label>
-          <%= text_field 'article', 'title', :class => 'large' %>
-       </li>
-       <li>
-          <label for="article_body"><%= _("Post")%>:</label>
-          <%= markup_help_popup @article.text_filter, image_tag('admin/help.png', :alt => "markup help", :title => "Markup Help") %>
-          <%= text_area 'article', 'body', :rows => 25, :style => 'width: 100%;'  %>
-       </li>
-       <li>
-          <%= link_to_function _("Optional extended content") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "extended", :duration => 0.5) } %>
-       </li>
-       <li id="extended"<%- if @article.extended.blank? -%> style="display:none;"<%- end -%>>
-          <label for="article_extended"><%= _("Optional Extended Content")%>:</label>
-          <%= text_area 'article', 'extended', :rows => 30, :style => 'width: 100%;'  %>
-       </li>
-       <li>
-          <label for="categories" class="block"><%= _("Categories")%>:</label>
-          <select id="categories" class="large" name="categories[]" multiple="multiple" size="10">
-             <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
-		  </select>
-       </li>
-       <li>
-          <label for="article_keywords"><%= _("Tags")%>:</label>
-          <%= text_field 'article', 'keywords', :style => 'width: 100%;' %>
-       </li>
-     </ul>
-     <p class="r"><%= save(_("Save") + " &raquo;") %></p>
-  </div>
-	<% if this_blog.editor == 1 %>
-	<iframe id="preview" class="post" style="display: block;"></iframe>
-  <br style ="clear: both"/>
-	<% end %>
-</fieldset>
-
-<% if this_blog.display_advanced == 1 %>
-<fieldset class="set admin">
-  <legend><%= _("Upload")%></legend>
-  <div id="attachments">
-    <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
-  </div>
-</fieldset>
-<% end %>
-
-<fieldset class="set admin">
-  <legend><%= _("Options")%></legend>
-  <ul>
-	<% if this_blog.display_advanced == 1 %>
-     <li>
-       <label for="article_permalink" class="float"><%= _("Permalink")%>:</label>
-       <%= text_field 'article', 'permalink'  %>
-     </li>
-     <li class="checkbox">
-       <label for="article_allow_comments" class="float"><%= _("Allow comments") %>: </label>
-       <%= check_box 'article', 'allow_comments'  %>
-     </li>
-     <li class="checkbox">
-        <label for="article_allow_pings" class="float"><%= _("Allow trackbacks")%>: </label>
-        <%= check_box 'article', 'allow_pings'  %>
-     </li>
-	<% else %>
-		<%= hidden_field_tag 'article_allow_comments', 1 %>
-		<%= hidden_field_tag 'article_allow_pings', 1 %>
-	<% end %>
-     <li>
-       <label for="article_published" class="float"><%= _("Published")%>:</label>
-       <%= check_box 'article', 'published'  %>
-     </li>
-     <li>
-        <label for="article_published_at" class="float"><%= _("Publish at")%>:</label>
-        <%= datetime_select 'article', 'published_at', :include_blank => true  %>
-     </li>
-	<% if this_blog.display_advanced == 1 %>
-     <li>
-        <label for="article_text_filter" class="float"><%= _("Textfilter")%>: </label>
-        <%= select 'article', 'text_filter', text_filter_options %>
-     </li>
-	<% else %>
-		<%= hidden_field_tag 'article_text_filter', this_blog.text_filter%>
-	<% end %>
-  </ul>
-</fieldset>
-
+<div id="article_keywords_auto_complete" class="auto_complete"></div>
+<ul class="set admin">
+  <li>
+    <label for="article_title" class="block title"><%= _("Title")%></label>
+    <%= text_field 'article', 'title', :class => 'large' %>
+  </li>
+  <li>
+    <label for="article_body" class="block content"><%= _("Content")%></label>
+    <%= t_textarea 'article', 'body', {:height => '300', :class => 'large'} %>
+  </li>
+  <li>
+    <label class="block r" for="article_extended">
+      <%= link_to_function _("Add Extended Content") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "extended", :duration => 0.2) } %>
+    </label>
+    <ul>
+      <li id="extended" <%= "style='display: none;'" if @article.extended.blank? %>>
+        <%= t_textarea 'article', 'extended', :height => '450', :class => 'large' %>
+      </li>
+    </ul>
+  </li>
+  <li style="margin-bottom: 20px;">
+    <label class="block tags" for="article_keywords"><%= _("Tags") %></label>
+        <%= text_field 'article', 'keywords', {:autocomplete => 'off', :class => 'large'} %>
+        <%= auto_complete_field 'article_keywords', { :url => { :action => "auto_complete_for_article_keywords"}, :tokens => ','}%>
+  </li>
+  <li class="paginate l">
+    <label for="categories" class="block">
+      <%= link_to_function _("Categories") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "categories", :duration => 0.2) } %>
+    </label>
+    <select id="categories" class="large" name="categories[]" multiple="multiple" size="10" <%= "style='display:none;'" if @article.categories.blank? %>>
+      <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
+    </select>
+  </li>
+  <li class="paginate l">
+    <label class="block">
+      <%= link_to_function _("Uploads") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "attachments", :duration => 0.2) } %>
+    </label>
+    <ul>
+      <li id="attachments" <%= 'style="display: none"' unless @article.resources.count > 0 %>>
+        <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
+      </li>
+    </ul>
+  </li>
+  <li class="paginate l">
+    <label class="block">
+      <%= link_to_function _("Post settings") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "publishing_options", :duration => 0.2) } %>
+    </label>
+    <ul>
+      <li id="publishing_options" <%= "style='display: none;'" unless @article.published.blank? %> >
+        <ul>
+          <li>
+            <label for="article_published_at" class="float"><%= _("Publish at")%>:</label>
+            <%= datetime_select 'article', 'published_at', :include_blank => true  %>            
+          </li>
+          <li>
+            <label for="article_published" class="float"><%= _("Online")%>:</label>
+            <%= check_box 'article', 'published'  %>
+          </li>
+          <li>
+            <label for="article_permalink" class="float"><%= _("Permalink") %></label>
+            <%= text_field 'article', 'permalink' %>
+          </li>     
+          <li class="checkbox">
+            <label for="article_allow_comments" class="float"><%= _("Allow comments") %>: </label>
+            <%= check_box 'article', 'allow_comments'  %>
+          </li>
+          <li class="checkbox">
+            <label for="article_allow_pings" class="float"><%= _("Allow trackbacks")%>: </label>
+            <%= check_box 'article', 'allow_pings'  %>
+          </li>
+        </ul>
+        <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
+      </li>
+    </ul>
+  </li>
+</ul>
 <!--[eoform:articles]-->

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

@@ -1,3 +1,3 @@
-    <%= link_to _("Previous page"), { :id => pages.current.previous } if pages.current.previous -%>
-    <%= pagination_links pages, :name => 'id' -%>
-    <%= link_to _("Next page"), { :id => pages.current.next } if pages.current.next -%>
+    <%= link_to _("Previous page"), :id => pages.current.previous, :params => params_qsa  if pages.current.previous -%>
+    <%= pagination_links pages, {:name => 'id' , :params => params_qsa} -%>
+    <%= link_to _("Next page"), :id => pages.current.next, :params => params_qsa  if pages.current.next -%>

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

@@ -1,10 +1,3 @@
-  <% @page_heading = _('Edit Article') %>
+<% subtabs_for(:write) %>
 
-  <% content_for('tasks') do %>
-    <%= task_overview %>
-
-    <li><%= link_to _('View article on your blog'), @article.permalink_url %></li>
-  <% end %>
-
-  <h3><%= _("Edit Article")%></h3>
-  <%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "edit", :id => @article.id } } %>
+<%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "edit", :id => @article.id } } %>

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

@@ -0,0 +1,17 @@
+  <% @page_heading = _('Manage posts') %>
+  <% subtabs_for(:content) %>
+
+  <div id="quick-navigate" style="display:none;position:absolute;">
+    <%= render :partial => 'admin/content/pages', :object => @articles_pages -%>
+  </div>
+
+  <div id="quick-post" style="display:none;position:absolute;">
+    <%= render :partial => "quick_post" %>
+  </div>
+  <div class="list" id="articles">	
+    <%= render :partial => 'articles' %>
+  </div>                      
+  <div class="paginate">
+    <%= render :partial => 'admin/content/pages', :object => @articles_pages -%>
+  </div>
+  

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

@@ -1,6 +1,3 @@
-<% content_for('tasks') do %>
-	<%= subtab _("Write Post"), "current", {:controller=>"content", :action=>"new"} %>
-	<%= subtab _("Write Page"), "", {:controller=>"pages", :action=>"new"} %>
-<% end %> 
+<% subtabs_for(:write) %>
 
 <%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "new" } } %>

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

@@ -1,23 +1,2 @@
-  <% @page_heading = _('Preview Article') %>
-
-  <% content_for('tasks') do %>
-    <%= task_edit _('Edit this article'), @article.id %>
-    <li><%= link_to _('View article on your blog'), @article.permalink_url %></li>
-	<%= task_overview %>
-  <% end %>
-
-  <h3>Live Preview</h3>
-
-  <div class="form" style="text-align: center; margin: auto;">
-	<iframe src="<%=@article.permalink_url%>" width="95%" height="700px"></iframe>
-  </div>
-
-  <h3><%= _("Categories")%></h3>
-  <div id="categories" class="form">
-    <%= render :partial => 'show_categories' -%>
-  </div>
-
-  <h3><%= _("Attachments")%></h3>
-  <div id="resources" class="form">
-    <%= render :partial => 'show_resources' -%>
-  </div>
+<iframe src="<%=article_path(@article) %>" width="100%" height="700px" border="0"></iframe>
+<a href="#" class="lbAction" rel="deactivate">Close.</a>

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

@@ -0,0 +1,17 @@
+<div class="dashboard">
+  <h3><%= _("Last Comments") %></h3>
+  <ul>
+    <% if @comments.size == 0 %>
+      <li <%= alternate_class %>><%= _("No comments yet") %></li>
+    <% else %>
+      <% for comment in @comments -%>
+        <li <%= alternate_class %>>
+          <% title = ''; title << 'by ' + comment.author -%>
+          <% title << ' on ' + comment.article.title -%>
+          <%= link_to_permalink comment,h(title) %>
+        </li>
+      <% end %>
+    <% end %>
+  </ul>
+  <hr />
+</div>

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

@@ -0,0 +1,4 @@
+<div class="dashboard">
+  <p>This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to <%= link_to(_('write a post'), :controller => 'content', :action => 'new') %>, <%= link_to(_('write a page'), :controller => 'page', :action => 'new') %>, or <%= 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 and <%= link_to(_("Change your blog presentation"), :controller => 'themes') -%> or <%= link_to(_("enable plugins"), :controller => 'sidebar') -%>.</p>
+</div>

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

@@ -0,0 +1,12 @@
+<div class="dashboard">
+  <h3><%= _("Most popular") %></h3>
+  <ul>
+    <% if @bestof.size == 0 %>
+      <li <%= alternate_class %>><%= _("Nothing to show yet") %> !</li>
+    <% else %>
+      <% for article in @bestof -%>
+        <li <%= alternate_class %>><%= link_to_permalink article, article.title  %> (<%= link_to_permalink article, article.comment_count %>)</li>
+      <% end %>
+    <% end -%>
+  </ul>
+</div>

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

@@ -0,0 +1,15 @@
+<div class="dashboard">
+  <h3><%= _("Last posts") %></h3>
+  <ul>
+	<% if @recent_posts.size == 0 %>
+      <li <%= alternate_class %>> <%= 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 <%= alternate_class %>>
+          <%= link_to_permalink post, post.title %> (<%= link_to_permalink(post, post.published_comments.size) %>)
+        </li>
+      <% end %> 
+    <% end %>
+  </ul>
+  <hr />
+</div>

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

@@ -0,0 +1,13 @@
+<div class="dashboard-small">
+  <h3><%= _("System information") %></h3>
+  <ul> 
+    <li>You're running Typo <%= TYPO_VERSION %></li>
+  </ul>
+  <h3><%= _("Statistics") %></h3>
+  <ul> 
+    <li <%= alternate_class %>>Total posts : <%= @statposts %></li>
+    <li <%= alternate_class %>>Your posts : <%= @statuserposts %></li>
+    <li <%= alternate_class %>>Total comments : <%= @statcomments %></li>
+    <li <%= alternate_class %>>Spam comments : <%= @statspam %></li>
+  </ul>
+</div>

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

@@ -0,0 +1,3 @@
+<div class="dashboard-small">
+  Welcome<br /> back, <%= current_user.name %>!
+</div>

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

@@ -1,61 +1,17 @@
-<div class="dashboard">
-	<% content_for('tasks') do %>
-	<%= subtab _("Typo documentation"), "", "http://typosphere.org/main_page" %>
-  <% end %> 
-  
-  <h3><span><%= _("What can you do ?") %></span></h3>
-  <ul>
-    <%= content_tag :li, link_to(_('Write a post'), :controller => 'content', :action => 'new') -%>
-    <%= content_tag :li, link_to(_("Update your profile or change your password"), 
-      :controller => 'users', :action => 'edit', :id => session[:user_id]) -%>
-    <%= content_tag :li, link_to(_("Change you blog presentation"), :controller => 'themes') -%>
-    <%= content_tag :li, link_to(_("Enable plugins"), :controller => 'sidebar') -%>
-  </ul>
-</div>
+<% content_for('tasks') do %>
+<%= subtab _("Typo documentation"), "", "http://typosphere.org/main_page" %>
+<% end %> 
 
-<div class="dashboard">
-  <h3><span><%= _("Last Comments") %></span></h3>
-  <ul>
-    <% if @comments.size == 0 %>
-      <li><%= _("No comments yet") %></li>
-    <% else %>
-      <% for comment in @comments -%>
-        <li>
-          <% title = ''; title << 'by ' + comment.author -%>
-          <% title << ' on ' + comment.article.title -%>
-          <%= link_to_permalink comment,h(title) %>
-        </li>
-      <% end %>
-    <% end %>
-  </ul>
-</div>
+<hr />
 
-<div class="dashboard">
-  <h3><span><%= _("Last posts") %></span></h3>
-  <ul>
-	<% if @recent_posts.size == 0 %>
-      <li>No posts yet, why don't you start and <%= link_to "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>
+<%= render_partial "welcome" %>
+<%= render_partial "overview" %>
 
-<div class="dashboard">
-  <h3><span><%= _("Most popular") %></span></h3>
-  <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>
+<hr />
 
-<br style="clear: both" />
+<%= render_partial "sysinfo" %>
+<%= render_partial "comments" %>
+<%= render_partial "posts" %>
+<%= render_partial "popular" %>
+
+<hr />

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

@@ -0,0 +1,41 @@
+<% @page_heading = _("Comments and Trackbacks for") + " #{ this_blog.settings['blog_name'] }" %>
+<% subtabs_for(:feedback) %>
+
+<div class="search">
+  <% form_tag({:action => 'index'}, :method => :get) do %>
+    <label for="search"><%= _("Search Comments and Trackbacks that contain")%>...:</label><br /> 
+	<input type="text" id="feedback_search" name="search" value="<%=h params[:search] %>" size="30" />
+	<%= submit_tag "Search" %>
+  <% end %>
+</div>
+
+<div class="list">
+  <% form_tag({:action => 'bulkops'}, :method => :post) do %>
+    <%= render :partial => 'button' %>
+	
+  <%= hidden_field_tag "search", params[:search]%>
+  <%= hidden_field_tag "page", params[:page]%>
+  <table>
+  <tr class="first">
+ 	<th class="first"><input class="feedback_check" type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"/></th>
+	<th><%= _("Status")%></th>
+	<th><%= _("Article")%></th>
+    <th><%= _("Author")%></th>
+    <th><%= _("Comment Excerpt")%></th>
+    <th><%= _("IP")%></th>
+		<th><%= _("View")%></th>
+		<th><%= _("Edit")%></th>
+    <th class="last"><%= _("Delete") %></th>
+  </tr>
+  <%= render :partial => 'item', :collection => @feedback %>
+  </table>
+	<div class="paginate">
+		<%= link_to _("Previous page"), { :page => @pages.current.previous, :search => params[:search] } if @pages.current.previous %>
+		<%= pagination_links(@pages, :params => {:search => params[:search]}) %>
+		<%= link_to _("Next page"), { :page => @pages.current.next, :search => params[:search] } if @pages.current.next %>
+	</div>
+    <%= render :partial => 'button' %>
+  <% end %>
+</div>
+
+