refinerycms 0.9.7.11 → 0.9.7.13

data/Gemfile

@@ -17,16 +17,16 @@ gem 'sqlite3-ruby', :require => 'sqlite3' #db_adapter=sqlite3
 # gem 'aws-s3'
 
 #===REFINERY REQUIRED GEMS===
-gem 'acts_as_indexed',  '= 0.6.3', :require => 'acts_as_indexed'
-gem 'authlogic',        '= 2.1.5', :require => 'authlogic'
-gem 'friendly_id',      '= 3.0.6', :require => 'friendly_id'
+gem 'acts_as_indexed',  '= 0.6.4', :require => 'acts_as_indexed'
+gem 'authlogic',        '= 2.1.6', :require => 'authlogic'
+gem 'friendly_id',      '= 3.1.3', :require => 'friendly_id'
 gem 'rails',            '= 2.3.8'
 gem 'rmagick',          '~> 2.12.0'
 gem 'truncate_html',    '= 0.3.2', :require => 'truncate_html'
 gem 'will_paginate',    '= 2.3.14', :require => 'will_paginate'
 
 group :test do
-  gem 'json_pure',      '=1.4.5', :require => 'json/pure'
+  gem 'json_pure',      '=1.4.6', :require => 'json/pure'
   gem 'factory_girl'
   gem 'test-unit',      '= 1.2.3'
   gem 'capybara'
@@ -45,11 +45,11 @@ end
 
 #===REQUIRED FOR REFINERY GEM INSTALL===
 # Leave the gem below disabled (commented out) if you're not using the gem install method.
-# gem 'refinerycms',    '= 0.9.7.11'
+# gem 'refinerycms',    '= 0.9.7.12'
 #===END OF REFINERY GEM INSTALL REQUIREMENTS===
 
 # Bundle gems for certain environments:
 
 # Specify your application's gem requirements here. See the examples below:
 # gem 'refinerycms-news', '~> 0.9.8', :require => 'news'
-# gem 'refinerycms-portfolio', '~> 0.9.7', :require => 'portfolio'
+# gem 'refinerycms-portfolio', '~> 0.9.7', :require => 'portfolio'

data/bin/refinerycms

@@ -17,6 +17,13 @@ else
   Pathname.new(File.expand_path(File.dirname(__FILE__) << "/.."))
 end
 
+require refinery_root.join('vendor', 'plugins', 'refinery', 'lib', 'refinery.rb')
+
+if ARGV.include?("-v") or ARGV.include?("--version")
+  puts Refinery::Version
+  exit
+end
+
 unless (app_path = ARGV.shift).nil? or app_path.length == 0
   # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
   if (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2))

data/changelog.md

