refinerycms 0.9.4.5 → 0.9.5

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

@@ -1192,7 +1192,7 @@ WYMeditor.editor.prototype.status = function(sMessage) {
  */
 WYMeditor.editor.prototype.update = function() {
 
-	var html = this.xhtml().gsub(/<\/([A-Za-z0-9]*)></, function(m){return "</" + m[1] +">\n<"});
+	var html = this.xhtml().gsub(/<\/([A-Za-z0-9]*)></, function(m){return "</" + m[1] +">\n<"}).gsub(/src=\"system\/images/, 'src="/system/images'); // make system/images calls absolute.
 	jQuery(this._element).val(html);
 	jQuery(this._box).find(this._options.htmlValSelector).val(html);
 };
@@ -1317,7 +1317,7 @@ WYMeditor.editor.prototype.uniqueStamp = function() {
 };
 
 WYMeditor.editor.prototype.paste = function(sData) {
-
+console.log('pasting..');
 	var sTmp;
 	var container = this.selected();
 	
@@ -1608,7 +1608,7 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
 			else {
 				wym._exec(WYMeditor.CREATE_LINK, wym._current_unique_stamp);
 
-				jQuery("a[@href=" + wym._current_unique_stamp + "]", wym._doc.body)
+				jQuery("a[href=" + wym._current_unique_stamp + "]", wym._doc.body)
 						.attr(WYMeditor.HREF, sUrl)
 						.attr(WYMeditor.TITLE, jQuery(wym._options.titleSelector).val())
 						.attr(WYMeditor.TARGET, jQuery(wym._options.targetSelector).val());			
@@ -3275,7 +3275,7 @@ WYMeditor.XhtmlParser.prototype.parse = function(raw)
 WYMeditor.XhtmlParser.prototype.beforeParsing = function(raw)
 {
 	if(raw.match(/class="MsoNormal"/) || raw.match(/ns = "urn:schemas-microsoft-com/)){
-		// Usefull for cleaning up content pasted from other sources (MSWord)
+		// Useful for cleaning up content pasted from other sources (MSWord)
 		this._Listener.avoidStylingTagsAndAttributes();
 	}
 	return this._Listener.beforeParsing(raw);
@@ -4466,7 +4466,6 @@ WYMeditor.WymClassMozilla.prototype.keyup = function(evt) {
 			 && evt.keyCode != 224
 			 && !evt.metaKey
 			 && !evt.ctrlKey) {
-			
 		//NOT BACKSPACE, NOT DELETE, NOT CTRL, NOT COMMAND
 		//text nodes replaced by P
 		

data/public/stylesheets/formatting.css

@@ -0,0 +1,5 @@
+@import url('refinery/formatting.css');
+/*  
+    Override default refinery formatting below. 
+    Formatting applies to backend WYSIWYG editors and all frontend. 
+*/

data/public/stylesheets/home.css

@@ -0,0 +1,5 @@
+@import url('/stylesheets/refinery/home.css');
+/* 
+    Override default refinery homepage styles here. 
+    These only apply to the homepage of your site. 
+*/

data/public/stylesheets/{formatting.css.example → refinery/formatting.css}

@@ -1,36 +1,3 @@
-/* basic formatting styles */
-body {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 14px;
-}
-#header h1 a {
-    text-decoration: none;
-}
-a, a:visited {
-    color: #1A2DE1;
-}
-h1 {
-    font-size: 24px;
-}
-h2 {
-    font-size: 14px;
-}
-#menu a {
-    text-decoration: none;
-}
-#menu li.selected a, #menu a.on, #menu a:hover {
-	text-decoration: underline;
-}
-#menu li.selected ul li a {
-	text-decoration: none;
-}
-#menu li ul li.selected a, #menu li ul li a.on, #menu li ul li a:hover {
-	text-decoration: underline;
-}
-.inquiries .message_field label {
-	vertical-align: top;
-}
-
 /* Default error colouring */
 
 div.fieldWithErrors {
@@ -83,4 +50,48 @@ Clearfix docs
 .clearfix {
 	display:block;
 }
-/* End hide from IE Mac */
+/* End hide from IE Mac */
+
+#page {
+    background: white;
+    padding: 20px;
+    width: 1000px;
+    margin: 0px auto;
+}
+#body_content_left {
+    float: left;
+    width: 600px;
+}
+#body_content_right {
+    float: right;
+    margin: 0px 12px;
+    width: 360px;
+}
+
+.inquiries form label {
+    width: 150px;
+    float: left;
+}
+.inquiries form input {
+    
+}
+.inquiries form input, .inquiries form textarea {
+	
+}
+.inquiries form textarea {
+	
+}
+.inquiries form .actions {
+    margin-left: 150px;
+}
+
+.inquiries form .actions input {
+}
+
+.inquiries .field {
+    margin: 12px 0px;
+}
+
+.inquiries form {
+    padding-top: 12px;
+}

data/public/stylesheets/{refinery.css → refinery/refinery.css}

@@ -14,18 +14,6 @@ body {
 	background: black url('/images/refinery/page_bg.png') repeat;
 }
 
-div.login {
-	width: 300px !important;
-}
-
-div.login h1 {
-	margin: 0; 
-	padding: 5px; 
-	font-size: 20px; 
-	text-align: center;
-	line-height:22px
-}
-
 acronym {
 	cursor: help;
 }
@@ -114,7 +102,7 @@ hr {
 	width: 545px;
 }
 .login #flash {
-	width: 230px;
+	width: 520px;
 }
 #message, #flash {
 	padding: 8px 8px 8px 30px;
@@ -167,13 +155,50 @@ a:hover {
 	border-bottom: 1px solid #727272;
 }
 
