typo 5.3 → 5.4

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

@@ -7,14 +7,8 @@
 	<fieldset id="write" class="set">
 		<legend><%= _("Write")%></legend>
 		<ul>
-		    <li>
-            <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
-            <select name="setting[text_filter]" id="text_filter">
-              <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.text_filter) %>
-            </select>
-        </li>
         <li>
-            <label for="comment_text_filter" class="float"><%= _("Comments filter")%>:</label>
+            <label for="comment_text_filter" class="float"><%= _("Comments filter")%></label>
             <select name="setting[comment_text_filter]" id="comment_text_filter">
             <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
             </select>
@@ -29,17 +23,16 @@
               <%= _("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.")%>
           </li>
           <li class="checkbox">
-            <label class="float" for="send_outbound_pings"><%= _("Send trackbacks")%>:</label>
-            <input name="setting[send_outbound_pings]" id="send_outbound_pings" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.send_outbound_pings%> />
-           <input name="setting[send_outbound_pings]" type="hidden" value="0" />
+            <label class="float" for="setting_send_outbound_pings"><%= _("Send trackbacks")%></label>
+            <%= check_box(:setting, :send_outbound_pings) %>
           </li>
           <li>
-              <label class="float" for="ping_urls"><%= _("URLs to ping automatically")%>:</label>
-              <textarea name="setting[ping_urls]" id="ping_urls" rows="5" cols="50"><%=h this_blog.ping_urls %></textarea>
+              <label class="float" for="setting_ping_urls"><%= _("URLs to ping automatically")%></label>
+              <%= text_area(:setting, :ping_urls, :cols => 40, :rows => 5) %>
           </li>
           <li>
-              <label class="float" for="geourl_location"><%= _("Latitude, Longitude")%>:</label>
-              <input name="setting[geourl_location]" size="20" id="geourl_location" type="text" value="<%= this_blog.geourl_location %>" />
+              <label class="float" for="setting_geourl_location"><%= _("Latitude, Longitude")%></label>
+              <%= text_field(:setting, :geourl_location, :size => 20)%>
               <span class="float"><%= _("Display")%> <a href="http://geourl.org"><%= _("your lattitude and longitude")%></a> (<%= _("exemple")%> <tt>47.774,-122.201</tt>)</span>
           </li>
 
@@ -51,35 +44,34 @@
     <ul>
       <li><%= _("The below settings act as defaults when you choose to publish an enclosure with iTunes metadata")%>.</li>
       <li>
-        <label for="itunes_author" class="float"><%= _("Author")%>:</label>
-        <input name="setting[itunes_author]" size="25" id="itunes_author" type="text" value="<%= this_blog.itunes_author %>" />
+        <label for="setting_itunes_author" class="float"><%= _("Author")%></label>
+        <%= text_field(:setting, :itunes_author, :size => 25) %>
       </li>
       <li>
-        <label for="itunes_subtitle" class="float"><%= _("Subtitle")%>: <span class="mandatory">*</span></label>
-        <input name="setting[itunes_subtitle]" size="25" id="itunes_subtitle" type="text" value="<%= this_blog.itunes_subtitle %>" />
+        <label for="setting_itunes_subtitle" class="float"><%= _("Subtitle")%> <span class="mandatory">*</span></label>
+        <%= text_field(:setting, :itunes_subtitle, :size => 25) %>
       </li>
       <li>
-        <label class="float" for="itunes_summary"><%= _("Summary")%>: <span class="mandatory">*</span></label>
-        <textarea name="setting[itunes_summary]" cols="40" rows="3"><%=h this_blog.itunes_summary %></textarea>
+        <label class="float" for="setting_itunes_summary"><%= _("Summary")%> <span class="mandatory">*</span></label>
+        <%= text_area :setting, :itunes_summary, :cols => 40, :rows => 3 %>
         <span class="float mandatory">* <%= _("Setting for channel")%></span>
       </li>
       <li>
-        <label class="float" for="itunes_email"><%= _("Email")%>: <span class="mandatory">**</span></label>
-        <input name="setting[itunes_email]" size="25" id="itunes_email" type="text" value="<%= this_blog.itunes_email %>" />
+        <label class="float" for="setting_itunes_email"><%= _("Email")%> <span class="mandatory">**</span></label>
+        <%= text_field(:setting, :itunes_email, :size => 25) %>
       </li>
       <li>
