alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,101 +1,103 @@
 /*
- *= require_self
+*= require_self
 */
 
 @import "alchemy/defaults";
 
 @mixin transition {
-	-webkit-transition: left 0.15s ease-in-out;
-	-moz-transition: left 0.15s ease-in-out;
-	-ms-transition: left 0.15s ease-in-out;
-	-o-transition: left 0.15s ease-in-out;
-	transition: left 0.15s ease-in-out;
+  -webkit-transition: left 0.15s ease-in-out;
+  -moz-transition: left 0.15s ease-in-out;
+  -ms-transition: left 0.15s ease-in-out;
+  -o-transition: left 0.15s ease-in-out;
+  transition: left 0.15s ease-in-out;
 }
 
 @mixin bounce {
-	-webkit-transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
-	-moz-transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
-	-ms-transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
-	-o-transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
-	transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
+  -webkit-transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
+  -moz-transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
+  -ms-transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
+  -o-transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
+  transition-timing-function: cubic-bezier(0, 0.5, .5, 1.3);
 }
 
 @mixin bottom-right-rounded-border {
-	$side: bottom-right;
-	$radius: 3px;
-	-webkit-border-#{$side}-radius: $radius;
-	-moz-border-radius-#{$side}: $radius;
-	-ms-border-#{$side}-radius: $radius;
-	-o-border-#{$side}-radius: $radius;
-	border-#{$side}-radius: $radius;
+  $side: bottom-right;
+  $radius: 3px;
+  -webkit-border-#{$side}-radius: $radius;
+  -moz-border-radius-#{$side}: $radius;
+  -ms-border-#{$side}-radius: $radius;
+  -o-border-#{$side}-radius: $radius;
+  border-#{$side}-radius: $radius;
 }
 
 @mixin box-shadow {
-	$shadow: 0px 0px 4px $dark-gray;
-	-webkit-box-shadow: $shadow;
-	-moz-box-shadow: $shadow;
-	-ms-box-shadow: $shadow;
-	-o-box-shadow: $shadow;
-	box-shadow: $shadow;
+  $shadow: 0px 0px 4px $dark-gray;
+  -webkit-box-shadow: $shadow;
+  -moz-box-shadow: $shadow;
+  -ms-box-shadow: $shadow;
+  -o-box-shadow: $shadow;
+  box-shadow: $shadow;
 }
 
 #alchemy_menubar {
-	position: fixed;
-	top: 0;
-	left: -319px;
-	width: 312px;
-	z-index: 10000;
-	background: $light-gray;
-	@include transition;
-	@include bounce;
-	@include bottom-right-rounded-border;
-	@include box-shadow;
-	border-right: $default-border;
-	border-bottom: $default-border;
-	line-height: 8*$default-padding;
-	height: 8*$default-padding;
-	padding: 4px 40px 4px 8px;
-	overflow: hidden;
-	&:hover {
-		left: 0;
-		@include transition;
-	};
-	&:after {
-		content: '';
-		width: 24px;
-		height: 24px;
-		position: absolute;
-		right: 10px;
-		top: 8px;
-		background: image-url('alchemy/icons.png') -240px 0;
-	};
-	ul {
-		padding: 0;
-		margin: 0;
-		height: 32px;
-		li {
-			height: 32px;
-			margin: 0 $default-padding 0 0;
-			padding: 5px 0 0 0;
-			display: inline;
-			display: inline-block;
-			list-style-type: none;
-			a {
-				@include button-styles;
-				display: block;
-				line-height: 16px;
-				text-align: center;
-				padding: 2px 4px;
-				width: 90px;
-				text-decoration: none;
-				outline: none;
-				&:hover {
-					@include button-hover-styles;
-				}
-				&:active {
-					outline: none;
-				}
-			}
-		}
-	}
+  position: fixed;
+  top: 0;
+  left: -319px;
+  width: 312px;
+  z-index: 10000;
+  background: $light-gray;
+  @include transition;
+  @include bounce;
+  @include bottom-right-rounded-border;
+  @include box-shadow;
+  border-right: $default-border;
+  border-bottom: $default-border;
+  line-height: 8*$default-padding;
+  height: 8*$default-padding;
+  padding: 4px 40px 4px 8px;
+  overflow: hidden;
+  &:hover {
+    left: 0;
+    @include transition;
+  }
+;
+  &:after {
+    content: '';
+    width: 24px;
+    height: 24px;
+    position: absolute;
+    right: 10px;
+    top: 8px;
+    background: image-url('alchemy/icons.png') -240px 0;
+  }
+;
+  ul {
+    padding: 0;
+    margin: 0;
+    height: 32px;
+    li {
+      height: 32px;
+      margin: 0 $default-padding 0 0;
+      padding: 5px 0 0 0;
+      display: inline;
+      display: inline-block;
+      list-style-type: none;
+      a {
+        @include button-styles;
+        display: block;
+        line-height: 16px;
+        text-align: center;
+        padding: 2px 4px;
+        width: 90px;
+        text-decoration: none;
+        outline: none;
+        &:hover {
+          @include button-hover-styles;
+        }
+        &:active {
+          outline: none;
+        }
+      }
+    }
+  }
 }

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

