typo 5.4.3 → 5.4.4

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

@@ -3,83 +3,83 @@
 
 <% form_tag :action => 'update' do %>
 
-<fieldset>
-  <legend><%= _("Your blog")%></legend>
-  
-  <div>
-    <label for="setting_blog_name" class="float"><%= _("Blog name")%></label>
-    <p class='input_text_title'>
-      <%= text_field(:setting, :blog_name, {:class => 'small', :size => this_blog.blog_name.length})%>
-    </p>
+<div 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> <%= _("Your blog")%></h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <div class='setting'>
+      <label for="setting_blog_name" class="float"><%= _("Blog name")%></label>      
+      <div class='input_text'>
+        <%= text_field(:setting, :blog_name, {:class => 'medium', :size => this_blog.blog_name.length })%>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="clear float" for="setting_blog_subtitle"><%= _("Blog subtitle")%></label>  
+      <div class='input_text'>
+        <%= text_field(:setting, :blog_subtitle, {:class => 'medium', :size => this_blog.blog_subtitle.length})%>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="base_url"><%= _("Blog URL")%></label>
+      <div class='input_text'>
+        <%= text_field(:setting, :base_url, {:size => this_blog.base_url.length, :class => 'medium'})%>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_lang"><%= _("Language")%></label>
+      <div class='input_text'>
+        <select name="setting[lang]" id='setting_lang'>
+          <%= fetch_langs %>
+        </select>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_allow_signup"><%= _("Allow users to register")%></label>
+      <div class='input_text'>
+        <%= check_box(:setting, :allow_signup) %>    
+        <span><%= _("You can allow users to register to your blog. By default, they will register as contributors, an unpriviledged account level which grant them no rights but own a profile on the site. If you don't want users to register, you can thus add them by yourself in the users part of this admin.") %>.</span>        
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_admin_display_elements"><%= _("Items to display in admin lists")%></label>
+      <div class='input_text'>
+        <%= text_field(:setting, :admin_display_elements, {:size => 4, :class => 'small'})%>
+      </div>      
+    </div>
   </div>
-  <div>
-    <label class="float" for="setting_blog_subtitle"><%= _("Blog subtitle")%></label>
-    <p class='input_text_title'>
-      <%= text_field(:setting, :blog_subtitle, {:class => 'small', :size => this_blog.blog_subtitle.length})%>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="base_url"><%= _("Blog URL")%></label>
-    <p class='input_text_title'>
-      <%= text_field(:setting, :base_url, {:size => this_blog.base_url.length, :class => 'small'})%>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_lang"><%= _("Language")%></label>
-    <p class='input_text_title'>
-      <select name="setting[lang]" id='setting_lang'>
-        <%= fetch_langs %>
-      </select>
-    </p>
-  </div>
-  <p><%= _("You can allow users to register to your blog. By default, they will register as contributors, an unpriviledged account level which grant them no rights but own a profile on the site. If you don't want users to register, you can thus add them by yourself in the users part of this admin.") %>.</p>
-  <div>
-    <label class="float" for="setting_allow_signup"><%= _("Allow users to register")%></label>
-    <p class='input_text_title'>
-      <%= radio_button(:setting, :allow_signup, 0)%>
-      <label for="setting_allow_signup_0"><%= _("No")%></label>
-      <%= radio_button(:setting, :allow_signup, 1)%>
-      <label for="setting_allow_signup_1"><%= _("Yes")%></label>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_admin_display_elements"><%= _("Items to display in admin lists")%></label>
-    <p class='input_text_title'>
-      <%= text_field(:setting, :admin_display_elements, {:size => 4, :class => 'small'})%>
-    </p>
-  </div>
-</fieldset>
+</div>
 
