typus 3.1.0.rc14 → 3.1.0.rc15

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

@@ -0,0 +1,23 @@
+<!-- This probably needs a rename, but for the moment is ok -->
+
+<% if (resources = Typus.resources.delete_if { |r| !(admin_user.is_a?(FakeUser) || admin_user.resources.include?(r)) }).any? %>
+
+  <h2><%= Typus::I18n.t("Resources") %></h2>
+
+  <table>
+
+    <thead>
+      <tr>
+        <th><%= Typus::I18n.t("Name") %></th>
+      </tr>
+    </thead>
+
+    <% resources.each do |resource| %>
+      <tr class="<%= cycle("even", "odd") %>">
+        <td><%= link_to Typus::I18n.t(resource.titleize.capitalize), :controller => "/admin/#{resource.underscore}" %></td>
+      </tr>
+    <% end %>
+
+  </table>
+
+<% end %>

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

@@ -0,0 +1,23 @@
+<div class="actions">
+  <div class="left">
+    <ul>
+      <li><%= link_to Typus::I18n.t("All"), params.dup.cleanup.merge(:action => 'index') %> (<%= resource.count %>)</li>
+      <% predefined_filters.each do |filter, action, scope| %>
+        <% url = action.is_a?(String) ? params.dup.cleanup.merge(:action => action) : action %>
+        <li><%= link_to Typus::I18n.t(filter), url %> <%= "(#{@resource.send(scope).count})" if scope && @resource.respond_to?(scope) %></li>
+      <% end %>
+    </ul>
+  </div>
+
+  <div class="right">
+    <% unless resource.count.zero? %>
+      <ul>
+        <li><%= Typus::I18n.t("Export as") %></li>
+        <ul>
+          <li><%= link_to "CSV", :format => 'csv' %></li>
+          <li><%= link_to "XML", :format => 'xml' %></li>
+        </ul>
+      </ul>
+    <% end %>
+  </div>
+</div>

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

@@ -3,29 +3,35 @@
   title(page_title)
 %>
 
-<% content_for :sidebar do %>
-  <% build_sidebar.present? ? build_sidebar : render("admin/templates/profile_sidebar") %>
-<% end %>
+<% content_for :main_grid do %>
+  <h2>
+    <%= page_title %>
+    <small><%= list_actions %></small>
+  </h2>
 
-<h2>
-  <%= page_title %>
-  <small><%= list_actions %></small>
-</h2>
+  <% if flash[:notice] && headless_mode? %>
+    <script>
+      $(document).ready(function() { parent.location.reload(); });
+    </script>
+  <% end %>
 
-<% if flash[:notice] && headless_mode? %>
-  <script>
-    $(document).ready(function() { parent.location.reload(); });
-  </script>
-<% end %>
+  <%= display_flash_message %>
+  <%= render 'edit' %>
 
-<%= display_flash_message %>
-<%= render 'edit' %>
+  <%
+    options = params.dup.cleanup.merge!(:action => 'update')
+    button = Typus::I18n.t("Save %{resource}", :resource => @resource.model_name.human)
+  %>
 
-<%
-  options = params.dup.cleanup.merge!(:action => 'update')
-  button = Typus::I18n.t("Save %{resource}", :resource => @resource.model_name.human)
-%>
+  <%= render :partial => 'form', :locals => { :options => options, :button => button } %>
+
+  <%= typus_relationships unless headless_mode? %>
+<% end %>
 
-<%= render :partial => 'form', :locals => { :options => options, :button => button } %>
+<div class="grid_2">
+  <%= build_sidebar.present? ? build_sidebar : render("admin/templates/profile_sidebar") %>
+</div>
 
-<%= typus_relationships unless headless_mode? %>
+<div class="grid_8">
+  <%= yield :main_grid %>
+</div>

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

@@ -0,0 +1,7 @@
+<h3>Actions</h3>
+
+<ul>
+  <li>Action number one</li>
+  <li>Action number two</li>
+  <li>Action number three</li>
+</ul>

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

