outpost-cms 0.0.3 → 0.0.4

data/app/assets/javascripts/outpost/notification.js.coffee

@@ -5,42 +5,64 @@
 #
 class outpost.Notification
     constructor: (@wrapper, @type, @message) ->
-        @el = $("<div />", class: "alert alert-#{type}").html("#{message}")
+        @el = @_buildElement()
 
+    # Alias for #append
     render: ->
+        @append()
+
+    # Replaces the element.
+    # This is useful if you've changed the message or type.
+    rerender: ->
+        newEl = @_buildElement()
+        @el.replaceWith(newEl)
+        @el = newEl
+
+    # Append the element to the wrapper.
+    append: ->
         @wrapper.append @el
-    
+
+    # Prepend the element to the wrapper.
     prepend: ->
         @wrapper.prepend @el
-        
+
     # Replaces the wrapper's content with the alert
     replace: ->
         @wrapper.html @el
-        
+
+    # Delegation for jQuery: @el.html("new text")
+    html: (html) ->
+        @el.html(html)
+
     # Delegation for jQuery: @el.is(":visible")
     isVisible: ->
         @el.is(":visible")
-        
+
     # Delegation for jQuery: @el.show()
     show: ->
         @el.show()
-        
+
     # Delegation for jQuery: @el.hide()
-    hide: -> 
+    hide: ->
         @el.hide()
-    
+
     # Delegation for jQuery: @el.fadeIn()
     fadeIn: (speed=400, callback=null) ->
         @el.fadeIn(speed, callback?())
-    
+
     # Delegation for jQuery: @el.fadeOut()
     fadeOut: (speed=400, callback=null) ->
         @el.fadeOut(speed, callback?())
-        
+
     # Delegation for jQuery: @el.detach()
     detach: ->
         @el.detach()
-        
+
     # Delegation for jQuery: @el.remove()
     remove: ->
         @el.remove()
+
+
+    # Builds an element based on the attributes.
+    _buildElement: ->
+        $("<div />", class: "alert alert-#{@type}").html("#{@message}")

data/app/assets/javascripts/outpost/preview.js.coffee

@@ -6,13 +6,13 @@
 class outpost.Preview
     constructor: (@options) ->
         _t = @
-        
+
         $("form #preview-submit a.js-preview-btn").on
             click: (event) ->
                 event.preventDefault()
                 target = $(@)
                 form   = target.closest("form")
-                
+
                 # Update any hidden textareas that are using CKEditor
                 # Then serialize the form.
                 if CKEDITOR?
@@ -27,7 +27,7 @@ class outpost.Preview
                     url: "#{_t.options.baseUrl}/preview"
                     data:
                         data
-                    
+
                     beforeSend: (jqXHR, settings) ->
                         _t.openWindow(target.data("windowOptions"))
                         _t.writeToWindow(JST['outpost/templates/loading']())
@@ -47,7 +47,7 @@ class outpost.Preview
     # If it already exists, just focus on it.
     openWindow: (options="")->
         if !@window or (@window and @window.closed)