-<fieldset>
-  <legend>Publishing options</legend>
-  <div>
-    <label for="setting_limit_article_display" class="float"><%= _("Display")%> </label>
-    <p class='input_text_title'>
-      <%= text_field(:setting, :limit_article_display, {:size => 4, :class => 'small'})%>
-      <%= _("articles on my homepage by default")%>
-    </p>
-  </div>
-  <div>
-    <label for="setting_limit_rss_display" class="float"><%= _("Display")%> </label>
-    <p class='input_text_title'>
-      <%= text_field(:setting, :limit_rss_display, {:size => 4, :class => 'small'})%>
-      <%= _("articles in my news feed by default")%>.
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_show_extended_on_rss"><%= _("Show full article on feed")%>:</label>
-    <p class='input_text_title'>
-      <%= check_box(:setting, :show_extended_on_rss) %>    
-    </p>
-  </div>
-  <p><%= _('You can use your Google Feedburner account instead of Typo feed URL. To enable this, fill this form with your Feedburner ID.') %></p>
-  <div>
-    <label class="float" for="setting_feedburner_url"><%= _("Feedburner ID")%></label>
-    <p class='input_text_title'>
-      <%= text_field(:setting, :feedburner_url, :class => 'small medium')%>
-    </p>
+<div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-default ui-corner-top'><span class='ui-icon ui-icon-gear'></span> <%= _("Publishing options")%></h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <div class='setting'>
+      <label for="setting_limit_article_display" class="float"><%= _("Display")%> </label>
+      <div class='input_text'>      
+        <%= text_field(:setting, :limit_article_display, {:size => 4, :class => 'small'})%>
+        <%= _("articles on my homepage by default")%>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label for="setting_limit_rss_display" class="float"><%= _("Display")%> </label>    
+      <div class='input_text'>
+        <%= text_field(:setting, :limit_rss_display, {:size => 4, :class => 'small'})%>
+        <%= _("articles in my news feed by default")%>.
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_show_extended_on_rss"><%= _("Show full article on feed")%>:</label>
+      <div class='input_text'>
+        <%= check_box(:setting, :show_extended_on_rss) %>    
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_feedburner_url"><%= _("Feedburner ID")%></label>
+      <div class='input_text'>
+        <%= text_field(:setting, :feedburner_url, :class => 'medium')%> 
+        <span><%= _('You can use your Google Feedburner account instead of Typo feed URL. To enable this, fill this form with your Feedburner ID.') %></span>
+      </div>      
+    </div>
   </div>
-</fieldset>
+</div>
 
 <%= hidden_field_tag 'from', 'index' %>  
 <%= render :partial => 'submit' %>

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

@@ -4,76 +4,77 @@
 <%= error_messages_for 'blog' %>
 
 <% form_tag :action => 'update' do %>