@@ -0,0 +1,8 @@
+<% if (items = @resource.limit(10)).any? %>
+  <h3>Edited Recently</h3>
+  <ul>
+    <% items.each do |item| %>
+      <li><%= link_to item.to_label, :action => 'edit', :id => item %></li>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -3,44 +3,54 @@
   title(page_title)
 %>
 
-<% content_for :sidebar, build_sidebar %>
+<% content_for :main_grid do %>
 
-<h2>
-  <%= page_title %>
-  <small><%= list_actions %></small>
-</h2>
+  <h2>
+    <%= page_title %>
+    <small><%= list_actions %></small>
+  </h2>
 
-<%= display_flash_message %>
+  <%= display_flash_message %>
 
-<%= render 'index' %>
+  <%= render 'index' %>
 
-<ul class="predefined_filters">
-  <li><%= link_to Typus::I18n.t("All"), params.dup.cleanup.merge(:action => 'index') %> (<%= resource.count %>)</li>
-  <% predefined_filters.each do |filter, action, scope| %>
-    <% url = action.is_a?(String) ? params.dup.cleanup.merge(:action => action) : action %>
-    <li><%= link_to Typus::I18n.t(filter), url %> <%= "(#{@resource.send(scope).count})" if scope && @resource.respond_to?(scope) %></li>
-  <% end %>
-  <% unless resource.count.zero? %>
-    <li>|</li>
-    <li><%= link_to "CSV", :format => 'csv' %></li>
-    <li><%= link_to "XML", :format => 'xml' %></li>
-  <% end %>
-</ul>
+  <ul class="predefined_filters">
+    <li><%= link_to Typus::I18n.t("All"), params.dup.cleanup.merge(:action => 'index') %> (<%= resource.count %>)</li>
+    <% predefined_filters.each do |filter, action, scope| %>
+      <% url = action.is_a?(String) ? params.dup.cleanup.merge(:action => action) : action %>
+      <li><%= link_to Typus::I18n.t(filter), url %> <%= "(#{@resource.send(scope).count})" if scope && @resource.respond_to?(scope) %></li>
+    <% end %>
+    <% unless resource.count.zero? %>
+      <li>|</li>
+      <li><%= link_to "CSV", :format => 'csv' %></li>
+      <li><%= link_to "XML", :format => 'xml' %></li>
+    <% end %>
+  </ul>
 
-<% if (build_filters || search) %>
-  <div class="filters">
-    <%= build_filters %>
-    <%= search %>
-  </div>
-<% end %>
+  <% if (build_filters || search) %>
+    <div class="filters">
+      <%= build_filters %>
+      <%= search %>
+    </div>
+  <% end %>
 
-<% if @items.any? -%>
-  <% if controller.respond_to?(:bulk) %>
-    <%= build_actions { build_list(@resource, fields, @items) } %>
+  <% if @items.any? -%>
+    <% if controller.respond_to?(:bulk) %>
+      <%= build_actions { build_list(@resource, fields, @items) } %>
+    <% else %>
+      <%= build_list(@resource, fields, @items) %>
+    <% end %>
+    <%= paginate(@items, Typus.pagination) %>
   <% else %>
-    <%= build_list(@resource, fields, @items) %>
+    <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.downcase.pluralize) %></p>
   <% end %>
-  <%= paginate(@items, Typus.pagination) %>
-<% else %>
-  <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.downcase.pluralize) %></p>
+
 <% end %>
+
+<div class="grid_2">
+  <%= build_sidebar %>
+</div>
+
+<div class="grid_10">
+  <%= yield :main_grid %>
+</div>

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

@@ -3,14 +3,22 @@
   title(page_title)
 %>
 
-<% content_for :sidebar, build_sidebar %>
+<% content_for :main_grid do %>
+  <h2>
+    <%= page_title %>
+    <small><%= list_actions %></small>
+  </h2>
 
