refinerycms-core 0.9.9.7 → 0.9.9.8

data/lib/gemspec.rb

@@ -21,11 +21,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'refinerycms-base',            '~> #{::Refinery::Version}'
   s.add_dependency 'refinerycms-settings',        '~> #{::Refinery::Version}'
-  s.add_dependency 'refinerycms-generators',      '~> 0.9.9.3'
+  s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
-  s.add_dependency 'moretea-awesome_nested_set',  '= 1.4.3.1'
+  s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
   s.add_dependency 'rails',                       '~> 3.0.5'
   s.add_dependency 'rdoc',                        '>= 2.5.11' # helps fix ubuntu
   s.add_dependency 'truncate_html',               '~> 0.5'

data/lib/generators/refinerycms_generator.rb

@@ -21,16 +21,16 @@ class RefinerycmsGenerator < ::Refinery::Generators::EngineInstaller
       self.options = new_options
     end
 
-    # First, effectively move / rename files that get in the way of Refinery CMS
-    %w(public/index.html config/cucumber.yml app/views/layouts/application.html.erb public/javascripts/rails.js).each do |roadblock|
-      if (roadblock_path = Rails.root.join(roadblock)).file?
-        create_file "#{roadblock}.backup",
-                    :verbose => true do roadblock_path.read end
-        remove_file roadblock_path, :verbose => true
+    unless self.options[:update]
+      # First, effectively move / rename files that get in the way of Refinery CMS
+      %w(public/index.html app/views/layouts/application.html.erb public/javascripts/rails.js).each do |roadblock|
+        if (roadblock_path = Rails.root.join(roadblock)).file?
+          create_file "#{roadblock}.backup",
+                      :verbose => true do roadblock_path.read end
+          remove_file roadblock_path, :verbose => true
+        end
       end
-    end
 
