imagine_cms 3.0.1 → 3.0.2

data/.gitignore

@@ -1,5 +1,4 @@
-.bundle/
-log/*.log
+Gemfile.lock
 pkg/
 rdoc/
 test/dummy/db/*.sqlite3

data/app/assets/javascripts/imagine.js

@@ -382,8 +382,6 @@ function showDatePicker(object, method_prefix) {
     var el = $('date_picker_' + object + '_' + method_prefix + 'main');
     el.hide();
     el.style.position = 'absolute';
-/*    el.style.left = (coords[0] - 120) + 'px';*/
-/*    el.style.top  = (coords[1] + 14) + 'px';*/
     el.show();
 }
 
@@ -652,7 +650,7 @@ function hideDojoDialog(id) {
 
 function editProperties(url, titleText) {
     $('properties_dialog_content').innerHTML = 'Loading...';
-    new Ajax.Updater('properties_dialog_content', url, {asynchronous:true, evalScripts:true});
+    new Ajax.Updater('properties_dialog_content', url, {method:'get', asynchronous:true, evalScripts:true});
     
     showDojoDialog('properties_dialog', titleText);
 }

data/app/controllers/management/users_controller.rb

@@ -10,7 +10,7 @@ class Management::UsersController < Management::ApplicationController
   ###
   
   def index
-    @users = User.all
+    @users = User.order('active desc, username').all
   end
   
   def new

data/app/helpers/cms_application_helper.rb

@@ -863,7 +863,7 @@ module CmsApplicationHelper
                     "'&exclude_days=#{exclude_days.join(',')}' + " +
                     "'&onchange=#{escape_javascript(options[:onchange])}' + " +
                     "'&object=#{object}' + " +
-                    "'&method_prefix=#{method_prefix}', {asynchronous:true, evalScripts:true})"
+                    "'&method_prefix=#{method_prefix}', {method:'get', asynchronous:true, evalScripts:true})"
     
     ret = <<EOF
   <span><a href="#" onclick="showDatePicker('#{object}', '#{method_prefix}'); return false;"><span id="date_picker_#{object}_#{method_prefix}_value">#{default_value.strftime('%a %m/%d/%y')}</span></a></span>
@@ -926,7 +926,7 @@ EOF
                     "'&year=' + $('event_calendar_year_sel').value + " +
                     "'&min_time=#{start_date.to_i}&max_time=#{end_date.to_i}" +
                     "&calendar_id=#{calendar_id}&css_prefix=#{css_prefix}" +
-                    "&popout_direction=#{popout_direction.to_s}', {asynchronous:true, evalScripts:true})"
+                    "&popout_direction=#{popout_direction.to_s}', {method:'get', asynchronous:true, evalScripts:true})"
     
     # keep all this junk in sync with what's in UtilController
     @month = Time.now.month

data/app/views/management/cms/_edit_page.html.erb

@@ -1,16 +1,16 @@
 <script type="text/javascript">
   attrlist = new Array(<%= @attrs.size %>)
   
-  <% @attrs.each_with_index do |attr, i| -%>
+  <%- @attrs.each_with_index do |attr, i| -%>
   attrlist[<%= i %>]="<%=h attr %>"
-  <% end -%>
+  <%- end -%>
 </script>
 
 <div id="save_errors" class="error"></div>
 
 <%= form_remote_tag :url => { :action => 'edit_page', :id => @pg },
-                   :loading => "$('btn_save').disabled = true; $('btn_save').value = 'Saving...';",
-                   :html => { :onsubmit => 'teardownTextFieldHints();' } do -%>
+                    :loading => "$('btn_save').disabled = true; $('btn_save').value = 'Saving...';",
+                    :html => { :onsubmit => 'teardownTextFieldHints();' } do %>
 <table>
   <col width="120"><col width="*"><col width="5">
 <%- if (@pg.id || 2) > 1 -%>
@@ -56,7 +56,7 @@
             <%= date_picker :pg, :article_date, :default_value => (@pg.article_date || @pg.created_on || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %>
           </td>
           <td width="120">
-            <div id="div_article_end_date"<%= @pg.article_end_date && @pg.article_date != @pg.article_end_date ? '' : 'style="display: none"' %>>&ndash; <%= date_picker :pg, :article_end_date, :default_value => (@pg.article_end_date || @pg.article_date || @pg.created_on || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %></div>
+            <div id="div_article_end_date"<%= @pg.article_end_date && @pg.article_date != @pg.article_end_date ? '' : 'style="display: none"'.html_safe %>>&ndash; <%= date_picker :pg, :article_end_date, :default_value => (@pg.article_end_date || @pg.article_date || @pg.created_on || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %></div>
           </td>
           <td align="right" width="180">
             <input type="checkbox" name="use_article_date_range" value="1" onclick="$('div_article_end_date').toggle();"<%= @pg.article_end_date && @pg.article_date != @pg.article_end_date ? ' checked="checked"' : '' %> /><label for="use_article_date_range">Use date range</label>

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/test/imagine_cms_test.rb

@@ -1,7 +1,15 @@
 require 'test_helper'
 
 class ImagineCmsTest < ActiveSupport::TestCase
+  
+  def teardown
+  end
+  
   test "truth" do
     assert_kind_of Module, ImagineCms
   end
+  
+  private
+    
+    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,7 +180,6 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - app/assets/images/codepress/line-numbers.png

data/Gemfile.lock

@@ -1,119 +0,0 @@
-PATH
-  remote: .
-  specs:
-    imagine_cms (3.0.0.beta11)
-      acts_as_tree (~> 1.1)
-      aws-s3 (~> 0.6.3)
-      mini_magick (~> 3.3)
-      net-dns (~> 0.7.1)
-      prototype-rails (~> 3.2.0)
-      rails (~> 3.2.0)
-      rinku (~> 1.7.2)
-      rmagick
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    acts_as_tree (1.2.0)
-      activerecord (>= 3.0.0)
-    arel (3.0.2)
-    aws-s3 (0.6.3)
-      builder
-      mime-types
-      xml-simple
-    builder (3.0.4)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    mini_magick (3.4)
-      subexec (~> 0.2.1)
-    multi_json (1.3.7)
-    net-dns (0.7.1)
-    polyglot (0.3.3)
-    prototype-rails (3.2.1)
-      rails (~> 3.2)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
-      bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rinku (1.7.2)
-    rmagick (2.13.1)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    subexec (0.2.2)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    xml-simple (1.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  imagine_cms!
-  jquery-rails
-  sqlite3