typus 3.1.0.rc14 → 3.1.0.rc15

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

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

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

@@ -1,5 +1,5 @@
 <% unless values.empty? %>
-  <li id="<%= attribute %>">
+  <li id="<%= attribute_id %>">
     <%= form.label label_text %>
     <%= form.select :parent_id, values, { :include_blank => true } %>
   </li>

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

@@ -1,17 +1,41 @@
-<% resources.each do |resource, actions| %>
+<% if Typus.quick_sidebar %>
+  <h2><%= @resource.typus_application %></h2>
 
-  <% klass = resource.constantize %>
+  <ul>
+    <% resources.each do |resource, actions| %>
+      <% klass = resource.constantize %>
+      <li>
+        <%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %>
+        <small>
+          <%= link_to Typus::I18n.t("Add New"), :controller => "/admin/#{klass.to_resource}", :action => "new" %>
+        </small>
+      </li>
+    <% end %>
+  </ul>
+<% else %>
+  <div id="sidebar">
 
-  <%= link_to :controller => "/admin/#{klass.to_resource}" do %>
-    <h3><%= klass.model_name.human.pluralize %></h3>
-  <% end %>
+    <% resources.each do |resource, actions| %>
 
-  <% if @resource.model_name.eql?(resource) %>
-    <ul>
-      <% actions.each do |action| %>
-        <li><%= link_to action[:message], action[:url] %></li>
-      <% end %>
-    </ul>
-  <% end %>
+      <% klass = resource.constantize %>
 
+      <ul>
+
+        <%= link_to :controller => "/admin/#{klass.to_resource}" do %>
+          <li class="header"><%= klass.model_name.human.pluralize %></li>
+        <% end %>
+
+        <% if @resource.model_name.eql?(resource) %>
+          <ul>
+            <% actions.each do |action| %>
+              <li><%= link_to action[:message], action[:url] %></li>
+            <% end %>
+          </ul>
+        <% end %>
+
+      </ul>
+
+    <% end %>
+
+  </div>
 <% end %>

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

@@ -1,4 +1,6 @@
-<% content_for :table_headers do %>
+<% yield_name = "table_headers_#{model}" %>
+
+<% content_for yield_name do %>
   <thead>
     <tr>
       <% if controller.respond_to?(:bulk) %>
@@ -13,7 +15,7 @@
 
 <table>
 
-  <%= yield :table_headers %>
+  <%= yield yield_name %>
 
   <% items.each do |item| %>
     <tr class="<%= cycle('even', 'odd') %>" id="<%= dom_id(item) %>">
@@ -38,6 +40,6 @@
     </tr>
   <% end %>
 
-  <%= yield :table_headers %>
+  <%= yield yield_name %>
 
 </table>

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

@@ -10,49 +10,36 @@
 
   <div id="wrapper">
 
-    <div id="header_wrapper">
-
-      <div id="header">
-        <%= header %>
-        <div class="clear"></div>
-      </div>
-
-      <div id="links">
+    <div id="header">
+      <div class="container_12">
+        <div class="grid_12 title">
+          <%= header %>
+        </div>
 
-        <div class="left">
+        <div class="grid_8 applications">
           <%= apps %>
         </div>
 
-        <div class="right">
+        <div class="grid_4 profile">
           <%= login_info %>
         </div>
-
-        <div class="clear"></div>
-
       </div>
-
     </div>
 
-    <div id="content_wrapper">
-
-      <div id="sidebar">
-        <%= yield :sidebar %>
-      </div>
-
-      <div id="content">
+    <div id="content">
+      <div class="container_12">
         <%= yield :layout %>
       </div>
-
-      <div class="clear"></div>
-
     </div>
 
-    <div id="footer_wrapper">
-
-      <div id="footer">
-        <%= Typus.admin_sub_title.html_safe %>
+    <div id="footer">
+      <div class="container_12">
+        <div class="grid_12">
+          <span class="copyright">
+            Powered by <%= link_to "Typus", "http://core.typuscms.com/" %> &#183; <%= Typus.admin_sub_title.html_safe %>
+          </span>
+        </div>
       </div>
