alchemy_cms 2.1.6 → 2.1.7

data/Gemfile

@@ -14,7 +14,6 @@ group :test do
 end
 
 group :assets do
-	gem 'sass-rails', '~> 3.1.4'
 	gem 'uglifier', '>= 1.0.3'
 end
 

data/alchemy_cms.gemspec

@@ -24,14 +24,15 @@ Gem::Specification.new do |s|
 	s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
 	s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
 	s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.0.9"])
-	s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0"])
+	s.add_runtime_dependency(%q<kaminari>, ["~> 0.13.0"])
 	s.add_runtime_dependency(%q<acts_as_ferret>, ["~> 0.5"])
 	s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1"])
 	s.add_runtime_dependency(%q<magiclabs-userstamp>, ["~> 2.0.2"])
 	s.add_runtime_dependency(%q<dynamic_form>, ["~> 1.1"])
 	s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0.16"])
 	s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
-
+	s.add_runtime_dependency('sass-rails', ['~> 3.1.4'])
+	
 	s.add_development_dependency(%q<rspec-rails>, ["~> 2.8"])
 	s.add_development_dependency(%q<sqlite3>)
 

data/app/assets/javascripts/alchemy/alchemy.link_overlay.js

@@ -27,7 +27,7 @@ if (typeof(Alchemy) === 'undefined') {
             url: Alchemy.routes.link_admin_pages_path,
             success: function(data, textStatus, XMLHttpRequest) {
               $dialog.html(data);
-              Alchemy.SelectBox('#alchemyLinkOverlay select');
+              Alchemy.SelectBox('#alchemyLinkOverlay select.alchemy_selectbox');
             },
             error: function(XMLHttpRequest, textStatus, errorThrown) {
               Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);

data/app/assets/javascripts/alchemy/alchemy.windows.js

@@ -162,7 +162,7 @@ if (typeof(Alchemy) === 'undefined') {
 									top: ($(window).height() - $dialog.dialog('widget').height()) / 2
 								});
 							}
-							Alchemy.SelectBox('#alchemyOverlay select');
+							Alchemy.SelectBox('#alchemyOverlay select.alchemy_selectbox');
 							Alchemy.Datepicker('#alchemyOverlay input.date, #alchemyOverlay input[type="date"]');
 							Alchemy.ButtonObserver('#alchemyOverlay .button');
 						},

data/app/assets/stylesheets/alchemy/alchemy.css

@@ -4,7 +4,6 @@
 *= require alchemy/buttons
 *= require alchemy/dashboard
 *= require alchemy/elements
-*= require alchemy/flags
 *= require alchemy/flash
 *= require alchemy/frame
 *= require alchemy/icons

data/app/assets/stylesheets/alchemy/base.css.scss

@@ -787,7 +787,8 @@ div.field_with_errors {
 }
 
 p.foot_note {
-	font-size: 0.8em;
+	font-size: 10px;
+	line-height: 1.5em;
 }
 
 #errorExplanation ul {
@@ -1357,10 +1358,6 @@ div.assign_file_file_icon img {
 	width: 217px;
 }
 
-#alchemy .ui-dialog-content p {
-	min-height: 21px;
-}
-
 table.window_form td.checkbox {
 	text-align: left;
 }

data/app/assets/stylesheets/alchemy/elements.css.scss

@@ -1,18 +1,5 @@
 @import "alchemy/defaults";
 
