typo 5.4.3 → 5.4.4

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

@@ -1,11 +1,12 @@
-<div id="active_<%= active.html_id %>" class="dragitem">
-  <h4 class="handle"><%= active.display_name %></h4>
-  <p><%= active.description %></p>
-  <div class="space">
-  <div><% active.class.fields.each do |row| -%>
-    <%= row.line_html(active) %>
-  <% end -%></div>
-  <%= link_to_remote('remove',
+<div id="active_<%= active.html_id %>" class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings target'>
+  <h4 class='ui-accordion-header ui-helper-reset ui-state-default ui-corner-top'><%= active.display_name %></h4>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <p><%= active.description %></p>
+      <div><% active.class.fields.each do |row| -%>
+        <%= row.line_html(active) %>
+        <% end -%>
+      </div>
+      <%= link_to_remote('remove',
         :url => {:action => 'remove', :id => active.id,
                  :element => "active_#{active.html_id}"},
         :before => "new Effect.Fade('active_#{active.html_id}')",

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

@@ -1,5 +1,7 @@
-<div id="available_<%= available.short_name %>" class="dragitem">
-  <h4 class="handle"><%= available.display_name %></h4>
-  <p><%= available.description %></p>
+<div id="available_<%= available.short_name %>" class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings target'>
+  <h4 class='ui-accordion-header ui-helper-reset ui-state-default ui-corner-top'><%= available.display_name %></h4>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <p><%= available.description %></p>
+  </div>
 </div>
 <%= draggable_element "available_#{available.short_name}" %>

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

@@ -11,33 +11,33 @@
                 			:failure => "var g = new k.Growler({location : 'br'}); 
                 			g.error('Oops, something wrong happened', {life: 3});
                 			")  %>
-  <div class="paginate r">
-    <input value="<%= _('Publish changes')%>" class="submit" type="submit"/>
+  <div>
+    <%= save(_('Publish changes'))%>
   </div>
   <div id="messages">&nbsp;</div>
 
   <div id="sidebar-config">
-    <div id="available" class="dropbox">
-      <h2><%= _("Available Items")%></h2>
-      <div id="available_box">
+    <div id="available" class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
+      <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><%= _("Available Items")%></h3>
+      <div id="available_box" class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
         <%= render :partial => 'availables', :object => @available %>
       </div>
     </div>
 
-    <div id="cnt-active" class='dropbox'>
-      <h2 id="hdr-active">
+    <div id="cnt-active" class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons'>
+      <h3 id="hdr-active" class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'>
         <%= _("Active Sidebar items")%>
         <%= image_tag "spinner-blue.gif", :id => 'update_spinner',
                       :style => 'display:none;' -%>
-      </h2>
-      <div id="active">
+      </h3>
+      <div id="active" class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
         <%= render :partial => 'actives', :object => @active %>
       </div>
     </div>
-    <br clear="all" />
+    <br class='clear' />
 
-	  <div class="paginate r">
-	    <input value="<%= _('Publish changes')%>" class="submit" type="submit"/>
+	  <div>
+	    <%= save(_('Publish changes'))%>
 	  </div>
 
   </div>

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

@@ -5,13 +5,26 @@
   <p><%= _("Sorry the theme catalogue is not available") %></p>
 <% end %>
 
+<% i = 0 %>
 <% for theme in @themes %>
-  <div class="theme">
-    <div class='inner'>
+<div class='dashboard-left ui-accordion ui-widget ui-helper-reset ui-accordion-icons theme settings'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-default ui-corner-top'>
+    <span class='ui-icon ui-icon-image'> </span>
+    <%= theme.name %>
+  </h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+
       <%= link_to(image_tag(theme.image), theme.url) %>
-      <h3><%= theme.name %> created by <%= theme.author %></h3>
+      <p>Created by <%= theme.author %></p>
       <p><%= theme.description %></p>
     </div>
   </div>
+  <% if i == 2 %>
+    <% i = 0 %>
+    <br class='clear' />
+  <% else %>
+    <% i+=1 %>
+  <% end %>
+  
 <% end %>
 <hr class="clear" />

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

@@ -1,20 +1,30 @@
 <% @page_heading = _('Choose a theme') %>
 <% subtabs_for(:themes) %>
-
+<% i = 0 %>
 <% for theme in @themes %>
-<div class="theme">
-  <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 %>
-    <%= theme.description_html %>
-    <% if theme.path == @active.path -%>
-    <em>(<%= _("Active theme")%>)</em>
-    <% end -%>
+  <div class='dashboard-left ui-accordion ui-widget ui-helper-reset ui-accordion-icons theme settings'>
+    <h3 class='ui-accordion-header ui-helper-reset <%= theme.path == @active.path ? 'ui-state-active' : 'ui-state-default' %> ui-corner-top'>
+      <span class='ui-icon <%= theme.path == @active.path ? 'ui-icon-star' : 'ui-icon-image'  %>'> </span>
+      <%= theme.name %>
+    </h3>
+    <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+      <% 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 %>
+      <%= theme.description_html %>
+      <% if theme.path == @active.path -%>
+        <em>(<%= _("Active theme")%>)</em>
+      <% end -%>
+    </div>
   </div>
-</div>
+<% if i == 2 %>
+  <% i = 0 %>
+  <br class='clear' />
+<% else %>
+  <% i+=1 %>
+<% end %>
 <% end %>
 
 <hr class="clear" />

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

@@ -1,183 +1,188 @@
 <%= error_messages_for 'user' %>
 
-<fieldset>
-  <legend><%= _("Personal information")%></legend>
+<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-person'> </span><%= _("Account settings")%></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="user_login"><%= _("Login")%></label>
+      <p class='input_text'>
+        <%= text_field('user', 'login', {:class => 'medium'}) %>
+      </p>
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_password"><%= _("Password")%></label>
+      <p class='input_text'>
+        <%= password_field('user', 'password', {:class => 'medium'}) %>
+      </p>
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_password"><%= _("Password confirmation")%></label>
+      <p class='input_text'>
+        <%= password_field('user', 'password_confirmation', {:class => 'medium'})  %>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_email"><%= _("Email")%></label> 
+      <p class='input_text'>
+        <%= text_field('user', 'email', {:class => 'medium'})  %>
+      </p>
+    </div>
 
-  <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>
-  
+    <% if controller.controller_name == 'users' %>
+    <div class='setting clear'>
+      <label class="float" for="user_profile"><%= _("Profile")%></label>
+      <p class='input_text'>
+        <%=  select("user", "profile_id", @profiles.collect {|p| [ _(p.nicename), p.id ] }, { :include_blank => false }) %>
+      </p>
+    </div>
+    <div class='setting clear'>
+      <label class='float' for="user_state"><%= _("User's status")%></label>
+      <p class='input_text'>
+        <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 %>
+  </div>
+</div>
 
-<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 %>
+<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-person'> </span><%= _("Profile Settings")%></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="user_firstname"><%= _("Firstname") %></label>
+      <p class='input_text'>
+        <%= text_field('user', 'firstname', {:class => 'medium'}) %>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_lastname"><%= _("Lastname") %></label>
+      <p class='input_text'>
+        <%= text_field('user', 'lastname', {:class => 'medium'}) %>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_nickname"><%= _("Nickname") %></label>
+      <p class='input_text'>
+        <%= text_field('user', 'nickname', {:class => 'medium'}) %>
+      </p>      
+    </div>
+    <% unless @user.login.nil? %>
+    <div class='setting clear'>
+      <label class="float" for="user_login"><%= _("Display Name")%></label>
+      <p class='input_text'>
+        <select name="user[name]">
+          <%= render_options_for_display_name %>
+        </select>
+      </p>
+    </div>
+    <% end %>
+    <div class='setting clear'>
+      <label class="float"><%= _("Editor")%></label>
+      <p class='input_text'>
+        <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 class='setting clear'>
+      <label class="float" for="text_filter"><%= _("Article filter")%></label>
+      <p class='input_text'>
+        <select name="user[text_filter_id]" id="text_filter">
+          <%= options_for_select text_filter_options_with_id, @user.text_filter.id %>
+        </select>
+      </p>      
+    </div>
+  </div>
+</div>
 
-  <% 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>
+<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-person'> </span><%= _("Notifications")%></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="user_notify_via_email"><%= _("Send notification messages via email")%>?</label>
+      <p class='input_text'>
+        <%= check_box 'user', 'notify_via_email'  %>
+      </p>
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_notify_on_new_articles"><%= _("Send notification messages when new articles are posted")%>?</label>
+      <p class='input_text'>
+        <%= check_box 'user', 'notify_on_new_articles'  %>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_notify_on_comments"><%= _("Send notification messages when comments are posted")%>?</label>
+      <p class='input_text'>
+        <%= check_box 'user', 'notify_on_comments'  %>
+      </p>  
+    </div>
+  </div>
+</div>
 
-<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>
+<% unless controller.controller_name == 'users'%>
+<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-person'> </span><%= _("Contact Options")%></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="user_url"><%= _("Your site")%></label>
+      <p class='input_text'>
+        <%= text_field('user', 'url', {:class => 'medium'}) %>
+        <%= check_box 'user', 'show_url' %> 
+        <label for='user_show_url'><%= _("display url on public profile") %></label>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_msn"><%= _("Your MSN")%></label>
+      <p class='input_text'>
+        <%= text_field('user', 'msn', {:class => 'medium'}) %>
+        <%= check_box 'user', 'show_msn' %> 
+        <label for='user_show_msn'><%= _("display MSN ID on public profile") %></label>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_yahoo"><%= _("Your Yahoo ID")%></label>
+      <p class='input_text'>
+        <%= text_field('user', 'yahoo', {:class => 'medium'}) %>
+        <%= check_box 'user', 'show_yahoo' %> 
+        <label for='user_show_yahoo'><%= _("display Yahoo! ID on public profile") %></label>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_jabber"><%= _("Your Jabber ID")%></label>
+      <p class='input_text'>
+        <%= text_field('user', 'jabber', {:class => 'medium'}) %>
+        <%= check_box 'user', 'show_jabber' %> 
+        <label for='user_show_jabber'><%= _("display Jabber ID on public profile") %></label>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_aim"><%= _("Your AIM id")%></label>
+      <p class='input_text'>
+        <%= text_field('user', 'aim', {:class => 'medium'}) %>
+        <%= check_box 'user', 'show_aim' %> 
+        <label for='user_show_aim'><%= _("display AIM ID on public profile") %></label>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class="float" for="user_twitter"><%= _("Your Twitter username")%></label>
+      <p class='input_text'>
+        <%= text_field('user', 'twitter', {:class => 'medium'}) %>
+        <%= check_box 'user', 'show_twitter' %> 
+        <label for='user_show_twitter'><%= _("display twitter on public profile") %></label>
+      </p>      
+    </div>
+    <div class='setting clear'>
+      <label class='float' for="user_description"><%= _("Tell us more about you")%></label>
+      <p class='input_text'>
+        <%= text_area('user', 'description', {:class => 'medium', :rows => 5}) %>
+      </p>      
+    </div>
+  </div>
+</div>
+<% end %>
 
 <%= cancel_or_save %>