-
     </div>
 
   </div>

data/app/views/layouts/admin/headless.html.erb

@@ -9,7 +9,7 @@
 <body>
 
   <div id="content" class="headless">
-    <%= yield :layout %>
+    <%= yield :main_grid %>
   </div>
 
 </body>

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

@@ -16,6 +16,12 @@
       <%= yield :layout %>
     </div>
 
+    <% if content_for?(:actions) %>
+      <div id="actions">
+        <%= yield :actions %>
+      </div>
+    <% end %>
+
   </div>
 
 </body>

data/lib/support/fake_user.rb

@@ -1,5 +1,7 @@
 class FakeUser
 
+  include Typus::Orm::ActiveRecord::User::InstanceMethodsMore
+
   def id
     0
   end
@@ -20,10 +22,6 @@ class FakeUser
     !is_root?
   end
 
-  def locale
-    ::I18n.locale
-  end
-
   def applications
     Typus.applications
   end
@@ -32,10 +30,6 @@ class FakeUser
     Typus.application(name)
   end
 
-  def role
-    Typus.master_role
-  end
-
   def status
     true
   end

data/lib/typus.rb

@@ -35,6 +35,7 @@ module Typus
 
   module Authentication
     autoload :Base, "typus/authentication/base"
+    autoload :Devise, "typus/authentication/devise"
     autoload :None, "typus/authentication/none"
     autoload :HttpBasic, "typus/authentication/http_basic"
     autoload :Session, "typus/authentication/session"
@@ -129,10 +130,13 @@ module Typus
   @@master_role = "admin"
 
   mattr_accessor :user_class_name
-  @@user_class_name = "TypusUser"
+  @@user_class_name = "AdminUser"
 
   mattr_accessor :user_foreign_key
-  @@user_foreign_key = "typus_user_id"
+  @@user_foreign_key = "admin_user_id"
+
+  mattr_accessor :quick_sidebar
+  @@quick_sidebar = false
 
   class << self
 

data/lib/typus/authentication/devise.rb

@@ -0,0 +1,19 @@
+module Typus
+  module Authentication
+    module Devise
+
+      protected
+
+      include Base
+
+      def admin_user
+        send("current_#{Typus.user_class_name.underscore}")
+      end
+
+      def authenticate
+        send("authenticate_#{Typus.user_class_name.underscore}!")
+      end
+
+    end
+  end
+end

data/lib/typus/controller/headless.rb

@@ -3,7 +3,7 @@ module Typus
     module Headless
 
       def self.included(base)
-        base.before_filter :set_resources_action_for_headless_on_index, :only => [:index]
+        base.before_filter :set_resources_action_for_headless_on_index, :only => [:index, :trash]
         base.before_filter :set_resources_action_for_headless, :only => [:new, :create, :edit, :show]
         base.helper_method :headless_mode?
         base.layout :set_headless_layout

data/lib/typus/orm/active_record/admin_user_v1.rb

@@ -12,8 +12,8 @@ module Typus
 
             extend Typus::Orm::ActiveRecord::User::ClassMethods
 
-            include InstanceMethods
             include Typus::Orm::ActiveRecord::User::InstanceMethods
+            include InstanceMethods
 
             attr_accessor :password
 
@@ -44,6 +44,20 @@ module Typus
 
         module InstanceMethods
 
+          def to_label
+            full_name = [first_name, last_name].delete_if { |s| s.blank? }
+            full_name.any? ? full_name.join(" ") : email
+          end
+
+          def locale
+            (preferences && preferences[:locale]) ? preferences[:locale] : ::I18n.default_locale
+          end
+
+          def locale=(locale)
+            self.preferences ||= {}
+            self.preferences[:locale] = locale
+          end
+
           def authenticated?(password)
             crypted_password == encrypt(password)
           end

data/lib/typus/orm/active_record/admin_user_v2.rb

@@ -13,8 +13,8 @@ module Typus
 
             extend Typus::Orm::ActiveRecord::User::ClassMethods
 
-            include InstanceMethodsOnActivation
             include Typus::Orm::ActiveRecord::User::InstanceMethods
