refinerycms 0.9.6.31 → 0.9.6.32

data/VERSION

@@ -1 +1 @@
-0.9.6.31
+0.9.6.32

data/bin/refinery-update-core

@@ -9,7 +9,7 @@ unless rails_root.nil? or rails_root.length == 0
   FileUtils::makedirs dirs.map {|dir| File.join(rails_root, dir) }
 
   # copy in the new assets.
-  assets = [%w(public stylesheets refinery), %w(public javascripts refinery), %w(public javascripts wymeditor), %w(VERSION)]
+  assets = [%w(public stylesheets refinery), %w(public javascripts refinery), %w(public javascripts wymeditor), %w(VERSION), %w(public images wymeditor skins refinery), %w(public images refinery), %w(public stylesheets wymeditor skins refinery), %w(public javascripts jquery)]
 	assets.each do |asset|
 	  FileUtils::rm_rf File.join(rails_root, asset), :secure => true # ensure the destination is clear.
 	  FileUtils::cp_r File.join(refinery_root, asset), File.join(rails_root, asset) # copy the new assets into the project.

data/config/application.rb

@@ -2,7 +2,7 @@
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
-REFINERY_GEM_VERSION = '0.9.6.31' unless defined? REFINERY_GEM_VERSION
+REFINERY_GEM_VERSION = '0.9.6.32' unless defined? REFINERY_GEM_VERSION
 
 # Boot Rails
 require File.join(File.dirname(__FILE__), 'boot')

data/db/seeds.rb

@@ -66,12 +66,28 @@ contact_us_page.parts.create({
               :body => "<p>163 Evergreen Terrace<br/>Happyville<br/>USA.<br/>Phone: 1-800 CALLUSNOW</p>",
               :position => 1
             })