@@ -1,31 +1,31 @@
 @import "alchemy/defaults";
 
 span.icon.module {
-	width: 24px;
-	height: 24px;
-	margin-bottom: 4px;
+  width: 24px;
+  height: 24px;
+  margin-bottom: 4px;
 }
 
 span.module.dashboard {
-	background-position: -240px 0;
+  background-position: -240px 0;
 }
 
 span.module.pages {
-	background-position: -40px 0;
+  background-position: -40px 0;
 }
 
 span.module.users {
-	background-position: -80px 0;
+  background-position: -80px 0;
 }
 
 span.module.library {
-	background-position: -120px 0;
+  background-position: -120px 0;
 }
 
 span.module.languages {
-	background-position: -200px 0;
+  background-position: -200px 0;
 }
 
 span.module.exit {
-	background-position: -160px 0;
+  background-position: -160px 0;
 }

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

@@ -1,56 +1,56 @@
 @import "alchemy/defaults";
 
 div.pagination {
-	clear: both;
-	zoom: 1;
-	text-align: right;
-	line-height: 24px;
-	height: 24px;
-	width: 100%;
-	margin-top: 4*$default-padding;
-	
-	a, span, em {
-		font-size: 12px;
-		height: 25px;
-		line-height: 25px;
-		padding: $default-padding;
-	}
-	
-	a:hover {
-		color: #000;
-		text-shadow: none;
-		text-decoration: underline;
-	}
-	
-	.current {
-		@include button-styles;
-		background: $button-hover-bg-color;
-		color: $text-color;
-		border: 1px solid #888;
-		text-shadow: 0px 1px 1px #fff;
-		cursor: default;
-	}
-	
-	.previous_page {
-		margin-right: 2*$default-padding;
-	}
-	
-	.next_page {
-		margin-left: 2*$default-padding;
-	}
-	
-	.disabled {
-		color: #c0c0c0;
-	}
-	
-	span.gap {
-		border: none;
-		background: transparent;
-		cursor: default;
-	}
+  clear: both;
+  zoom: 1;
+  text-align: right;
+  line-height: 24px;
+  height: 24px;
+  width: 100%;
+  margin-top: 4*$default-padding;
+
+  a, span, em {
+    font-size: 12px;
+    height: 25px;
+    line-height: 25px;
+    padding: $default-padding;
+  }
+
+  a:hover {
+    color: #000;
+    text-shadow: none;
+    text-decoration: underline;
+  }
+
+  .current {
+    @include button-styles;
+    background: $button-hover-bg-color;
+    color: $text-color;
+    border: 1px solid #888;
+    text-shadow: 0px 1px 1px #fff;
+    cursor: default;
+  }
+
+  .previous_page {
+    margin-right: 2*$default-padding;
+  }
+
+  .next_page {
+    margin-left: 2*$default-padding;
+  }
+
+  .disabled {
+    color: #c0c0c0;
+  }
+
+  span.gap {
+    border: none;
+    background: transparent;
+    cursor: default;
+  }
 }
 
 #assign_image_list div.pagination {