-#alchemy div.content_editor input.text_with_icon.auto_resize.thin_border {
-	padding-right: 52px;
-	width: 314px;
-}
-
-.element_editor p.footnote {
-	clear: both;
-	float: left;
-	font-size: 10px;
-	margin-top: 4px;
-	width: 100%;
-}
-
 .element_heading .preview_text_quote {
 	font-size: 10px;
 	font-style: italic;
@@ -174,30 +161,74 @@ div.element_editor {
 	@include rounded-corner;
 	background-color: #f0e8d7;
 	margin-bottom: 8px;
-}
 
-div.element_editor.not-draggable {
-	@include opacity(50);
-}
+	&.not-draggable {
+		@include opacity(50);
+	}
 
-div.element_editor.dirty {
-	border-color: #d0c83d;
-}
+	&.dirty {
+		border-color: #d0c83d;
 
-div.element_editor.dirty .element_head,
-div.element_editor.dirty .element_foot {
-	background-color: #fff8df;
-}
+		.element_head, .element_foot {
+			background-color: #fff8df;
+		}
+	}
+
+	&.selected {
+		border-color: #4b93db;
+		-moz-box-shadow: 0 0 3px #4b93db;
+		-webkit-box-shadow: 0 0 3px #4b93db;
+		box-shadow: 0 0 3px #4b93db;
+	}
+
+	div.error {
+		padding: 8px 4px 8px 32px;
+		margin-bottom: 8px;
+		margin-top: 8px;
+		@include rounded-corner;
+		background-color: #f1c9ca;
+		color: #931f23;
+		border-style: solid;
+		border-width: 1px;
+		position: relative;
+
+		span.icon {
+			position: absolute;
+			left: 8px;
+			top: 8px;
+		}
+	}
+
+	.validation_notice {
+		font-size: 10px;
+		margin-top: 1em;
+	}
+
+	.foot_note {
+		padding: $default-padding;
+		background-color: #fffdef;
+		@include rounded-corner;
+		margin-bottom: 1em;
+	}
+
+	p.content_editor_error {
+		border: 1px solid #f5b04e;
+		padding: 4px 8px;
+		line-height: 21px;
+		background-color: #f5dea9;
+		margin-top: 4px;
+		@include rounded-corner;
 
-div.element_editor.selected {
-	border-color: #4b93db;
-	-moz-box-shadow: 0 0 3px #4b93db;
-	-webkit-box-shadow: 0 0 3px #4b93db;
-	box-shadow: 0 0 3px #4b93db;
+		span.icon.warning {
+			position: relative;
+			top: 2px;
+			margin-right: 8px;
+		}
+	}
 }
 
 #alchemy .ui-dialog div.element_editor form {
-	margin: 4px 0 0;
+	margin: 0;
 	padding: 0 8px;
 	overflow: hidden;
 }
@@ -363,33 +394,6 @@ a.fold_element {
 	margin: 1px;
 }
 
