refinerycms 0.9.5.31 → 0.9.6

data/public/javascripts/wymeditor/skins/refinery/skin.js

@@ -3,38 +3,38 @@ WYMeditor.SKINS['refinery'] = {
 	init: function(wym) {
 
 		//render following sections as panels
-/*		jQuery(wym._box).find(wym._options.classesSelector)
+/*		$(wym._box).find(wym._options.classesSelector)
 			.addClass("wym_panel"); */
 
 		//render following sections as buttons
-		jQuery(wym._box).find(wym._options.toolsSelector)
+		$(wym._box).find(wym._options.toolsSelector)
 			.addClass("wym_buttons");
 
 		//render following sections as dropdown menus
- /*		 jQuery(wym._box).find(wym._options.classesSelector)
+ /*		 $(wym._box).find(wym._options.classesSelector)
 			.addClass("wym_dropdown")
 			.find(WYMeditor.H2)
 			.append("<span>&nbsp;&gt;</span>");
 */
 		// auto add some margin to the main area sides if left area
 		// or right area are not empty (if they contain sections)
-		jQuery(wym._box).find("div.wym_area_right ul")
+		$(wym._box).find("div.wym_area_right ul")
 			.parents("div.wym_area_right").show()
 			.parents(wym._options.boxSelector)
 			.find("div.wym_area_main")
 			.css({"margin-right": "155px"});
 
-		jQuery(wym._box).find("div.wym_area_left ul")
+		$(wym._box).find("div.wym_area_left ul")
 			.parents("div.wym_area_left").show()
 			.parents(wym._options.boxSelector)
 			.find("div.wym_area_main")
 			.css({"margin-left": "155px"});
 
 		//make hover work under IE < 7
-		jQuery(wym._box).find(".wym_section").hover(function(){
-			jQuery(this).addClass("hover");
+		$(wym._box).find(".wym_section").hover(function(){
+			$(this).addClass("hover");
 		},function(){
-			jQuery(this).removeClass("hover");
+			$(this).removeClass("hover");
 		});
 	}
 };

data/public/stylesheets/refinery/refinery.css

@@ -208,8 +208,12 @@ a:hover {
 
 #header ul#menu {
 	display: block;
-	margin: 0;
-	padding: 32px 15px 0 0;
+	margin: 0px;
+	padding: 0px;
+	position: absolute;
+	bottom: 0px;
+	left: 15px;
+	right: 15px;
 }
 
 #header ul#menu li#logout {
@@ -265,10 +269,12 @@ pre {
 	background: url('/images/refinery/header_background.png') #50504B repeat-x bottom;
 	padding: 26px 15px 0 15px;
 	position: relative;
+	height: 93px;
 }
 
 #page_container.login #header {
 	padding: 42px 15px 42px 15px;
+	height: 35px;
 }
 
 #site_link {
@@ -425,38 +431,57 @@ pre {
 .tree li span.spacing {
 	display: none;
 }
-.reordering .hover {
+#content .ui-sortable li.hover {
 	height: 300%;
 	display: block;
 }
 
-.reordering {
+#content .ui-sortable {
 	margin: 0;
-	padding: 0;
-}
-
-.reordering li ul{
-	padding: 6px 10px 0px 40px !important;
+	padding: 12px 0px;
 }
 
-.reordering ul.empty {
-	margin: 0;
-	display: block !important;
+#content .ui-sortable li ul{
+	padding: 6px 10px 12px 40px !important;
 }
 
-ul.reordering li {
+#content ul.ui-sortable li {
 	background: #E6E5DC !important;
 	cursor: move;
 	border: 1px solid #b7b7a8;
-	line-height: 16px;
 	margin-bottom: 2px !important;
 	padding: 3px 0px 0px 3px !important;
 }
-.reordering .actions {
+#content ul.ui-sortable li ul.empty {
+    display: block;
+}
+#content ul.ui-sortable li ul li.empty {
+    border: 0px none;
+}
+#content .ui-sortable .actions {
 	display: none !important;
 }
-.reordering li span.spacing {
+#content .ui-sortable ul.spacing li {
 	display: block;
+	border: 0px none;
+}
+#content .ui-sortable ul {
+    min-height: 12px;
+}
+#content .ui-sortable li.placeholder {
+    opacity: 0.4;
+    border-width: 2px;
+    border-style: dashed;
+    height: 38px;
+}
+#content ul.ui-sortable li.ui-sortable-helper {
+    height: 38px !important;
+}
+#content ul.ui-sortable li.ui-sortable-helper ul {
+    display: none;
+}
+.ui-sortable-helper {
+    opacity: 0.7;
 }
 
 #content h2 {
