alchemy_cms 2.4.rc2 → 2.4.rc4

data/.gitignore

@@ -19,4 +19,5 @@ spec/dummy/db/test.sqlite3-journal
 spec/dummy/db/seeds.rb
 .rvmrc
 spec/dummy/config/locales/**/*
-/coverage/
+/coverage/
+*.gem

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
 branches:
   only:
@@ -10,7 +9,11 @@ before_script:
   - "export PATH=phantomjs/bin:$PATH"
   - phantomjs --version
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:schema:load --trace'"
-script: "bundle exec rspec spec"
+script: "bundle exec rspec spec $SPEC_FLAGS"
 env:
-  - DB=mysql
-  - DB=postgresql
+  - DB=mysql SPEC_FLAGS="-t ~type:request"
+  - DB=postgresql SPEC_FLAGS="-t ~type:request"
+  - DB=mysql SPEC_FLAGS="-t type:request"
+matrix:
+  allow_failures:
+    - env: DB=mysql SPEC_FLAGS="-t type:request"

data/README.md

@@ -126,6 +126,7 @@ Authors
 * Thomas von Deyen: <https://github.com/tvdeyen>
 * Robin Böning: <https://github.com/robinboening>
 * Marc Schettke: <https://github.com/masche842>
+* Hendrik Mans: <https://github.com/hmans>
 * Carsten Fregin: <https://github.com/cfregin>
 
 License

data/alchemy_cms.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name                  = "alchemy_cms"
   s.version               = Alchemy::VERSION
   s.platform              = Gem::Platform::RUBY
-  s.authors               = ["Thomas von Deyen", "Robin Boening", "Marc Schettke", "Carsten Fregin"]
+  s.authors               = ["Thomas von Deyen", "Robin Boening", "Marc Schettke", "Hendrik Mans", "Carsten Fregin"]
   s.email                 = ["alchemy@magiclabs.de"]
   s.homepage              = "http://alchemy-cms.com"
   s.summary               = %q{An extremly flexbile CMS for Rails 3.2}
@@ -14,6 +14,24 @@ Gem::Specification.new do |s|
   s.requirements         << 'ImageMagick (libmagick), v6.6 or greater.'
   s.required_ruby_version = '~> 1.9.2'
   s.license               = 'BSD New'