+            include InstanceMethods
 
             attr_reader   :password
             attr_accessor :password_confirmation
@@ -40,7 +40,21 @@ module Typus
 
         end
 
-        module InstanceMethodsOnActivation
+        module InstanceMethods
+
+          def to_label
+            full_name = [first_name, last_name].delete_if { |s| s.blank? }
+            full_name.any? ? full_name.join(" ") : email
+          end
+
+          def locale
+            (preferences && preferences[:locale]) ? preferences[:locale] : ::I18n.default_locale
+          end
+
+          def locale=(locale)
+            self.preferences ||= {}
+            self.preferences[:locale] = locale
+          end
 
           # Returns self if the password is correct, otherwise false.
           def authenticate(unencrypted_password)

data/lib/typus/orm/active_record/user/class_methods.rb

@@ -8,9 +8,8 @@ module Typus
             options = args.extract_options!
             options[:password] ||= Typus.password
             options[:role] ||= Typus.master_role
-            user = new :email => options[:email], :password => options[:password]
-            user.status = true
-            user.role = options[:role]
+            options[:status] = true
+            user = new options, :without_protection => true
             user.save ? user : false
           end
 

data/lib/typus/orm/active_record/user/instance_methods.rb

@@ -5,14 +5,17 @@ module Typus
         module InstanceMethods
 
           def to_label
-            full_name = [first_name, last_name].delete_if { |s| s.blank? }
-            full_name.any? ? full_name.join(" ") : email
+            email
           end
 
           def resources
             Typus::Configuration.roles[role.to_s].compact
           end
 
+          def models
+            Typus.models.delete_if { |m| cannot?('read', m) }
+          end
+
           def applications
             Typus.applications.delete_if { |a| application(a).empty? }
           end

data/lib/typus/orm/active_record/user/instance_methods_more.rb

@@ -0,0 +1,19 @@
+module Typus
+  module Orm
+    module ActiveRecord
+      module User
+        module InstanceMethodsMore
+
+          def locale
+            ::I18n.locale
+          end
+
+          def role
+            Typus.master_role
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc14"
+  VERSION = "3.1.0.rc15"
 end

data/vendor/assets/adapt/css/1200.css

@@ -0,0 +1,357 @@
+/*
+  960 Grid System ~ Core CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+*/
+
+/*
+  Forces backgrounds to span full width,
+  even if there is horizontal scrolling.
+  Increase this if your layout is wider.
+
+  Note: IE6 works fine without this fix.
+*/
+
+body {
+  min-width: 1200px;
+}
+
+/* `Containers
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 {
+  margin-left: auto;
+  margin-right: auto;
+  width: 1200px;
+}
+
+/* `Grid >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12 {
+  display: inline;
+  float: left;
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+.push_1, .pull_1,
+.push_2, .pull_2,
+.push_3, .pull_3,
+.push_4, .pull_4,
+.push_5, .pull_5,
+.push_6, .pull_6,
+.push_7, .pull_7,
+.push_8, .pull_8,
+.push_9, .pull_9,
+.push_10, .pull_10,
+.push_11, .pull_11 {
+  position: relative;
+}
+
+/* `Grid >> Children (Alpha ~ First, Omega ~ Last)
+----------------------------------------------------------------------------------------------------*/
+
+.alpha {
+  margin-left: 0;
+}
+
+.omega {
+  margin-right: 0;
+}
+
+/* `Grid >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .grid_1 {
+  width: 80px;
+}
+
+.container_12 .grid_2 {
+  width: 180px;
+}
+
+.container_12 .grid_3 {
+  width: 280px;
+}
+
+.container_12 .grid_4 {
+  width: 380px;
+}
+
+.container_12 .grid_5 {
+  width: 480px;
+}
+
+.container_12 .grid_6 {
+  width: 580px;
+}
+
+.container_12 .grid_7 {
+  width: 680px;
+}
+
+.container_12 .grid_8 {
+  width: 780px;
+}
+
+.container_12 .grid_9 {
+  width: 880px;
+}
+
+.container_12 .grid_10 {
+  width: 980px;
+}
+
+.container_12 .grid_11 {
+  width: 1080px;
+}
+
+.container_12 .grid_12 {
+  width: 1180px;
+}
+
+/* `Prefix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .prefix_1 {
+  padding-left: 100px;
+}
+
+.container_12 .prefix_2 {
+  padding-left: 200px;
+}
+
+.container_12 .prefix_3 {
+  padding-left: 300px;
+}
+
+.container_12 .prefix_4 {
+  padding-left: 400px;
+}
+
+.container_12 .prefix_5 {
+  padding-left: 500px;
+}
+
+.container_12 .prefix_6 {
+  padding-left: 600px;
+}
+
+.container_12 .prefix_7 {
+  padding-left: 700px;
+}
+
+.container_12 .prefix_8 {
+  padding-left: 800px;
+}
+
+.container_12 .prefix_9 {
+  padding-left: 900px;
+}
+
+.container_12 .prefix_10 {
+  padding-left: 1000px;
+}
+
+.container_12 .prefix_11 {
+  padding-left: 1100px;
+}
+
+/* `Suffix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .suffix_1 {
+  padding-right: 100px;
+}
+
+.container_12 .suffix_2 {
+  padding-right: 200px;
+}
+
+.container_12 .suffix_3 {
+  padding-right: 300px;
+}
+
+.container_12 .suffix_4 {
+  padding-right: 400px;
+}
+
+.container_12 .suffix_5 {
+  padding-right: 500px;
+}
+
+.container_12 .suffix_6 {
+  padding-right: 600px;
+}
+
+.container_12 .suffix_7 {
+  padding-right: 700px;
+}
+
+.container_12 .suffix_8 {
+  padding-right: 800px;
+}
+
+.container_12 .suffix_9 {
+  padding-right: 900px;
+}
+
+.container_12 .suffix_10 {
+  padding-right: 1000px;
+}
+
+.container_12 .suffix_11 {
+  padding-right: 1100px;
+}
+
+/* `Push Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .push_1 {
+  left: 100px;
+}
+
+.container_12 .push_2 {
+  left: 200px;
+}
+
+.container_12 .push_3 {
+  left: 300px;
+}
+
+.container_12 .push_4 {
+  left: 400px;
+}
+
+.container_12 .push_5 {
+  left: 500px;
+}
+
+.container_12 .push_6 {
+  left: 600px;
+}
+
+.container_12 .push_7 {
+  left: 700px;
+}
+
+.container_12 .push_8 {
+  left: 800px;
+}
+
+.container_12 .push_9 {
+  left: 900px;
+}
+
+.container_12 .push_10 {
+  left: 1000px;
+}
+
+.container_12 .push_11 {
+  left: 1100px;
+}
+
+/* `Pull Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .pull_1 {
+  left: -100px;
+}
+
+.container_12 .pull_2 {
+  left: -200px;
+}
+
+.container_12 .pull_3 {
+  left: -300px;
+}
+
+.container_12 .pull_4 {
+  left: -400px;
+}
+
+.container_12 .pull_5 {
+  left: -500px;
+}
+
+.container_12 .pull_6 {
+  left: -600px;
+}
+
+.container_12 .pull_7 {
+  left: -700px;
+}
+
+.container_12 .pull_8 {
+  left: -800px;
+}
+
+.container_12 .pull_9 {
+  left: -900px;
+}
+
+.container_12 .pull_10 {
+  left: -1000px;
+}
+
+.container_12 .pull_11 {
+  left: -1100px;
+}
+
+/* `Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+.clear {
+  clear: both;
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */
+
+.clearfix:before,
+.clearfix:after,
+.container_12:before,
+.container_12:after {
+  content: '.';
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  font-size: 0;
+  line-height: 0;
+  width: 0;
+  height: 0;
+}
+
+.clearfix:after,
+.container_12:after {
+  clear: both;
+}
+
+/*
+  The following zoom:1 rule is specifically for IE6 + IE7.
+  Move to separate stylesheet if invalid CSS is a problem.
+*/
+
+.clearfix,
+.container_12 {
+  zoom: 1;
+}