refinerycms 0.9.6.30 → 0.9.6.31

data/VERSION

@@ -1 +1 @@
-0.9.6.30
+0.9.6.31

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.30' unless defined? REFINERY_GEM_VERSION
+REFINERY_GEM_VERSION = '0.9.6.31' unless defined? REFINERY_GEM_VERSION
 
 # Boot Rails
 require File.join(File.dirname(__FILE__), 'boot')

data/public/javascripts/refinery/boot_wym.js

@@ -104,7 +104,6 @@ var wymeditor_boot_options = $.extend({
       + "<form>"
         + "<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='" + WYMeditor.DIALOG_PASTE + "' />"
         + "<div class='field'>"
-          + "<label for='wym_text'>{Text_From_Word}</label"
           + "<textarea class='wym_text' rows='10' cols='50'></textarea>"
         + "</div>"
         + "<div id='dialog-form-actions' class='form-actions'>"

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

@@ -95,7 +95,7 @@ $.extend(WYMeditor, {
     DIALOG_LINK         - A link dialog type.
     DIALOG_IMAGE        - An image dialog type.
     DIALOG_TABLE        - A table dialog type.
-    DIALOG_PASTE        - A 'Paste from Word' dialog type.
+    DIALOG_PASTE        - A 'Paste' dialog type.
     BOLD                - Command: (un)set selection to <strong>.
     ITALIC              - Command: (un)set selection to <em>.
     CREATE_LINK         - Command: open the link dialog or (un)set link.
@@ -1277,8 +1277,8 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
   else {
     parent_node = selected;
   }
-
-  if ((parent_node != null) && (dialogType != WYMeditor.DIALOG_PASTE) && (parent_node.tagName.toLowerCase() != WYMeditor.A))
+  
+  if ((parent_node != null) && (parent_node.tagName.toLowerCase() != WYMeditor.A))
   {
     // wrap the current selection with a funky span (not required for safari)
     if (!this._selected_image && !$.browser.safari)
@@ -1381,14 +1381,51 @@ WYMeditor.editor.prototype.paste = function(sData) {
 
   //add a P for each item
   if(container && container.tagName.toLowerCase() != WYMeditor.BODY) {
+    contentAfterBreak = "";
+    insertedContentAfterBreak = "";
     for(x = aP.length - 1; x >= 0; x--) {
-      sTmp = aP[x];
       //simple newlines are replaced by a break
-      sTmp = sTmp.replace(rExp, "<br />");
-      if (x == 0 && $(container).html().replace(/<br\ ?\/?>/, "").length == 0) {
-        $(container).html(sTmp);
+      sTmp = aP[x].replace(rExp, "<br />");
+      if (x == 0) {
+        // if we're inside a p tag but the container is not a p tag
+        // then we need to close the p tag first before starting a new one.
+        // Only if we placed more items after it (aP.length)
+        if (aP.length > 1
+            && $(container).get(0).tagName.toLowerCase() == "span"
+            && $(container).attr('id') == ('replace_me_with_' + wym._current_unique_stamp)
+            && $(container).parent().get(0).tagName.toLowerCase() == "p")
+        {
+          p = $(container).parent();
+          matches = p.html().match(new RegExp("([\\s\\S]*)\<span id=[\'|\"]replace_me_with_" + wym._current_unique_stamp + "[\'|\"]\>.*\<\/span\>"));
+          sTmp = matches[1] + sTmp + $(container).html();
+          p.html(sTmp);
+          if (insertedContentAfterBreak != null && insertedContentAfterBreak.length > 0) {
+            p.after(insertedContentAfterBreak);
+          }
+          if (contentAfterBreak != null && contentAfterBreak.length > 0) {
+            if ((last_paste = p.parent().find('p#last_paste')).length == 1) {
+              last_paste.attr('id', null).html(last_paste.html() + contentAfterBreak);
+            } else {
+              p.next().after("<p>" + contentAfterBreak + "</p>");
+            }
+          }
+
+        } else {
+          $(container).html($(container).html() + sTmp);
+        }
       } else {
-        $(container).after("<p>" + sTmp + "</p>");
+        if ((aP.length -1) == x) {
+          contentAfterBreak = $(container).parent().html().match(new RegExp("\<span id=[\'|\"]replace_me_with_" + wym._current_unique_stamp + "[\'|\"]\>.*\<\/span\>([\\s\\S]*)"))[1].split('</p>')[0];
+          sTmp = "<p id='last_paste'>" + sTmp + "</p>";
+        } else {
+          sTmp = "<p>" + sTmp + "</p>";
+        }
+
+        if (insertedContentAfterBreak == "") {
+          insertedContentAfterBreak = insertedContentAfterBreak + sTmp;
+        } else {
+          insertedContentAfterBreak = sTmp + insertedContentAfterBreak;
+        }
       }
     }
   } else {
@@ -1406,37 +1443,40 @@ WYMeditor.editor.prototype.paste = function(sData) {
 
   if (replaceable.get(0) != null) {
     // set the id of the container back.
-    replaceable.get(0).id = replaceable.get(0)._id_before_replaceable;
+    if (replaceable.get(0).tagName.toLowerCase() == 'span') {
+      replaceable.replaceWith(replaceable.html());
+    }
+    replaceable.attr('id', replaceable.get(0)._id_before_replaceable || null);
   }
 };
 
 WYMeditor.editor.prototype.insert = function(html) {
-    // Do we have a selection?
-    if (this._iframe.contentWindow.getSelection().focusNode != null) {
-        // Overwrite selection with provided html
-        this._exec(WYMeditor.INSERT_HTML, html);
-    } else {
-        // Fall back to the internal paste function if there's no selection
-        this.paste(html);
-    }
+  // Do we have a selection?
+  if (this._iframe.contentWindow.getSelection().focusNode != null) {
+    // Overwrite selection with provided html
+    this._exec(WYMeditor.INSERT_HTML, html);
+  } else {
+    // Fall back to the internal paste function if there's no selection
+    this.paste(html);
+  }
 };
 
 WYMeditor.editor.prototype.wrap = function(left, right, selection) {
-    // Do we have a selection?
-    if (selection == null) { selection = this._iframe.contentWindow.getSelection();}
-    if (selection.focusNode != null) {
-        // Wrap selection with provided html
-        this._exec( WYMeditor.INSERT_HTML, left + selection.toString() + right);
-    }
+  // Do we have a selection?
+  if (selection == null) { selection = this._iframe.contentWindow.getSelection();}
+  if (selection.focusNode != null) {
+    // Wrap selection with provided html
+    this._exec( WYMeditor.INSERT_HTML, left + selection.toString() + right);
+  }
 };
 
 WYMeditor.editor.prototype.unwrap = function(selection) {
-    // Do we have a selection?
-    if (selection == null) { selection = this._iframe.contentWindow.getSelection();}
-    if (selection.focusNode != null) {
-        // Unwrap selection
-        this._exec( WYMeditor.INSERT_HTML, selection.toString() );
-    }
+  // Do we have a selection?
+  if (selection == null) { selection = this._iframe.contentWindow.getSelection();}
+  if (selection.focusNode != null) {
+    // Unwrap selection
+    this._exec( WYMeditor.INSERT_HTML, selection.toString() );
+  }
 };
 
 WYMeditor.editor.prototype.addCssRules = function(doc, aCss) {
@@ -4741,6 +4781,53 @@ WYMeditor.WymClassSafari.prototype.initIframe = function(iframe) {
     this.listen();
 };
 
+WYMeditor.WymClassSafari.prototype.paste = function(sData) {
+
+  wym = this;
+
+  wym.format_block();
+
+  var sTmp;
+  replaceable = $(wym._doc.body).find('#replace_me_with_' + wym._current_unique_stamp);
+
+  // replaceable doesn't actually get replaced here, it's just used as a marker for where the cursor was.
+  var container = replaceable.get(0) || this.selected();
+
+  //split the data, using double newlines as the separator
+  var aP = sData.split(wym._newLine + wym._newLine);
+  var rExp = new RegExp(wym._newLine, "g");
+
+  //add a P for each item
+  if(container && container.tagName.toLowerCase() != WYMeditor.BODY) {
+    for(x = aP.length - 1; x >= 0; x--) {
+      sTmp = aP[x];
+      //simple newlines are replaced by a break
+      sTmp = sTmp.replace(rExp, "<br />");
+      if (x == 0 && $(container).html().replace(/<br\ ?\/?>/, "").length == 0) {
+        $(container).html(sTmp);
+      } else {
+        $(container).after("<p>" + sTmp + "</p>");
+      }
+    }
+  } else {
+    for(x = 0; x < aP.length; x++) {
+      sTmp = aP[x];
+      //simple newlines are replaced by a break
+      sTmp = sTmp.replace(rExp, "<br />");
+      if (x == 0 && $(container).html().replace(/<br\ ?\/?>/, "").length == 0) {
+        $(container).html(sTmp);
+      } else {
+        $(wym._doc.body).append("<p>" + sTmp + "</p>");
+      }
+    }
+  }
+
+  if (replaceable.get(0) != null) {
+    // set the id of the container back.
+    replaceable.get(0).id = replaceable.get(0)._id_before_replaceable;
+  }
+};
+
 WYMeditor.WymClassSafari.prototype._exec = function(cmd,param) {
 
     if(!this.selected()) return(false);

data/public/javascripts/wymeditor/lang/en.js

@@ -37,12 +37,11 @@ WYMeditor.STRINGS['en'] = {
 	Cancel:			 'Cancel',
 	Choose:			 'Choose',
 	Preview:			'Preview',
-	Paste_From_Word:	'Paste from Word',
+	Paste_From_Word:	'Paste',
 	Tools:			'Tools',
 	Containers:		 'Containers',
 	Classes:			'Classes',
 	Status:			 'Status',
 	Source_Code:		'Source code',
-		Text_From_Word: 	'Text From Word',
 		Css_Class: 				'Apply CSS Class'
 };

data/public/javascripts/wymeditor/lang/fa.js

@@ -36,7 +36,7 @@ WYMeditor.STRINGS['fa'] = {
 	Cancel:			 'لغو',//Cancel
 	Choose:			 'انتخاب',//Choose
 	Preview:			'پیش‌نمایش',//Preview
-	Paste_From_Word:	'انتقال از ورد',//Paste from Word
+	Paste_From_Word:	'انتقال از ورد',//Paste
 	Tools:			'ابزار',//Tools
 	Containers:		 '‌قالب‌ها',//Containers
 	Classes:			'کلاس‌ها',//Classes

data/public/stylesheets/refinery/refinery.css

@@ -1258,4 +1258,8 @@ ul#plugins li {
 }
 .tooltip * {
   color: black;
+}
+
+.wym_dialog_paste .field textarea {
+  width: 98%;
 }

data/readme.md

@@ -148,7 +148,7 @@ This will pull in all of the updated files in the project and may result in some
 
 * Manage who can access Refinery
 * Control which plugins each user has access to
-* Uses the popular [RESTful authentication](http://github.com/technoweenie/restful-authentication) Rails plugin
+* Uses the popular [authlogic](http://github.com/binarylogic/authlogic) authentication Rails plugin
 
 ### [Themes](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/themes/themes.md)
 

data/vendor/plugins/authentication/authentication.md

@@ -4,7 +4,9 @@
 
 At the heart of Refinery's user management is the authentication plugin located in ``vendor/plugins/authentication``
 
-What this really is is just a standard [RESTFul authentication](http://github.com/technoweenie/restful-authentication) install extended with a few extra features like "I forgot my password" and hooked directly into the heart of Refinery's plugin system.
+What this really is is just a standard [authlogic](http://github.com/binarylogic/authlogic) install extended with a few extra features like "I forgot my password" and hooked directly into the heart of Refinery's plugin system.
+
+Authlogic allows you to easily integrate with other systems too. So you could be logged in into another system using authlogic and easily stay logged in between the two systems without having to login twice.
 
 ## Adding New Users
 

data/vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb

@@ -1,13 +1,11 @@
 <%
   # web address link
   web_address_text = "http://"
-  unless params[:current_link].blank?
-    web_address_text = params[:current_link] if params[:current_link] =~ /^http:\/\//
-  end
-  web_address_target_blank = params[:target_blank] == "true"
+  web_address_text = params[:current_link] if params[:current_link].present? and params[:current_link] =~ /^http:\/\//
+  web_address_target_blank = (params[:target_blank] == "true")
 
   # mailto link
-  unless params[:current_link].blank?
+  if params[:current_link].present?
     if params[:current_link] =~ /^mailto:/
       email_address_text = params[:current_link].split("mailto:")[1].split('?')[0]
     end
@@ -16,18 +14,18 @@
   end
 
   # resource link
-  unless params[:current_link].blank?
+  if params[:current_link].present?
     is_resource_link = params[:current_link].include?("/system/resources")
   end
 
-  if params[:paginating].blank?
+  if params[:paginating].present?
+    page_area_selected = (params[:paginating] == "your_page")
+    resource_area_selected = (params[:paginating] == "resource_file")
+  else
     page_area_selected = (!is_resource_link and web_address_text == "http://" and email_address_text.blank?)
     web_address_area_selected = (web_address_text != "http://")
     email_address_area_selected = !email_address_text.blank?
     resource_area_selected = is_resource_link
-  else
-    page_area_selected = (params[:paginating] == "your_page")
-    resource_area_selected = (params[:paginating] == "resource_file")
   end
 %>
 <div class='clearfix dialog_link_to'>

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 30
-  version: 0.9.6.30
+  - 31
+  version: 0.9.6.31
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +12:00
+date: 2010-04-20 00:00:00 +12:00
 default_executable: 
 dependencies: []