-<fieldset>
-  <legend><%= _("Search Engine Optimisation")%></legend>
-
-  <div>
-    <label class="float"><%= _("Show blog name")%></label>
-    <p class='input_text_title ml140'>
-      <%= radio_button(:setting, :title_prefix, 1)%>    
-      <label for="setting_title_prefix_1"><%= _("At the beginning of page title")%></label><br />
-      <%= radio_button(:setting, :title_prefix, 2)%>
-      <label for="setting_title_prefix_2"><%= _("At the end of page title")%></label><br />
-      <%= radio_button(:setting, :title_prefix, 0)%>
-      <label for="setting_title_prefix_0"><%= _("Don't show blog name in page title")%></label>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_permalink_format"><%= _("Format of permalink")%></label>
-    <p class='input_text_title'>
-      <%= text_field(:setting, :permalink_format, { :class => 'small medium'})%>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_google_analytics"><%= _("Google Analytics")%></label>
-    <p class='input_text_title'>
-      <%= text_field(:setting, :google_analytics, :class => 'small medium')%>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_meta_description"><%= _("Meta description")%></label>
-    <p class='input_text_title ml140'>
-      <%= text_area(:setting, :meta_description, :rows => 3, :class => 'small large')%>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_meta_keywords"><%= _("Meta keywords")%></label>
-    <p class='input_text_title ml140'>
-      <%= text_field(:setting, :meta_keywords, :class => 'small medium')%>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_rss_description"><%= _("Use RSS description")%></label>
-    <p class='input_text_title ml140'>
-       <%= check_box(:setting, :rss_description)%>
-      <%= "#{_('This will display')} <em>#{_('Original article writen by')} ... #{_('and published on')} <a href='#{this_blog.base_url}'>#{this_blog.blog_name}</a> | <a href='#{this_blog.base_url}'>#{_('direct link to this article')}</a> | #{_('If you are reading this article elsewhere than')} <a href='#{this_blog.base_url}'>#{this_blog.blog_name}</a>, #{_('it has been illegally reproduced and without proper authorization')}</em> #{_('at the bottom of each of your post in the RSS feed')}"%>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_index_categories"><%= _("Index categories")%></label>
-    <p class='input_text_title ml140'>
-      <%= check_box(:setting, :index_categories)%>
-      <%= _("Unchecking this box will add <code>noindex, follow</code> meta tags in every category page, removing them from search engines and preventing duplicate content issues") %>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_index_tags"><%= _("Index tags")%></label>
-    <p class='input_text_title ml140'>
-      <%= check_box(:setting, :index_tags)%>
-      <%= _("Unchecking this box will add <code>noindex, follow</code> meta tags in every tags page, removing them from search engines and preventing duplicate content issues") %>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_robots"><%= _("Robots.txt")%></label>
-    <p class='input_text_title ml140'>
-      <%= text_area(:setting, :robots, :rows => 10, :class => 'small large')%>
-    </p>
+<div 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> <%= _("Search Engine Optimisation")%></h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <div class='setting'>
+      <label class="float"><%= _("Show blog name")%></label>
+      <div class='input_text'>
+        <%= radio_button(:setting, :title_prefix, 1)%>
+        <label for="setting_title_prefix_1"><%= _("At the beginning of page title")%></label><br />
+        <%= radio_button(:setting, :title_prefix, 2)%>
+        <label for="setting_title_prefix_2"><%= _("At the end of page title")%></label><br />
+        <%= radio_button(:setting, :title_prefix, 0)%>
+        <label for="setting_title_prefix_0"><%= _("Don't show blog name in page title")%></label>      
+      </div>
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_permalink_format"><%= _("Format of permalink")%></label>
+      <div class='input_text'>
+        <%= text_field(:setting, :permalink_format, { :class => 'medium'})%>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_google_analytics"><%= _("Google Analytics")%></label>
+      <div class='input_text'>
+        <%= text_field(:setting, :google_analytics, :class => 'medium')%>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_meta_description"><%= _("Meta description")%></label>
+      <div class='input_text'>
+        <%= text_area(:setting, :meta_description, :rows => 3, :class => 'medium')%>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_meta_keywords"><%= _("Meta keywords")%></label>
+      <div class='input_text'>
+        <%= text_area(:setting, :meta_keywords, :rows => 3, :class => 'medium')%>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_rss_description"><%= _("Use RSS description")%></label>
+      <div class='input_text'>
+        <%= check_box(:setting, :rss_description)%>
+        <span><%= "#{_('This will display')} <em>#{_('Original article writen by')} ... #{_('and published on')} <a href='#{this_blog.base_url}'>#{this_blog.blog_name}</a> | <a href='#{this_blog.base_url}'>#{_('direct link to this article')}</a> | #{_('If you are reading this article elsewhere than')} <a href='#{this_blog.base_url}'>#{this_blog.blog_name}</a>, #{_('it has been illegally reproduced and without proper authorization')}</em> #{_('at the bottom of each of your post in the RSS feed')}"%></span>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_index_categories"><%= _("Index categories")%></label>
+      <div class='input_text'>
+        <%= check_box(:setting, :index_categories)%>
+        <span><%= _("Unchecking this box will add <code>noindex, follow</code> meta tags in every category page, removing them from search engines and preventing duplicate content issues") %></span>
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_index_tags"><%= _("Index tags")%></label>
+      <div class='input_text'>
+        <%= check_box(:setting, :index_tags)%>
+        <span><%= _("Unchecking this box will add <code>noindex, follow</code> meta tags in every tags page, removing them from search engines and preventing duplicate content issues") %></span>        
+      </div>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="setting_robots"><%= _("Robots.txt")%></label>
+      <div class='input_text'>
+        <%= text_area(:setting, :robots, :rows => 10, :class => 'medium')%>
+      </div>      
+    </div>
   </div>
 
   <% unless robot_writable? -%>