-.content_editor select.essence_editor_select {
-	@include rounded-corner;
-	background: white;
-	border: 1px solid $button-border-color;
-	font-size:11px;
-	height:21px;
-	line-height:21px;
-	padding:2px;
-}
-
-.content_editor select.essence_editor_select optgroup {
-	color: gray;
-	font-style: normal;
-	font-weight: bold;
-	text-indent: 8px;
-}
-
-.content_editor select.essence_editor_select option {
-	padding-top: 2px;
-	padding-bottom: 2px;
-	color: black;
-}
-
-.content_editor select.essence_editor_select optgroup option {
-	text-indent: 24px;
-}
-
 .droppable_element_placeholder {
 	border: 1px dotted $button-border-color;
 	background-color: $medium-gray;
@@ -437,17 +441,6 @@ a.icon_button.linked {
 	cursor: default;
 }
 
-div.content_editor.essence_date {
-	float: none;
-	display: inline;
-	display: inline-block;
-	vertical-align: top;
-
-	input.date {
-		width: 154px;
-	}
-}
-
 div.essence_picture_editor {
 	float: left;
 	height: 126px;
@@ -455,14 +448,6 @@ div.essence_picture_editor {
 	position: relative;
 }
 
-div.essence_picture_editor.content_editor {
-	float: none;
-	height: auto;
-	display: inline;
-	display: inline-block;
-	margin: 8px 0;
-}
-
 div.essence_picture_editor .picture_tool_delete {
 	position: absolute;
 	right: 4px;
@@ -676,14 +661,6 @@ div.content_text_editor input.text_short {
 	width: 100%;
 }
 
-// div.element_content {
-// 	white-space: nowrap;
-
-// 	p, div {
-// 		white-space: normal;
-// 	}
-// }
-
 div.content_editor {
 	margin-bottom: 8px;
 	margin-top: 8px;
@@ -750,46 +727,66 @@ div.content_editor {
 			min-width: 90px;
 			margin-right: 4px;
 		}
+
+		a.icon_button.small {
+			display: none;
+		}
 	}
-}
 
-.element_editor div.error {
-	background-color: #f5dea9;
-	padding: 8px 4px 8px 32px;
-	margin-bottom: 8px;
-	margin-top: 8px;
-	@include rounded-corner;
-	border: 1px solid #f5b04e;
-	position: relative;
-}
+	&:hover label a.icon_button.small {
+		display: inline-block;
+	}
 
-.element_editor div.error span.icon.warning {
-	position: absolute;
-	top: 8px;
-	left: 8px;
-}
+	input.text_with_icon.auto_resize.thin_border {
+		padding-right: 52px;
+		width: 314px;
+	}
 
-.element_editor p.content_editor_error {
-	border: 1px solid #f5b04e;
-	padding: 4px 8px;
-	line-height: 21px;
-	background-color: #f5dea9;
-	margin-top: 4px;
-	@include rounded-corner;
-}
+	select.essence_editor_select {
+		@include rounded-corner;
+		background: white;
+		border: 1px solid $button-border-color;
+		font-size:11px;
+		height:21px;
+		line-height:21px;
+		padding:2px;
+
+		optgroup {
+			color: gray;
+			font-style: normal;
+			font-weight: bold;
+			text-indent: 8px;
+
+			option {
+				text-indent: 24px;
+			}
+		}
 
-p.content_editor_error span.icon.warning {
-	position: relative;
-	top: 2px;
-	margin-right: 8px;
-}
+		option {
+			padding-top: 2px;
+			padding-bottom: 2px;
+			color: black;
+		}
+	}
 
-div.content_editor label a.icon_button.small {
-	display: none;
-}
+	&.essence_date {
+		float: none;
+		display: inline;
+		display: inline-block;
+		vertical-align: top;
 
-div.content_editor:hover label a.icon_button.small {
-	display: inline-block;
+		input.date {
+			width: 154px;
+		}
+	}
+
+	&.essence_picture_editor {
+		float: none;
+		height: auto;
+		display: inline;
+		display: inline-block;
+		margin: 8px 0;
+	}
 }
 
 .o2k7Skin span.alchemy_link {
@@ -834,24 +831,6 @@ textarea.tinymce {
 	border-width: 1px;
 }
 
-div.element_editor div.error {
-	padding: 8px 4px 8px 32px;
-	margin-bottom: 8px;
-	margin-top: 8px;
-	@include rounded-corner;
-	background-color: #f1c9ca;
-	color: #931f23;
-	border-style: solid;
-	border-width: 1px;
-	position: relative;
-}
-
-div.element_editor div.error span.icon {
-	position: absolute;
-	left: 8px;
-	top: 8px;
-}
-
 .element_errors {
 	margin-top: 8px;
 	margin-bottom: 8px;
@@ -862,9 +841,9 @@ div.element_editor div.error span.icon {
 	color: #931f23;
 	border-style: solid;
 	border-width: 1px;
-}
 
-.element_errors p {
-	margin: 0;
-	line-height: 24px;
+	p {
+		margin: 0;
+		line-height: 24px;
+	}
 }

data/app/assets/stylesheets/alchemy/frame.css.scss

@@ -205,7 +205,7 @@ div#user_info {
 	span.page_status_and_name {
 		padding: 0 8px;
 		background-color: $medium-gray;
-		text-shadow: #fff 0 1px 2px;
+		text-shadow: 0px 1px 1px #FFFFFF;
 		@include disable-user-select;
 		cursor: default;
 		line-height: 20px;
@@ -216,12 +216,18 @@ div#user_info {
 		height: 22px;
 		margin-right: 1px;
 		
-		.flag {
+		.page_language {
 			float: none;
 			position: relative;
 			display: inline-block;
-			bottom: 1px;
-			margin-right: 3px;
+			bottom: 2px;
+			border: 1px solid #f0c8d1;
+			background-color: #f0c8d1;
+			color: #ac3d57;
+			@include rounded-corner;
+			margin-right: 2px;
+			padding: 2px 3px;
+			line-height: 11px;
 		}
 		
 		span.page_name {

data/app/assets/stylesheets/alchemy/tables.css.scss

@@ -35,6 +35,10 @@ td.input, td.submit, td.select {
 	padding-right: 0;
 }
 
+td.checkbox {
+	padding: 6px 4px;
+}
+
 td.value {
 	padding-left: 2*$default-padding;
 }

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -50,7 +50,7 @@ module Alchemy
 			def update
 				@attachment = Attachment.find(params[:id])
 				oldname = @attachment.name
-				if @attachment.update_attributes(params[:attachment])
+				if @attachment.update_attributes(params[:attachment], :as => current_user.role.to_sym)
 					flash[:notice] = t("File renamed successfully from: '%{from}' to '%{to}'", :from => oldname, :to => @attachment.name)
 				else
 					render :action => "edit"