alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/README.md

@@ -26,7 +26,7 @@ Features
 - RSS Feeds
 - Contactforms
 - Attachments and downloads
-- Powerfull image rendering
+- Powerful image rendering
 - Extendable
 - Integrates in exsiting Rails Apps
 - Caching

data/alchemy_cms.gemspec

@@ -32,7 +32,7 @@ POST_INSTALL
   s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths         = ["lib"]
 
-  s.add_runtime_dependency %q<rails>,                      ["~> 3.2.8"]
+  s.add_runtime_dependency %q<rails>,                      ["~> 3.2.11"]
   s.add_runtime_dependency %q<authlogic>,                  ["~> 3.1.3"]
   s.add_runtime_dependency %q<awesome_nested_set>,         ["~> 2.0"]
   s.add_runtime_dependency %q<acts-as-taggable-on>,        ["~> 2.1"]
@@ -54,7 +54,7 @@ POST_INSTALL
   s.add_development_dependency %q<bumpy>
   s.add_development_dependency %q<capybara>
   s.add_development_dependency %q<factory_girl_rails>
-  s.add_development_dependency %q<rspec-rails>
+  s.add_development_dependency %q<rspec-rails>,            ['2.12.0']
   s.add_development_dependency %q<sqlite3>
   s.add_development_dependency %q<yard>
   s.add_development_dependency %q<redcarpet>

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

@@ -141,30 +141,6 @@ if (typeof(Alchemy) === 'undefined') {
       }
     },
 
-    Tooltips: function() {
-      var xOffset = 10;
-      var yOffset = 20;
-      $(".tooltip").hover(function(e) {
-        this.original_title = this.title;
-        if (this.original_title == '') {
-          this.tooltip_content = $(this).next('.tooltip_content').html();
-        } else {
-          this.tooltip_content = this.original_title;
-        }
-        if (this.tooltip_content != null) {
-          this.title = "";
-          $("body").append("<div id='tooltip'>" + this.tooltip_content + "</div>");
-          $("#tooltip").css("top", (e.pageY - xOffset) + "px").css("left", (e.pageX + yOffset) + "px").fadeIn(400);
-        }
-      }, function() {
-        this.title = this.original_title;
-        $("#tooltip").remove();
-      });
-      $(".tooltip").mousemove(function(e) {
-        $("#tooltip").css("top", (e.pageY - xOffset) + "px").css("left", (e.pageX + yOffset) + "px");
-      });
-    },
-
     SelectBox: function(scope) {
       $('select.alchemy_selectbox', scope).selectBoxIt();
     },

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

