typus 3.0.2 → 3.0.4

data/app/mailers/admin/mailer.rb

@@ -7,7 +7,7 @@ class Admin::Mailer < ActionMailer::Base
     @url = url
 
     mail :to => user.email,
-         :subject => "[#{Typus.admin_title}] #{_t("Reset password")}"
+         :subject => "[#{Typus.admin_title}] #{Typus::I18n.t("Reset password")}"
   end
 
 end

data/app/views/admin/account/forgot_password.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = _t("Forgot password")
+  page_title = Typus::I18n.t("Forgot password")
   title(page_title)
 %>
 
@@ -13,7 +13,7 @@
     </li>
 
     <li>
-      <%= submit_tag _t("Submit"), :class => "button" %> <%= link_to _t("I remember my password"), new_admin_session_path %>
+      <%= submit_tag Typus::I18n.t("Submit"), :class => "button" %> <%= link_to Typus::I18n.t("I remember my password"), new_admin_session_path %>
     </li>
 
   </ul>

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

@@ -1,5 +1,5 @@
 <%
-  page_title = _t("Sign up")
+  page_title = Typus::I18n.t("Sign up")
   title(page_title)
 %>
 
@@ -8,14 +8,18 @@
   <ul>
 
     <li>
-      <%= form.label :email, Typus.user_class.human_attribute_name(:email) %>
-      <%= form.text_field :email, :size => 20, :class => "text" %>
+      <%= form.label :email, Typus.user_class.human_attribute_name(:email), :for => 'autofocus' %>
+      <%= form.text_field :email, :size => 20, :class => "text", :id => 'autofocus', :autofocus => 'autofocus' %>
     </li>
 
     <li>
-      <%= submit_tag _t("Sign up"), :class => "button" %>
+      <%= submit_tag Typus::I18n.t("Sign up"), :class => "button" %>
     </li>
 
   </ul>
 
+  <script type="text/javascript">
+    (function() { document.getElementById('autofocus').focus(); })();
+  </script>
+
 <% end %>

data/app/views/admin/base/user_guide.html.erb

@@ -0,0 +1,85 @@
+<% content_for :sidebar do %>
+
+  <h3>User Guide</h3>
+
+  <ul>
+    <li><%= link_to "Introduction", "#introduction" %></li>
+    <li><%= link_to "Basics", "#basics" %></li>
+    <li><%= link_to "Registered Users", "#registered-users" %></li>
+  </ul>
+
+<% end %>
+
+<a name="introduction"></a>
+
+<h2>Introduction</h2>
+
+<p>
+This website is powered by <%= link_to "Ruby on Rails", "http://rubyonrails.org/" %> and <%= link_to "Typus", "http://core.typuscms.com/" %>.
+</p>
+
+<p>With <%= link_to "Typus", "http://core.typuscms.com/" %>, also known as the application backend or admin interface, you'll be able to update your application contents and perform the most common operations for the site maintenance.</p>
+
+<p>
+You can get more information at <%= link_to "http://core.typuscms.com/", "http://core.typuscms.com/" %>.
+</p>
+
+<a name="basics"></a>
+
+<h2>Basic Actions</h2>
+
+<h3>Create Entries</h3>
+
+<p>
+To create a new entry:
+</p>
+
+<ul>
+<li>Click on entries tab.</li>
+<li>Click "Add new" sub tab.</li>
+<li>Start filling in the blanks.</li>
+<li>When you are ready, click "Save Entry".</li>
+</ul>
+
+<h3>Editing &amp; Updating Entries</h3>
+
+<p>
+To edit entries:
+</p>
+
+<ul>
+  <li>Click on entries tab.</li>
+  <li>You'll see a list of entries, if you have already create some.</li>
+  <li>Click on "Edit".</li>
+  <li>Edit the entry.</li>
+  <li>When you are ready, click "Update Entry".</li>
+</ul>
+
+<h3>Removing Entries</h3>
+
+<p>
+To remove entries:
+</p>
+
+<ul>
+  <li>Click on entries tab.</li>
+  <li>You'll see a list of entries, if you have already create some.</li>
+  <li>Click on "Trash".</li>
+  <li>Click "Ok" on the dialog to confirm you want to remove the entry.</li>
+</ul>
+
+<p>
+Removing entries will be only available if you have permissions to do so.
+</p>
+
+<a name="registered-users"></a>
+
+<h2>Registered Users</h2>
+
+<p>
+Registered users can do a variety of different things on a <strong>Typus</strong> driven site. The various elements available to the user are determined by their user level. </p>
+
+<p>When <code>:session</code> authentication is enabled <strong>Typus</strong> will enable a a default role which will allow registered users perform all kind of operations on entries: create, read, update and destroy.
+</p>
+
+<p>It's usually recommended having an extra role which some restrictions.</p>

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