-    unless self.options[:update]
       # Copy asset files (JS, CSS) so they're ready to use.
       %w(application.css formatting.css home.css theme.css).map{ |ss|
         Refinery.roots('core').join('public', 'stylesheets', ss)

data/public/javascripts/refinery/admin.js

@@ -165,7 +165,7 @@ init_interface = function() {
   });
 
   $('.form-actions .form-actions-left input:submit#submit_button').click(function(e) {
-    $("<img src='/images/refinery/icons/ajax-loader.gif' width='16' height='16' class='save-loader' />").appendTo($(this).parent());
+    $("<img src='/images/refinery/ajax-loader.gif' width='16' height='16' class='save-loader' />").appendTo($(this).parent());
   });
 
   $('a.suppress').live('click', function(e){
@@ -437,14 +437,14 @@ var link_tester = {
     loader_img.insertAfter($(textbox_id));
     result_span.insertAfter(loader_img);
 
-    $(textbox_id).bind('paste keypress',function(){
+    $(textbox_id).bind('paste blur',function(){
       $(textbox_id).stop(true); // Clear the current queue; if we weren't checking yet, cancel it.
       $(textbox_id + '_test_loader').hide();
       $(textbox_id + '_test_result').hide();
       $(textbox_id + '_test_result').removeClass('success_icon').removeClass('failure_icon');
 
-      // Wait one second before checking.
-      $(textbox_id).delay(1000).queue(function () {
+      // Wait 300ms before checking.
+      $(textbox_id).delay(300).queue(function () {
         $(textbox_id + '_test_loader').show();
         $(textbox_id + '_test_result').hide();
         $(textbox_id + '_test_result').removeClass('success_icon').removeClass('failure_icon');

data/public/javascripts/refinery/core.js

@@ -11,8 +11,15 @@ init_flash_messages = function(){
     , 'visibility':'visible'
   }).animate({'opacity': '1'}, 550);
   $('#flash_close').click(function(e) {
-     $('#flash').animate({'opacity': 0, 'visibility': 'toggle'}, 330);
-     e.preventDefault();
+    try {
+      $('#flash').animate({
+         'opacity': 0,
+         'visibility': 'hidden'
+      }, 330);
+    } catch(ex) {
+      $('#flash').hide();
+    }
+    e.preventDefault();
   });
   $('#flash.flash_message').prependTo('#records');
 };

data/public/javascripts/refinery/submenu.js

@@ -7,7 +7,7 @@ $(document).ready(function(){
   $('nav#actions.multilist > ul:not(.search_list) li > a').not('.not_a_link a').each(function(i,a){
     if ($(this).data('dialog-title') == null) {
       $(this).bind('click', function(){
-        $(this).css('background-image', "url('/images/refinery/icons/ajax-loader.gif') !important");
+        $(this).css('background-image', "url('/images/refinery/ajax-loader.gif') !important");
       });
     }
   });
@@ -46,4 +46,4 @@ $(document).ready(function(){
     }, $(this)));
     e.preventDefault();
   });
-});
+});

data/public/stylesheets/refinery/refinery.css

@@ -623,7 +623,7 @@ label.stripped {
 .record .title span {
   line-height: 30px;
 }
-#records.files .record .title, #dialog_main #resource_file_area #pages_list ul li a.page_link {
+#records.files .record .title, #dialog_main #resource_file_area .pages_list ul li a.page_link {
   display:inline-block;
   padding-left:24px;
   min-height:16px;
@@ -631,29 +631,29 @@ label.stripped {
   background-position:left;
   background-image: url('/images/refinery/icons/folder_page_white.png');
 }
-#dialog_main #resource_file_area #pages_list ul li a.page_link{
+#dialog_main #resource_file_area .pages_list ul li a.page_link{
   background-position:5px center;
   display:block;
 }
-#records.files .record .title.pdf, #dialog_main #resource_file_area #pages_list ul li a.page_link.pdf {
+#records.files .record .title.pdf, #dialog_main #resource_file_area .pages_list ul li a.page_link.pdf {
 	background-image: url('/images/refinery/icons/pdf.png');
 }
-#records.files .record .title.jpg, #records.files .record .title.gif, #records.files .record .title.jpeg, #records.files .record .title.png, #records.files .record .title.tiff, #dialog_main #resource_file_area #pages_list ul li a.page_link.jpg, #dialog_main #resource_file_area #pages_list ul li a.page_link.jpeg, #dialog_main #resource_file_area #pages_list ul li a.page_link.gif, #dialog_main #resource_file_area #pages_list ul li a.page_link.png, #dialog_main #resource_file_area #pages_list ul li a.page_link.tiff {
+#records.files .record .title.jpg, #records.files .record .title.gif, #records.files .record .title.jpeg, #records.files .record .title.png, #records.files .record .title.tiff, #dialog_main #resource_file_area .pages_list ul li a.page_link.jpg, #dialog_main #resource_file_area .pages_list ul li a.page_link.jpeg, #dialog_main #resource_file_area .pages_list ul li a.page_link.gif, #dialog_main #resource_file_area .pages_list ul li a.page_link.png, #dialog_main #resource_file_area .pages_list ul li a.page_link.tiff {
 	background-image: url('/images/refinery/icons/img.png');
 }
-#records.files .record .title.doc, #records.files .record .title.pages, #records.files .record .title.docx, #dialog_main #resource_file_area #pages_list ul li a.page_link.doc, #dialog_main #resource_file_area #pages_list ul li a.page_link.docx, #dialog_main #resource_file_area #pages_list ul li a.page_link.pages {
+#records.files .record .title.doc, #records.files .record .title.pages, #records.files .record .title.docx, #dialog_main #resource_file_area .pages_list ul li a.page_link.doc, #dialog_main #resource_file_area .pages_list ul li a.page_link.docx, #dialog_main #resource_file_area .pages_list ul li a.page_link.pages {
 	background-image: url('/images/refinery/icons/doc.png');
 }
-#records.files .record .title.ppt, #records.files .record .title.keynote, #dialog_main #resource_file_area #pages_list ul li a.page_link.ppt, #dialog_main #resource_file_area #pages_list ul li a.page_link.keynote {
+#records.files .record .title.ppt, #records.files .record .title.keynote, #dialog_main #resource_file_area .pages_list ul li a.page_link.ppt, #dialog_main #resource_file_area .pages_list ul li a.page_link.keynote {
 	background-image: url('/images/refinery/icons/ppt.png');
 }
-#records.files .record .title.xls, #records.files .record .title.numbers, #dialog_main #resource_file_area #pages_list ul li a.page_link.xls, #dialog_main #resource_file_area #pages_list ul li a.page_link.numbers {
+#records.files .record .title.xls, #records.files .record .title.numbers, #dialog_main #resource_file_area .pages_list ul li a.page_link.xls, #dialog_main #resource_file_area .pages_list ul li a.page_link.numbers {
 	background-image: url('/images/refinery/icons/xls.png');
 }
-#records.files .record .title.zip, #records.files .record .title.rar, #dialog_main #resource_file_area #pages_list ul li a.page_link.zip, #dialog_main #resource_file_area #pages_list ul li a.page_link.rar {
+#records.files .record .title.zip, #records.files .record .title.rar, #dialog_main #resource_file_area .pages_list ul li a.page_link.zip, #dialog_main #resource_file_area .pages_list ul li a.page_link.rar {
 	background-image: url('/images/refinery/icons/zip.png');
 }