-    <p class='mandatory'><small><%= _("You robots.txt file is not writeable. Typo won't be able to write it")%></small></p>
+    <div class='mandatory'><small><%= _("You robots.txt file is not writeable. Typo won't be able to write it")%></small></div>
   <% end -%>
-</fieldset>
+</div>
 <%= hidden_field_tag 'from', 'seo' %>  
 <%= render :partial => 'submit' %>
 <% end %>

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

@@ -1,42 +1,42 @@
 <% @page_heading = _('Database migration') %>
 <% subtabs_for(:settings) %>
 
-<div id="settings">
-  <div id="gensettings">
-    <h3><%= _("Information")%></h3>
+<div 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> <%= _("Information")%></h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+
     <p>
-      <label><%= _("Current database version")%>:</label>
-      <span class="db_version"><%= @current_version %></span>
+      <strong><%= _("Current database version")%>:</strong>
+      <%= @current_version %>
     </p>
+
+    <% unless @needed_migrations.blank? %>
     <p>
-      <label><%= _("New database version")%>:</label>
-      <span class="db_version"><%= @needed_version %></span>
+      <strong><%= _("New database version")%>:</strong>
+      <%= @needed_version %>
     </p>
     <p>
       <label><%= _("Your database supports migrations")%>:</label>
-      <span class="db_version"><%= @support ? _('yes') : _('no') %></span>
+      <%= @support ? _('yes') : _('no') %>
     </p>
-  </div>
-
-  <% unless @needed_migrations.blank? %>
-  <div id="need">
     <h3><%= _("Needed migrations")%></h3>
     <ul>
       <% for migration in @needed_migrations %>
       <li><%= migration.humanize %></li>
       <% end %>
     </ul>
-  </div>
-  <% end %>
+    <% end %>
 
+    <% form_tag :action => 'migrate' do %>
+      <% if @current_version == @needed_version %>
+      <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><strong><%= _("You are up to date!")%></strong></p>
+        </div>
+      </div>
+      <% else %>
+      <%= save(_("Update database now")) %>  <small><%= _("may take a moment")%></small>
+      <% end %>
+    <% end %>
+  </div>
 </div>
-
-<% form_tag :action => 'migrate' do %>
-<div id="operations" class="paginate l">
-  <% if @current_version == @needed_version %>
-  <strong><%= _("You are up to date!")%></strong>
-  <% else %>
-  <%= save(_("Update database now")) %>  <small><%= _("may take a moment")%></small>
-  <% end %>
-</div>
-<% end %>

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

@@ -3,78 +3,32 @@
 
 <% form_tag :action => 'update' do %>
 