-	margin-bottom: 8px;
-	text-align: center;
+  margin-bottom: 8px;
+  text-align: center;
 }

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

@@ -9,26 +9,26 @@ div#corner,
 div#flash_notices,
 div.pagination span,
 div.pagination a {
-	display: none;
+  display: none;
 }
 
 div#archive_all {
-	padding: 0;
+  padding: 0;
 }
 
 span.icon.true:before {
-	content: 'x';
+  content: 'x';
 }
 
 div.pagination {
-	text-align: right;
+  text-align: right;
 }
 
 div.pagination em.current {
-	border: none;
-	text-shadow: none;
+  border: none;
+  text-shadow: none;
 }
 
 div.pagination em:before {
-	content: 'Page ';
+  content: 'Page ';
 }

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

@@ -1,57 +1,54 @@
 @import "alchemy/defaults";
 
 div#bottom_panel {
-	position: fixed;
-	bottom: 0;
-	right: 0;
-	width: 100%;
-	z-index: 10;
-	background: $medium-gray image-url('alchemy/shading.png') repeat-x 0 0;
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  z-index: 10;
+  background: $medium-gray image-url('alchemy/shading.png') repeat-x 0 0;
 }
 
 div#bottom_panel div.info {
-	margin: 16px 16px 8px 81px;
-	width: 720px;
+  margin: 16px 16px 8px 81px;
+  width: 720px;
 }
 
 div#bottom_buttons {
-	padding: 0 16px 16px;
-	margin-left: 65px;
+  padding: 0 16px 16px;
+  margin-left: 65px;
 }
 
 .sitemap_pagename_link {
-	background-color: #FFFFFF;
-	color: black;
-	display: block;
-	padding-left: 4px;
-	text-decoration: none;
+  background-color: #FFFFFF;
+  color: black;
+  display: block;
+  padding-left: 4px;
+  text-decoration: none;
 }
 
 .sitemap_pagename_link.inactive {
-	color: #656565;
+  color: #656565;
 }
 
 .redirect_url {
-	position: absolute;
-	top: 4px;
-	right: 184px;
-	text-align: right;
-	background-color: #fff0c4;
-	line-height: 22px;
-	padding-right: 4px;
-	font-size: 10px;
-	padding-left: 4px;
-	max-width: 45%;
-	white-space: nowrap;
-	overflow: hidden;
+  position: absolute;
+  top: 4px;
+  right: 184px;
+  text-align: right;
+  background-color: #fff0c4;
+  line-height: 22px;
+  padding-right: 4px;
+  font-size: 10px;
+  padding-left: 4px;
 }
 
 .sitemap_pagename_link.odd {
-	background-color: #fff;
+  background-color: #fff;
 }
 
 a.sitemap_pagename_link:hover {
-	text-decoration: underline;
+  text-decoration: underline;
 }
 
 div#page_selector_container a.sitemap_pagename_link:hover {
@@ -59,13 +56,13 @@ div#page_selector_container a.sitemap_pagename_link:hover {
 }
 
 a.sitemap_pagename_link:hover:after {
-	content: '';
-	width: 16px;
-	height: 16px;
-	float: left;
-	margin-right: 4px;
-	background: image-url('alchemy/icons.png') -160px -168px;
-	margin-top: 4px;
+  content: '';
+  width: 16px;
+  height: 16px;
+  float: left;
+  margin-right: 4px;
+  background: image-url('alchemy/icons.png') -160px -168px;
+  margin-top: 4px;
 }
 
 div#page_selector_container a.sitemap_pagename_link:hover:after {
@@ -73,92 +70,109 @@ div#page_selector_container a.sitemap_pagename_link:hover:after {
 }
 
 .sitemap_line_spacer {
-	float: left;
-	width: 20px;
-	height: 28px;
-}
-
-ul#sitemap ul {
-	margin: 0;
-	padding: 0;
-	display: block;
+  float: left;
+  width: 20px;
+  height: 28px;
 }
 
-ul#sitemap li,
 ul#layoutpages li {