@@ -1,5 +1,7 @@
 <h2>Welcome!</h2>
 
-<p>If you need help don't hesitate in joining the <%= link_to 'mailing list', 'http://groups.google.com/group/typus' %>.</p>
+<p>If you need help don't hesitate in joining the <%= link_to 'mailing list', 'http://groups.google.com/group/typus' %> or use the <%= link_to "help", "/admin/help" %>.</p>
 
 <p>Replace this sidebar dropping a file named <code>_sidebar.html.erb</code> on the <code>app/views/admin/dashboard</code> folder.</p>
+
+<p>If you need help you can use the provided <%= link_to "user guide", "user_guide" %>.</p>

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

@@ -1,5 +1,5 @@
 <%
-  page_title = _t("Dashboard")
+  page_title = Typus::I18n.t("Dashboard")
   title(page_title)
 %>
 
@@ -13,4 +13,4 @@
 
 <%= applications %>
 
-<%= resources(current_user) %>
+<%= resources(admin_user) %>

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

@@ -125,11 +125,11 @@ consequat.
 <h2>Error Messages (h2)</h2>
 
 <div id="flash" class="notice">
-  <p><strong>Hey!</strong> Sample ui-state-highlight style.</p>
+  <strong>Hey!</strong> Sample ui-state-highlight style.
 </div>
 
 <div id="flash" class="alert">
-  <p><strong>Alert:</strong> Sample ui-state-error style.</p>
+  <strong>Alert:</strong> Sample ui-state-error style.
 </div>
 
 <h2>Filters (h2)</h2>

data/app/views/admin/helpers/_apps.html.erb

@@ -1,8 +1,9 @@
 <ul>
   <% dashboard = 'active' if params[:controller].include?('dashboard') %>
-  <li><%= link_to _t("Dashboard"), admin_dashboard_path, :class => dashboard %></li>
-  <% current_user.applications.each do |app| %>
-    <% klass = (@resource && Typus.application(app).include?(@resource.name)) ? 'active' : nil %>
-    <li><%= link_to _t(app), { :controller => Typus.application(app).sort {|a,b| a.constantize.model_name.human <=> b.constantize.model_name.human}.first.tableize }, { :class => klass } %></li>
+  <li><%= link_to Typus::I18n.t("Dashboard"), admin_dashboard_path, :class => dashboard %></li>
+  <% admin_user.applications.each do |app| %>
+    <% klass = (@resource && Typus.application(app).include?(@resource.model_name)) ? 'active' : nil %>
+    <% controller = Typus.application(app).sort.first.tableize %>
+    <li><%= link_to Typus::I18n.t(app), { :controller => "/admin/#{controller}" }, { :class => klass } %></li>
   <% end %>
 </ul>

data/app/views/admin/helpers/_file_preview.html.erb

@@ -0,0 +1,3 @@
+<%= link_to preview, :class => "fancybox" do %>
+  <%= image_tag thumb, :alt => preview %>
+<% end %>

data/app/views/admin/helpers/_header.html.erb

@@ -1,7 +1,7 @@
 <h1 class="logo">
-  <% begin %>
-    <%= link_to Typus.admin_title, root_path, :title => _t("View site") %>
-  <% rescue %>
+  <% if has_root_path? %>
+    <%= link_to Typus.admin_title, root_path, :title => Typus::I18n.t("View site") %>
+  <% else %>
     <%= Typus.admin_title %>
   <% end %>
 </h1>

data/app/views/admin/helpers/_login_info.html.erb

@@ -1,4 +1,4 @@
 <ul>
-  <li><%= _t("Logged as") %> <%= user_details %></li>
-  <li><%= link_to _t("Sign out"), admin_session_path, :confirm => message, :method => :delete %></li>
+  <li><%= Typus::I18n.t("Logged as") %> <%= link_to admin_user.name, { :controller => "/admin/#{Typus.user_class.to_resource}", :action => 'edit', :id => admin_user.id } %></li>
+  <li><%= link_to Typus::I18n.t("Sign out"), admin_session_path, :confirm => Typus::I18n.t("Are you sure you want to sign out and end your session?"), :method => :delete %></li>
 </ul>

data/app/views/admin/helpers/dashboard/_applications.html.erb

@@ -1,28 +1,25 @@
-<% current_user.applications.each do |app| %>
+<% admin_user.applications.each do |app| %>
 
   <table>
 
     <thead>
       <tr>
-        <th colspan="2"><%= _t(app) %></th>
+        <th><%= Typus::I18n.t(app) %></th>
       </tr>
     </thead>
 
-    <% current_user.application(app).each do |model| %>
+    <% admin_user.application(app).each do |model| %>
 
       <%
-        klass = model.constantize
-        klass_human_name = klass.model_name.human.gsub("/", " ").pluralize
-        admin_items_path = { :controller => "admin/#{klass.to_resource}" }
+        klass = model.typus_constantize
+        klass_human_name = klass.model_name.human.pluralize
+        admin_items_path = { :controller => "/admin/#{klass.to_resource}" }
       %>
 
       <tr class="<%= cycle("even", "odd") %>">
         <td>
           <%= link_to klass_human_name, admin_items_path %>
         </td>
-        <td class="right">
-          <%= link_to_if current_user.can?("create", klass), _t("Add"), admin_items_path.merge(:action => "new") %>
-        </td>
       </tr>
 
     <% end %>

data/app/views/admin/helpers/dashboard/_resources.html.erb

@@ -4,14 +4,13 @@
 
     <thead>
       <tr>
-        <th colspan="2"><%= _t("Resources") %></th>
+        <th><%= Typus::I18n.t("Resources") %></th>
       </tr>
     </thead>
 
     <% resources.each do |resource| %>
       <tr class="<%= cycle("even", "odd") %>">
-      <td><%= link_to _t(resource.titleize.capitalize), :controller => "admin/#{resource.underscore}" %></td>
-      <td align="right" style="vertical-align: bottom;"></td>
+        <td><%= link_to Typus::I18n.t(resource.titleize.capitalize), :controller => "/admin/#{resource.underscore}" %></td>
       </tr>
     <% end %>
 

data/app/views/admin/helpers/filters/_filters.html.erb

@@ -6,7 +6,7 @@
         <li><%= select_tag filter[:filter], options_for_select(filter[:items], params[filter[:filter]]) %></li>
       <% end %>
       <%= hidden_field_tag :search, params[:search] if params[:search] %>
-      <li><%= submit_tag _t("Filter"), :name => nil %></li>
+      <li><%= submit_tag Typus::I18n.t("Filter"), :name => nil %></li>
     </ul>
   </div>
 

data/app/views/admin/helpers/resources/_display_link_to_previous.html.erb

@@ -1,3 +1,3 @@
 <div id="flash" class="notice">
-  <%= message %> <%= link_to _t("Do you want to cancel it?"), params[:back_to] %>
+  <%= link_to Typus::I18n.t("Cancel adding a new %{resource}?", :resource => @resource.model_name.human.downcase), params[:back_to] %>
 </div>

data/app/views/admin/helpers/resources/_errors.html.erb

@@ -0,0 +1,10 @@
+<% if @item.errors.any? %>
+  <div id="errorExplanation">
+    <h3><%= Typus::I18n.t("%{errors} prohibited this page from being saved:", :errors => pluralize(@item.errors.count, "error")) %></h3>
+    <ul>
+    <% @item.errors.full_messages.each do |full_message| %>
+      <li><%= full_message %></li>
+    <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/admin/helpers/search/_search.html.erb

@@ -2,7 +2,7 @@
 
   <%= form_tag url_for(:controller => params[:controller]), :method => :get do %>
     <ul>
-      <li><%= search_field_tag "search", nil, :id => "quicksearch", :title => (params[:search] || _t("Search")) %></li>
+      <li><%= search_field_tag "search", nil, :id => "quicksearch", :title => (params[:search] || Typus::I18n.t("Search")) %></li>
     </ul>
     <% hidden_params.each do |field| %>
       <%= field %>

data/app/views/admin/helpers/sidebar/_sidebar.html.erb

@@ -1,12 +1,15 @@
 <% resources.each do |key, value| %>
 
-  <% resource = "/admin/#{key.constantize.to_resource}" %>
+  <%
+    klass = key.typus_constantize
+    resource = "/admin/#{klass.to_resource}"
+  %>
 
   <%= link_to :controller => resource, :action => "index" do %>
