typo 5.0.2 → 5.0.3.98

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

@@ -1,41 +1,37 @@
 <%= error_messages_for 'page' %>
 <!--[form:pages]-->
-<fieldset class="set admin" style="display: block">
-  <iframe id="preview" class="post" style="display: none;"></iframe>
-  <div <%='style="width: 48%; float: left;"' if this_blog.editor == 1 %>>
-     <ul>
-       <li>
-          <label for="page_title" class="block"><%= _("Title")%>:</label>
-          <%= text_field 'page', 'title', :size => 20, :style => "width: 100%;"  %>
-       </li>
-       <li>
-          <label for="page_name" class="block"><%= _("Permalink")%>:</label>
-          <%= this_blog.base_url %>pages/ <%= text_field 'page', 'name', :size => 25  %>
-       </li>
-       <li>
-          <label for="page_body"><%= _("Page Content")%>:</label>
-          <%= markup_help_popup @page.text_filter, image_tag('admin/help.png', :alt => " markup help", :title => "Markup help") %>
-          <%= text_area 'page', 'body', :rows => 25, :style => 'width: 100%;'  %> 
-       </li>
-     </ul>
-     <p class="r"><%= save(_("Save") + " &raquo;") %></p>
-  </div>
-  <br style="clear: both;" />
-</fieldset>
+<ul class="set admin">
+  <li>
+    <label for="page_title" class="block title"><%= _("Title")%></label>
+    <%= text_field 'page', 'title', :class => 'large'  %>
+  </li>
+  <li>
+    <label for="page_body" class="block content"><%= _("Content")%></label>
+    <%= t_textarea 'page', 'body', {:height => '300', :class => 'large'} %> 
+  </li>
+  <li class="paginate l">
+    <label for="options">
+      <%= link_to_function _("Options") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "options", :duration => 0.2) } %>
+    </label>
+    <ul>
+      <li id="options" style='display: none;'>
+        <ul>
+          <li>
+            <label for="page_name" class="float"><%= _("Permalink")%>:</label>
+            <%= text_field 'page', 'name', :size => 25  %>
+          </li>
+          <li>
+            <label for="page_published" class="float"><%= _("Online")%>:</label>
+            <%= check_box 'page', 'published'  %>
+            <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
 
-<fieldset class="set admin">
-  <legend><%= _("Options")%></legend>
-  <ul>
-     <li>
-       <label for="page_text_filter" class="float"><%= _("Textfilter")%>: </label>
-       <%= select 'page', 'text_filter', text_filter_options %>
-     </li>
-     <li>
-       <label for="page_published" class="float"><%= _("Published")%>:</label>
-       <%= check_box 'page', 'published'  %>
-     </li>
 
-  </ul>
-</fieldset>
+
+</ul>
 
 <!--[eoform:pages]-->

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

@@ -1,24 +1,49 @@
+<% form_tag({:action => 'index'}, :method => :get, :name => 'search') do %>
 <table cellspacing="1" cellpadding="0">