-	list-style-type: none;
-	display: block;
-	margin-left: 0;
-	margin-bottom: 0;
-	line-height: 22px;
-}
-
-ul#sitemap li {
-	padding-left: 0;
-	li {
-		padding-left: 22px;
-		padding-right: 0;
-	}
-}
-
-ul#layoutpages li {
-	padding: 0;
+  padding: 0;
 }
 
 div.sitemap_page {
-	height: 22px;
-	padding-bottom: 4px;
-	padding-top: 4px;
-	position: relative;
+  height: 22px;
+  padding-bottom: 4px;
+  padding-top: 4px;
+  position: relative;
 }
 
 div.sitemap_page:hover a.sitemap_pagename_link {
-	background-color: #fdffdf;
+  background-color: #fdffdf;
 }
 
 div.sitemap_left_images {
-	margin-top: 3px;
-	float: left;
-	margin-right: 8px;
-	background-color: $light-gray;
+  margin-top: 3px;
+  float: left;
+  margin-right: 8px;
+  background-color: $light-gray;
 }
 
-#sitemap a.page_folder {
-	background-image: image-url('alchemy/gui/toggle.png');
-	background-repeat: no-repeat;
-	height: 9px;
-	width: 9px;
-	font-size: 0;
-	float: left;
-	margin-left: -18px;
-	margin-top: 3px;
+div.sitemap_right_tools {
+  height: 22px;
+  background-color: $light-gray;
+  padding-left: 16px;
+  float: right;
+  width: 100px;
 }
 
-#sitemap a.page_folder.collapsed {
-	background-position: 0 0;
+div#page_selector_container div.sitemap_right_tools {
+  width: 24px;
 }
 
-#sitemap a.page_folder.folded {
-	background-position: -9px 0;
-}
+ul#sitemap {
 
-div.sitemap_right_tools {
-	height: 22px;
-	background-color: $light-gray;
-	padding-left: 16px;
-	float: right;
-	width: 100px;
+  li.legend {
+
+    span.right {
+      margin-right: 52px;
+
+      span.page_move {
+        display: inline-block;
+        width: 74px;
+        text-align: center;
+      }
+    }
+  }
+
+  a.page_folder {
+    background-image: image-url('alchemy/gui/toggle.png');
+    background-repeat: no-repeat;
+    height: 9px;
+    width: 9px;
+    font-size: 0;
+    float: left;
+    margin-left: -18px;
+    margin-top: 3px;
+
+    &.collapsed {
+      background-position: 0 0;
+    }
+
+    &.folded {
+      background-position: -9px 0;
+    }
+  }
+
+  ul {
+    margin: 0;
+    padding: 0;
+    display: block;
+  }
+
+  li {
+    padding-left: 0;
+
+    li {
+      padding-left: 22px;
+      padding-right: 0;
+    }
+  }
 }
 
-div#page_selector_container div.sitemap_right_tools {
-	width: 24px;
+ul#sitemap li,
+ul#layoutpages li {
+  list-style-type: none;
+  display: block;
+  margin-left: 0;
+  margin-bottom: 0;
+  line-height: 22px;
 }
 
 ul#sitemap li .sitemap_toolrow,
 ul.list li .sitemap_toolrow {
-	margin: 0;
-	overflow: auto;
-	padding: 4px 0;
+  margin: 0;
+  overflow: auto;
+  padding: 4px 0;
 }
 
 ul#sitemap .sitemap_sitename,
@@ -180,118 +194,135 @@ div.page_infos {
 }
 
 .page_status {
-	width: 16px;
-	height: 16px;
-	background-repeat: no-repeat;
-	float: left;
-	margin: 2px 2px 0 4px;
+  width: 16px;
+  height: 16px;
+  background-repeat: no-repeat;
+  float: left;
+  margin: 2px 2px 0 4px;
 }
 
 #sub_navigation span.page_status_and_name span.page_status {
