outpost-cms 0.0.3 → 0.0.4

data/app/helpers/outpost_helper.rb

@@ -1,5 +1,5 @@
 module OutpostHelper
-  # Public: Maps the standard Rails flash keys (+notice+, +alert+) to the 
+  # Public: Maps the standard Rails flash keys (+notice+, +alert+) to the
   # appropriate Bootstrap alert class (+success+, +error+ respectively).
   # Falls back to just returning the passed-in symbol as a string.
   #
@@ -16,7 +16,7 @@ module OutpostHelper
       notice: "success",
       alert:  "error"
     }
-    
+
     name_bootstrap_map[name.to_sym] || name.to_s
   end
 
@@ -37,8 +37,8 @@ module OutpostHelper
   end
 
   # Public: Place a modal anywhere with a button to toggle it.
-  # 
-  # options - (Hash) Options to pass into the modal template. Useful for 
+  #
+  # options - (Hash) Options to pass into the modal template. Useful for
   #           CSS ID, and modal title.
   # block   - The block that gets captured and rendered inside of the modal.
   #

data/app/helpers/render_helper.rb

@@ -13,9 +13,9 @@ module RenderHelper
   #
   # Returns a String of the table, or a message if no records are present.
   def list_table(records, model, &block)
-    render '/outpost/shared/list_table', 
-      :model   => model, 
-      :records => records, 
+    render '/outpost/shared/list_table',
+      :model   => model,
+      :records => records,
       :table   => capture(&block)
   end
 
@@ -34,8 +34,8 @@ module RenderHelper
   #
   # Returns a String of the fieldset.
   def form_block(title="", &block)
-    render "/outpost/shared/form_block", 
-      :title => title, 
+    render "/outpost/shared/form_block",
+      :title => title,
       :body  => capture(&block)
   end
 end

data/app/helpers/utility_helper.rb

@@ -26,7 +26,7 @@ module UtilityHelper
   # Returns String of the formatted date
   def format_date(date, options={})
     return nil if !date.respond_to?(:strftime)
-    
+
     format_str = options[:with] if options[:with].present?
 
     format_str ||= case options[:format].to_s
@@ -35,7 +35,7 @@ module UtilityHelper
       when "event"     then "%A, %B %-d"
       else "%b %-d, %Y"
     end
-    
+
     format_str += ", %l:%M%P" if options[:time] == true
 
     date.strftime(format_str)
@@ -84,9 +84,9 @@ module UtilityHelper
   #
   # elements - Zero or more strings to prepend onto the page title.
   #            The final argument can optionally be hash:
-  #            :separator - (String) The separator to use between 
+  #            :separator - (String) The separator to use between
   #                         elements (default: " | ").
-  # 
+  #
   # Examples
   #
   #   set_page_title "Events", "Forum", separator: " :: "
@@ -102,7 +102,7 @@ module UtilityHelper
 
   # Public: Generate the full page title.
   #
-  # last_element - (String) The string that will be appendended onto the 
+  # last_element - (String) The string that will be appendended onto the
   #                rest of the title.
   # separator    - (String) The separator to use between the title and the last
   #                element (default: " | ").

data/app/models/permission.rb

@@ -1,17 +1,20 @@
 class Permission < ActiveRecord::Base
   outpost_model
-  
+
   #-------------------
   # Association
   has_many :user_permissions
-  has_many :users, class_name: Outpost.config.user_class, through: :user_permissions, dependent: :destroy
-  
+  has_many :users,
+    :class_name   => Outpost.config.user_class,
+    :through      => :user_permissions,
+    :dependent    => :destroy
+
   #-------------------
   # Validation
   validates :resource, uniqueness: true
-  
+
   #-------------------
-  
+
   def title
     self.resource.titleize
   end

data/app/views/layouts/outpost/application.html.erb

@@ -5,7 +5,7 @@
   <title><%= page_title %></title>
   <%= stylesheet_link_tag "outpost/application" %>
   <%= javascript_include_tag "outpost/application" %>
-  
+
   <link rel="shortcut icon" href="/favicon.ico" />
   <%= csrf_meta_tags %>
 </head>
@@ -15,10 +15,10 @@
   <div class="navbar-inner">
     <div class="container">
       <a href="<%=outpost_root_path%>" class="brand">Outpost</a>
-      
+
       <% if current_user %>
         <ul class="nav">
-          
+
           <!-- Full Navigation -->
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-align-justify icon-white"></i> Navigation <b class="caret"></b></a>
@@ -31,23 +31,23 @@
                 <% if index % per_col == 0 %>
                   <div class="grouper">
                 <% end %>
-                
+
                 <li>
                   <a href="<%=model.admin_index_path%>">
                     <%= model.name.titleize.pluralize %>
                   </a>
-                  
+
                   <div class="btn-links">
                     <% if model.respond_to?(:admin_new_path) %>
                       <a class="add btn btn-mini" href="<%=model.admin_new_path%>"><i class="icon-plus-sign"></i> Add</a>
                     <% end %>
                   </div>
                 </li>
-                
+
                 <% if index % per_col == per_col - 1 or model == models.last %>
                   </div>
                 <% end %>
-                
+
               <% end %>
             </ul> <!-- dropdown-menu -->
           </li> <!-- dropdown -->

data/app/views/layouts/outpost/minimal.html.erb

@@ -5,7 +5,7 @@
   <title><%= page_title %></title>
   <%= stylesheet_link_tag "outpost/application" %>
   <%= javascript_include_tag "outpost/application" %>
-  
+
   <%= csrf_meta_tags %>
 </head>
 <body>

data/app/views/outpost/errors/error_500.html.erb

@@ -3,6 +3,6 @@
 <pre>
   <%= Time.now %>
   <%= request.url %>
-  
+
   <%= error.to_yaml %>
 </pre>

data/app/views/outpost/resource/_errors.html.erb

@@ -1,11 +1,2 @@
-<% if f.object.errors[:base].present? %>
-  <div class="alert alert-error">
-    <ul class="unstyled" style="margin-bottom: 0">
-      <% f.object.errors[:base].each do |message| %>
-        <li><%= message %></li>
-      <% end %>
-    </ul>
-  </div>
-<% else %>
-  <%= f.error_notification %>
-<% end %>
+<%= f.full_errors(:base) %>
+<%= f.error_notification %>

data/app/views/outpost/resource/edit.html.erb

@@ -1,10 +1,14 @@
 <% add_to_page_title "Editing: #{@record.to_title}" %>
 
-<%= simple_form_for [:outpost, @record], html: { class: "form-horizontal" } do |f| %>
+<%= simple_form_for [:outpost, @record], html: { class: "form-horizontal js-content-form" } do |f| %>
   <%= render 'errors', f: f %>
   <%= render 'form_fields', record: @record, f: f %>
   <%= render 'extra_fields', f: f %>
   <%= render "/outpost/shared/submit_row", record: @record %>
+
+  <% content_for :footer do %>
+    <script>outpost.Utilities.preventEnterFromSubmittingForm("#<%=f.options[:html][:id]%>");</script>
+  <% end %>
 <% end %>
 
 <% content_for :sidebar do %>
@@ -21,15 +25,15 @@
       <% if @record.respond_to?(:published_at) && @record.respond_to?(:published?) && @record.published? %>
         on <strong><%= format_date @record.published_at, time: true %></strong>
       <% end %>
-      
+
       <% if @record.respond_to?(:publish_alarm) && @record.publish_alarm.present? && @record.publish_alarm.fire_at.present? %>
         Alarm - <strong><%= format_date @record.publish_alarm.fire_at, time: true %></strong>
       <% end %>
     </li>
   </ul>
-  
+
   <hr />
-  
+
   <div id="fixed-sidebar" data-spy="affix" data-offset-top="140">
     <!-- Be sure to change the data-offset-top attribute on this element if you move it vertically -->
     <%= render "/outpost/shared/form_nav" %>

data/app/views/outpost/resource/new.html.erb

@@ -1,10 +1,14 @@
 <% add_to_page_title "Add #{model.to_title}" %>
 