-#records.files .record .title.mp3, #records.files .record .title.wav, #records.files .record .title.aiff, #records.files .record .title.m4a, #dialog_main #resource_file_area #pages_list ul li a.page_link.mp3, #dialog_main #resource_file_area #pages_list ul li a.page_link.wav, #dialog_main #resource_file_area #pages_list ul li a.page_link.aiff, #dialog_main #resource_file_area #pages_list ul li a.page_link.m4a {
+#records.files .record .title.mp3, #records.files .record .title.wav, #records.files .record .title.aiff, #records.files .record .title.m4a, #dialog_main #resource_file_area .pages_list ul li a.page_link.mp3, #dialog_main #resource_file_area .pages_list ul li a.page_link.wav, #dialog_main #resource_file_area .pages_list ul li a.page_link.aiff, #dialog_main #resource_file_area .pages_list ul li a.page_link.m4a {
   background-image: url('/images/refinery/icons/music.png');
 }
 #records .actions {
@@ -875,59 +875,59 @@ body.dialog form {
   width: 940px;
   padding: 6px;
 }
-#dialog_main #pages_list {
+#dialog_main .pages_list {
   width: 100%;
   padding-bottom: 40px;
 }
-#dialog_main #pages_list ul {
+#dialog_main .pages_list ul {
   margin: 0px 12px 0px 12px;
   padding: 0px;
 }
-#dialog_main #pages_list ul li {
+#dialog_main .pages_list ul li {
   cursor: pointer;
   line-height: 24px;
   list-style: none;
 }
-#dialog_main #pages_list li.child a {
+#dialog_main .pages_list li.child a {
   padding-left: 27px;
 }
-#dialog_main #pages_list li.child1 a {
+#dialog_main .pages_list li.child1 a {
   padding-left: 47px;
 }
-#dialog_main #pages_list li.child2 a {
+#dialog_main .pages_list li.child2 a {
   padding-left: 67px;
 }
-#dialog_main #pages_list li.child3 a {
+#dialog_main .pages_list li.child3 a {
   padding-left: 87px;
 }
-#dialog_main #pages_list li.child4 a {
+#dialog_main .pages_list li.child4 a {
   padding-left: 107px;
 }
 /*
-#dialog_main #pages_list ul li span  {
+#dialog_main .pages_list ul li span  {
   display: block;
   padding: 3px;
   margin-left: 24px;
 }*/
-#dialog_main #pages_list ul li a {
+#dialog_main .pages_list ul li a {
   display: block;
   padding: 3px 3px 3px 27px;
   text-decoration: none;
   border-bottom: none;
   border: 1px solid transparent;
 }
-#dialog_main #pages_list li a:hover {
+#dialog_main .pages_list li a:hover {
   background-color: #C9DAE2;
 }
 #dialog_main .actions {
   margin-right: 48px;
 }
-#dialog_main #pages_list .linked a, #dialog_main #pages_list .linked a:hover {
+#dialog_main .pages_list .linked a, #dialog_main .pages_list .linked a:hover {
   border: 1px solid #00A017;
   color: #00A017;
   background: 7px 7px no-repeat url('/images/refinery/icons/accept.png') #E0F5E0;
 }
-#dialog_main #pages_list .linked a em {
+#dialog_main .pages_list .linked a em {
   color: #00A017;
 }
 #dialog_main #web_address_area, #dialog_main #email_address_area {

data/refinerycms-core.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.7}
+  s.version           = %q{0.9.9.8}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-03-10}
+  s.date              = %q{2011-03-11}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,13 +14,13 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '~> 0.9.9.7'
-  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.7'
-  s.add_dependency 'refinerycms-generators',      '~> 0.9.9.3'
+  s.add_dependency 'refinerycms-base',            '~> 0.9.9.8'
+  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.8'
+  s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
-  s.add_dependency 'moretea-awesome_nested_set',  '= 1.4.3.1'
+  s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
   s.add_dependency 'rails',                       '~> 3.0.5'
   s.add_dependency 'rdoc',                        '>= 2.5.11' # helps fix ubuntu
   s.add_dependency 'truncate_html',               '~> 0.5'

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.7
+  version: 0.9.9.8
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +13:00
+date: 2011-03-11 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.7
+        version: 0.9.9.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.7
+        version: 0.9.9.8
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.3
+        version: "1.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -88,9 +88,9 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.4.3.1
+        version: "1.4"
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency