typus 3.1.0.rc18 → 3.1.0.rc19

data/app/assets/javascripts/typus/application.js

@@ -1,2 +1,8 @@
-// Create the file `app/assets/javascripts/typus/application.js` in your
-// application if you need/want to extend some javascript functionality.
+//= require jquery
+//= require jquery_ujs
+//= require jquery.fancybox-1.3.4.pack
+//= require jquery.searchField
+//= require js/jquery.formalize.min
+//= require typus/jquery.application
+//= require typus/custom
+//= require chosen.jquery.min

data/app/assets/javascripts/typus/custom.js

@@ -0,0 +1,2 @@
+// Create the file `app/assets/javascripts/typus/custom.js` in your
+// application if you need/want to extend some javascript functionality.

data/app/assets/javascripts/typus/jquery.application.js

@@ -11,6 +11,18 @@ $(document).ready(function() {
         'scrolling': false,
     });
 
+    $(".iframe_with_reload").fancybox({
+        'width': 720,
+        'height': '90%',
+        'autoScale': false,
+        'transitionIn': 'none',
+        'transitionOut': 'none',
+        'type': 'iframe',
+        'centerOnScroll': true,
+        'scrolling': false,
+        onClosed: function() { parent.location.reload(true); },
+    });
+
     $(".iframe").fancybox({
         'width': 720,
         'height': '90%',
@@ -29,6 +41,8 @@ $(document).ready(function() {
         $('.action-toggle').each(function() { this.checked = status; });
     });
 
+    $(".chzn-select").chosen();
+
 });
 
 function setConfirmUnload(on) {

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

@@ -1,12 +1,20 @@
-
-/* Create the file `app/assets/stylesheets/typus/application.css` in your
-   application if you need/want to override/add some stylesheets. */
-
 /*
-.logo {
-  height: 50px;
-  width: 150px;
-  background: transparent url(/images/logo.gif) no-repeat;
-  text-indent: -10000px;
-}
+*= require jquery.fancybox-1.3.4
+*= require chosen
+*= require css/formalize
+*= require css/fluid
+*= require typus/reset
+*= require typus/layout
+*= require typus/defaults
+*= require typus/errors
+*= require typus/account
+*= require typus/header
+*= require typus/content
+*= require typus/sidebar
+*= require typus/footer
+*= require typus/tables
+*= require typus/pagination
+*= require typus/forms
+*= require typus/hacks
+*= require typus/custom
 */

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

@@ -26,7 +26,6 @@
 
 #content li {
   list-style: square;
-  line-height: 1.5em;
 }
 
 #content pre {

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

@@ -0,0 +1,11 @@
+/* Create the file `app/assets/stylesheets/typus/custom.css` in your
+   application if you need/want to override/add some stylesheets. */
+
+/*
+.logo {
+  height: 50px;
+  width: 150px;
+  background: transparent url(/images/logo.gif) no-repeat;
+  text-indent: -10000px;
+}
+*/

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

@@ -12,7 +12,7 @@
 #errorExplanation p,
 #errorExplanation li,
 #errorExplanation h3 {
-  color: #D12F19;
+  color: #D12F19!important;
 }
 
 #errorExplanation h3 { margin: 5px 0 0 0; }

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

@@ -8,14 +8,15 @@ fieldset ol {
 }
 
 fieldset ol li {
+  line-height: 1.5em;
   list-style: none!important;
-  margin: 1em 0!important;
+  margin: 1em 0;
 }
 
 fieldset small {
-  font-size: 0.9em;
+  font-size: 0.85em;
   font-weight: normal;
-  margin: 0 0 0 0.25em;
+  margin: 0 0 0 0.5em;
 }
 
 fieldset small a {
@@ -24,8 +25,10 @@ fieldset small a {
 
 fieldset.inputs {}
 
-  fieldset.inputs input[type='text'],
-  fieldset.inputs input[type='password'] {
+  /* I know I can use input[type='text'] but for some reason this is not 
+     working with "Chosen".
+  */
+  fieldset.inputs input.text {
     font-size: 1.25em;
     width: 100%;
   }
@@ -50,3 +53,12 @@ fieldset.buttons {
   fieldset.buttons ol li {
     display: inline;
   }
+
+fieldset ol ul {
+  margin: 0!important;
+}
+
+  fieldset ol ul label.inline_label {
+    display: inline;
+    font-weight: normal;
+  }

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

@@ -18,3 +18,7 @@
 .box_relationships {
   margin-top: 2.5em;
 }
+
+.search-choice span {
+  color: black!important;
+}

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

@@ -1,6 +1,6 @@
 #header {
   background: #4A525A;
-  padding: 1.25em 1em;
+  padding: 1.25em 0 1.25em 1em;
 }
 
 #header .title {
@@ -28,8 +28,13 @@
   display: inline;
 }
 
+#header .applications {
+  margin: -0.5em 1em;
+}
+
 #header .applications ul li {
-  padding-right: 0.25em;
+  line-height: 2.5em;
+  padding: 0 0.25em 0 0;
 }
 
 #header .applications ul li a {
@@ -47,6 +52,7 @@
 }
 
 #header .profile {
+  margin: 0.25em 0 0 0;
   text-align: right;
 }
 

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

@@ -1,7 +1,6 @@
 .pagination {
   border-top: 1px solid #D3D3D3;
-  border-bottom: 1px solid #D3D3D3;
-  margin: -1em auto 1em auto;
+  margin: 1em auto;
   padding: 1em 0;
   text-align: center;
 }
@@ -37,6 +36,7 @@
 
 .pagination .first,
 .pagination .last,
-.pagination .current {
+.pagination .current,
+.pagination .gap {
   display: none;
 }

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

@@ -13,6 +13,10 @@
   margin: 0;
 }
 
+#sidebar ul li {
+  line-height: 1.5em;
+}
+
 #sidebar ul ul li {
   list-style: none;
   padding-left: 0.5em;

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

@@ -1,5 +1,4 @@
 table {
-  margin-bottom: 2em!important;
   width: 100%;
   text-align: left;
 }

data/app/controllers/admin/account_controller.rb

@@ -23,8 +23,7 @@ class Admin::AccountController < Admin::BaseController
 
   def send_password
     if user = Typus.user_class.find_by_email(params[:typus_user][:email])
-      url = admin_account_url(user.token)
-      Admin::Mailer.reset_password_link(user, url).deliver
+      Admin::Mailer.reset_password_instructions(user).deliver
       redirect_to new_admin_session_path, :notice => Typus::I18n.t("Password recovery link sent to your email.")
     else
       render :action => :forgot_password

data/app/controllers/admin/base_controller.rb

@@ -8,8 +8,7 @@ class Admin::BaseController < ActionController::Base
 
   helper_method :admin_user
 
-  def user_guide
-  end
+  def user_guide; end
 
   protected
 
@@ -29,4 +28,8 @@ class Admin::BaseController < ActionController::Base
     Typus.user_class.count.zero?
   end
 
+  def not_allowed
+    render :text => "Not allowed!", :status => :unprocessable_entity
+  end
+
 end

data/app/controllers/admin/dashboard_controller.rb

@@ -1,6 +1,11 @@
 class Admin::DashboardController < Admin::BaseController
 
+  def index; end
+
   def show
+    render params[:application].parameterize
+  rescue ActionView::MissingTemplate
+    render "index"
   end
 
 end

data/app/controllers/admin/resource_controller.rb

@@ -2,7 +2,6 @@ class Admin::ResourceController < Admin::BaseController
 
   before_filter :check_if_user_can_perform_action_on_resource
 
-  def index
-  end
+  def index; end
 
 end

data/app/controllers/admin/resources_controller.rb

@@ -1,8 +1,6 @@
 class Admin::ResourcesController < Admin::BaseController
 
   include Typus::Controller::Actions
-  include Typus::Controller::Associations
-  include Typus::Controller::Autocomplete
   include Typus::Controller::Filters
   include Typus::Controller::Format
   include Typus::Controller::Headless
@@ -10,26 +8,24 @@ class Admin::ResourcesController < Admin::BaseController
   Whitelist = [:edit, :update, :destroy, :toggle, :position, :relate, :unrelate]
 
   before_filter :get_model
-  before_filter :set_context # MultiSite ...
+  before_filter :set_context
   before_filter :get_object, :only => Whitelist + [:show]
   before_filter :check_resource_ownership, :only => Whitelist
   before_filter :check_if_user_can_perform_action_on_resources
 
-  ##
-  # This is the main index of the model. With filters, conditions and more.
-  #
-  # By default application can respond to html, csv and xml, but you can add
-  # your formats.
-  #
   def index
     get_objects
 
+    custom_actions_for(:index).each do |action|
+      prepend_resources_action(action.titleize, {:action => action, :id => nil}, {})
+    end
+
     respond_to do |format|
       format.html do
         if headless_mode_with_custom_action_is_enabled?
           set_headless_resource_actions
         else
-          add_resource_action(default_action.titleize, {:action => default_action}, {})
+          set_default_action
           add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
         end
         generate_html