-<tr>
-  <th class="first"><%= order_link "Title", 'admin/pages', 'list', 'title'%></th>
-  <th><%= _("Permalink")%></th>
-  <th><%= order_link "Date", 'admin/pages', 'list', 'created_at' %></th>
-  <th><%= _("Author")%></th>
-  <th><%= order_link "Published", 'admin/pages', 'list', 'state' %></th>
-  <th><%= _("View")%></th>
-  <th><%= _("Edit")%></th>
-  <th class="last"><%= _("Delete")%></th>
-</tr>
-<% for page in @pages %>
-<tr <%= alternate_class %>>
-  <td class="first"> <%= link_to_permalink(page,page.title) %></td>
-  <td>/pages/<%= page.name %></td>
-  <td><%= page.created_at.strftime("%d/%m/%Y at %H:%M") %></td>
-  <td><%= author_link(page)  %></td>
-  <td class="operation"><%= (page.published?) ? image_tag('admin/checked.png', :alt => "online", :title => _("Online")) : image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline")) %></td>
-  <td class="operation"><%= link_to image_tag('admin/show.png', :alt => "View page", :title => "Preview page"), {:action => "show", :id => page.id} %></td>
-  <td class="operation"><%= link_to_edit page %></td>
-  <td class="operation last"><%= link_to_destroy page %></td>    
-</tr>  
-<% end %>
-</table>
+  <tr class="first">
+    <th><%= _("Title") %></th>
+    <th><%= _("Permalink")%></th>
+    <th><%= _("Date") %></th>
+    <th><%= _("Author")%></th>
+    <th><%= _("Status") %></th>
+    <th><%= _("Preview")%></th>
+    <th><%= _("Edit")%></th>
+    <th><%= _("Delete")%></th>
+  </tr>
+  <tr class="menubar">
+    <td colspan=2>&nbsp;</td>
+    <td>
+    <%= collection_select_with_current(:search, :published_at, Page.find_by_published_at, "publication", "publication", @search[:published_at].to_s, true) %>      
+    </td>
+    <td><%= collection_select_with_current(:search, :user_id, User.find(:all), "id", "name", @search[:user_id].to_i, true) %></td>
+    <td>
+      <select name="search[published]">
+        <option value="">Please select</option>
+        <option value="0">Unpublished</option>
+        <option value="1">Published</option>
+      </select>
+    </td>
+    <td colspan="3"><input type="submit" value="Filter" />
+  </tr>
+  <%= render_void_table(@pages.size, 8)  %>
+
+  <% for page in @pages %>
+  <tr <%= alternate_class %>>
+    <td><%= link_to_permalink(page, page.title) %></td>
+    <td><%= page.name%></td>
+    <td><%= page.created_at.strftime('%d/%m/%Y at %H:%M') %></td>
+    <td><%= author_link(page) %></td>
+    <td class="operation">
+    <% if page.published? %>
+    <%= image_tag('admin/checked.png', :alt => "online", :title => _("Online")) %>
+    <% else %>
+    <%= image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline"))  %>
+    <% end %>
+    </td>
+    <td class='operation'><%= link_to_show page  %></td>
+    <td class='operation'><%= link_to_edit page %></td>
+    <td class="operation"><%= link_to image_tag('admin/delete.png'), {:action => 'destroy', :id => page.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
+  </tr>
+  <% end %>
+  </table>
+<% end %>

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

@@ -1,9 +1,4 @@
-  <% @page_heading = _('Pages') %>
+<% @page_heading = _('Pages') %>
+<% subtabs_for(:write) %>
 
-  <% content_for('tasks') do %>
-    <%= task_new _('Create new page') %>
-    <li><%= link_to _('View page on your blog'), @page.permalink_url %></li>
-  <% end %>
-
-  <h3><%= _("Editing page")%></h3>
-  <%= render :partial => "admin/shared/edit", :locals => { :form_type => "page", :form_action => { :action => "edit", :id => @page } } %>
+<%= render :partial => "admin/shared/edit", :locals => { :form_type => "page", :form_action => { :action => "edit", :id => @page } } %>

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

@@ -0,0 +1,6 @@
+  <% @page_heading = _('Manage pages') %>
+  <% subtabs_for(:content) %>
+  
+  <div class="list" id="pages">	
+    <%= render :partial => 'pages' %>
+  </div>                      

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

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

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

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

data/app/views/admin/resources/_resources.html.erb

@@ -1,6 +1,6 @@
-<table cellspacing="1" cellpadding="0">
-<tr>
-  <th class="first"><%= _("Filename")%> <small>(<%= _('right-click for link')%>)</small></th>
+<table>
+<tr class="first">
+  <th><%= _("Filename")%> <small>(<%= _('right-click for link')%>)</small></th>
   <th><%= _("Content Type")%></th>
   <th><%= _("MetaData")%></th>
   <th><%= _("File Size")%></th>
@@ -10,7 +10,7 @@
 <% blog_root = request.relative_url_root -%>
 <% for upload in resources -%>
 <tr <%= alternate_class -%>>
-  <td class="first"><%= link_to "#{upload.filename}", "#{blog_root}/files/#{upload.filename}" -%></td>
+  <td><%= link_to "#{upload.filename}", "#{blog_root}/files/#{upload.filename}" -%></td>
   <td>
     <%= task_edit_resource_mime(upload.mime, upload.id) %>
     <div id="edit-resource-mime-<%= upload.id %>" style="display:none;position:absolute;">
@@ -34,7 +34,8 @@
   <% end -%>
   <td><%=h upload.size rescue 0 -%> bytes</td>
   <td><%=h upload.created_at.strftime('%Y-%m-%d %H:%M:%S') -%></td>
-  <td class="operation last"><%= link_to_destroy upload -%></td>    
+  <td class="operation"><%= link_to image_tag('admin/delete.png'), {:action => 'destroy', :id => upload.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
+    
 </tr>  
 <% end -%>
 </table>

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

@@ -0,0 +1,12 @@
+  <% @page_heading = _('Uploads') + ' <span> &raquo; ' + link_to(_("add new"), :action => 'new') + '</span>' %>
+  <% subtabs_for(:content) %>
+
+  <div class="list" id="resources">	
+    <%= render :partial => 'resources' -%>
+  </div>
+	<div class="paginate">
+		<%= link_to _("Previous page"), { :page => @resources_pages.current.previous } if @resources_pages.current.previous %>
+		<%= pagination_links(@resources_pages) %>
+		<%= link_to _("Next page"), { :page => @resources_pages.current.next } if @resources_pages.current.next %>
+	</div>
+	

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

@@ -1,14 +1,5 @@
 	<% @page_heading = _('Feedback') %>
-
-  <% content_for('tasks') do -%>
-	<%= subtab _("General settings"), "", {:controller => "settings"} %>
-	<%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
-	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
-	<%= subtab _("Feedback"), "current", { :controller => 'settings', :action => 'feedback' } %>
-	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
-	<%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>
-  <% end -%> 
-
+  <% subtabs_for(:settings) %>
 	<% form_tag :action => 'feedback' do %>
 
 <div class="admin">
@@ -61,15 +52,6 @@
               <input name="setting[email_from]" size="25" id="email_from" type="text" value="<%= this_blog.email_from %>" />
               <span class="float"><%= _("Email address used by Typo to send notifications")%>.</span>
           </li>
-          <li>
-              <label for="jabber_address" class="float"><%=_("Jabber account")%>:</label>
-              <input name="setting[jabber_address]" size="20" id="jabber_address" type="text" value="<%= this_blog.jabber_address %>" />
-              <span class="float"><%= _("Jabber account to use when sending Jabber notifications") %>.</span>
-          </li>
-          <li>
-              <label class="float" for="jabber_password"><%= _("Jabber password")%>:</label>
-              <input name="setting[jabber_password]" size="20" id="jabber_password" type="password" value="<%= this_blog.jabber_password %>" />
-          </li>
       </ul>
   </fieldset>
 <%= render :partial => 'submit' %>

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

@@ -1,16 +1,6 @@
 	<% @page_heading = _('General settings') %>
-
-  <% content_for('tasks') do -%>
-	<%= subtab _("General settings"), "current", {:controller => "settings"} %>
-	<%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
-	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
-	<%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>			
-	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
-	<%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>
-	<%= subtab _("Empty Fragment Cache"), "", {:controller => '/admin/cache', :action => 'sweep'} if this_blog.cache_option == 'caches_action_with_params'  %>
-	<%= subtab _("Rebuild cached HTML"), "", {:controller => '/admin/cache', :action => 'sweep_html'} if this_blog.cache_option == 'caches_page' %>
-  <% end -%> 
-
+  <% subtabs_for(:settings) %>
+  
 	<% form_tag :action => 'index' do %>
 
 <div class="admin">
@@ -35,19 +25,9 @@
 					<%= fetch_langs %>
 				</select>
 			</li>
-      <li><%= _("This option let you choose between the simple admin interface or the complete one, displaying much more options and therefore more complicated to use. For advanced users only!") %></li>
-			<li>
-				<label class="float" for="display_advanced">Choose interface:</label>
-				<input type="radio" name="setting[display_advanced]" value="0" id="display_advanced_0" <%= 'checked="checked"' if this_blog.display_advanced == 0 %>/>
-				<label for="display_advanced_0"><%= _("Use simple interface (default)")%></label>
-				<span class="float">
-					<input type="radio" name="setting[display_advanced]" value="1" id="display_advanced_1" <%= 'checked="checked"' if this_blog.display_advanced == 1 %>/>
-					<label for="display_advanced_1"><%= _("Use complete admin")%></label>
-				</span>
-			</li>
 			<li><%= _("By default, Typo generates static HTML pages for your posts. However, if you plan to publish posts in the futur, you may want to use semi dynamic caching") %>.</li>
 			<li>
-				<label class="float" for="caches_page">Choose caching methode:</label>
+				<label class="float" for="caches_page"><%= _("Choose caching methode")%>:</label>
 				<input type="radio" name="setting[cache_option]" value="caches_page" id="cache_option_0" <%= 'checked="checked"' if this_blog.cache_option == 'caches_page' %>/>
 				<label for="cache_option_0"><%= _("Use static HTML page caching ")%></label>
 				<span class="float">

data/app/views/admin/settings/podcast.html.erb

@@ -1,14 +1,5 @@
 <% @page_heading = _('Podcast') %>
-
-<% content_for('tasks') do -%>
-  <%= subtab _("General settings"), "", {:controller => "settings"} %>
-  <%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
-	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
-	<%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>			
-	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
-	<%= subtab _("Podcasts"), "current", { :controller => 'settings', :action => 'podcast' } %>
-<% end -%> 
-
+<% subtabs_for(:settings) %>
 <% form_tag :action => 'podcast' do %>
 
 <div class="admin">

data/app/views/admin/settings/read.html.erb

@@ -1,14 +1,5 @@
 	<% @page_heading = _('Read') %>
-
-  <% content_for('tasks') do -%>
-	<%= subtab _("General settings"), "", {:controller => 'settings'} %>
-	<%= subtab _("Read"), "current", { :controller => 'settings', :action => 'read' } %>
-	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
-	<%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>			
-	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
-	<%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>	
-  <% end -%> 
-
+  <% subtabs_for(:settings) %>
 	<% form_tag :action => 'read' do %>
 
 <div class="admin">

data/app/views/admin/settings/spam.html.erb

@@ -1,14 +1,5 @@
 	<% @page_heading = _('Spam') %>
-
-  <% content_for('tasks') do -%>
-	<%= subtab _("General settings"), "", {:controller => "settings"} %>
-	<%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
-	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
-	<%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>			
-	<%= subtab _("Spam"), "current", { :controller => 'settings', :action => 'spam' } %>
-	<%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>
-  <% end -%> 
-
+  <% subtabs_for(:settings) %>
 	<% form_tag :action => 'spam' do %>
 
 <div class="admin">

data/app/views/admin/settings/write.html.erb

@@ -1,14 +1,6 @@
 	<% @page_heading = _('Write') %>
-
-  <% content_for('tasks') do -%>
-	  <%= subtab _("General settings"), "", {:controller => "settings"} %>
-	  <%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
-	  <%= subtab _("Write"), "current", { :controller => 'settings', :action => 'write' } %>
-	  <%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>
-	  <%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
-	  <%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>
-  <% end -%> 
-
+  <% subtabs_for(:settings) %>
+  
 	<% form_tag :action => 'write' do %>
 
 <div class="admin">
@@ -19,10 +11,6 @@
 				<label class="float"><%= _("Editor")%>:</label>
 				<input type="radio" name="setting[editor]" value="2" id="editor_2" <%= 'checked="checked"' if this_blog.editor == 2 %>/>
 				<label for="editor_2"><%= _("Use visual rich editor")%></label>
-				<span class="float">
-					<input type="radio" name="setting[editor]" value="1" id="editor_1" <%= 'checked="checked"' if this_blog.editor == 1 %>/>
-					<label for="editor_1"><%= _("Use simple editor with live preview (default)")%></label>
-				</span>
 				<span class="float">
 					<input type="radio" name="setting[editor]" value="0" id="editor_0" <%= 'checked="checked"' if this_blog.editor == 0 %>/>
 				    <label for="editor_0"><%= _("Use simple editor without live preview")%></label>

data/app/views/admin/shared/_edit.html.erb

@@ -1,10 +1,7 @@
 <% form_tag(form_action, :id => "#{form_type}_form", :enctype => "multipart/form-data") do %>
   <%= render :partial => "form" %>
 
-  <div id="operations" class="paginate">
-    <p class="r"><%= save(_("Save") + " &raquo;") %></p>
-  </div>
-
+  <%= cancel_or_save %>
 <% end %>
 
 <%= observe_form "#{form_type}_form",

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

@@ -1,15 +1,12 @@
 <% @page_heading = 'Sidebar' %>
-<% content_for('tasks') do %>
-    <%= subtab _("Sidebar"), "current", {:controller=>"sidebar", :action=>"index"} %>
-    <%= subtab(_("Text Filters"), "", {:controller=>"textfilters", :action=>"list"}) %>
-<% end %>
-  <p class="paginate l">You can download and install sidebar plugins from our official <a href="http://svn.typosphere.org/typo/plugins/">plugin repository</a> running script/plugins install http://svn.typosphere.org/typo/plugins/myplugin, or upload them in the vendors/plugin directory.</p>
+<% subtabs_for(:sidebar) %>
+
 
   <p><%= _("Drag and drop to change the sidebar items displayed on this blog.  To remove items from the sidebar just click remove  Changes are saved immediately, but not activated until you click the 'Publish' button")%>.</p>
 
   <%= form_remote_tag(:url=>{:action=>'publish'},
                       :loading => "new Element.show('update_spinner')")  %>
-  <div class="paginate l">
+  <div class="paginate r">
     <input value="<%= _('Publish changes')%>" class="submit" type="submit"/>
   </div>
   <div id="messages">&nbsp;</div>
@@ -34,8 +31,14 @@
     </div>
     <br clear="all" />
 
-	  <div class="paginate l">
+	  <div class="paginate r">
 	    <input value="<%= _('Publish changes')%>" class="submit" type="submit"/>
 	  </div>
 
-  </div>
+  </div>
+  
+<h2><%= _("Get more themes") %></h2>
+  <p>You can download and install sidebar plugins from our official <a href="http://typosphere.org/articles/2007/08/26/typo-plugins-directory">plugin repository</a>. All you have to do is upload the theme directory in your vendor/plugins directory. You can aso run</p> 
+  
+  <p><code>script/plugins install http://svn.typosphere.org/typo/plugins/myplugin.</code></p>
+  

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

@@ -0,0 +1,4 @@
+<p>
+  <label for="tag_name"><%= _("Name")%>:</label> 
+  <%= text_field 'tag', 'name'  %>
+</p>