@@ -1,4 +1,15 @@
+## 0.9.7.12 [11 August 2010]
+
+* Smoothed the sortable list in the admin UI. [Joe Sak](http://github.com/joemsak)
+* Binding link dialogue URL checker to paste action. [Joe Sak](http://github.com/joemsak)
+* Kill hidden overflow on dialogues for smaller browser windows. [Joe Sak](http://github.com/joemsak) and [Philip Arndt](http://github.com/parndt)
+* Refactored the ``parse_branch`` method to speed up reordering on the server. [Joshua Davey](http://github.com/jgdavey)
+* Running ``refinerycms`` with ``-v`` or ``--version`` will now output the version number. [Steven Heidel](http://github.com/stevenheidel)
+* Made the core codebase not rely so heavily on ``@page[:body]`` by adding ``Page.default_parts`` and using ``.first`` on that instead. [Philip Arndt](http://github.com/parndt)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.11...0.9.7.12)
+
 ## 0.9.7.11 [07 August 2010]
+
 * Removed ``app/controllers/application.rb`` due to its serious deprecation. Fixed deprecations in how we use acts_as_indexed. [Philip Arndt](http://github.com/parndt)
 * Added passing cucumber features for search for: [Uģis Ozols](http://github.com/ugisozols)
   - Images
@@ -16,10 +27,11 @@
 * Fix XSS vulnerability on page meta information by escaping the relevant fields properly [David Jones](http://github.com/djones)
 * Ensure that the generator script grabs the first attribute that is a string, not just the first attribute, when choosing the field for Dashboard activity. [Joe Sak](http://github.com/joemsak)
 * Updated ``json-pure`` to ``1.4.5``, now using the actual gem [Philip Arndt](http://github.com/parndt)
-* [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.10...master)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.10...0.9.7.11)
 
 
 ## 0.9.7.10 [02 August 2010]
+
 * Added options to site_bar partial to allow particular components to be disabled (CSS, JS, jQuery or cornering script) so that they don't interfere with these already being included in the theme. [Philip Arndt](http://github.com/parndt)
 * Fixed the schema file as it was invalid somehow. [Steven Heidel](http://github.com/stevenheidel)
 * Made search more consistent and added it to Spam/Ham. [Uģis Ozols](http://github.com/ugisozols)

data/config/acts_as_indexed_config.rb

@@ -1,7 +1,10 @@
 # The acts_as_indexed instructions tell us to put this in environment/initializers/
 # but that doesn't work so we're putting it here and requiring it using refinery.
-ActsAsIndexed.configure do |config|
-  config.index_file = Rails.root.join('tmp', 'index')
-  config.index_file_depth = 3
-  config.min_word_size = 3
+ActsAsIndexed::Configuration.module_eval do
+  def initialize
+    @index_file = Rails.root.join('tmp', 'index') if Rails.root
+    @index_file_depth = 3
+    @min_word_size = 3
+    @if_proc = if_proc
+  end
 end

data/config/application.rb

@@ -18,6 +18,11 @@ Refinery::Initializer.run do |config|
     :secret => 'eec8fffc3637c05895f8e6a355179eaad0003ac5617e5368955baf7989e1faca4d8ab37140d690c20b05d5815609b7c680c644277b6a892be316a85c6596d75c'
   }
 
+  config.to_prepare do
+    # Here we set up the default acts_as_indexed configuration.
+    load(Rails.root.join('config', 'acts_as_indexed_config.rb').to_s)
+  end
+
 end
 
 # You can set things in the following file and we'll try hard not to destroy them in updates, promise.

data/public/javascripts/jquery/jquery.corner.js

@@ -219,7 +219,13 @@
 					$(d).addClass('jquery-corner');
 					var ds = d.style;
 
-					bot ? this.appendChild(d) : this.insertBefore(d, this.firstChild);
+					// IE always trips up here and breaks rendering elsewhere, so suppress.
+					try {
+						bot ? this.appendChild(d) : this.insertBefore(d, this.firstChild);
+					}
+					catch(a){
+						// don't really care.
+					}
 
 					if (bot && cssHeight != 'auto') {
 						if ($.css(this, 'position') == 'static')

data/public/javascripts/jquery/jquery.jcarousel.js

@@ -113,7 +113,7 @@
             }
         }
 
-        if (e.nodeName == this.options.listTag.toUpperCase()) {
+        if (e.nodeName.toUpperCase() == this.options.listTag.toUpperCase()) {
             this.list = $(e);
             this.container = this.list.parent();
 
@@ -569,7 +569,9 @@
                 c = e;
                 var d = this.dimension(e);
                 if (d == 0) {
-                    alert('jCarousel: No width/height set for items. This will cause an infinite loop. Aborting...');
+                    if (console && $.isFunction(console.log)) {
+                      console.log('jCarousel: No width/height set for items. This will cause an infinite loop. Aborting...');
+                    }
                     return 0;
                 }
 
@@ -842,9 +844,11 @@
         },
 
         clipping: function() {
+          if (this.clip[0] != null) {
             return !this.options.vertical ?
                 this.clip[0].offsetWidth - $jc.intval(this.clip.css('borderLeftWidth')) - $jc.intval(this.clip.css('borderRightWidth')) :
                 this.clip[0].offsetHeight - $jc.intval(this.clip.css('borderTopWidth')) - $jc.intval(this.clip.css('borderBottomWidth'));
+          }
         },
 
         index: function(i, s) {

data/public/javascripts/refinery/admin.js

@@ -144,7 +144,9 @@ init_modal_dialogs = function(){
       if ($.browser.msie) {
         iframe.css({'margin':'-2px 2px 2px -2px'});
       }
-      $(document.body).addClass('hide-overflow');
+      if(parseInt($anchor.data('dialog-height')) < $(window).height()) {
+        $(document.body).addClass('hide-overflow');
+      }
       e.preventDefault();
     });
   });
@@ -158,6 +160,7 @@ init_sortable_menu = function(){
   $menu.sortable({
     axis: 'x',
     cursor: 'crosshair',
+    connectWith: '.nested',
     update: function(){
       var ser   = $menu.sortable('serialize', {key: 'menu[]', expression: /plugin_([\w]*)$/}),
           token = escape($('#admin_authenticity_token').val());
@@ -171,7 +174,7 @@ init_sortable_menu = function(){
   $menu.find('#menu_reorder').click(function(e){
     e.preventDefault();
     $('#menu_reorder, #menu_reorder_done').toggle();
-    $('#site_bar, #header >*:not(#header_content, #menu, script), #content').fadeTo(500, 0.65);
+    $('#site_bar, header >*:not(#menu, script), #content').fadeTo(500, 0.65);
     $menu.find('.tab a').click(function(ev){
       ev.preventDefault();
     });
@@ -182,7 +185,7 @@ init_sortable_menu = function(){
   $menu.find('#menu_reorder_done').click(function(e){
     e.preventDefault();
     $('#menu_reorder, #menu_reorder_done').toggle();
-    $('#site_bar, #header >*:not(#header_content, #menu, script), #content').fadeTo(500, 1);
+    $('#site_bar, header >*:not(#menu, script), #content').fadeTo(500, 1);
     $menu.find('.tab a').unbind('click');
 
     $menu.sortable('disable');
@@ -427,7 +430,7 @@ var link_dialog = {
   },
 
   web_tab: function(){
-    $('#web_address_text').change(function(){
+    $('#web_address_text').bind('paste change',function(){
       var prefix = '#web_address_',
           icon = '';
 
@@ -783,6 +786,7 @@ var list_reorder = {
       , 'cursor': 'drag'
       , 'items': 'li'
       , 'axis': 'y'
+      , 'connectWith' : '.nested'
     };
 
     $(list_reorder.sortable_list).find('li').each(function(index, li) {
@@ -792,7 +796,7 @@ var list_reorder = {
 
     if (list_reorder.tree && !$.browser.msie) {
       $(list_reorder.sortable_list).parent().nestedSortable($.extend(sortable_options, {
-        'maxDepth': 1
+        'maxDepth': 2
         , 'placeholderElement': 'li'
       }));
       $(list_reorder.sortable_list).addClass('ui-sortable');
@@ -800,7 +804,7 @@ var list_reorder = {
       $(list_reorder.sortable_list).sortable(sortable_options);
     }
 
-    $('#site_bar, #header > *:not(script)').fadeTo(500, 0.3);
+    $('#site_bar, header > *:not(script)').fadeTo(500, 0.3);
     $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul')).fadeTo(500, 0.55);
 
     $('#reorder_action').hide();
@@ -824,8 +828,11 @@ var list_reorder = {
   }
 
   , disable_reordering: function(e) {
+    if($('#reorder_action_done').hasClass('loading')){
+      return false;
+    }
     if(e) { e.preventDefault(); }
-
+    $('#reorder_action_done').addClass('loading');
     if (list_reorder.update_url != null) {
       serialized = "";
       list_reorder.sortable_list.find('> li[id]').each(function(index, li) {
@@ -842,9 +849,13 @@ var list_reorder = {
 
       $.post(list_reorder.update_url, serialized, function(data) {
         // handle the case where we get the whole list back including the <ul> or whatever.
-        if (data.match(new RegExp("^"+ $(list_reorder.sortable_list).get(0).tagName.toLowerCase() + "\ id=\"|\'" + list_reorder.sortable_list + "\"|\'>")).length == 1) {
+        if ((matches = data.match(new RegExp("^<" + list_reorder.sortable_list.get(0).tagName.toLowerCase()
+                                             + "[^>]+" + list_reorder.sortable_list.attr('id') + "[^>]>"))) != null)
+        {
           // replace reorder authenticity token's value.
-          $('#reorder_authenticity_token').val($($(data.split('reorder_authenticity_token')).last().get(0).split('value=\'')).last().get(0).split('\'')[0]);
+          $('#reorder_authenticity_token').val(
+            $($(data.split('reorder_authenticity_token')).last().get(0).split('value=\''))
+              .last().get(0).split('\'')[0]);
           // replace actual list content.
           $(list_reorder.sortable_list).html($(data).html());
         } else {
@@ -873,9 +884,9 @@ var list_reorder = {
     }
     $(list_reorder.sortable_list).removeClass('reordering, ui-sortable');
 
-    $('#site_bar, #header > *:not(script)').fadeTo(250, 1);
+    $('#site_bar, header > *:not(script)').fadeTo(250, 1);
     $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul')).fadeTo(250, 1, function() {
-      $('#reorder_action_done').hide();
+      $('#reorder_action_done').hide().removeClass('loading');
       $('#reorder_action').show();
     });
   }

data/public/javascripts/refinery/boot_wym.js

@@ -1,6 +1,9 @@
 onOpenDialog = function(dialog) {
-  $('.ui-dialog').corner('6px').find('.ui-dialog-titlebar').corner('1px top');
-  $(document.body).addClass('hide-overflow');
+  (dialog = $('.ui-dialog')).corner('6px')
+                            .find('.ui-dialog-titlebar').corner('1px top')
+  if (dialog.height() < $(window).height()) {
+    $(document.body).addClass('hide-overflow');
+  }
 }
 
 onCloseDialog = function(dialog) {
@@ -197,7 +200,8 @@ $(function()
   wymeditor_inputs = $('.wymeditor');
   wymeditor_inputs.each(function(input) {
     if ((containing_field = $(this).parents('.field')).get(0).style.height == '') {
-      containing_field.addClass('hide-overflow').css('height', $(this).outerHeight() - containing_field.offset().top + $(this).offset().top + 45);
+      containing_field.addClass('hide-overflow')
+                      .css('height', $(this).outerHeight() - containing_field.offset().top + $(this).offset().top + 45);
     }
     $(this).hide();
   });

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -4969,19 +4969,23 @@ WYMeditor.WymClassSafari.prototype.addCssRule = function(styles, oCss) {
 //keydown handler, mainly used for keyboard shortcuts
 WYMeditor.WymClassSafari.prototype.keydown = function(e) {
 
-  if(e.ctrlKey){
-    //'this' is the doc
-    var wym = WYMeditor.INSTANCES[this.title];
+  //'this' is the doc
+  var wym = WYMeditor.INSTANCES[this.title];
 
-    if(e.keyCode == 66) {
+  if(e.ctrlKey){
+    if(e.keyCode == 66){
       //CTRL+b => STRONG
       wym._exec(WYMeditor.BOLD);
-      return false;
-    } else if(e.keyCode == 73) {
+      e.preventDefault();
+    }
+    if(e.keyCode == 73){
       //CTRL+i => EMPHASIS
       wym._exec(WYMeditor.ITALIC);
-      return false;
+      e.preventDefault();
     }
+  } else if(e.shiftKey && e.keyCode == 13) {
+    wym._exec('InsertLineBreak');
+    e.preventDefault();
   }
 };
 
@@ -5007,10 +5011,6 @@ WYMeditor.WymClassSafari.prototype.keyup = function(e) {
     }
   }
 
-  //fix #112
-  if(e.keyCode == 13 && e.shiftKey) {
-    wym._exec('InsertLineBreak');
-  }
   else if(($.inArray(e.keyCode, [8, 17, 46, 224]) == -1) && !e.metaKey && !e.ctrlKey)
   {
     //NOT BACKSPACE, NOT DELETE, NOT CTRL, NOT COMMAND

data/public/stylesheets/ie7.css

@@ -1 +1 @@
-@import url('/stylesheets/refinery/ie.css');
+@import url('/stylesheets/refinery/ie-less-than-8.css');

data/public/stylesheets/refinery/formatting.css

@@ -1,5 +1,9 @@
 /* Default error colouring */
 
+article, nav, header, footer, aside, hgroup, section{
+	display:block;
+}
+
 div.fieldWithErrors {
   display: inline;
 }

data/public/stylesheets/refinery/refinery.css

@@ -25,7 +25,7 @@ acronym {
 label[for] {
   cursor: pointer;
 }
-#page_container, #site_bar_content, #header_content {
+#page_container, #site_bar_content, header {
   margin: 0px auto 10px auto;
   text-align: left;
   width: 990px;
@@ -169,13 +169,20 @@ hr {
 #flash.flash_message a#flash_close {
   top: 21px;
 }
-#header a, #content a {
+#content a {
   border-bottom: 1px dotted #727272;
 }
 a {
   color: #41403C;
   text-decoration: none;
 }
+a:hover {
+  color: #000;
+  border-bottom: 1px solid #727272;
+}
+header a, header a:hover {
+  border-bottom: 0px none;
+}
 #content .wym_box a, #content .ui-tabs a {
   border-bottom: 0px none;
 }
@@ -193,28 +200,24 @@ a {
 .less-important {
   color: #727272;
 }
-#header a {
-  border: 0px;
-}
-a:hover {
-  color: #000;
-  border-bottom: 1px solid #727272;
-}
 a#site_bar_refinery_cms_logo {
   left: 448px;
 }
 #content, #page_container {
   background-color: white;
 }
-body.login #page_container, body.login #site_bar_content, body.login #header_content {
+body.login #page_container, body.login #site_bar_content, body.login header {
   width: 590px;
 }
 body.login #page_container {
   width: 560px;
 }
-body.login #header_content {
+body.login header {
   background: #eaeaea;
 }
+header, footer, nav {
+  display: block;
+}
 body.login #site_bar_content a#site_bar_refinery_cms_logo {
   left: 247px;
 }
@@ -281,12 +284,12 @@ body.login .fieldWithErrors input.larger {
   background-position: 0px -82px;
   border: 1px solid red;
 }
-#header_content {
+header {
   height: 60px;
   position: relative;
   margin-bottom: 0px;
 }
-body.login #header_content h1 {
+body.login header h1 {
   color: #41403c;
   vertical-align: middle;
   text-align: center;
@@ -295,7 +298,7 @@ body.login #header_content h1 {
   padding-bottom: 0px;
   line-height: 60px;
 }
-#menu, #header_content .jcarousel-container {
+#menu, header .jcarousel-container {
   display: block;
   margin: 0px;
   padding: 0px;
@@ -305,23 +308,23 @@ body.login #header_content h1 {
   right: 0px;
   background: transparent;
 }
-#header_content .jcarousel-container {
+header .jcarousel-container {
   position: absolute !important;
 }
-#header_content .jcarousel-container .jcarousel-prev,
-  #header_content .jcarousel-container .jcarousel-next {
+header .jcarousel-container .jcarousel-prev,
+  header .jcarousel-container .jcarousel-next {
   position: absolute;
   top: 13px;
   cursor: pointer;
 }
-#header_content .jcarousel-container .jcarousel-prev {
+header .jcarousel-container .jcarousel-prev {
   left: -20px;
 }
-#header_content .jcarousel-container .jcarousel-next {
+header .jcarousel-container .jcarousel-next {
   right: -20px;
 }
-#header_content .jcarousel-container .jcarousel-prev-disabled,
-  #header_content .jcarousel-container .jcarousel-next-disabled {
+header .jcarousel-container .jcarousel-prev-disabled,
+  header .jcarousel-container .jcarousel-next-disabled {
   display: none !important;
 }
 #menu.ui-sortable a {
@@ -350,7 +353,7 @@ body.login #header_content h1 {
   padding: 11px 13px;
   margin-top: 0px;
 }
-#menu a#menu_reorder, #header #menu a#menu_reorder_done {
+#menu a#menu_reorder, header #menu a#menu_reorder_done {
   height: 14px;
   width: 14px;
   margin-top: 11px;
@@ -378,12 +381,12 @@ pre {
 #site_link:hover {
   text-decoration: underline;
 }
-#header #logo {
+header #logo {
   position: absolute;
   right: 20px;
   top: 25px;
 }
-#header h1, #header h1 a {
+header h1, header h1 a {
   color: white;
   font-size: 20px;
   font-weight: normal;
@@ -391,7 +394,7 @@ pre {
   padding-bottom: 4px;
   margin-top: 0;
 }
-#header p {
+header p {
   color: white;
   font-size: 90%;
   padding: 0;
@@ -410,6 +413,10 @@ pre {
   vertical-align: top;
   margin-bottom: 2px;
   line-height: 35px;
+  position: relative;
+}
+#records > ul.ui-sortable li {
+  position: static;
 }
 #content #records > ul li .actions a {
   line-height: 29px;
@@ -494,6 +501,10 @@ pre {
 #records ul#sortable_list {
   margin-top: 6px;
 }
+.ui-sortable .nested{
+  padding:5px;
+  margin:5px 0;
+}
 #records ul#sortable_list.ui-sortable {
   margin-top: 0px;
 }
@@ -545,10 +556,11 @@ pre {
   height: 38px;
 }
 #content .tree .ui-sortable li.placeholder {
-  height: 6px;
+  height: 38px;
   border-width: 2px;
-  position: absolute;
+  position: relative;
   background: #22A7F2 !important;
+  margin:5px 0;
 }
 #content #records .tree .ui-sortable li.helper, #content .tree .ui-sortable li.helper {
   opacity: 0.5 !important;
@@ -687,9 +699,6 @@ label.stripped {
 #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 .record {
-  position: relative;
-}
 #records .actions {
   position: absolute;
   right: 0px;
@@ -701,7 +710,7 @@ label.stripped {
 }
 #records.tree .actions {
   line-height: 22px;
-  margin-top: 1px;
+  top: 1px;
 }
 .published {
   width: 25px;
@@ -1041,6 +1050,9 @@ a img {
 .reorder_icon {
    background-image: url('/images/refinery/icons/arrow_switch.png');
 }
+.reorder_icon.loading{
+  background-image:url('/images/refinery/icons/ajax-loader.gif');
+}
 .user_comment_icon {
   background-image: url('/images/refinery/icons/user_comment.png');
 }