typus 3.1.0.rc14 → 3.1.0.rc15

data/app/assets/stylesheets/typus/layout.css

@@ -0,0 +1,4 @@
+#wrapper {
+  min-height: 100%;
+  position: relative;
+}

data/app/assets/stylesheets/typus/pagination.css

@@ -1,16 +1,42 @@
-.pagination { border-top: 1px solid #D3D3D3; margin: 1.5em auto; padding: 1em 0; text-align: center;}
+.pagination {
+  border-top: 1px solid #D3D3D3;
+  border-bottom: 1px solid #D3D3D3;
+  margin: -1em auto 1em auto;
+  padding: 1em 0;
+  text-align: center;
+}
+
+.pagination em {
+  font-style: normal!important;
+}
 
-.pagination em { font-style: normal!important; }
 .pagination em,
-.pagination a { padding: 3px 5px; text-decoration: none; }
+.pagination a {
+  padding: 3px 5px;
+  text-decoration: none;
+}
+
 .pagination a:hover,
-.pagination em { background: #000; color: #FFF; }
+.pagination em {
+  background: #000;
+  color: #FFF;
+}
+
+.pagination span.disabled {
+  color: #D3D3D3;
+  margin: 2px;
+  padding: 2px 3px; }
 
-.pagination span.disabled { color: #D3D3D3; margin: 2px; padding: 2px 3px; }
+.pagination .prev {
+  float: left;
+}
 
-.pagination .prev { float: left; }
-.pagination .next { float: right; }
+.pagination .next {
+  float: right;
+}
 
 .pagination .first,
 .pagination .last,
-.pagination .current { display: none; }
+.pagination .current {
+  display: none;
+}

data/app/assets/stylesheets/typus/sidebar.css

@@ -0,0 +1,23 @@
+#sidebar ul li.header {
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  background: #242527;
+  color: #FFF;
+  font-size: 1.20em;
+  font-weight: bold;
+  padding: 0.25em 0.5em;
+  margin: 0.5em 0;
+}
+
+#sidebar ul {
+  margin: 0;
+}
+
+#sidebar ul ul li {
+  list-style: none;
+  padding-left: 0.5em;
+}
+
+#sidebar a {
+  text-decoration: none;
+}

data/app/assets/stylesheets/typus/tables.css

@@ -0,0 +1,47 @@
+table {
+  margin-bottom: 2em!important;
+  width: 100%;
+  text-align: left;
+}
+
+table a {
+  text-decoration: none;
+}
+
+table th {
+  background: #242527;
+  color: #FFF;
+  padding: 6px;
+}
+
+table th a {
+  color: #FFF!important;
+  text-decoration: none;
+}
+
+table th a:hover {
+  text-decoration: underline;
+}
+
+table td.right {
+  text-align: right;
+}
+
+table tr.even {
+  background: #FFF!important;
+}
+
+table tr.even:hover,
+table tr.odd:hover {
+  background: #E4E4E4!important;
+}
+
+table tr.odd {
+  background: #F3F3F3;
+}
+
+table td {
+  border: none;
+  padding: 5px;
+  vertical-align: top;
+}

data/app/helpers/admin/base_helper.rb

@@ -32,7 +32,7 @@ module Admin::BaseHelper
   def admin_sign_out_path
     case Typus.authentication
     when :devise
-      send("destroy_#{Typus.user_class_name.underscore}_session")
+      send("destroy_#{Typus.user_class_name.underscore}_session_path")
     else
       destroy_admin_session_path
     end

data/app/helpers/admin/resources/data_types/belongs_to_helper.rb

@@ -38,6 +38,7 @@ module Admin::Resources::DataTypes::BelongsToHelper
            :association => association,
            :resource => @resource,
            :attribute => attribute,
+           :attribute_id => "#{@resource.table_name}_#{attribute}",
            :form => form,
            :related_fk => related_fk,
            :related => related,

data/app/helpers/admin/resources/data_types/tree_helper.rb

@@ -6,6 +6,7 @@ module Admin::Resources::DataTypes::TreeHelper
 
   def typus_tree_field(attribute, form)
     locals = { :attribute => attribute,
+               :attribute_id => "#{@resource.table_name}_#{attribute}",
                :form => form,
                :label_text => @resource.human_attribute_name(attribute),
                :values => expand_tree_into_select_field(@resource.roots, "parent_id") }

data/app/helpers/admin/resources/display_helper.rb

@@ -2,7 +2,7 @@ module Admin::Resources::DisplayHelper
 
   def build_display(item, fields)
     fields.map do |attribute, type|
-      value = if (type == :boolean) || (data = item.send(attribute))
+      value = if (type == :boolean) || (data = item.send(attribute)).present?
                 send("display_#{type}", item, attribute)
               else
                 "—".html_safe

data/app/helpers/admin/resources/form_helper.rb

@@ -31,6 +31,7 @@ module Admin::Resources::FormHelper
 
     locals = { :resource => @resource,
                :attribute => attribute,
+               :attribute_id => "#{@resource.table_name}_#{attribute}",
                :options => options,
                :html_options => html_options,
                :form => form,

data/app/helpers/admin/resources_helper.rb

@@ -17,7 +17,9 @@ module Admin::ResourcesHelper
 
     admin_user.application(app_name).each do |resource|
       klass = resource.constantize
-      resources[resource] = [sidebar_all_resource(klass), sidebar_add_new(klass)].compact
+      if (new_link = sidebar_add_new(klass))
+        resources[resource] = [new_link]
+      end
     end
 
     render "helpers/admin/resources/sidebar", :resources => resources
@@ -29,10 +31,6 @@ module Admin::ResourcesHelper
     end
   end
 
-  def sidebar_all_resource(klass)
-    { :message => Typus::I18n.t("All #{klass.model_name.human.pluralize}"), :url => { :action => "index" } }
-  end
-
   # TODO: This method should be moved to `lib/typus/controller/actions.rb`
   def resource_actions
     @resource_actions ||= []

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

@@ -13,9 +13,15 @@
     </li>
 
     <li>
-      <%= submit_tag Typus::I18n.t("Submit"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %> <%= link_to Typus::I18n.t("I remember my password"), new_admin_session_path %>
+      <%= submit_tag Typus::I18n.t("Submit"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %>
     </li>
 
   </ul>
 
 <% end %>
+
+<% content_for :actions do %>
+  <ul>
+    <li><%= link_to Typus::I18n.t("I remember my password"), new_admin_session_path %></li>
+  </ul>
+<% end %>

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

@@ -1,83 +1,87 @@
-<% 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 %>
-
 <%
   rails = "http://rubyonrails.org/"
   typus = "http://core.typuscms.com/"
 %>
 
-<a name="introduction"></a>
+<% content_for :main_grid do %>
+  <a name="introduction"></a>
 
-<h2>Introduction</h2>
+  <h2>Introduction</h2>
 
-<p>This website is powered by <%= link_to "Ruby on Rails", rails %> and
-<%= link_to "Typus", typus %>.</p>
+  <p>This website is powered by <%= link_to "Ruby on Rails", rails %> and
+  <%= link_to "Typus", typus %>.</p>
 
-<p>With <%= link_to "Typus", typus %>, 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>With <%= link_to "Typus", typus %>, 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 typus, typus %>.</p>
+  <p>You can get more information at <%= link_to typus, typus %>.</p>
 
-<a name="basics"></a>
+  <a name="basics"></a>
 
-<h2>Basic Actions</h2>
+  <h2>Basic Actions</h2>
 
-<h3>Create Entries</h3>
+  <h3>Create Entries</h3>
 
-<p>To create a new entry:</p>
+  <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>
+  <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>
+  <h3>Editing &amp; Updating Entries</h3>
 
-<p>To edit entries:</p>
+  <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>
+  <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>
 
-<h3>Removing Entries</h3>
+  <p>Removing entries will be only available if you have permissions to do so.</p>
 
-<p>To remove entries:</p>
+  <a name="registered-users"></a>
 
-<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>
+  <h2>Registered Users</h2>
 
-<p>Removing entries will be only available if you have permissions to do so.</p>
+  <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>
 
-<a name="registered-users"></a>
+  <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>
 
-<h2>Registered Users</h2>
+  <p>It's usually recommended having an extra role which some restrictions.</p>
+<% end %>
 
-<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>
+<div class="grid_2">
+  <h2>User Guide</h2>
 
-<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>
+  <ul>
+    <li><%= link_to "Introduction", "#introduction" %></li>
+    <li><%= link_to "Basics", "#basics" %></li>
+    <li><%= link_to "Registered Users", "#registered-users" %></li>
+  </ul>
+</div>
 
-<p>It's usually recommended having an extra role which some restrictions.</p>
+<div class="grid_8">
+  <%= yield :main_grid %>
+</div>

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

@@ -3,20 +3,10 @@
   title(page_title)
 %>
 
-<% content_for :sidebar do %>
-  <%= render "sidebar" %>
-<% end %>
+<div class="grid_2">
+  <%= render 'admin/dashboard/sidebar' %>
+</div>
 
-<h2>
-  <%= page_title %>
-</h2>
-
-<% if admin_user.applications.any? %>
-  <%= render 'applications' %>
-<% else %>
-  <div class="notice">
-    No applications detected.
-  </div>
-<% end %>
-
-<%= resources(admin_user) %>
+<div class="grid_10">
+  <%= render 'admin/dashboard/widgets/applications' %>
+</div>

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

@@ -0,0 +1,31 @@
+<!-- Applications list with models. -->
+
+<h2><%= Typus::I18n.t("Applications") %></h2>
+
+<% if admin_user.applications.any? %>
+  <% admin_user.applications.each do |app| %>
+
+    <table>
+
+      <thead>
+        <tr>
+          <th><%= Typus::I18n.t(app) %></th>
+        </tr>
+      </thead>
+
+      <% admin_user.application(app).map { |i| i.constantize }.each do |klass| %>
+        <tr class="<%= cycle("even", "odd") %>">
+          <td>
+            <%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %>
+          </td>
+        </tr>
+      <% end %>
+
+    </table>
+
+  <% end %>
+<% else %>
+  <div class="notice">
+    No applications detected.
+  </div>
+<% end %>

data/app/views/admin/dashboard/widgets/_models.html.erb

@@ -0,0 +1,23 @@
+<!-- List of all available models -->
+
+<h2><%= Typus::I18n.t("Site Administration") %></h2>
+
+<table>
+
+  <thead>
+    <tr>
+      <th><%= Typus::I18n.t("Model name") %></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <% admin_user.models.map { |i| i.constantize }.each do |klass| %>
+    <tr class="<%= cycle("even", "odd") %>">
+      <td><%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %></td>
+      <td width="80px" align="right">
+        <%= link_to Typus::I18n.t("Add New"), :controller => "/admin/#{klass.to_resource}", :action => 'new' %>
+      </td>
+    </tr>
+  <% end %>
+
+</table>

data/app/views/admin/dashboard/widgets/_models_extended.html.erb

@@ -0,0 +1,25 @@
+<!-- List of all available models -->
+
+<h2><%= Typus::I18n.t("Site Administration") %></h2>
+
+<table>
+
+  <thead>
+    <tr>
+      <th><%= Typus::I18n.t("Model name") %></th>
+      <th><%= Typus::I18n.t("Records") %></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <% admin_user.models.map { |i| i.constantize }.each do |klass| %>
+    <tr class="<%= cycle("even", "odd") %>">
+      <td><%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %></td>
+      <td width="30px" align="right"><%= klass.count %></td>
+      <td width="80px" align="right">
+        <%= link_to Typus::I18n.t("Add New"), :controller => "/admin/#{klass.to_resource}", :action => 'new' %>
+      </td>
+    </tr>
+  <% end %>
+
+</table>