-        <label class="float" for="itunes_name"><%= _("Optional Name")%>: <span class="mandatory">**</span></label>
-        <input name="setting[itunes_name]" size="25" id="itunes_name" type="text" value="<%= this_blog.itunes_name %>" />
+        <label class="float" for="setting_itunes_name"><%= _("Optional Name")%> <span class="mandatory">**</span></label>
+        <%= text_field(:setting, :itunes_name, :size => 25) %>
         <span class="float mandatory">** <%= _("Not published by Apple")%></span>
       </li>
       <li>
-        <label class="float" for="itunes_copyright"><%= _("Copyright Information")%>:</label>
-        <input name="setting[itunes_copyright]" size="25" id="itunes_copyright" type="text" value="<%= this_blog.itunes_copyright %>" />
+        <label class="float" for="setting_itunes_copyright"><%= _("Copyright Information")%></label>
+        <%= text_field(:setting, :itunes_copyright, :size => 25) %>
       </li>
       <li class="checkbox">
-        <label class="float" for="itunes_explicit"><%= _("Explicit")%>:</label>
-        <input name="setting[itunes_explicit]" id="itunes_explicit" type="checkbox"  value="1" <%= 'checked="checked"' if this_blog.itunes_explicit%> />
-        <input name="setting[itunes_explicit]" type="hidden" value="0" />
+        <label class="float" for="setting_itunes_explicit"><%= _("Explicit")%></label>
+        <%= check_box(:setting, :itunes_explicit)%>
       </li>
     </ul>
   </fieldset>

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

@@ -24,13 +24,13 @@
       </div>
     </div>
 
-    <div id="cnt-active">
+    <div id="cnt-active" class='dropbox'>
       <h2 id="hdr-active">
         <%= _("Active Sidebar items")%>
         <%= image_tag "spinner-blue.gif", :id => 'update_spinner',
                       :style => 'display:none;' -%>
       </h2>
-      <div id="active" class="dropbox">
+      <div id="active">
         <%= render :partial => 'actives', :object => @active %>
       </div>
     </div>

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

@@ -1,10 +1,19 @@
-  <% @page_heading = _('Manage tags') %>
-  <% subtabs_for(:content) %>
+<% @page_heading = _('Manage tags') %>
+<% subtabs_for(:content) %>
   
-  <div class="list" id="tags">	
-    <%= render :partial => 'tags' %>
-  </div>                      
-  
-  <div class="paginate">
-    <%= will_paginate @tags %>
-	</div>
+<table cellspacing="1" cellpadding="0">
+  <tr>
+    <th><%= _("Display Name") %></th>
+    <th><%= _("Name") %></th>
+    <th><%= _("Articles") %></th>
+  </tr>
+  <%= render_void_table(@tags.size, 3)  %>
+  <% for tag in @tags %>
+  <tr <%= alternate_class %>>
+    <td> <%= link_to_edit tag.display_name, tag %></td>
+    <td><%= tag.name %></td>
+    <td><%= link_to_permalink tag, tag.articles.count %></td>
+  </tr>  
+  <% end %>
+  <%= display_pagination(@tags, 3)%>  
+</table>

data/app/views/admin/themes/catalogue.html.erb

@@ -5,21 +5,13 @@
   <p><%= _("Sorry the theme catalogue is not available") %></p>
 <% end %>
 
-<% i = 0 %>
 <% for theme in @themes %>
-  <% i = i+1 %>
-
-    <div class="theme">
-      <div>
-        <%= link_to(image_tag(theme.image), theme.url) %>
-        <h3><%= theme.name %> created by <%= theme.author %></h3>
-        <p><%= theme.description %></p>
-      </div>
+  <div class="theme">
+    <div class='inner'>
+      <%= link_to(image_tag(theme.image), theme.url) %>
+      <h3><%= theme.name %> created by <%= theme.author %></h3>
+      <p><%= theme.description %></p>
     </div>