+contact_us_page_position = -1
+privacy_policy_page = Page.create(:title => "Privacy Policy",
+            :deletable => true,
+            :show_in_menu => false,
+            :position => (contact_us_page_position += 1),
+            :parent_id => contact_us_page.id)
+privacy_policy_page.parts.create({
+              :title => "Body",
+              :body => "<p><strong>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>",
+              :position => 0
+            })
+privacy_policy_page.parts.create({
+              :title => "Side Body",
+              :body => "",
+              :position => 1
+            })
 
 thank_you_page = Page.create(:title => "Thank You",
             :menu_match => "^/inquiries/thank_you$",
             :show_in_menu => false,
             :deletable => false,
-            :position => 0,
+            :position => (contact_us_page_position += 1),
             :parent_id => contact_us_page.id)
 thank_you_page.parts.create({
               :title => "Body",
@@ -90,21 +106,6 @@ page_not_found_page.parts.create({
               :position => 0
             })
 
-privacy_policy_page = Page.create(:title => "Privacy Policy",
-            :deletable => true,
-            :show_in_menu => false,
-            :position =>  (page_position += 1))
-privacy_policy_page.parts.create({
-              :title => "Body",
-              :body => "<p><strong>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>",
-              :position => 0
-            })
-privacy_policy_page.parts.create({
-              :title => "Side Body",
-              :body => "",
-              :position => 1
-            })
-
 down_for_maintenance_page = Page.create(:title => "Down for maintenance",
             :menu_match => "^/maintenance$",
             :show_in_menu => false,

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

@@ -0,0 +1,239 @@
+/*!
+ * jQuery corner plugin: simple corner rounding
+ * Examples and documentation at: http://jquery.malsup.com/corner/
+ * version 2.09 (11-MAR-2010)
+ * Requires jQuery v1.3.2 or later
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ * Authors: Dave Methvin and Mike Alsup
+ */
+
+/**
+ *  corner() takes a single string argument:  $('#myDiv').corner("effect corners width")
+ *
+ *  effect:  name of the effect to apply, such as round, bevel, notch, bite, etc (default is round).
+ *  corners: one or more of: top, bottom, tr, tl, br, or bl.  (default is all corners)
+ *  width:   width of the effect; in the case of rounded corners this is the radius.
+ *           specify this value using the px suffix such as 10px (yes, it must be pixels).
+ */
+;(function($) {
+
+var style = document.createElement('div').style;
+var moz = style['MozBorderRadius'] !== undefined;
+var webkit = style['WebkitBorderRadius'] !== undefined;
+var radius = style['borderRadius'] !== undefined || style['BorderRadius'] !== undefined;
+var mode = document.documentMode || 0;
+var noBottomFold = $.browser.msie && (($.browser.version < 8 && !mode) || mode < 8);
+
+var expr = $.browser.msie && (function() {
+    var div = document.createElement('div');
+    try { div.style.setExpression('width','0+0'); div.style.removeExpression('width'); }
+    catch(e) { return false; }
+    return true;
+})();
+
+function sz(el, p) {
+    return parseInt($.css(el,p))||0;
+};
+function hex2(s) {
+    var s = parseInt(s).toString(16);
+    return ( s.length < 2 ) ? '0'+s : s;
+};
+function gpc(node) {
+    while(node) {
+        var v = $.css(node,'backgroundColor');
+        if (v && v != 'transparent' && v != 'rgba(0, 0, 0, 0)') {
+	        if (v.indexOf('rgb') >= 0) {
+	            var rgb = v.match(/\d+/g);
+	            return '#'+ hex2(rgb[0]) + hex2(rgb[1]) + hex2(rgb[2]);
+	        }
+            return v;
+		}
+		node = node.parentNode; // keep walking if transparent
+    }
+    return '#ffffff';
+};
+
+function getWidth(fx, i, width) {
+    switch(fx) {
+    case 'round':  return Math.round(width*(1-Math.cos(Math.asin(i/width))));
+    case 'cool':   return Math.round(width*(1+Math.cos(Math.asin(i/width))));
+    case 'sharp':  return Math.round(width*(1-Math.cos(Math.acos(i/width))));
+    case 'bite':   return Math.round(width*(Math.cos(Math.asin((width-i-1)/width))));
+    case 'slide':  return Math.round(width*(Math.atan2(i,width/i)));
+    case 'jut':    return Math.round(width*(Math.atan2(width,(width-i-1))));
+    case 'curl':   return Math.round(width*(Math.atan(i)));
+    case 'tear':   return Math.round(width*(Math.cos(i)));
+    case 'wicked': return Math.round(width*(Math.tan(i)));
+    case 'long':   return Math.round(width*(Math.sqrt(i)));
+    case 'sculpt': return Math.round(width*(Math.log((width-i-1),width)));
+	case 'dogfold':
+    case 'dog':    return (i&1) ? (i+1) : width;
+    case 'dog2':   return (i&2) ? (i+1) : width;
+    case 'dog3':   return (i&3) ? (i+1) : width;
+    case 'fray':   return (i%2)*width;
+    case 'notch':  return width;
+	case 'bevelfold':
+    case 'bevel':  return i+1;
+    }
+};
+
+$.fn.corner = function(options) {
+    // in 1.3+ we can fix mistakes with the ready state
+	if (this.length == 0) {
+        if (!$.isReady && this.selector) {
+            var s = this.selector, c = this.context;
+            $(function() {
+                $(s,c).corner(options);
+            });
+        }
+        return this;
+	}
+
+    return this.each(function(index){
+		var $this = $(this);
+		// meta values override options
+		var o = [$this.attr($.fn.corner.defaults.metaAttr) || '', options || ''].join(' ').toLowerCase();
+		var keep = /keep/.test(o);                       // keep borders?
+		var cc = ((o.match(/cc:(#[0-9a-f]+)/)||[])[1]);  // corner color
+		var sc = ((o.match(/sc:(#[0-9a-f]+)/)||[])[1]);  // strip color
+		var width = parseInt((o.match(/(\d+)px/)||[])[1]) || 10; // corner width
+		var re = /round|bevelfold|bevel|notch|bite|cool|sharp|slide|jut|curl|tear|fray|wicked|sculpt|long|dog3|dog2|dogfold|dog/;
+		var fx = ((o.match(re)||['round'])[0]);
+		var fold = /dogfold|bevelfold/.test(o);
+		var edges = { T:0, B:1 };
+		var opts = {
+			TL:  /top|tl|left/.test(o),       TR:  /top|tr|right/.test(o),
+			BL:  /bottom|bl|left/.test(o),    BR:  /bottom|br|right/.test(o)
+		};
+		if ( !opts.TL && !opts.TR && !opts.BL && !opts.BR )
+			opts = { TL:1, TR:1, BL:1, BR:1 };
+
+		// support native rounding
+		if ($.fn.corner.defaults.useNative && fx == 'round' && (radius || moz || webkit) && !cc && !sc) {
+			if (opts.TL)
+				$this.css(radius ? 'border-top-left-radius' : moz ? '-moz-border-radius-topleft' : '-webkit-border-top-left-radius', width + 'px');
+			if (opts.TR)
+				$this.css(radius ? 'border-top-right-radius' : moz ? '-moz-border-radius-topright' : '-webkit-border-top-right-radius', width + 'px');
+			if (opts.BL)
+				$this.css(radius ? 'border-bottom-left-radius' : moz ? '-moz-border-radius-bottomleft' : '-webkit-border-bottom-left-radius', width + 'px');
+			if (opts.BR)
+				$this.css(radius ? 'border-bottom-right-radius' : moz ? '-moz-border-radius-bottomright' : '-webkit-border-bottom-right-radius', width + 'px');
+			return;
+		}
+
+		var strip = document.createElement('div');
+		$(strip).css({
+			overflow: 'hidden',
+			height: '1px',
+			minHeight: '1px',
+			fontSize: '1px',
+			backgroundColor: sc || 'transparent',
+			borderStyle: 'solid'
+		});
+
+        var pad = {
+            T: parseInt($.css(this,'paddingTop'))||0,     R: parseInt($.css(this,'paddingRight'))||0,
+            B: parseInt($.css(this,'paddingBottom'))||0,  L: parseInt($.css(this,'paddingLeft'))||0
+        };
+
+        if (typeof this.style.zoom != undefined) this.style.zoom = 1; // force 'hasLayout' in IE
+        if (!keep) this.style.border = 'none';
+        strip.style.borderColor = cc || gpc(this.parentNode);
+        var cssHeight = $(this).outerHeight();
+
+        for (var j in edges) {
+            var bot = edges[j];
+            // only add stips if needed
+            if ((bot && (opts.BL || opts.BR)) || (!bot && (opts.TL || opts.TR))) {
+                strip.style.borderStyle = 'none '+(opts[j+'R']?'solid':'none')+' none '+(opts[j+'L']?'solid':'none');
+                var d = document.createElement('div');
+                $(d).addClass('jquery-corner');
+                var ds = d.style;
+
+                bot ? this.appendChild(d) : this.insertBefore(d, this.firstChild);
+
+                if (bot && cssHeight != 'auto') {
+                    if ($.css(this,'position') == 'static')
+                        this.style.position = 'relative';
+                    ds.position = 'absolute';
+                    ds.bottom = ds.left = ds.padding = ds.margin = '0';
+                    if (expr)
+                        ds.setExpression('width', 'this.parentNode.offsetWidth');
+                    else
+                        ds.width = '100%';
+                }
+                else if (!bot && $.browser.msie) {
+                    if ($.css(this,'position') == 'static')
+                        this.style.position = 'relative';
+                    ds.position = 'absolute';
+                    ds.top = ds.left = ds.right = ds.padding = ds.margin = '0';
+
+                    // fix ie6 problem when blocked element has a border width
+                    if (expr) {
+                        var bw = sz(this,'borderLeftWidth') + sz(this,'borderRightWidth');
+                        ds.setExpression('width', 'this.parentNode.offsetWidth - '+bw+'+ "px"');
+                    }
+                    else
+                        ds.width = '100%';
+                }
+                else {
+                	ds.position = 'relative';
+                    ds.margin = !bot ? '-'+pad.T+'px -'+pad.R+'px '+(pad.T-width)+'px -'+pad.L+'px' :
+                                        (pad.B-width)+'px -'+pad.R+'px -'+pad.B+'px -'+pad.L+'px';
+                }
+
+                for (var i=0; i < width; i++) {
+                    var w = Math.max(0,getWidth(fx,i, width));
+                    var e = strip.cloneNode(false);
+                    e.style.borderWidth = '0 '+(opts[j+'R']?w:0)+'px 0 '+(opts[j+'L']?w:0)+'px';
+                    bot ? d.appendChild(e) : d.insertBefore(e, d.firstChild);
+                }
+
+				if (fold && $.support.boxModel) {
+					if (bot && noBottomFold) continue;
+					for (var c in opts) {
+						if (!opts[c]) continue;
+						if (bot && (c == 'TL' || c == 'TR')) continue;
+						if (!bot && (c == 'BL' || c == 'BR')) continue;
+
+						var common = { position: 'absolute', border: 'none', margin: 0, padding: 0, overflow: 'hidden', backgroundColor: strip.style.borderColor };
+						var $horz = $('<div/>').css(common).css({ width: width + 'px', height: '1px' });
+						switch(c) {
+						case 'TL': $horz.css({ bottom: 0, left: 0 }); break;
+						case 'TR': $horz.css({ bottom: 0, right: 0 }); break;
+						case 'BL': $horz.css({ top: 0, left: 0 }); break;
+						case 'BR': $horz.css({ top: 0, right: 0 }); break;
+						}
+						d.appendChild($horz[0]);
+
+						var $vert = $('<div/>').css(common).css({ top: 0, bottom: 0, width: '1px', height: width + 'px' });
+						switch(c) {
+						case 'TL': $vert.css({ left: width }); break;
+						case 'TR': $vert.css({ right: width }); break;
+						case 'BL': $vert.css({ left: width }); break;
+						case 'BR': $vert.css({ right: width }); break;
+						}
+						d.appendChild($vert[0]);
+					}
+				}
+            }
+        }
+    });
+};
+
+$.fn.uncorner = function() {
+	if (radius || moz || webkit)
+		this.css(radius ? 'border-radius' : moz ? '-moz-border-radius' : '-webkit-border-radius', 0);
+	$('div.jquery-corner', this).remove();
+	return this;
+};
+
+// expose options
+$.fn.corner.defaults = {
+	useNative: true, // true if plugin should attempt to use native browser support for border radius rounding
+	metaAttr:  'data-corner' // name of meta attribute to use for options
+};
+
+})(jQuery);

data/public/javascripts/refinery/admin.js

@@ -94,6 +94,8 @@ init_sortable_menu = function(){
 
     $menu.sortable('disable');
   });
+  
+  $menu.find('> li a').corner('top 5px');
 }
 
 init_submit_continue = function(){
@@ -340,7 +342,7 @@ var page_options = {
     // set the page tabs up, but ensure that all tabs are shown so that when wymeditor loads it has a proper height.
     // also disable page overflow so that scrollbars don't appear while the page is loading.
     $(document.body).addClass('hide-overflow');
-    page_options.tabs = $('#page-tabs').tabs({tabTemplate: '<li><a href="#{href}">#{label}</a></li>'});
+    page_options.tabs = $('#page-tabs').tabs({tabTemplate: '<li><a href="#{href}">#{label}</a></li>'}).find(' > ul li a').corner('top 5px');
     part_shown = $('#page-tabs .page_part.field').not('.ui-tabs-hide');
     $('#page-tabs .page_part.field').removeClass('ui-tabs-hide');
 
@@ -355,6 +357,7 @@ var page_options = {
       // hide the tabs that are supposed to be hidden and re-enable overflow.
       $(document.body).removeClass('hide-overflow');
       $('#page-tabs .page_part.field').not(part_shown).addClass('ui-tabs-hide');
+      $('#page-tabs > ul li a').corner('top 5px');
     }
 
     if(this.enable_parts){
@@ -418,7 +421,7 @@ var page_options = {
               $('#new_page_part_index').val(parseInt($('#new_page_part_index').val()) + 1);
               $('#new_page_part_title').val('');
 
-              $('#page-tabs').tabs();
+              $('#page-tabs').tabs().find('> ul li a').corner('top 5px');
             }
           );
         }else{

data/public/javascripts/refinery/boot_wym.js

@@ -18,8 +18,8 @@ var wymeditor_boot_options = $.extend({
     ,{'name': 'CreateLink', 'title': 'Link', 'css': 'wym_tools_link'}
     ,{'name': 'Unlink', 'title': 'Unlink', 'css': 'wym_tools_unlink'}
     ,{'name': 'InsertImage', 'title': 'Image', 'css': 'wym_tools_image'}
-    ,{'name': 'InsertTable', 'title': 'Table', 'css': 'wym_tools_table'}
     ,{'name': 'ToggleHtml', 'title': 'HTML', 'css': 'wym_tools_html'}
+    ,{'name': 'InsertTable', 'title': 'Table', 'css': 'wym_tools_table'}
     ,{'name': 'Paste', 'title': 'Paste_From_Word', 'css': 'wym_tools_paste'}
   ]
 

data/public/stylesheets/refinery/refinery.css

@@ -220,6 +220,12 @@ a:hover {
   float: right;
 }
 
+#header #menu.ui-sortable li a {
+  cursor: move;
+}
+#header #menu.ui-sortable-disabled li a {
+  cursor: pointer;
+}
 #header  li {
   float: left;
   margin-right: 2px;
@@ -228,10 +234,10 @@ a:hover {
 
 #header li a {
   display: block;
-  padding: 9px;
+  padding: 9px 13px;
   font-size: 14px;
   background-color: #c2c2b3;
-  margin-top: 6px;
+  margin-top:4px;
 }
 
 #header li a:hover {
@@ -240,10 +246,31 @@ a:hover {
 
 #header li a.active {
   background-color: #f6f5f4;
-  padding: 12px;
+  padding: 11px 13px;
   margin-top: 0px;
 }
 
+#header #menu li a#menu_reorder, #header #menu li a#menu_reorder_done {
+  height: 10px;
+  margin-top: 11px;
+  cursor: pointer;
+  background-color: #8a8a72;
+  background-repeat: no-repeat;
+  background-position: 7px;
+  width: 4px;
+  _margin-top: 8px;
+  padding: 8px 12px;
+}
+#header #menu li a#menu_reorder:hover, #header #menu li a#menu_reorder_done:hover {
+  background-color: #a1a18b;
+}
+#header #menu li a#menu_reorder {
+  background-image: url('/images/refinery/icons/arrow_switch.png');
+}
+#header #menu li a#menu_reorder_done {
+  background-image: url('/images/refinery/icons/tick.png');
+}
+
 #content {
   padding: 15px;
 }
@@ -895,27 +922,6 @@ ul#menu.reordering_menu li a {
   cursor: move;
 }
 
-#header #menu li a#menu_reorder, #header #menu li a#menu_reorder_done {
-  height: 10px;
-  margin-top: 11px;
-  cursor: pointer !important;
-  background-color: #8a8a72;
-  background-repeat: no-repeat;
-  background-position: 7px;
-  width: 4px;
-  _margin-top: 6px;
-  padding: 9px 12px;
-}
-#header #menu li a#menu_reorder:hover, #header #menu li a#menu_reorder_done:hover {
-  background-color: #a1a18b;
-}
-#header #menu li a#menu_reorder {
-  background-image: url('/images/refinery/icons/arrow_switch.png');
-}
-#header #menu li a#menu_reorder_done {
-  background-image: url('/images/refinery/icons/tick.png');
-}
-
 .clearfix:after {
   content:".";
   display:block;
@@ -987,19 +993,6 @@ ul#page_parts, ul#page_parts_controls {
   padding: 0;
 }
 