@@ -20,14 +20,12 @@ if (typeof(Alchemy) === 'undefined') {
     },
 
     fade: function() {
-      $('#flash_notices div[class="flash notice"]').delay(5000).hide('drop', {
+      $('.flash.notice, .flash.warn', '#flash_notices').delay(5000).hide('drop', {
         direction: "up"
       }, 400, function() {
         $(this).remove();
       });
-      $('#flash_notices div[class!="flash notice"]').css({
-        cursor: 'pointer'
-      }).click(function() {
+      $('.flash.error', '#flash_notices').click(function() {
         $(this).hide('drop', {
           direction: "up"
         }, 400, function() {

data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee

@@ -3,7 +3,6 @@ window.Alchemy = {} if window.Alchemy == undefined
 Alchemy.GUI =
 
   init: ->
-    Alchemy.Tooltips()
     Alchemy.SelectBox()
     Alchemy.Datepicker()
     Alchemy.Buttons.observe()

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

@@ -14,7 +14,7 @@ if (typeof(Alchemy) === 'undefined') {
       $sortables.nestedSortable({
         disableNesting: 'no-nest',
         forcePlaceholderSize: true,
-        handle: 'span.handle',
+        handle: '.handle',
         items: 'li',
         listType: 'ul',
         opacity: 0.5,

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

@@ -456,26 +456,6 @@ div.all_rights {
   margin-top: 10px;
 }
 
-#tooltip {
-  border: 1px solid #0b5c84;
-  color: #333333;
-  position: absolute;
-  display: none;
-  padding: $default-padding;
-  font-size: 11px;
-  max-width: 200px;
-  @include rounded-corner;
-  -moz-box-shadow: 0 2px 8px $dark-gray;
-  -webkit-box-shadow: 0 2px 8px $dark-gray;
-  box-shadow: 0 2px 8px $dark-gray;
-  background-color: #eaf4f9;
-}
-
-#tooltip p,
-#tooltip h1 {
-  font-size: 11px;
-}
-
 .date_select_without_time #date_date_4i {
   display: none;
 }
@@ -558,6 +538,10 @@ div#toolbar_buttons_right {
 p.foot_note {
   font-size: 10px;
   line-height: 1.5em;
+  padding: $default-padding;
+  background-color: $light_yellow;
+  border: 1px solid $medium-gray;
+  @include rounded-corner;
 }
 
 #all_files td.name a {

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

@@ -199,9 +199,6 @@ div.element_editor {
   }
 
   .foot_note {
-    padding: $default-padding;
-    background-color: $light_yellow;
-    @include rounded-corner;
     margin-bottom: 1em;
   }
 
@@ -708,7 +705,21 @@ div.content_editor {
     }
   }
 
-  &.essence_select label { margin-bottom: 4px }
+  &.essence_select {
+
+    label { margin-bottom: 4px }
+
+    .selectboxit-container {
+      box-sizing: border-box;
+      width: 100%;
+    }
+
+    .selectboxit {
+      box-sizing: border-box;
+      width: 100% !important;
+      height: 100%;
+    }
+  }
 
   &:hover label a.icon_button.small {
     @include inline-block;
@@ -787,6 +798,8 @@ textarea.default_tinymce, textarea.custom_tinymce {
 
 .essence_html_editor textarea {
   font-family: $mono-font-face;
+  resize: vertical;
+  font-size: 11px;
 }
 
 .text_short_float_left {
@@ -818,35 +831,10 @@ a.hint {
   top: 8px;
   width: 16px;
   height: 16px;
+  cursor: help !important;
 
   &:hover span.bubble { display: block }
-
-  span.bubble {
-    display: none;
-    background: $light_yellow;
-    @include rounded-corner;
-    @include box-shadow(0 4px 24px $dark-gray);
-    position: absolute;
-    right: -25px;
-    top: 26px;
-    z-index: 100;
-    padding: 8px;
-    line-height: 1.5em;
-    min-width: 180px;
-    font-size: 12px;
-
-    &:before {
-      content: '';
-      position: absolute;
-      top: -8px;
-      right: 24px;
-      width: 0px;
-      height: 0px;
-      border-style: solid;
-      border-width: 0 8px 8px 8px;
-      border-color: transparent transparent $light_yellow transparent;
-    }
-  }
+  span.bubble { @include tooltip }
 }
 
 .content_editor .hint {

data/app/assets/stylesheets/alchemy/flash.scss

@@ -34,6 +34,17 @@ div.flash {
     border-color: $error_border_color;
     color: $error_text_color;
     background-color: $error_background_color;
+    cursor: pointer;
+
+    &:after {
+      content: '';
+      position: absolute;
+      right: 2*$default-padding;
+      top: 2*$default-padding;
+      width: 16px;
+      height: 16px;
+      background: url(ui-icons_666666_256x240.png) -96px -128px no-repeat;
+    }
   }
 
   &.info {

data/app/assets/stylesheets/alchemy/form_elements.scss

@@ -248,10 +248,6 @@ textarea, input[type="text"], input[type="email"], input[type="password"], .thin
   width: 139px;
 }
 
-#alchemy .ui-dialog-content input.long, #alchemy .ui-dialog-content textarea.long {
-  width: 250px;
-}
-
 #alchemy .ui-dialog-content input.very_long {
   width: 310px;
 }
@@ -324,10 +320,9 @@ select {
  */
 
 form td.select .selectboxit {
-  width: 208px;
 
   .selectboxit-text {
-    max-width: 180px !important;
+    line-height: 17px !important;
   }
 }
 
@@ -391,14 +386,6 @@ form td.select .selectboxit {
       }
     }
 
-    &.full_width {
-      width: 426px;
-
-      .selectboxit-text {
-        max-width: 396px !important;
-      }
-    }
-
     &.tiny {
       padding: 2px 2px 2px 8px;
       height: 14px;
@@ -434,6 +421,7 @@ form td.select .selectboxit {
       @include disable-user-select;
       @include text-overflow(ellipsis);
       padding-right: 32px;
+      line-height: normal !important;
     }
 
     /* Dropdown List Down Arrow Container (if an image is not used) */

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

@@ -95,6 +95,7 @@
       list-style-type: none;
 
       a {
+        line-height: 14px;
         @include default-button-style;
         font-weight: normal;
         text-decoration: none !important;

data/app/assets/stylesheets/alchemy/mixins.scss

@@ -42,7 +42,11 @@
   border: $border;
   @include box-shadow(0 0 6px $blue, inset 0 0 4px $light-blue);
   outline: none;
-  @include transition(all 0.25s ease-in-out);
+  @include transition(
+    box-shadow 0.25s ease-in-out,
+    background-color 0.25s ease-in-out,
+    border 0.25s ease-in-out
+  );
 
   &::-moz-focus-inner {
     border: none !important;
@@ -74,7 +78,11 @@
   font-size: 12px;
   line-height: 12px;
   height: 29px;
-  @include transition(all 0.25s ease-in-out);
+    @include transition(
+    box-shadow 0.25s ease-in-out,
+    background-color 0.25s ease-in-out,
+    border 0.25s ease-in-out
+  );
 
   &:focus {
     @include default-focus-style;
@@ -89,3 +97,30 @@
   -ms-text-overflow: $prop;
   -moz-text-overflow: $prop;
 }
+
+@mixin tooltip {
+  display: none;
+  background: $light_yellow;
+  @include rounded-corner;
+  @include box-shadow(0 4px 24px $dark-gray);
+  position: absolute;
+  right: -25px;
+  top: 26px;
+  z-index: 100;
+  padding: 8px;
+  line-height: 1.5em;
+  min-width: 180px;
+  font-size: 12px;
+
+  &:before {
+    content: '';
+    position: absolute;
+    top: -8px;
+    right: 24px;
+    width: 0px;
+    height: 0px;
+    border-style: solid;
+    border-width: 0 8px 8px 8px;
+    border-color: transparent transparent $light_yellow transparent;
+  }
+}

data/app/assets/stylesheets/alchemy/notices.scss

@@ -6,6 +6,7 @@
   @include rounded-corner;
   position: relative;
   margin-bottom: 8px;
+  text-align: left;
 
   h2 { margin-top: 0 }
 

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

@@ -269,12 +269,42 @@ span.page_status {
   width: 16px;
   height: 16px;
   background: url('icons.png') no-repeat 0 -40px;
+  position: relative;
+  cursor: help;
 }
 
 .locked .site_status {
   background-position: -32px -40px;
 }
 
+.tooltip {
+  @include tooltip;
+  right: auto;
+  left: -12px;
+  top: 24px;
+  min-width: 240px;
+
+  &:before {
+    right: auto;
+    left: 12px;
+  }
+
+  p, h3 {
+    font-size: 11px;
+    margin: 0;
+    padding: 0;
+  }
+
+  h3 { margin-top: 0.5em }
+}
+
+#sitemap.sorting {
+  .site_status { cursor: move }
+  .tooltip { display: none }
+}
+
+.site_status:hover .tooltip { display: block }
+
 #sub_navigation span.page_status_and_name span.site_status {
   float: none;
   @include inline-block;

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

@@ -33,26 +33,36 @@ table tr td.tools {
 td.label, td.input, td.submit, td.select, td.value, td.note {
   padding: 2px 0;
   vertical-align: top;
+
+  input[type="text"], input[type="email"], input[type="password"], textarea {
+    width: 100%;
+  }
 }
 
-td.input, td.submit, td.select, td.value {
-  text-align: right;
+td.select {
 
-  &.left {
-    text-align: left;
+  .selectboxit-container {
+    box-sizing: border-box;
+    width: 100%;
+  }
+
+  .selectboxit {
+    box-sizing: border-box;
+    width: 100% !important;
+    height: 100%;
   }
 }
 
+td.submit { text-align: right }
+
 td.input {
-  .autocomplete_tag_list { float: right }
+  .autocomplete_tag_list { width: 100% }
 }
 
-td.submit p.foot_note { float: left; padding-top: 1em }
-
 td.label {
   white-space: nowrap;
-  width: 80px;
-  padding: 9px 2*$default-padding 0 0;
+  width: 60px;
+  padding: 9px 4*$default-padding 0 0;
   line-height: 21px;
 
   &.mandatory:after {
@@ -74,25 +84,8 @@ td.label {
 
 td.checkbox {
   padding-top: 10px;
-  text-align: right;
+  padding-left: 0;
   white-space: nowrap;
-
-  label {
-    @include inline-block;
-    text-align: left;
-    width: 195px;
-  }
-
-  &.long {
-    label {
-      width: 226px;
-    }
-  }
-
-  input[type="checkbox"] {
-    vertical-align: middle;
-    margin-top: 4px;
-  }
 }
 
 td.value {