-  <% if i == 3 %>
-    <% i = 0%>
-    <hr class="clear" />
-  <% end %>
-
+  </div>
 <% end %>
 <hr class="clear" />

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

@@ -1,26 +1,20 @@
 <% @page_heading = _('Choose a theme') %>
 <% subtabs_for(:themes) %>
 
-<% i = 0 %>
 <% for theme in @themes %>
-<% i = i+1 %>
 <div class="theme">
-  <div>
+  <div class='inner'>
     <% if theme.path == @active.path -%>
       <%= image_tag(url_for(:action => 'preview', :theme => theme.name, :skip_relative_url_root => true)) %>
     <% else %>
       <%= link_to(image_tag(url_for(:action => 'preview', :theme => theme.name, :skip_relative_url_root => true)), :action => 'switchto', :theme => theme.name) %>
     <% end %>
-    </div>
-  <%= theme.description_html %>
-  <% if theme.path == @active.path -%>
-  <em>(<%= _("Active theme")%>)</em>
-  <% end -%>
+    <%= theme.description_html %>
+    <% if theme.path == @active.path -%>
+    <em>(<%= _("Active theme")%>)</em>
+    <% end -%>
+  </div>
 </div>
-<% if i == 3 %>
-  <% i = 0%>
-  <hr class="clear" />
-<% end %>
 <% end %>
 
 <hr class="clear" />

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

@@ -1,65 +1,183 @@
 <%= error_messages_for 'user' %>
-<ul>
-<li>
-  <label class="float" for="user_login"><%= _("Login")%>:</label>
-  <%= text_field 'user', 'login'  %>
-</li>
-<% if current_user.admin? %>
-<li>
-	<label class="float" for="user_profile"><%= _("Profile")%>:</label>
-	<%=  select("user", "profile_id", @profiles.collect {|p| [ _(p.nicename), p.id ] }, { :include_blank => true }) %>
-  <% # _("Blog publisher"), _("Contributor") , _("Typo administrator") %>
-</li>
-<% end %>
-<li>
-  <label class="float" for="user_login"><%= _("Display Name")%>:</label>
-  <%= text_field 'user', 'name'  %>
-</li>
-<li>
-<label class="float" for="user_email"><%= _("Email")%>:</label> 
-<%= text_field 'user', 'email'  %> <small><%=_("(this will be shown publically if supplied)") %></small>
-</li>
-<li>
-  <label class="float" for="user_password"><%= _("Password")%>:</label>
-  <%= password_field_tag 'user[password]', '', :id => 'user_password', :size => 30 %>
-</li>
-<li>
-  <label class="float" for="user_password"><%= _("Password confirmation")%>:</label>
-  <%= password_field 'user', 'password_confirmation'  %>
-</li>
-<li>
-  <label class='float' for="user_state"><%= _("State")%></label>
-  <select name="user[state]">
-    <option value="active" <%= 'selected' if @user.state == 'active' %>><%= _("Active")%></option>
-    <option value="inactive" <%= 'selected' if @user.state == 'inactive'%>><%= _("Inactive")%></option>
-  </select>
-</li>
-<li>
-	<label class="float"><%= _("Editor")%>:</label>
-	<input type="radio" name="user[editor]" value="visual" id="editor_2" <%= 'checked="checked"' if @user.editor == 'visual' %>/>
-	<label for="editor_2"><%= _("Use visual rich editor")%></label>
-	<span class="float">
-		<input type="radio" name="user[editor]" value="simple" id="editor_0" <%= 'checked="checked"' if @user.editor == 'simple' %>/>
-	    <label for="editor_0"><%= _("Use simple editor")%></label>
-	</span>
-</li>
-<li>
-    <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
-    <select name="user[text_filter_id]" id="text_filter">
-      <%= options_for_select text_filter_options_with_id, @user.text_filter.id %>
-    </select>
-</li>
-<li>
-  <label class="float" for="user_notify_via_email"><%= _("Send notification messages via email")%>?</label>
-  <%= check_box 'user', 'notify_via_email'  %> 
-</li>
-<li>
-  <label class="float" for="user_notify_on_new_articles"><%= _("Send notification messages when new articles are posted")%>?</label>
-  <%= check_box 'user', 'notify_on_new_articles'  %>
-</li>
 