-	float: none;
-	display: inline-block;
-	position: relative;
-	top: 1px;
-	margin-left: 2px;
+  float: none;
+  display: inline-block;
+  position: relative;
+  top: 1px;
+  margin-left: 2px;
 }
 
 span.page_status.restricted {
-	background: image-url('alchemy/icons.png') -258px -39px;
+  background: image-url('alchemy/icons.png') -258px -39px;
 }
 
 span.page_status.not_restricted {
-	background: image-url('alchemy/icons.png') -290px -39px;
-	@include opacity(30);
+  background: image-url('alchemy/icons.png') -290px -39px;
+  @include opacity(30);
 }
 
 span.page_status.visible {
-	background: image-url('alchemy/icons.png') -128px -39px;
+  background: image-url('alchemy/icons.png') -128px -39px;
 }
 
 span.page_status.not_visible {
-	background: image-url('alchemy/icons.png') -160px -39px;
-	@include opacity(30);
+  background: image-url('alchemy/icons.png') -160px -39px;
+  @include opacity(30);
 }
 
 span.page_status.public {
-	background: image-url('alchemy/icons.png') -192px -39px;
+  background: image-url('alchemy/icons.png') -192px -39px;
 }
 
 span.page_status.not_public {
-	background: image-url('alchemy/icons.png') -224px -39px;
-	@include opacity(30);
+  background: image-url('alchemy/icons.png') -224px -39px;
+  @include opacity(30);
 }
 
 .site_status {
-	float: left;
-	width: 16px;
-	height: 16px;
-	background: image-url('alchemy/icons.png') no-repeat 0 -40px;
+  float: left;
+  width: 16px;
+  height: 16px;
+  background: image-url('alchemy/icons.png') no-repeat 0 -40px;
 }
 
 .locked .site_status {
-	background-position: -32px -40px;
+  background-position: -32px -40px;
 }
 
 #sub_navigation span.page_status_and_name span.site_status {
-	float: none;
-	display: inline-block;
-	margin-right: 4px;
-	margin-left: 0;
-	margin-bottom: 0;
+  float: none;
+  display: inline-block;
+  margin-right: 4px;
+  margin-left: 0;
+  margin-bottom: 0;
 }
 
 #sitemap img.link_arrow {
-	float: right;
-	text-align: right;
+  float: right;
+  text-align: right;
 }
 
 ul#sitemap li img {
-	border-width: 0;
-	border-style: none;
-	float: left;
+  border-width: 0;
+  border-style: none;
+  float: left;
 }
 
 .sitemap_sitestatus {
-	float: right;
-	margin-top: 4px;
+  float: right;
+  margin-top: 4px;
 }
 
 a.folder_link {
-	text-decoration: none;
-	outline: none;
+  text-decoration: none;
+  outline: none;
 }
 
 .sitemap_sitetools {
-	padding: 0;
-	float: left;
-	width: 70px;
-	margin-left: 8px;
+  padding: 0;
+  float: left;
+  width: 70px;
+  margin-left: 8px;
 }
 
 .sitemap_right_tools a {
-	float: left;
-	width: 21px;
-	height: 21px;
+  float: left;
+  width: 21px;
+  height: 21px;
 }
 
 .sitemap_sitetools .icon.blank {
-	margin-left: 2px;
-	float: left;
-	margin-top: 3px;
-	margin-right: 3px;
+  margin-left: 2px;
+  float: left;
+  margin-top: 3px;
+  margin-right: 3px;
 }
 
 .sitemap_right_tools span.icon {
-	margin-top: 3px;
-	margin-left: 2px;
+  margin-top: 3px;
+  margin-left: 2px;
 }
 
 #create_language_tree_form {
-	width: 360px;
+  width: 360px;
+
+  &.ui-dialog-content div.info {
+    margin: 2*$default-padding;
+    margin-bottom: 0;
+  }
+}
+
+h2#sitemap_heading {
+  padding: 0;
+
+  span.page_infos {
+    margin-right: 144px;
+    width: 40px;
+    text-align: center;
+    float: right;
+    line-height: 28px;
+  }
 
-	&.ui-dialog-content div.info {
-		margin: 2*$default-padding;
-		margin-bottom: 0;
-	}
+  span.page_name {
+    line-height: 28px;
+    margin-left: 24px;
+  }
 }