@@ -50,11 +46,6 @@ class Admin::ResourcesController < Admin::BaseController
     end
   end
 
-  ##
-  # Create new items. There's an special case when we create an item from
-  # another item. In this case, after the item is created we also create the
-  # relationship between these items.
-  #
   def create
     @item = @resource.new
     @item.assign_attributes(params[@object_name], :as => :admin)
@@ -73,18 +64,23 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   def edit
+    custom_actions_for(:edit).each do |action|
+      prepend_resources_action(action.titleize, {:action => action, :id => @item}, {})
+    end
   end
 
   def show
     check_resource_ownership if @resource.typus_options_for(:only_user_items)
 
-=begin
+    if admin_user.can?('edit', @resource)
+      prepend_resources_action("Edit", {:action => 'edit', :id => @item}, {})
+    end
+
     respond_to do |format|
       format.html # show.html.erb
-      format.xml { render :xml => @item }
+      format.xml { can_export?(:xml) ? render(:xml => @item) : not_allowed }
       format.json { render :json => @item }
     end
-=end
   end
 
   def update
@@ -166,6 +162,13 @@ class Admin::ResourcesController < Admin::BaseController
 
   # Here we set the current scope!
   def set_scope
+    if (scope = params[:scope])
+     if @resource.respond_to?(scope)
+       @resource = @resource.send(scope)
+     else
+       not_allowed
+     end
+   end
   end
 
   def set_wheres
@@ -197,47 +200,29 @@ class Admin::ResourcesController < Admin::BaseController
   def redirect_on_success
     path = params.dup.cleanup
 
-    # Redirects to { :action => 'index' }
     if params[:_save]
-      path.delete_if { |k, v| %w(action id).include?(k) }
-    end
-
-    ##
-    # Here what we basically do is to associate objects after they have been
-    # created. It's similar to calling `relate` but which the difference that
-    # we are creating a new record.
-    #
-    # We have two objects, detect the relationship_between them and then
-    # call the related method.
-    #
-    if params[:_saveandassign]
-      item_class = params[:resource].constantize
-      # For some reason we are forced to set the /admin prefix to the controller
-      # when working with namespaced stuff.
-      options = { :controller => "/admin/#{item_class.to_resource}" }
-      assoc = item_class.relationship_with(@resource).to_s
-      unused_path, notice, alert = send("set_#{assoc}_association", item_class, options)
-      path.merge!(:action => 'edit', :id => @item.id)
+      path.delete_if { |k, v| %w(action id).include?(k) } # Redirects to { :action => 'index' }
+    elsif params[:_addanother]
+      path.merge!(:action => 'new', :id => nil) # Redirects to { :action => 'new' }
+    elsif params[:_continue]
+      path.merge!(:action => 'edit', :id => @item.id) # Redirects to { :action => 'edit' => :id => @item.id }
     end
 
-    # Redirects to { :action => 'new' }
-    if params[:_addanother]
-      path.merge!(:action => 'new', :id => nil)
-    end
-
-    # Redirects to { :action => 'edit' => :id => @item.id }
-    if params[:_continue]
-      path.merge!(:action => 'edit', :id => @item.id)
-    end
-
-    message = (params[:action] == 'create') ? "%{model} successfully created." : "%{model} successfully updated."
+    message = params[:action].eql?('create') ? "%{model} successfully created." : "%{model} successfully updated."
     notice = Typus::I18n.t(message, :model => @resource.model_name.human)
 
     redirect_to path, :notice => notice
   end
 
-  def default_action
-    @resource.typus_options_for(:default_action_on_item)
+  def set_default_action
+    default_action = @resource.typus_options_for(:default_action_on_item)
+    action = admin_user.can?('edit', @resource.model_name) ? default_action : "show"
+    add_resource_action(action.titleize, {:action => action}, {})
+  end
+
+  def custom_actions_for(action)
+    return [] if headless_mode?
+    @resource.typus_actions_on(action).reject { |a| admin_user.cannot?(a, @resource.model_name) }
   end
 
 end

data/app/controllers/admin/session_controller.rb

@@ -5,15 +5,14 @@ class Admin::SessionController < Admin::BaseController
 
   before_filter :create_an_account?, :only => [:new, :create]
 
-  def new
-  end
+  def new; end
 
   def create
     user = user_scope.authenticate(params[:typus_user][:email], params[:typus_user][:password])
 
     path = if user
              session[:typus_user_id] = user.id
-             params[:back_to] || admin_dashboard_path
+             params[:back_to] || admin_dashboard_index_path
            else
              new_admin_session_path(:back_to => params[:back_to])
            end