-<h2>
-  <%= page_title %>
-  <small><%= list_actions %></small>
-</h2>
+  <%= render 'new' %>
 
-<%= render 'new' %>
+  <%= render :partial => 'form',
+             :locals => { :options => params.dup.cleanup.merge(:action => 'create') } %>
+<% end %>
 
-<%= render :partial => 'form',
-           :locals => { :options => params.dup.cleanup.merge(:action => 'create') } %>
+<div class="grid_2">
+  <%= build_sidebar %>
+</div>
+
+<div class="grid_8">
+  <%= yield :main_grid %>
+</div>

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

@@ -3,21 +3,29 @@
   title(page_title)
 %>
 
-<% content_for :sidebar, build_sidebar %>
+<% content_for :main_grid do %>
+  <h2>
+    <%= page_title %>
+    <small><%= list_actions %></small>
+  </h2>
 
-<h2>
-  <%= page_title %>
-  <small><%= list_actions %></small>
-</h2>
+  <%= display_flash_message %>
+  <%= render 'show' %>
 
-<%= display_flash_message %>
-<%= render 'show' %>
+  <dl>
+    <% build_display(@item, fields).each do |attribute, type| %>
+      <dt><%= attribute %></dt>
+      <dd><%= type %></dd>
+    <% end %>
+  </dl>
 
-<dl>
-  <% build_display(@item, fields).each do |attribute, type| %>
-    <dt><%= attribute %></dt>
-    <dd><%= type %></dd>
-  <% end %>
-</dl>
+  <%= typus_relationships %>
+<% end %>
 
-<%= typus_relationships %>
+<div class="grid_2">
+  <%= build_sidebar %>
+</div>
+
+<div class="grid_8">
+  <%= yield :main_grid %>
+</div>

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

@@ -18,9 +18,17 @@
     </li>
 
     <li>