+  s.post_install_message  = <<-POST_INSTALL
+
+_______.-=` Alchemy CMS Post Install Message ´=-._______
+
+
+ If you are installing Alchemy the first time
+ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+  $ bundle exec rake alchemy:install
+
+
+ If you are upgrading an existing Alchemy installation
+ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+  $ bundle exec rake alchemy:upgrade
+
+
+♥ ♥ ♥ ♥ ♥ ♥ ♥ Thanks for using Alchemy CMS ♥ ♥ ♥ ♥ ♥ ♥ ♥
+
+POST_INSTALL
 
   s.files                 = `git ls-files`.split("\n")
   s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")

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

@@ -6,8 +6,11 @@ if (typeof(Alchemy) === 'undefined') {
 
   $.extend(Alchemy, {
 
-    SortableElements: function(page_id, form_token) {
-      $('#element_area .sortable_cell').sortable({
+    SortableElements: function(page_id, form_token, selector) {
+      if (typeof(selector) === 'undefined') {
+        selector = '#element_area .sortable_cell';
+      }
+      $(selector).sortable({
         items: 'div.element_editor',
         handle: '.element_handle',
         axis: 'y',

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

@@ -199,7 +199,7 @@
       $(element).next().addClass('linked').removeClass('disabled')
 
     validateURLFormat: (url) ->
-      if url.match(/^(\/|[a-z]+:\/\/)/)
+      if url.match(/^(mailto:|\/|[a-z]+:\/\/)/)
         return true
       else
         return false

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

@@ -34,9 +34,10 @@ if (typeof(Alchemy) === 'undefined') {
           create: function() {
             var $spinner = $('<img src="/assets/alchemy/ajax_loader.gif" alt="" id="preview_load_info" />');
             var $reload = $('<a href="#" class="ui-dialog-titlebar-refresh ui-corner-all" role="button"></a>');
-            $('#ui-dialog-title-alchemyPreviewWindow').after($spinner);
+            var titlebar = $('#alchemyPreviewWindow').prev();
             $reload.append('<span class="ui-icon ui-icon-refresh">reload</span>');
-            $('#ui-dialog-title-alchemyPreviewWindow').after($reload);
+            titlebar.append($reload);
+            titlebar.append($spinner);
             $reload.click(Alchemy.reloadPreview);
           },
           close: function(event, ui) {
@@ -47,28 +48,10 @@ if (typeof(Alchemy) === 'undefined') {
               width: '100%'
             });
             Alchemy.PreviewWindow.button.disable();
-            Alchemy.previewWindowFrameWidth = $('#alchemyPreviewWindow').width();
           }
         }).dialogExtend({
           "maximize": true,
-          "dblclick": "maximize",
-          "events": {
-            beforeMaximize: function(evt, dlg) {
-              Alchemy.previewWindowPosition = $('#alchemyPreviewWindow').dialog('widget').offset();
-              Alchemy.previewWindowFrameWidth = $('#alchemyPreviewWindow').width();
-            },
-            maximize: function(evt, dlg) {
-              $('#alchemyPreviewWindow').css({
-                width: "100%"
-              });
-            },
-            restore: function(evt, dlg) {
-              $('#alchemyPreviewWindow').dialog('widget').css(Alchemy.previewWindowPosition);
-              $('#alchemyPreviewWindow').css({
-                width: Alchemy.previewWindowFrameWidth
-              });
-            }
-          }
+          "dblclick": "maximize"
         });
       } else {
         $('#alchemyPreviewWindow').dialog('open');

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

@@ -99,7 +99,6 @@ if (typeof(Alchemy) === 'undefined') {
         okLabel: okLabel,
         cancelLabel: cancelLabel,
         okCallback: function() {
-          $(this).dialog("close");
           Alchemy.pleaseWaitOverlay();
           $.ajax({
             url: url,

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

@@ -1082,3 +1082,7 @@ div#overlay_toolbar a.button:active {
 div.browse {
   margin-bottom: 1em;
 }
+
+#alchemyPreviewWindow {
+  width: 100% !important;
+}

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

@@ -207,10 +207,10 @@ div.element_editor {
   .autocomplete_tag_list {
     background-color: #e5dcca;
     margin: 0 -8px 1px -8px;
-    padding: 2 * $default-padding;
+    padding: 2*$default-padding;
 
     label {
-      top: 17px;
+      top: 18px;
       left: 14px;
     }
 
@@ -271,7 +271,7 @@ form.add_gallery_to_index {
 
 div.picture_gallery_images {
   overflow: hidden;
-  margin-bottom: 8px;
+  margin: $default-margin 0;
   border: 1px inset #cecece;
   @include rounded-corner;
   background-color: #e5dcca;
@@ -279,6 +279,10 @@ div.picture_gallery_images {
 
   .essence_picture_editor {
     margin: 1px;
+    float: left;
+    height: 126px;
+
+    .picture_thumbnail { margin: 0 }
   }
 }
 
@@ -317,7 +321,7 @@ div#element_area .sortable_cell {
 span.linkable_essence_tools {
   position: absolute;
   bottom: 0;
-  right: 2px;
+  right: 0;
 
   a.icon_button {
     margin: 0 0 0 4px;
@@ -405,27 +409,40 @@ div.content_editor.essence_date {
 }
 
 div.essence_picture_editor {
-  float: left;
-  height: 126px;
-  margin: 1px;
   position: relative;
-}
 
-div.essence_picture_editor .picture_tool_delete {
-  position: absolute;
-  right: 4px;
-  top: 4px;
-  padding: 2px 2px 0;
-  z-index: 2;
-}
+  .picture_tool_delete {
+    position: absolute;
+    right: $default-margin;
+    top: $default-margin;
+    padding: 2px 2px 0;
+    z-index: 2;
+  }
 
-div.essence_picture_editor.validation_failed .picture_thumbnail {
-  border-color: #931f23;
-  -webkit-box-shadow: #931f23 0px 1px 3px;
-  -moz-box-shadow: #931f23 0px 1px 3px;
-  -ms-box-shadow: #931f23 0px 1px 3px;
-  -o-box-shadow: #931f23 0px 1px 3px;
-  box-shadow: #931f23 0px 1px 3px;
+  .picture_thumbnail:hover .picture_tool_delete {
+    display: block;
+  }
+
+  .picture_thumbnail {
+    width: 111px;
+    height: 115px;
+    margin: $default-margin 0;
+
+    .thumbnail_background {
+      width: 111px;
+      height: 93px;
+    }
+  }
+
+  &.validation_failed .picture_thumbnail {
+    border-color: $error_border_color
+  }
+
+  .thumbnail_background.missing {
+    background-image: url('placeholder.png');
+    background-repeat: no-repeat;
+    background-position: center 12px;
+  }
 }
 
 div.essence_picture_css_class {
@@ -442,16 +459,6 @@ div.essence_picture_css_class {
   overflow: hidden;
 }
 
-div.essence_picture_editor .picture_thumbnail:hover .picture_tool_delete {
-  display: block;
-}
-
-div.essence_picture_editor .thumbnail_background.missing {
-  background-image: url('placeholder.png');
-  background-repeat: no-repeat;
-  background-position: center 12px;
-}
-
 .dragable_picture {
   float: left;
 }
@@ -487,17 +494,6 @@ div.essence_picture_editor .thumbnail_background.missing {
   }
 }
 
-.essence_picture_editor .picture_thumbnail {
-  width: 111px;
-  height: 115px;
-  margin: 0;
-}
-
-.essence_picture_editor .picture_thumbnail .thumbnail_background {
-  width: 111px;
-  height: 93px;
-}
-
 div.file {
   padding: 0;
   margin-top: 8px;
@@ -578,6 +574,11 @@ a.new_content_link {
   margin-top: 4px !important;
 }
 
+div.tinymce_container {
+  position: relative;
+  margin: $default-margin 0;
+}
+
 div.essence_richtext_loader {
   position: absolute;
   top: 0;
@@ -587,12 +588,12 @@ div.essence_richtext_loader {
   height: 100%;
   background-color: #F0E8D7;
   @include opacity(0.9);
-}
 
-div.essence_richtext_loader img {
-  position: absolute;
-  top: 46%;
-  left: 46%;
+  img {
+    position: absolute;
+    top: 46%;
+    left: 46%;
+  }
 }
 
 div.content_text_editor.text_short {
@@ -659,19 +660,16 @@ div.content_editor {
 
   &.validation_failed {
 
-    label {
-      color: #931f23;
-    }
-
-    input {
-      border: 1px solid #931f23;
-      background-color: #f9e8e9;
+    label { color: $error_text_color }
+    input { @include field_with_error }
+    .tinymce_container {
+      outline: 1px solid $error_border_color;
     }
   }
 
   label {
     display: block;
-    margin-bottom: 0.5em;
+    margin-bottom: 2px;
     font-size: 10px;
     text-shadow: #fff5e1 1px 1px 0;
     line-height: 15px;
@@ -707,6 +705,8 @@ div.content_editor {
     }
   }
 
+  &.essence_select label { margin-bottom: 4px }
+
   &:hover label a.icon_button.small {
     @include inline-block;
   }
@@ -797,13 +797,12 @@ textarea.default_tinymce, textarea.custom_tinymce {
 .element_errors {
   margin-top: 8px;
   margin-bottom: 8px;
-  background-color: #f1c9ca;
+  background-color: $error_background_color;
   padding: 2*$default-padding;
   list-style-type: none;
   @include rounded-corner;
-  color: #931f23;
-  border-style: solid;
-  border-width: 1px;
+  color: $error_text_color;
+  border: 1px solid $error_border_color;
 
   p {
     margin: 0;

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

@@ -31,9 +31,9 @@ div.flash {
   }
 
   &.error {
-    border-color: #c49c9c;
-    color: #592e2e;
-    background-color: #efd3d3;
+    border-color: $error_border_color;
+    color: $error_text_color;
+    background-color: $error_background_color;
   }
 
   &.info {

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

@@ -402,14 +402,23 @@ form td.select .selectboxit {
     &.tiny {
       padding: 2px 2px 2px 8px;
       height: 14px;
+      background-position: left 1px;
 
       .selectboxit-text {
         padding-right: 24px;
         font-size: 10px;
-        line-height: 14px;
+        line-height: 1.5 !important;
       }
 
-      .selectboxit-arrow-container { width: 16px }
+      .selectboxit-arrow-container {
+        width: 16px;
+        top: 8px;
+        height: 14px !important;
+      }
+
+      .selectboxit-arrow {
+        margin-top: 0 !important;
+      }
     }
 
     &:focus {
@@ -453,6 +462,8 @@ form td.select .selectboxit {
       display: block;
       background: url('ui-icons_666666_256x240.png') -127px -17px no-repeat;
     }
+
+    &.with_error { border-color: $error_border_color }
   }
 
   /* Dropdown List Options List*/
@@ -526,3 +537,5 @@ form td.select .selectboxit {
     padding-left: 24px;
   }
 }
+
+label.with_error { color: $error_text_color }

data/app/assets/stylesheets/alchemy/jquery-ui.scss

@@ -1491,7 +1491,7 @@ button.ui-button::-moz-focus-inner {
 
 #alchemy .ui-dialog .ui-dialog-titlebar-refresh {
   position: absolute;
-  right: 50px;
+  right: 48px;
   top: 50%;
   width: 19px;
   margin: -10px 0 0 0;
@@ -1501,7 +1501,7 @@ button.ui-button::-moz-focus-inner {
 
 #alchemy .ui-dialog .ui-dialog-titlebar-maximize,
 #alchemy .ui-dialog .ui-dialog-titlebar-restore {
-  margin-right: 12px;
+  margin-right: 0;
 }
 
 #alchemy .ui-dialog .ui-dialog-titlebar-close span {
@@ -1675,8 +1675,16 @@ button.ui-button::-moz-focus-inner {
   @include border-bottom-radius(0);
   padding: 0;
   white-space: nowrap;
-  background-color: #e5e5e5;
+  background-color: $medium-gray;
   font-weight: normal;
+
+  &.ui-tabs-active {
+    background-color: $light-gray;
+    margin-bottom: 0px;
+    height: 27px;
+
+    a { cursor: default }
+  }
 }
 
 #alchemy .ui-tabs .ui-tabs-nav li a {