-<fieldset>
-  <legend><%= _("Publish")%></legend>
-  <div>
-    <label class="float" for="setting_send_outbound_pings"><%= _("Send trackbacks")%></label>
-    <p class='input_text_title'>
-      <%= check_box(:setting, :send_outbound_pings) %>
-    </p>
-    <p><%= _("When publishing articles, Typo can send trackbacks to websites that you link to. This should be disabled for private blogs as it will leak non-public information to sites that you're discussing. For public blogs, there's no real point in disabling this.")%></p>
-  </div>
-  <div>
-    <label class="float" for="setting_ping_urls"><%= _("URLs to ping automatically")%></label>
-    <p class='input_text_title ml140'>
-      <%= text_area(:setting, :ping_urls, :rows => 3, :class => 'small medium') %>
-    </p>
-  </div>
-  <div>
-    <label class="float" for="setting_geourl_location"><%= _("Latitude, Longitude")%></label>
-    <p class='input_text_title ml140'>
-      <%= text_field(:setting, :geourl_location, { :class => 'small medium'})%><br />
-      <small><%= _("Display")%> <a href="http://geourl.org"><%= _("your lattitude and longitude")%></a> (<%= _("exemple")%> <tt>47.774,-122.201</tt>)</small>
-    </p>
-  </div>
-  </fieldset>
-
-  <fieldset>
-    <legend><%= _("Podcasts")%></legend>
-    <div>
-      <p><%= _("The below settings act as defaults when you choose to publish an enclosure with iTunes metadata")%>.</p>
-      <label for="setting_itunes_author" class="float"><%= _("Author")%></label>
-      <p class='input_text_title'>
-        <%= text_field(:setting, :itunes_author, { :class => 'small medium'}) %>
-      </p>      
-    </div>
-    <div>
-      <label for="setting_itunes_subtitle" class="float"><%= _("Subtitle")%> <span class="mandatory">*</span></label>
-      <p class='input_text_title'>
-        <%= text_field(:setting, :itunes_subtitle, { :class => 'small medium'}) %>
-      </p>  
+<div 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> <%= _("Publish")%></h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <div class='setting'>
+      <label class="float" for="setting_send_outbound_pings"><%= _("Send trackbacks")%></label>      
+      <div class='input_text'>
+        <%= check_box(:setting, :send_outbound_pings) %>
+        <span><%= _("When publishing articles, Typo can send trackbacks to websites that you link to. This should be disabled for private blogs as it will leak non-public information to sites that you're discussing. For public blogs, there's no real point in disabling this.")%></span>
+      </div>      
     </div>
-    <div>
-      <label class="float" for="setting_itunes_summary"><%= _("Summary")%> <span class="mandatory">*</span></label>
-      <p class='input_text_title ml140'>
-        <%= text_area :setting, :itunes_summary, :rows => 3, :class => 'small medium' %>
-      </p>
+    <div class='setting clear'>
+      <label class="float" for="setting_ping_urls"><%= _("URLs to ping automatically")%></label>
+      <div class='input_text'>
+        <%= text_area(:setting, :ping_urls, :rows => 3, :class => 'medium') %>
+      </div>      
     </div>
-    <div>
-      <label class="float" for="setting_itunes_email"><%= _("Email")%> <span class="mandatory">**</span></label>
-      <p class='input_text_title'>
-        <%= text_field(:setting, :itunes_email, {:class => 'small medium'}) %>
-      </p>      
+    <div class='setting clear'>
+      <label class="float" for="setting_geourl_location"><%= _("Latitude, Longitude")%></label>
+      <div class='input_text'>
+        <%= text_field(:setting, :geourl_location, { :class => 'medium'})%>
+        <span><%= _("Display")%> <a href="http://geourl.org"><%= _("your lattitude and longitude")%></a> (<%= _("exemple")%> <tt>47.774,-122.201</tt>)</span>
+      </div>
     </div>
-    <div>
-      <label class="float" for="setting_itunes_name"><%= _("Optional Name")%> <span class="mandatory">**</span></label>
-      <p class='input_text_title'>
-        <%= text_field(:setting, :itunes_name, {:class => 'small medium'}) %><br />
-        <small>** <%= _("Not published by Apple")%></small>
-      </p>
-    </div>
-    <div>
-      <label class="float" for="setting_itunes_copyright"><%= _("Copyright Information")%></label>
-      <p class='input_text_title'>
-        <%= text_field(:setting, :itunes_copyright, {:class => 'small medium'}) %>
-      </p>      
-    </div>
-    <div>
-      <label class="float" for="setting_itunes_explicit"><%= _("Explicit")%></label>
-      <p class='input_text_title'>
-        <%= check_box(:setting, :itunes_explicit)%>
-      </p>
-    </div>
-  </fieldset>
-  <%= hidden_field_tag 'from', 'write' %>
-  <%= render :partial => 'submit' %>
+  </div>
 </div>
+
+<%= hidden_field_tag 'from', 'write' %>
+<%= render :partial => 'submit' %>
 <% end %>