-      <%= submit_tag Typus::I18n.t("Sign in"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %> <%= link_to Typus::I18n.t("Recover password"), forgot_password_admin_account_index_path if Typus.mailer_sender %>
+      <%= submit_tag Typus::I18n.t("Sign in"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %>
     </li>
 
   </ul>
 
 <% end %>
+
+<% if Typus.mailer_sender %>
+  <% content_for :actions do %>
+    <ul>
+      <li><%= link_to Typus::I18n.t("Recover password"), forgot_password_admin_account_index_path %></li>
+    </ul>
+  <% end %>
+<% end %>

data/app/views/admin/templates/_belongs_to.html.erb

@@ -5,7 +5,7 @@
   end
 %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label related_fk, "#{label_text} <small>#{message}</small>".html_safe %>
   <%= form.select related_fk, values, options, html_options %>
 </li>

data/app/views/admin/templates/_belongs_to_with_autocomplete.html.erb

@@ -16,7 +16,7 @@
   </script>
 <% end %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label related_fk, "#{label_text} <small>#{message}</small>".html_safe %>
   <%= form.hidden_field related_fk %>
   <input id="tokenInput_for_<%= related_fk %>"

data/app/views/admin/templates/_boolean.html.erb

@@ -1,4 +1,4 @@
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.check_box attribute, options %>
   <%= form.label attribute, label_text, :class => "inline_label" %>
 </li>

data/app/views/admin/templates/_date.html.erb

@@ -3,7 +3,7 @@
   options.merge!(custom)
 %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, label_text %>
   <%= form.date_select attribute, options, html_options %>
 </li>

data/app/views/admin/templates/_datetime.html.erb

@@ -3,7 +3,7 @@
   options.merge!(custom)
 %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, label_text %>
   <%= form.datetime_select attribute, options, html_options %>
 </li>

data/app/views/admin/templates/_dragonfly.html.erb

@@ -1,4 +1,4 @@
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, link_to_detach_attribute_for_dragonfly(attribute) %>
   <%= form.file_field attribute, options %>
   <%= form.hidden_field "retained_#{attribute}" %>

data/app/views/admin/templates/_paperclip.html.erb

@@ -1,4 +1,4 @@
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, link_to_detach_attribute_for_paperclip(attribute) %>
   <%= form.file_field attribute, options %>
   <%= typus_paperclip_preview(@item, attribute) %>

data/app/views/admin/templates/_password.html.erb

@@ -1,4 +1,4 @@
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, label_text %>
   <%= form.password_field attribute, options %>
 </li>

data/app/views/admin/templates/_selector.html.erb

@@ -8,7 +8,7 @@
   end
 %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, "#{label_text} <small>#{message}</small>".html_safe %>
   <%= form.select attribute, @resource.send(attribute), options, html_options %>
 </li>

data/app/views/admin/templates/_string.html.erb

@@ -16,7 +16,7 @@
 
 %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, label_text.html_safe %>
   <%= form.text_field attribute, options %>
 </li>

data/app/views/admin/templates/_string_with_preview.html.erb

@@ -6,7 +6,7 @@
   end
 %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, raw(label_text) %>
   <%= form.text_field attribute, options %>
 </li>

data/app/views/admin/templates/_text.html.erb

@@ -10,7 +10,7 @@
   options = options.merge!(custom)
 %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, label_text.html_safe %>
   <%= form.text_area attribute, options %>
 </li>

data/app/views/admin/templates/_text_with_ckeditor.html.erb

@@ -1,13 +1,27 @@
 <% content_for :javascripts do %>
+  <script type="text/javascript">
+    var CKEDITOR_BASEPATH = '/assets/ckeditor/';
+  </script>
+
   <%= javascript_include_tag 'ckeditor/ckeditor' %>
+  <%= javascript_include_tag 'ckeditor/adapters/jquery' %>
+
+  <script type="text/javascript">
+    $(document).ready(function() {
+      // var config = { toolbar: 'Basic', };
+      // var config = { toolbar: 'Full', };
+      var config = { toolbar: [['Bold', 'Italic', 'Underline', '-', 'NumberedList', 'BulletedList', '-', 'Undo', 'Redo', '-', 'SelectAll']] };
+      $(".rich_text").ckeditor(config);
+    });
+  </script>
 <% end %>
 
 <%
-  custom = { :rows => @resource.typus_options_for(:form_rows), :class => "ckeditor" }
+  custom = { :rows => @resource.typus_options_for(:form_rows), :class => "rich_text" }
   options = options.merge!(custom)
 %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, label_text %>
   <%= form.text_area attribute, options %>
 </li>

data/app/views/admin/templates/_text_with_ckeditor_and_assets.html.erb

@@ -1,9 +1,23 @@
 <% content_for :javascripts do %>
+  <script type="text/javascript">
+    var CKEDITOR_BASEPATH = '/assets/ckeditor/';
+  </script>
+
   <%= javascript_include_tag 'ckeditor/ckeditor' %>
+  <%= javascript_include_tag 'ckeditor/adapters/jquery' %>
+
+  <script type="text/javascript">
+    $(document).ready(function() {
+      // var config = { toolbar: 'Basic', };
+      // var config = { toolbar: 'Full', };
+      var config = { toolbar: [['Bold', 'Italic', 'Underline', '-', 'NumberedList', 'BulletedList', '-', 'Undo', 'Redo', '-', 'SelectAll']] };
+      $(".rich_text").ckeditor(config);
+    });
+  </script>
 <% end %>
 
 <%
-  custom = { :rows => @resource.typus_options_for(:form_rows), :class => "ckeditor" }
+  custom = { :rows => @resource.typus_options_for(:form_rows), :class => "rich_text" }
   options = options.merge!(custom)
 %>
 
@@ -18,7 +32,7 @@
   DATA
 %>
 
-<li id="<%= attribute %>">
+<li id="<%= attribute_id %>">
   <%= form.label attribute, label_text.html_safe %>
   <%= form.text_area attribute, options %>
 </li>