-ul#page_parts li {
-  float: left;
-  list-style: none;
-  margin-right: 2px;
-}
-
-ul#page_parts li a {
-  display: block;
-  padding: 0px 8px;
-  border-bottom: none;
-}
-
-ul#page_parts li.active a, ul#page_parts li a.active {}
 ul#page_parts_controls {
   float: right;
   width: 5%;
@@ -1100,15 +1093,6 @@ textarea.wymeditor {
   padding: 10px;
 }
 
-.ui-dialog #dialog_loading {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  width: 208px;
-  height: 13px;
-  margin: -6px 0 0 -104px;
-}
-
 ul#image_grid {
   width: 580px;
   padding: 0px;
@@ -1166,80 +1150,10 @@ ul#plugins li {
   width:auto;
 }
 
-.ui-widget-overlay {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  right: 0px;
-  bottom: 0px;
-  width: auto !important;
-  opacity: .75;
-  filter:Alpha(Opacity=75);
-  background: #000;
-}
-
-.ui-dialog {
-  position: relative;
-  background-color: #fff;
-  color: #000;
-  border: 4px solid #525252;
-  width: auto;
-}
-.ui-dialog .ui-dialog-titlebar {
-  float: left;
-  position: relative;
-  width: 100%;
-  background-color: #e8e8e8;
-}
-.ui-dialog .ui-dialog-title {
-  float: left;
-  height: 33px;
-  line-height: 33px;
-  font-size: 16px;
-  padding-left: 10px;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-  position: absolute;
-  right: 10px;
-  top: 5px;
-  width: 19px;
-  border: none;
-}
-.ui-dialog .ui-dialog-titlebar-close span {
-  display: block;
-  margin: 1px;
-  background: transparent url('/images/thickbox/cross.png') top left no-repeat;
-  text-indent:-10000px;
-}
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus {
-  padding: 0;
-}
 #new_page_part_dialog .field {
   padding: 30px 10px;
 }
 
-.ui-tabs-hide {
-  display:none;
-}
-.ui-tabs .ui-state-default, .ui-tabs .ui-state-default a {
-  background-color: #c2c3b3;
-  line-height: 27px;
-  margin-top: 3px;
-}
-.ui-tabs .ui-state-active, .ui-tabs .ui-state-active a {
-  background-color: #808080;
-  color: #fff;
-  line-height: 33px;
-  margin-top: 0px;
-}
-.ui-dialog iframe {
-  clear:both;
-  border: 0px none;
-  margin-bottom:-1px;
-  margin-top:1px;
-  width: 100% !important;
-}
-
 .hide-overflow {
   overflow: hidden;
 }