-            @window = window.open("", "preview", 
+            @window = window.open("", "preview",
                 "scrollbars=yes,menubar=no,location=no,directories=no,toolbar=no,#{options}")
         else
             @window.focus()

data/app/assets/javascripts/outpost/utilities.js.coffee

@@ -0,0 +1,13 @@
+class outpost.Utilities
+    # Prevent forms from submitting when the "Enter"
+    # key is pressed inside of a text field
+    # Pass in an optional form ID to restrict it just to that form.
+    @preventEnterFromSubmittingForm: (formId='') ->
+        $("form#{formId} input[type=text]").on
+            keydown: (event) ->
+                key = event.keyCode || event.which
+
+                if key == 13 # Enter
+                    event.stopPropagation()
+                    event.preventDefault()
+                    false

data/app/assets/stylesheets/outpost/_base.css.scss

@@ -9,7 +9,7 @@ body, p {
   line-height: 14px;
 }
 
-small { 
+small {
   font-size: 11px;
 }
 
@@ -17,7 +17,7 @@ small {
   &.unstyled {
     padding: 0;
   }
-  
+
   padding-left: 0;
   padding-right: 0;
   margin: 0;
@@ -40,25 +40,25 @@ small {
 
 .cms-nav {
   max-width: 820px;
-  
+
   .grouper {
     display: inline-block;
     width: 400px;
     vertical-align: top;
   }
-  
+
   li {
     clear: both;
     border-bottom: 1px solid $grayLighter;
-    
+
     &:hover {
       background: $linkColor;
-      &> a { 
+      &> a {
         color: $white;
         text-decoration: none;
       }
     }
-    
+
     &> a {
       clear: none;
       width: 285px;
@@ -73,14 +73,14 @@ small {
       color: #333333;
       white-space: nowrap;
     }
-    
+
     .btn-links {
       display: inline-block;
       clear: both;
       vertical-align: bottom;
       margin-bottom: 3px;
       width: 60px;
-      
+
       &> a {
         margin: 0px 2px;
         &.add { float: right; }

data/app/assets/stylesheets/outpost/_forms.css.scss

@@ -8,8 +8,8 @@
 form.simple_form {
   table.field-rows {
     td, th {
-      text-align: left; 
-      padding: 5px 10px; 
+      text-align: left;
+      padding: 5px 10px;
     }
 
     tbody tr { padding: 5px 0; }
@@ -21,7 +21,7 @@ form.simple_form {
   input.wide, textarea {
       @extend .span7;
   }
-  
+
   input, textarea {
     &.span1 { @extend .span1; }
     &.span2 { @extend .span2; }
@@ -36,52 +36,61 @@ form.simple_form {
     &.span11 { @extend .span11; }
     &.span12 { @extend .span12; }
   }
-  
+
   input.thin, textarea.thin {
       @extend .span2;
   }
-  
+
   input.tiny {
       @extend .span1;
   }
-  
+
   // For code inputs
   textarea.fixed-font, input.fixed-font {
     @include font-monospace($size: 11px);
     background: #000;
     color: #FFFF00;
   }
-  
+
   textarea {
       &.tiny { height: 100px; }
       &.short { height: 200px; }
       &.tall { height: 600px; }
   }
-  
-  fieldset legend {
+
+  fieldset {
+    margin-bottom: 40px;
+
+    legend {
+      background: #000;
+      color: #fff;
+      padding: 0 5px;
       cursor: pointer;
+      line-height: 1.2em; // override bootstrap
+
       &:hover {
-          background: #ffffcc;
+          background: #666;
       }
+    }
   }
-  
+
   .counter-notify {
       @extend .span7;
   }
-  
+
   .inline { // Extend bootstrap .inline
       display: inline-block;
       margin-right: 5px;
       input[type=text] { @extend .span2; }
       input[type=checkbox] { width: 20px; }
-      
+
       .controls {
           margin-left: 10px;
       }
   }
-  
+
   .control-group.vertical {
-      label { 
+      label {
           float: none;
           text-align: left;
       }
@@ -114,3 +123,7 @@ form.simple_form {
 .select2-drop {
   z-index: 4;
 }
+
+.has-many-add-link {
+  @extend .btn;
+}

data/app/assets/stylesheets/outpost/_index.css.scss

@@ -5,9 +5,9 @@
     .select2-container {
         min-width: 130px;
     }
-    
+
     .filter.label {
-    display: inline-block; 
+    display: inline-block;
     margin-right: 10px;
     }
 

data/app/assets/stylesheets/outpost/_utility.css.scss

@@ -1,4 +1,4 @@
-.transparent { 
+.transparent {
     @include opacity(0.2);
     @include transition(.1s linear all);
 }

data/app/controllers/outpost/application_controller.rb

@@ -4,12 +4,12 @@ module Outpost
     include Outpost::Controller::Authorization
     include Outpost::Controller::Authentication
     include Outpost::Controller::CustomErrors
-    
+
     abstract!
     protect_from_forgery
     before_filter :root_breadcrumb
     before_filter :set_sections
-    
+
     #------------------------
     # Always want to add this link to the Breadcrumbs
     def root_breadcrumb
@@ -34,7 +34,9 @@ module Outpost
     #----------------------
 
     def render_preview_validation_errors(record)
-      render "/outpost/shared/_preview_errors", layout: "outpost/minimal", locals: { record: record }
+      render "/outpost/shared/_preview_errors",
+        :layout => "outpost/minimal",
+        :locals => { record: record }
     end
   end
 end

data/app/controllers/outpost/errors_controller.rb

@@ -1,6 +1,7 @@
 class Outpost::ErrorsController < Outpost::BaseController
   def not_found
-    render_error(404, ActionController::RoutingError.new("Not Found")) and return
+    render_error(404, ActionController::RoutingError.new("Not Found"))
+    return
   end
 
   def trigger_error

data/app/controllers/outpost/resource_controller.rb

@@ -4,7 +4,7 @@ module Outpost
     respond_to :html, :json, :js
 
     #-----------------
-    
+
     def extend_breadcrumbs_with_resource_root
       breadcrumb model.to_title.pluralize, model.admin_index_path
     end

data/app/controllers/outpost/sessions_controller.rb

@@ -4,23 +4,28 @@ module Outpost
     before_filter :get_authentication_attribute
 
     respond_to :html
-    
+
     def new
       redirect_to outpost_root_path if current_user
     end
-    
+
     def create
-      if user = Outpost.user_class.authenticate(params[@authentication_attribute], params[:password])
+      if user = Outpost.user_class.authenticate(
+        params[@authentication_attribute], params[:password])
+
         session[:user_id] = user.id
         user.update_column(:last_login, Time.now)
-        redirect_to session[:return_to] || outpost_root_path, notice: "Logged in."
+
+        redirect_to session[:return_to] || outpost_root_path,
+          notice: "Logged in."
+
         session[:return_to] = nil
       else
         flash.now[:alert] = "Invalid login information."
         render :new
       end
     end
-    
+
     def destroy
       @current_user = nil
       session[:user_id] = nil

data/app/helpers/authorization_helper.rb

@@ -1,9 +1,9 @@
 module AuthorizationHelper
-  # Public: Block out whole chunks of code based on permissions. 
+  # Public: Block out whole chunks of code based on permissions.
   #
-  # resource - (Class) The model that the user must have permission 
+  # resource - (Class) The model that the user must have permission
   #            to manage in order to see the block.
-  # message  - (String) The message to display if the user isn't 
+  # message  - (String) The message to display if the user isn't
   #            authorized (default: "").
   # block    - The block that will be captured if the user is authorized.
   #            Should return a String.

data/app/helpers/list_helper.rb

@@ -1,15 +1,23 @@
 module ListHelper
+  ICON_DOWN = "icon-arrow-down"
+  ICON_UP   = "icon-arrow-up"
+
+  BOOLEAN_BOOTSTRAP_MAP = {
+    true  => { icon: "icon-white icon-ok",     badge: "badge badge-success"},
+    false => { icon: "icon-white icon-remove", badge: "badge badge-important"}
+  }
+
   # Public: Renders the attribute for this column and record
   #
   # column  - (Outpost::Column) The column object.
   # record  - (Object) The ActiveRecord object being listed.
-  # 
+  #
   # Examples
-  #   
-  #   column.attribute # => :published_at 
+  #
+  #   column.attribute # => :published_at
   #   <%= render_attribute(column, @post) %>
   #   # => 2013-03-13 11:39:37 -0700
-  # 
+  #
   # Returns String of the rendered attribute.
   def render_attribute(column, record)
     if column.display.is_a? Proc
@@ -29,13 +37,13 @@ module ListHelper
         # If we have explicitly defined a helper for this attribute, use it.
         display_helper = :"display_#{column.attribute}"
 
-      elsif record.class.respond_to?(:reflect_on_association) && 
+      elsif record.class.respond_to?(:reflect_on_association) &&
         record.class.reflect_on_association(column.attribute.to_sym)
         # For associations, display the associated object's #to_title
         display_helper = :display_record
-        
-      elsif record.class.respond_to?(:columns_hash) && 
-        (ar_column = record.class.columns_hash[column.attribute]) && 
+
+      elsif record.class.respond_to?(:columns_hash) &&
+        (ar_column = record.class.columns_hash[column.attribute]) &&
         self.methods.include?(type_helper = :"display_#{ar_column.type}")
         # display_#{column_type} for generic display
         # Example: display_datetime
@@ -48,12 +56,18 @@ module ListHelper
 
       value = record.send(column.attribute)
       column._display_helper = display_helper
-      send(display_helper, value)
+
+      if self.method(display_helper).arity == 2
+        send(display_helper, value, record)
+      else
+        send(display_helper, value)
+      end
     end
   end
 
+
   # Public: Format a DateTime for displaying in lists
-  # 
+  #
   # date - (DateTime) The date to be formatted
   #
   # Examples
@@ -66,6 +80,7 @@ module ListHelper
     format_date(date, format: :full_date)
   end
 
+
   # Public: Display the attribute or "[blank]" if not present
   #
   # attrib  - (String) The attribute to display
@@ -87,6 +102,7 @@ module ListHelper
     attrib.present? ? attrib.to_s : content_tag(:em, fallback)
   end
 
+
   # Public: Display the attribute as a string.
   #
   # attrib - (String) The attribute to display.
@@ -101,22 +117,24 @@ module ListHelper
     attrib.to_s
   end
 
+
   # Public: Displays an String representation of the record using +#to_title+.
   #
   # record - (String) The associated record.
   #
   # Examples
-  # 
+  #
   #   user = User.last
   #   user.to_title # => "James Earl Jones"
   #   display_record(User.last)
   #   # => "James Earl Jones"
   #
   # Returns String representation of the passed-in record.
-  def display_record(record)
-    record.try(:to_title)
+  def display_record(associated_record)
+    associated_record.try(:to_title)
   end
-  
+
+
   # Public: Display a formatted DateTime.
   #
   # datetime - (DateTime) The DateTime object to format.
@@ -130,7 +148,8 @@ module ListHelper
   def display_datetime(datetime)
     format_date(datetime, format: :full_date, time: true)
   end
-  
+
+
   # Public: Display a boolean attribute as a sweet icon.
   #
   # boolean - (boolean) true or false
@@ -142,72 +161,69 @@ module ListHelper
   #   # =>   <i class="icon-white icon-ok"></i>
   #   # => </span>
   #
-  # Returns String of the appropriate icon. 
+  # Returns String of the appropriate icon.
   def display_boolean(boolean)
-    content_tag(:span, 
-      content_tag(:i, "", class: boolean_bootstrap_map[!!boolean][:icon]), 
-      class: boolean_bootstrap_map[!!boolean][:badge])
+    content_tag(:span,
+      content_tag(:i, "", class: BOOLEAN_BOOTSTRAP_MAP[!!boolean][:icon]),
+      class: BOOLEAN_BOOTSTRAP_MAP[!!boolean][:badge])
   end
 
-  # Private: Map for booleans to Bootstrap classes.
-  #
-  # Returns Hash
-  def boolean_bootstrap_map
-    {
-      true  => { icon: "icon-white icon-ok",     badge: "badge badge-success"},
-      false => { icon: "icon-white icon-remove", badge: "badge badge-important"}
-    }
-  end
 
   # Public: Maps the passed-in sort mode (asc, desc) to the appropriate
   # Bootstrap Glyphicons (icon-arrow-up, icon-arrow-down respectively)
   #
-  # sort_mode - (String) The sort mode ("asc", "desc").
+  # direction - (String) "ASC", "DESC"
   #
   # Examples
   #
-  #   <i class="<%= sort_mode_icon('asc') %>">
+  #   <i class="<%= direction_icon('ASC') %>">
   #   # => <i class="icon-arrow-up">
   #
   # Returns String of the icon class.
-  def sort_mode_icon(sort_mode)
-    case sort_mode
-    when "desc" then "icon-arrow-down"
-    when "asc"  then "icon-arrow-up"
+  def direction_icon(direction)
+    direction = direction.to_s.upcase
+
+    case direction
+    when Outpost::DESCENDING then ICON_DOWN
+    when Outpost::ASCENDING  then ICON_UP
     end
   end
 
-  # Public: Which sort mode to switch to. Useful for creating links to 
+
+  # Public: Which sort mode to switch to. Useful for creating links to
   # switch the sort mode or change the list order.
   #
-  # column            - (Outpost::Column) The column on which the sort 
+  # column            - (Outpost::Column) The column on which the sort
   #                     will be performed.
-  # current_order     - (String) The attribute that is currently being
+  # current_attribute - (String) The attribute that is currently being
   #                     ordered.
-  # current_sort_mode - (String) The current sort mode ("asc", "desc").
+  # current_direction - (String) The current sort mode ("ASC", "DESC").
   #
   # Examples
-  #   
+  #
   #   <%= link_to column.header, request.parameters.merge({
-  #      :sort_mode => switch_sort_mode(
-  #          column, current_order, current_sort_mode
+  #      :direction => switch_direction(
+  #          column, current_attribute, current_direction
   #      )
   #   }) %>
   #
   # Returns String of the sort mode, "asc" or "desc"
-  def switch_sort_mode(column, current_order, current_sort_mode)
-    if column.attribute == current_order
-      case current_sort_mode
-      when "asc"  then "desc"
-      when "desc" then "asc"
-      else column.default_sort_mode
+  def switch_direction(column, current_attribute, current_direction)
+    direction = current_direction.to_s.upcase
+
+    if column.attribute == current_attribute
+      case direction
+      when Outpost::ASCENDING then Outpost::DESCENDING
+      when Outpost::DESCENDING then Outpost::ASCENDING
+      else column.default_order_direction
       end
     else
-      column.default_sort_mode
+      column.default_order_direction
     end
   end
 
-  # Public: Generate a CSS class for the column. If the column represents 
+
+  # Public: Generate a CSS class for the column. If the column represents
   # an association, the class will be "column-association".
   #
   # model     - (Class) The ActiveRecord model.
@@ -227,6 +243,7 @@ module ListHelper
     end
   end
 
+
   # Public: Generate a CSS class for this attribute
   #
   # attribute - (String) The attribute.
@@ -240,4 +257,10 @@ module ListHelper
   def column_attribute_class(attribute)
     "column-#{attribute}".parameterize
   end
+
+
+  # Public: Call the BOOLEAN_BOOTSTRAP_MAP
+  def boolean_bootstrap_map
+    BOOLEAN_BOOTSTRAP_MAP
+  end
 end