-<%= simple_form_for [:outpost, @record], html: { class: "form-horizontal" } do |f| %>
+<%= simple_form_for [:outpost, @record], html: { class: "form-horizontal js-content-form" } do |f| %>
   <%= render 'errors', f: f %>
   <%= render 'form_fields', record: @record, f: f %>
   <%= render 'extra_fields', f: f %>
   <%= render "/outpost/shared/submit_row", record: @record %>
+
+  <% content_for :footer do %>
+    <script>outpost.Utilities.preventEnterFromSubmittingForm("#<%=f.options[:html][:id]%>");</script>
+  <% end %>
 <% end %>
 
 <% content_for :sidebar do %>

data/app/views/outpost/sessions/new.html.erb

@@ -9,7 +9,7 @@
     <%= label_tag "Password" %>
     <%= password_field_tag :password, nil, id: "password" %>
   </fieldset>
-  
+
   <div class="form-actions">
     <%= submit_tag "Submit", class: "btn" %>
   </div>

data/app/views/outpost/shared/_filters.html.erb

@@ -4,8 +4,8 @@
 
     <%= form_tag model.admin_index_path, method: :get, class: "form-inline" do %>
       <% list.filters.each do |attribute, filter| %>
-        <%= select_tag attribute, 
-          options_for_select(filter.collection.call, params[:filter].present? ? params[:filter][attribute] : nil), include_blank: true, 
+        <%= select_tag attribute,
+          options_for_select(filter.collection.call, params[:filter].present? ? params[:filter][attribute] : nil), include_blank: true,
           data: { placeholder: filter.title }, name: "filter[#{attribute}]", class: "input-medium" %>
       <% end %>
 

data/app/views/outpost/shared/_form_block.html.erb

@@ -3,11 +3,11 @@
   <% @sections[id] = title if @sections %>
   <fieldset class="form-block" id="<%=id%>">
   <legend><%= title %></legend>
-  
+
   <div class="hidden notification">
     <p class="muted"><i>Click header to show fields</i></p>
   </div>
-  
+
 <% else %>
   <fieldset class="form-block">
 <% end %>

data/app/views/outpost/shared/_form_nav.html.erb

@@ -7,6 +7,6 @@
       <% end %>
     </ul>
   </div>
-  
+
   <hr />
 <% end %>

data/app/views/outpost/shared/_full_errors.html.erb

@@ -0,0 +1,9 @@
+<% if f.object.errors[attribute].present? %>
+  <div class="alert alert-error">
+    <ul class="unstyled" style="margin-bottom: 0">
+      <% f.object.errors[attribute].map { |msg| f.object.errors.full_message(attribute, msg) }.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/outpost/shared/_headers.html.erb

@@ -1,14 +1,14 @@
 <th class="column-manage">Manage</th>
 
 <% list.columns.each do |attribute, column| %>
-  <% is_sorting = order == column.attribute.to_s %>
+  <% is_sorting = order_attribute == column.attribute.to_s %>
 
   <th class="<%='header-highlighted' if is_sorting%> <%='header-sortable' if column.sortable?%> <%=column_attribute_class(column.attribute)%> <%=column_type_class(model, column.attribute)%>">
     <% if column.sortable? || is_sorting %>
-      <i class="icon <%=sort_mode_icon(is_sorting ? sort_mode : column.default_sort_mode)%>"></i>
+      <i class="icon <%=direction_icon(is_sorting ? order_direction : column.default_order_direction)%>"></i>
 
-      <%= link_to_if column.sortable?, column.header, request.parameters.merge(order: column.attribute, sort_mode: switch_sort_mode(column, order, sort_mode)), class: "js-sort-link" %>
-      <%= render('/outpost/shared/cancel_link', href: url_for(request.parameters.merge(order: "", sort_mode: ""))) if (is_sorting && (order != list.default_order || sort_mode != list.default_sort_mode)) %>
+      <%= link_to_if column.sortable?, column.header, request.parameters.merge(order: column.attribute, direction: switch_direction(column, order_attribute, order_direction)), class: "js-sort-link" %>
+      <%= render('/outpost/shared/cancel_link', href: url_for(request.parameters.merge(order: "", direction: ""))) if (is_sorting && (order_attribute != list.default_order_attribute || order_direction != list.default_order_direction)) %>
     <% else %>
       <%= column.header %>
     <% end %>