-    <h3><%= _t(key.constantize.model_name.human.pluralize) %></h3>
+    <h3><%= klass.model_name.human.pluralize %></h3>
   <% end %>
 
-  <% if @resource.name.eql?(key) %>
+  <% if @resource.model_name.eql?(key) %>
     <ul>
       <% value.each do |v| %>
         <li><%= v %></li>

data/app/views/admin/helpers/table/_table.html.erb

@@ -5,18 +5,30 @@
       <% headers.each do |header| %>
         <th><%= header %></th>
       <% end %>
-      <th colspan="2"></th>
     </tr>
   </thead>
 
   <% items.each do |item| %>
     <tr class="<%= cycle('even', 'odd') %>" id="<%= dom_id(item) %>">
-      <% table_fields_for_item(item, fields, link_options).each do |field| %>
-        <%= field %>
+      <% table_fields_for_item(item, fields).each_with_index do |field, index| %>
+        <td>
+          <%= field %>
+          <% if index.zero? %>
+            <div class="actions">
+              <%= table_actions(model, item, association_name) %>
+            </div>
+          <% end %>
+        </td>
       <% end %>
-      <td width="10px"><%= table_default_action(model, item) %></td>
-      <td width="10px"><%= table_action(model, item) %></td>
     </tr>
   <% end %>
 
+  <thead>
+    <tr>
+      <% headers.each do |header| %>
+        <th><%= header %></th>
+      <% end %>
+    </tr>
+  </thead>
+
 </table>

data/app/views/admin/mailer/reset_password_link.text.erb

@@ -1,9 +1,9 @@
 
-<%= _t("You can update your password at") %>:
+<%= Typus::I18n.t("You can update your password at") %>:
 
     <%= @url %>
 
-<%= _t("If you didn't request a password update, you can ignore this message") %>
+<%= Typus::I18n.t("If you didn't request a password update, you can ignore this message") %>
 
 --
 <%= Typus.admin_title %>

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

@@ -1,15 +1,6 @@
-<%= form_for @item, :url  => options[:options], :html => { :multipart => true } do |form| %>
+<%= form_for @item, :url => options, :html => { :class => "resource", :multipart => true } do |form| %>
 
-  <% if @item.errors.any? %>
-  <div id="errorExplanation">
-    <h3><%= pluralize(@item.errors.count, "error") %> prohibited this page from being saved:</h3>
-    <ul>
-    <% @item.errors.full_messages.each do |full_message| %>
-      <li><%= full_message %></li>
-    <% end %>
-    </ul>
-  </div>
-  <% end %>
+  <%= render "admin/helpers/resources/errors" %>
 
   <fieldset class="inputs">
     <ol>
@@ -19,7 +10,7 @@
 
   <fieldset class="buttons">
     <ol>
-      <li><%= submit_tag options[:button] , :class => "commit" %> or <%= link_to _t("Cancel and go back").downcase, :action => "index" %></li>
+      <li><%= submit_tag button, :class => "commit", :onclick => "setConfirmUnload(false);" %></li>
     </ol>
   </fieldset>
 

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

@@ -1,9 +1,11 @@
 <%
-  page_title = _t("Edit %{resource}", :resource => @resource.model_name.human)
+  page_title = Typus::I18n.t("Edit %{resource}", :resource => @resource.model_name.human)
   title(page_title)
 %>
 
-<% content_for :sidebar, build_sidebar %>
+<% content_for :sidebar do %>
+  <% build_sidebar.present? ? build_sidebar : render("admin/templates/profile_sidebar") %>
+<% end %>
 
 <h2>
   <%= page_title %>
@@ -11,7 +13,7 @@
 
 <%= display_link_to_previous %>
 <%= display_flash_message %>
-<%= typus_render :partial => 'edit' %>
+<%= render 'edit' %>
 
 <%
   options = { :action => "update",
@@ -19,9 +21,9 @@
               :back_to => params[:back_to],
               :resource => params[:resource],
               :resource_id => params[:resource_id] }
-  button = _t("Save %{resource}", :resource => @resource.model_name.human)
+  button = Typus::I18n.t("Save %{resource}", :resource => @resource.model_name.human)
 %>
 
-<%= typus_render :partial => 'form', :options => options, :button => button %>
+<%= render :partial => 'form', :locals => { :options => options, :button => button } %>
 
 <%= raw typus_relationships %>