@@ -716,7 +741,7 @@ body.dialog form {
 
 .dialog #dialog_main {
 	float: left;
-	min-height: 415px;
+	min-height: 405px;
 	width: 756px;
 }
 
@@ -756,17 +781,18 @@ body.dialog form {
 }
 */
 #existing_image_area_content {
-	height: 342px;
+	height: 365px;
 }
 
 #existing_image_area .pagination {
 	background: #FFF;
-	bottom: 0px;
-	right: 0px;
+	/*bottom: 0px;*/
+	/*right: 0px;*/
 	text-align: right;
-	position: absolute;
+  float: right;
+	/*position: absolute;*/
 	margin: 0px;
-	width: 766px;
+	width: 763px;
 }
 
 #upload_image_area {
@@ -932,6 +958,16 @@ a img {
 	background-image: url('/images/refinery/icons/application_go.png');
 }
 
+.success_icon {
+  background-image: url('/images/refinery/icons/tick.png');
+  padding: 0px 8px;
+}
+
+.failure_icon {
+  background-image: url('/images/refinery/icons/cross.png');
+  padding: 0px 8px;
+}
+
 /* page parts */
 
 ul#page_parts {
@@ -951,20 +987,12 @@ ul#page_parts li {
 }
 
 ul#page_parts li a {
-	float: left;
-	line-height: 27px;
-	background: #c2c3b3;
+	display: block;
 	padding: 0px 8px;
 	border-bottom: none;
-	margin-top: 6px;
 }
 
-ul#page_parts li.active a, ul#page_parts li a.active {
-	background: #808080;
-	line-height: 33px;
-	color: white;
-	margin-top: 0px;
-}
+ul#page_parts li.active a, ul#page_parts li a.active {}
 ul#page_parts_controls {
 	float: right;
 	width: 5%;
@@ -1107,4 +1135,86 @@ ul#plugins li {
 }
 .label_inline_with_link a img {
 	vertical-align: middle;
+}
+
+#remove_picked_image {
+    margin-top:8px;
+    display:inline-block;
+    width:auto;
+}
+
+.ui-widget-overlay {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    width: auto !important;
+    height: 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:none;
+	margin-bottom:-1px;
+	margin-top:1px;
+	_margin-bottom:1px;
+	width: 100% !important;
 }

data/public/stylesheets/wymeditor/skins/refinery/skin.css

@@ -204,8 +204,15 @@
 	
 }
 .wym_skin_refinery .wym_tools_class .wym_classes .wym_tools_class_multiple_rules ul li a {
-	width: 186px;
+	width: 167px;
 	padding-left: 12px;
+	padding-right: 21px;
 	height: 16px;
 	line-height: 18px;
+}
+
+.wym_skin_refinery .wym_tools_class .wym_classes li.enabled a {
+    background-image: url('/images/refinery/icons/star.png');
+    background-repeat: no-repeat;
+    background-position: 181px 2px;
 }

data/readme.md

@@ -1,6 +1,8 @@
 # Refinery CMS
 