-#page {
+#page_container {
 	margin: 0px auto 10px auto;
 	text-align: left;
 	width: 990px;
+}
+#page_container #page {
 	background: #f6f5f4;
 }
 
+#page_container.login {
+	width: 590px;
+}
+
+#page_container.login #page h1 {
+	margin: 0; 
+	padding: 5px; 
+	font-size: 20px; 
+	line-height:22px
+}
+
+#page_container.login div.session_username, #page_container.login div.session_password {
+    float: left;
+}
+
+#page_container.login div.session_password {
+    margin-left: 25px;
+}
+
+#page_container.login div.remember_me {
+    margin-top: 12px;
+}
+
+#page_container.login div.remember_me label {
+    display: inline;
+}
+
+#page_container.login div.session_username input, #page_container.login div.session_password input {
+    width: 260px;
+}
+
+#page_container.login div.actions {
+    margin-top: 12px;
+}
+
 #header ul#menu {
 	display: block;
 	margin: 0;
@@ -232,7 +257,11 @@ pre {
 #header {
 	background: url('/images/refinery/header_background.png') #50504B repeat-x bottom;
 	padding: 26px 15px 0 15px;
-	position: relative;
+	position: relative;	
+}
+
+#page_container.login #header {
+    padding: 42px 15px 42px 15px;
 }
 
 #site_link {
@@ -246,10 +275,6 @@ pre {
 	text-decoration: underline;
 }
 
-#list_actions {
-
-}
-
 #header #logo {
 	position: absolute;
 	right: 20px;
@@ -273,16 +298,21 @@ pre {
 }
 
 #footer {
-	display: block; background: #CDCCBB; text-align: right; padding-right: 5px; 
+    margin: 0px auto;
+    text-align: center;
 }
 
-#footer a {
-	font-size: 100%;
+#footer_logo {
+    border: 0px none;
+    display:inline-block;
+    *display:inline;
+    margin: 50px auto 40px auto;
+    width: auto;
 }
 
-#footer, #footer * {
-	color: #99998B;
-	font-size: 85%;
+#footer p, #footer a {
+    color: white;
+    font-size: 11px;
 }
 
 #submenu {
@@ -759,12 +789,23 @@ body.dialog form {
 #dialog_main #pages_list ul li {
 	cursor: pointer;
 	line-height: 24px;
-	border: 1px solid transparent;
 	list-style: none;
 }
 
-#dialog_main #pages_list ul li.child {
-	padding-left: 20px;
+#dialog_main #pages_list li.child a {
+	padding-left: 27px;
+}
+#dialog_main #pages_list li.child1 a {
+    padding-left: 47px;
+}
+#dialog_main #pages_list li.child2 a {
+    padding-left: 67px;
+}
+#dialog_main #pages_list li.child3 a {
+    padding-left: 87px;
+}
+#dialog_main #pages_list li.child4 a {
+    padding-left: 107px;
 }
 /*
 #dialog_main #pages_list ul li span	{
@@ -772,22 +813,22 @@ body.dialog form {
 	padding: 3px;
 	margin-left: 24px;
 }*/
-#dialog_main #pages_list ul li a	{
+#dialog_main #pages_list ul li a {
 	display: block;
-	padding: 3px;
-	margin-left: 24px;
-  text-decoration: none;
-  border-bottom: none;
+	padding: 3px 3px 3px 27px;
+    text-decoration: none;
+    border-bottom: none;
+	border: 1px solid transparent;
 }
-#dialog_main #pages_list li:hover {
-	background-color: #C9DAE2 !important;
+#dialog_main #pages_list li a:hover {
+	background-color: #C9DAE2;
 }
 
 #dialog_main .actions {
 	margin-right: 48px;
 }
 
-#dialog_main #pages_list .linked, #dialog_main #pages_list .linked: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;

data/public/stylesheets/refinery/theme.css

@@ -0,0 +1,36 @@
+/* alignment styles */
+.text-align-left  {
+	text-align: left;
+}
+.text-align-center {
+	text-align: center;
+}
+.text-align-right {
+	text-align: right;
+}
+.text-align-justify {
+	text-align: justify;
+}
+
+/* block alignment styles */
+.image-align-left {
+	float: left;
+	margin-right: 6px;
+	margin-bottom: 6px;
+}
+.image-align-right {
+	float: right;
+	margin-left: 6px;
+	margin-bottom: 6px;
+}
+
+/* font sizes */
+.font-size-small {
+	font-size: 0.75em;
+}
+.font-size-normal {
+	font-size: 1em;
+}
+.font-size-large {
+	font-size: 1.25em;
+}

data/public/stylesheets/theme.css

@@ -1,36 +1 @@
-/* alignment styles */
-.text-align-left  {
-	text-align: left;
-}
-.text-align-center {
-	text-align: center;
-}
-.text-align-right {
-	text-align: right;
-}
-.text-align-justify {
-	text-align: justify;
-}
-
-/* block alignment styles */
-.image-align-left {
-	float: left;
-	margin-right: 6px;
-	margin-bottom: 6px;
-}
-.image-align-right {
-	float: right;
-	margin-left: 6px;
-	margin-bottom: 6px;
-}
-
-/* font sizes */
-.font-size-small {
-	font-size: 0.75em;
-}
-.font-size-normal {
-	font-size: 1em;
-}
-.font-size-large {
-	font-size: 1.25em;
-}
+@import url('/stylesheets/refinery/theme.css');

data/script/about

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/about'

data/script/console

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/console'

data/script/dbconsole

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'

data/script/destroy

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/destroy'

data/script/generate

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/generate'

data/script/performance/profiler

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/profiler'

data/script/performance/request

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/request'

data/script/plugin

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/plugin'