-<li>
-  <label class="float" for="user_notify_on_comments"><%= _("Send notification messages when comments are posted")%>?</label>
-  <%= check_box 'user', 'notify_on_comments'  %>
-</li>
-</ul>
+<fieldset>
+  <legend><%= _("Personal information")%></legend>
+
+  <div>
+    <label class="float" for="user_login"><%= _("Login")%></label>
+    <p class='input_text_title'>
+      <%= text_field('user', 'login', {:class => 'small medium'}) %>
+    </p>
+  </div>
+  <div>
+    <label class="float" for="user_firstname"><%= _("Firstname") %></label>
+    <p class='input_text_title'>
+      <%= text_field('user', 'firstname', {:class => 'small medium'}) %>
+    </p>
+  </div>
+  <div>
+    <label class="float" for="user_lastname"><%= _("Lastname") %></label>
+    <p class='input_text_title'>
+      <%= text_field('user', 'lastname', {:class => 'small medium'}) %>
+    </p>
+  </div>
+  <div>
+    <label class="float" for="user_nickname"><%= _("Nickname") %></label>
+    <p class='input_text_title'>
+      <%= text_field('user', 'nickname', {:class => 'small medium'}) %>
+    </p>
+  </div>
+</fieldset>
+  
+
+<fieldset>
+  <legend><%= _("User's settings")%></legend>
+
+  <% if controller.controller_name == 'users' %>
+  <div>
+    <label class="float" for="user_profile"><%= _("Profile")%></label>
+    <p class='input_text_title'>
+      <%=  select("user", "profile_id", @profiles.collect {|p| [ _(p.nicename), p.id ] }, { :include_blank => true }) %>
+    </p>
+  </div>
+  <div>
+    <label class='float' for="user_state"><%= _("User's status")%></label>
+    <p class='input_text_title'>
+      <select name="user[state]">
+        <option value="active" <%= 'selected' if @user.state == 'active' %>><%= _("Active")%></option>
+        <option value="inactive" <%= 'selected' if @user.state == 'inactive'%>><%= _("Inactive")%></option>
+      </select>
+    </p>
+  </div>
+  <% end %>
+
+  <% unless @user.login.nil? %>
+  <div>
+    <label class="float" for="user_login"><%= _("Display Name")%></label>
+    <p class='input_text_title'>
+      <select name="user[name]">
+        <%= render_options_for_display_name %>
+      </select>
+    </p>
+  </div>
+  <% end %>
+  
+  <div>
+    <label class="float" for="user_email"><%= _("Email")%></label> 
+    <p class='input_text_title'>
+      <%= text_field('user', 'email', {:class => 'small medium'})  %>
+    </p>
+  </div>
+  <div>
+    <label class="float" for="user_password"><%= _("Password")%></label>
+    <p class='input_text_title'>
+      <%= password_field('user', 'password', {:class => 'small medium'}) %>
+    </p>
+  </div>
+  <div>
+    <label class="float" for="user_password"><%= _("Password confirmation")%></label>
+    <p class='input_text_title'>
+      <%= password_field('user', 'password_confirmation', {:class => 'small medium'})  %>
+    </p>
+  </div>
+  <div>
+    <label class="float"><%= _("Editor")%></label>
+    <p class='input_text_title ml140'>
+      <input type="radio" name="user[editor]" value="simple" id="editor_0" <%= 'checked="checked"' if @user.editor == 'simple' %>/>
+      <label for="editor_0"><%= _("Use simple editor")%></label><br />
+      <input type="radio" name="user[editor]" value="visual" id="editor_2" <%= 'checked="checked"' if @user.editor == 'visual' %>/>
+      <label for="editor_2"><%= _("Use visual rich editor")%></label>
+    </p>
+  </div>
+  <div>
+    <label class="float" for="text_filter"><%= _("Article filter")%></label>
+    <p class='input_text_title ml140'>
+      <select name="user[text_filter_id]" id="text_filter">
+        <%= options_for_select text_filter_options_with_id, @user.text_filter.id %>
+      </select>
+    </p>
+  </div>
+</fieldset>
+
+<fieldset>
+  <legend><%= _("Notifications") %></legend>
+  <div>
+    <label class="float large" for="user_notify_via_email"><%= _("Send notification messages via email")%>?</label>
+    <p class='input_text_title'>
+      <%= check_box 'user', 'notify_via_email'  %>
+    </p>
+  </div>
+  <div class='clear'>
+    <label class="float large" for="user_notify_on_new_articles"><%= _("Send notification messages when new articles are posted")%>?</label>
+    <p class='input_text_title'>
+      <%= check_box 'user', 'notify_on_new_articles'  %>
+    </p>
+  </div>
+  <div class='clear'>
+    <label class="float large" for="user_notify_on_comments"><%= _("Send notification messages when comments are posted")%>?</label>
+    <p class='input_text_title'>
+      <%= check_box 'user', 'notify_on_comments'  %>
+    </p>
+  </div>
+</fieldset>
+
+<fieldset>
+  <legend><%= _("Contact options") %></legend>
+
+  <div class='clear'>
+    <label class="float" for="user_url"><%= _("Your site")%></label>
+    <p class='input_text_title ml140'>
+      <%= text_field('user', 'url', {:class => 'small medium'}) %>
+      <%= check_box 'user', 'show_url' %> 
+      <label for='user_show_url'><%= _("display url on public profile") %></label>
+    </p>
+  </div>
+  <div class='clear'>
+    <label class="float" for="user_msn"><%= _("Your MSN")%></label>
+    <p class='input_text_title ml140'>
+      <%= text_field('user', 'msn', {:class => 'small medium'}) %>
+      <%= check_box 'user', 'show_msn' %> 
+      <label for='user_show_msn'><%= _("display MSN ID on public profile") %></label>
+    </p>
+  </div>
+  <div class='clear'>
+    <label class="float" for="user_yahoo"><%= _("Your Yahoo ID")%></label>
+    <p class='input_text_title ml140'>
+      <%= text_field('user', 'yahoo', {:class => 'small medium'}) %>
+      <%= check_box 'user', 'show_yahoo' %> 
+      <label for='user_show_yahoo'><%= _("display Yahoo! ID on public profile") %></label>
+    </p>
+  </div>
+  <div class='clear'>
+    <label class="float" for="user_jabber"><%= _("Your Jabber ID")%></label>
+    <p class='input_text_title ml140'>
+      <%= text_field('user', 'jabber', {:class => 'small medium'}) %>
+      <%= check_box 'user', 'show_jabber' %> 
+      <label for='user_show_jabber'><%= _("display Jabber ID on public profile") %></label>
+    </p>
+  </div>
+  <div class='clear'>
+    <label class="float" for="user_aim"><%= _("Your AIM id")%></label>
+    <p class='input_text_title ml140'>
+      <%= text_field('user', 'aim', {:class => 'small medium'}) %>
+      <%= check_box 'user', 'show_aim' %> 
+      <label for='user_show_aim'><%= _("display AIM ID on public profile") %></label>
+    </p>
+  </div>
+  <div class='clear'>
+    <label class="float" for="user_twitter"><%= _("Your Twitter username")%></label>
+    <p class='input_text_title ml140'>
+      <%= text_field('user', 'twitter', {:class => 'small medium'}) %>
+      <%= check_box 'user', 'show_twitter' %> 
+      <label for='user_show_twitter'><%= _("display twitter on public profile") %></label>
+    </p>
+  </div>
+  <div class='clear'>
+    <label class='float' for="user_description"><%= _("Tell us more about you")%></label>
+    <p class='input_text_title'>
+      <%= text_area('user', 'description', {:class => 'small large', :rows => 5}) %>
+    </p>
+  </div>
+</fieldset>
+
+<%= cancel_or_save %>

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

@@ -1,10 +1,7 @@
   <% @page_heading = _('Edit User') %>
-  <% subtabs_for(:users) %>
+  <% subtabs_for(:settings) %>
   <% form_tag :action=>"edit", :id => @user.id do %>
 
-  <div class="admin">
-    <%= render :partial => "form" %>
-  </div>
+  <%= render :partial => "form" %>
 
-  <%= cancel_or_save %>
   <% end %>