-An open source Ruby on Rails content management system for small business.
+__An open source Ruby on Rails content management system for small business.__
+
+## Demo Site
 
 * [Front end live demo ](http://demo.refinerycms.com)
 * [Back end live demo ](http://demo.refinerycms.com/admin)
@@ -17,12 +19,11 @@ Unlike other content managers, Refinery is truly aimed at the end user making it
 
 ### For developers
 
-Refinery makes it easy to:
-
-* Get a small business site up and running __ridiculously quickly__
-* __Theme and customise__ the look to suit the business
-* __Extend with custom plugins__ to do anything Refinery doesn't do out of the box
-* Tries to stick to __"the Rails way"__ as much as possible
+* Allows you to get a small business site completed __ridiculously quickly__
+* Easily __[Theme and customise](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/themes/themes.md)__ the look to suit the business
+* __[Extend with custom plugins](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/plugins.md)__ to do anything Refinery doesn't do out of the box
+* Sticks to __"the Rails way"__ as much as possible. We don't force you to learn new templating languages.
+* Uses [jQuery](http://jquery.com/) for fast and concise JavaScript
 
 ## Requirements
 
@@ -34,13 +35,13 @@ Refinery runs using a number of gems which (as of Refinery version 0.9.5.29) are
 * [rails >= 2.3.5](http://gemcutter.org/gems/rails)
 * [aasm >= 2.1.3](http://gemcutter.org/gems/aasm)
 * [unicode >= 0.1](http://gemcutter.org/gems/unicode)
-* [slim_scrooge >= 1.0.3](http://gemcutter.org/gems/slim_scrooge)
 * [hpricot >= 0.8.1](http://gemcutter.org/gems/hpricot)
+* [slim_scrooge >= 1.0.3](http://gemcutter.org/gems/slim_scrooge) (_Windows & JRuby users can ignore this one_)
 
 ### Other dependancies
 
 * [RMagick](http://github.com/rmagick/rmagick) - [Install docs](http://rmagick.rubyforge.org/install-faq.html) or for
-Mac OS users [this install script](http://github.com/maddox/magick-installer) will be easier.
+Mac OS users [shell install script](http://github.com/maddox/magick-installer) will be easier.
 
 ## Installing and Setting Up Refinery
 
@@ -49,9 +50,9 @@ Mac OS users [this install script](http://github.com/maddox/magick-installer) wi
 #### Install the Gem
 
     gem install refinerycms --source http://gemcutter.org
-    refinery /path/to/project
+    refinery path/to/project
 
-#### Or, clone Refinery's Git repository
+#### Or, clone Refinery's GIT repository
 
     git clone git://github.com/resolve/refinerycms.git mynewsite.com
     cd ./mynewsite.com
@@ -75,7 +76,7 @@ After your database exists, you'll need to install the gems that Refinery depend
 
     ruby script/server
 
-Now visit [http://localhost:3000](http://localhost:3000) and your site should be running.
+Now visit [http://localhost:3000](http://localhost:3000) and your Refinery site should be running.
 
 You will be prompted to setup your first user.
 
@@ -86,13 +87,13 @@ You will be prompted to setup your first user.
 * [Developer video - 26 mins](http://refinerycms.com/pages/for-developers)
 * [IRC Channel](irc://irc.freenode.net/refinerycms)
 
-## Setting Up on Heroku
+## Setting Up on Heroku or Using S3 for Storage
 
 If you're using [Heroku](http://heroku.com/) you will want to put
 
     USE_S3_BACKEND = true
   
-in your ``config/production.rb`` file.
+in your ``config/production.rb`` file to make Refinery store files uploaded on Amazon S3.
 
 ## Updating to the latest Refinery
 
@@ -100,11 +101,11 @@ in your ``config/production.rb`` file.
 
 Simply run the command:
 
-    refinery-update-core /path/to/project/root/
+    refinery-update-core path/to/project/root/
 
 and the up-to-date core files will be copied from the latest gem into your project.
 
-### When using Git
+### When using GIT
 
 You can update by running these commands:
 
@@ -123,7 +124,8 @@ This will pull in all of the updated files in the project and may result in some
 ### [Images](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/images/images.md) & [Resources](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/resources/resources.md)
 
 * Easily upload and insert images
-* Upload and link to resources like PDF documents
+* Upload and link to resources such as PDF documents
+* Uses the popular [attachment_fu](http://github.com/technoweenie/attachment_fu) Rails plugin
 
 ### [Inquiries](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/inquiries/inquiries.md)
 
@@ -137,18 +139,30 @@ This will pull in all of the updated files in the project and may result in some
 ### [Settings](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery_settings/settings.md)
 
 * Manage the behaviour of Refinery
+* Easily integrate with [Google Analytics](https://www.google.com/analytics/)
 
 ### [Dashboard](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/dashboard/dashboard.md)
 
 * Get an overview of what has been updated recently
-  
-### ...Want more?
+
+### [Authentication & Users](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/authentication/authentication.md)
+
+* 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
+
+### [Themes](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/themes/themes.md)
+
+* Customise Refinery to look exactly how you want
+* The Rails Way: use regular Rails erb views, no templating languages here!
+
+### ...Want more? [Extend with Plugins](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/plugins.md)
 
 Extend Refinery easily by running the Refinery generator
 
     ruby script/generate refinery
   
-to get help on how to use that.
+to get help on how to use that. Or read the full documentation on [writing plugins for Refinery](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/plugins.md)
 
 ### What about a portfolio?
 
@@ -158,4 +172,4 @@ Check out the [portfolio plugin gem](http://github.com/resolve/portfolio)
 
 Refinery is released under the MIT license and is copyright (c) 2005-2009 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)
 
-A copy of the MIT license can be found in the license.md file.
+[Read the license](http://github.com/resolve/refinerycms/blob/master/license.md)