data/app/views/outpost/shared/_navigation.html.erb

@@ -9,23 +9,23 @@
       <% if index % per_col == 0 %>
         <div class="grouper">
       <% end %>
-      
+
       <li>
         <a href="<%=model.admin_index_path%>">
           <%= model.name.titleize.pluralize %>
         </a>
-        
+
         <div class="btn-links">
           <% if model.respond_to?(:admin_new_path) %>
             <a class="add btn btn-mini" href="<%=model.admin_new_path%>"><i class="icon-plus-sign"></i> Add</a>
           <% end %>
         </div>
       </li>
-      
+
       <% if index % per_col == per_col - 1 or model == models.last %>
         </div>
       <% end %>
-      
+
     <% end %>
   </ul> <!-- dropdown-menu -->
 </li> <!-- dropdown -->

data/app/views/outpost/shared/_submit_row.html.erb

@@ -1,7 +1,7 @@
 <!-- This block is part of a form -->
 <div class="form-actions submit-row">
   <div class="container">
-    <div class="btn-group dropup pull-left">
+    <div class="btn-group dropup pull-left js-save-btns">
       <%= button_tag "Save", name: "commit_action", value: "edit", class: "btn btn-primary btn-large span2" %>
       <button class="btn btn-primary btn-large dropdown-toggle" data-toggle="dropdown">
         <span class="caret"></span>
@@ -31,10 +31,10 @@
 
       <% if record.persisted? %>
         <%= link_to("View Live", record.public_path, class: "btn btn-success", target: "_blank") if record.public_path.present? %>
-        <%= link_to("Delete", 
-              [:outpost, record], 
-              class: "btn btn-danger", 
-              method: :delete, 
+        <%= link_to("Delete this #{model.to_title}",
+              [:outpost, record],
+              class: "btn btn-danger",
+              method: :delete,
               data: { confirm: "Click OK to delete this #{model.to_title}.\nClick CANCEL to return to editing." }
               ) %>
       <% end %>

data/lib/action_view/helpers/form_builder.rb

@@ -12,58 +12,70 @@ module ActionView
   module Helpers
     class FormBuilder
       def section(partial, options={}, &block)
-        @template.render( 
-          :partial => "/outpost/shared/sections/#{partial}", 
+        @template.render(
+          :partial => "/outpost/shared/sections/#{partial}",
           :locals  => {
             :f       => self,
-            :record  => self.object, 
+            :record  => self.object,
             :options => options,
             :extra   => block_given? ? @template.capture(&block) : ""
           })
       end
-      
+
       #----------------------
-      
+
       def render_fields(partial, options={})
-        @template.render( 
-          :partial => "/outpost/shared/fields/#{partial}_fields", 
+        @template.render(
+          :partial => "/outpost/shared/fields/#{partial}_fields",
           :locals  => {
             :f       => self,
             :index   => self.object.object_id,
             :options => options
           })
       end
-      
+
+      #----------------------
+
+      def full_errors(attribute, options={})
+        @template.render(
+          :partial => "/outpost/shared/full_errors",
+          :locals  => {
+            :f            => self,
+            :attribute    => attribute,
+            :options      => options
+          })
+      end
+
       #----------------------
-      
+
       def link_to_add_fields(association, options={})
         association = association.to_s
         partial     = options[:partial] || association.singularize
         title       = options[:title] || "Add Another #{association.singularize.titleize}"
-        
+
         new_object = self.object.send(association).klass.new
         id = new_object.object_id
-        
+
         fields = self.simple_fields_for(association, new_object, child_index: id) do |nf|
           nf.render_fields(partial)
         end
-                
-        @template.link_to(title, "#", class: "js-add-fields", 
+
+        @template.link_to(title, "#", class: "js-add-fields has-many-add-link",
           data: { id: id, build_target: options[:build_target], fields: fields.gsub("\n", "") })
       end
 
       #----------------------
-      
+
       def has_many_fields(association)
         partial = association.to_s.singularize
         fields  = String.new
-        
+
         self.object.send(association).each do |obj|
           fields << self.simple_fields_for(association, obj) do |nf|
             nf.render_fields(partial)
           end
         end
-        
+
         fields.html_safe
       end
     end