alchemy_cms 2.3.2 → 2.4.beta2

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

@@ -74,7 +74,7 @@ if (typeof(Alchemy) === 'undefined') {
           text: options.cancelLabel,
           click: function() {
             $(this).dialog("close");
-            Alchemy.enableButton('.disabled.button');
+            Alchemy.Buttons.enable();
           }
         }, {
           text: options.okLabel,
@@ -84,7 +84,7 @@ if (typeof(Alchemy) === 'undefined') {
           }
         }],
         open: function() {
-          Alchemy.ButtonObserver('#alchemyConfirmation .button');
+          Alchemy.Buttons.observe('#alchemyConfirmation');
         },
         close: function() {
           $('#alchemyConfirmation').remove();
@@ -153,14 +153,14 @@ if (typeof(Alchemy) === 'undefined') {
               }
               Alchemy.SelectBox('#alchemyOverlay');
               Alchemy.Datepicker('#alchemyOverlay input.date, #alchemyOverlay input[type="date"]');
-              Alchemy.ButtonObserver('#alchemyOverlay .button');
+              Alchemy.Buttons.observe('#alchemyOverlay');
               Alchemy.overlayObserver('#alchemyOverlay');
             },
             error: function(XMLHttpRequest, textStatus, errorThrown) {
               Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
             },
             complete: function(jqXHR, textStatus) {
-              Alchemy.enableButton('.disabled.button');
+              Alchemy.Buttons.enable();
             }
           });
         },

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

@@ -70,7 +70,6 @@ $default-form-field-margin: 0.3em 0;
 
 @mixin default-button-style {
   @include sassy-button('shiny');
-  display: inline;
   border-color: $button-border-color;
   margin: $default-form-field-margin;
 }

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

@@ -4,6 +4,7 @@
 *= require alchemy/archive
 *= require alchemy/dashboard
 *= require alchemy/elements
+*= require alchemy/errors
 *= require alchemy/flash
 *= require alchemy/form_elements
 *= require alchemy/frame
@@ -15,6 +16,6 @@
 *= require alchemy/tables
 *= require alchemy/upload
 *= require alchemy/jquery-ui.alchemy
-*= require alchemy/jquery.Jcrop
+*= require jquery.Jcrop.min
 *= require alchemy/custom
 */

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

@@ -646,39 +646,11 @@ div#toolbar_buttons_right {
   margin-left: 8px;
 }
 
-#errorExplanation {
-  background: #ffdfdf;
-  padding: 2*$default-padding;
-  text-align: left;
-  margin-bottom: 8px;
-  border: 1px solid #d08f91;
-  color: #690001;
-  @include rounded-corner;
-
-  &.ajax_status_code_0 {
-    border-color: #c4c19c;
-    color: #726d23;
-    background-color: #f3f0c1;
-  }
-}
-
-#errorExplanation h2 {
-  font-size: 1.2em;
-}
-
-div.field_with_errors {
-  display: inline;
-}
-
 p.foot_note {
   font-size: 10px;
   line-height: 1.5em;
 }
 
-#errorExplanation ul {
-  padding: 0 0 0 16px;
-}
-
 #all_files td.name a {
   cursor: -webkit-zoom-in;
   cursor: -moz-zoom-in;
@@ -727,31 +699,6 @@ textarea#essence_picture_caption {
   @include rounded-corner;
 }
 
-div#errors {
-  margin-bottom: 8px;
-  padding: 8px 8px 4px 28px;
-  border-width: 1px;
-  border-style: solid;
-  @include rounded-corner;
-  border-color: #c49c9c;
-  color: #592e2e;
-  background-color: #efd3d3;
-}
-
-#overlay_tabs div#errors {
-  margin: 8px 8px 0;
-}
-
-#errors ul li {
-  margin-bottom: 0.5em;
-}
-
-#errors ul {
-  margin: 0;
-  padding: 0;
-  list-style-type: decimal;
-}
-
 #alchemyConfirmation .alchemy_window_buttons {
   display: block;
   text-align: right;
@@ -1073,10 +1020,11 @@ select#url_protocol.medium {
 
 #alchemy .ui-dialog-content p.buttons {
   text-align: right;
-  line-height: 32px;
+  margin: 0;
 
   label {
     float: left;
+    line-height: 36px;
   }
 }
 

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

@@ -180,7 +180,7 @@ div.element_editor {
     box-shadow: 0 0 3px #4b93db;
   }
 
-  div.error {
+  div.error, div.warning {
     padding: 8px 4px 8px 32px;
     margin-bottom: 8px;
     margin-top: 8px;
@@ -198,6 +198,11 @@ div.element_editor {
     }
   }
 
+  div.warning {
+    background-color: #f7efb8;
+    color: #756f47;
+  }
+
   .validation_notice {
     font-size: 10px;
     margin-top: 1em;
@@ -582,10 +587,8 @@ table.content_editor_table {
 
 a.new_content_link {
   float: none;
-  @include inline-block;
-  margin-bottom: 8px;
-  margin-top: 4px;
-  line-height: 4em;
+  margin-bottom: 8px !important;
+  margin-top: 4px !important;
 }
 
 div.essence_richtext_loader {

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

@@ -0,0 +1,51 @@
+@import "alchemy/defaults";
+
+#errorExplanation {
+  background: #ffdfdf;
+  padding: 2*$default-padding;
+  text-align: left;
+  margin-bottom: 8px;
+  border: 1px solid #d08f91;
+  color: #690001;
+  @include rounded-corner;
+
+  &.ajax_status_code_0 {
+    border-color: #c4c19c;
+    color: #726d23;
+    background-color: #f3f0c1;
+  }
+
+  h2 {
+    font-size: 1.2em;
+  }
+
+  ul {
+    padding: 0 0 0 16px;
+  }
+}
+
+div.field_with_errors {
+  display: inline;
+}
+
+div#errors, div.errors {
+  margin-bottom: 8px;
+  padding: 8px 8px 4px 28px;
+  border-width: 1px;
+  border-style: solid;
+  @include rounded-corner;
+  border-color: #c49c9c;
+  color: #592e2e;
+  background-color: #efd3d3;
+  display: none;
+
+  ul {
+    margin: 0;
+    padding: 0;
+    list-style-type: decimal;
+  }
+
+  ul li {
+    margin-bottom: 0.5em;
+  }
+}

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

@@ -1,7 +1,5 @@
 @import "alchemy/defaults";
 
-/* @group Flash Notices */
-
 div#flash_notices {
   position: fixed;
   right: 0;

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

@@ -35,24 +35,15 @@ button, input[type="submit"], a.button, input.button {
     }
   }
 
-  &.cloned-button, &.cloned-button:hover, &.cloned-button:active {
-    display: inline-block;
-    padding: 0;
-    color: $text-color;
-    text-shadow: none;
-    @include box-shadow(none);
-    cursor: default;
-    background-image: none;
-    text-align: center;
-
-    img {
-      vertical-align: middle;
-    }
-  }
-
   &:focus {
     @include default-focus-style;
   }
+
+  &.disabled {
+    line-height: 13px;
+    padding-top: 5px;
+    padding-bottom: 4px;
+  }
 }
 
 .icon_button {
@@ -160,46 +151,6 @@ button.icon_button {
   height: 29px;
 }
 
-// a.button {
-//   padding: 5px 8px;
-//   text-decoration: none;
-//   float: left;
-//   line-height: 13px;
-
-//   &.small {
-//     height: 14px;
-//     padding-top: 2px;
-//     padding-bottom: 2px;
-//     border-radius: 10px;
-//     -o-border-radius: 10px;
-//     -ms-border-radius: 10px;
-//     -moz-border-radius: 10px;
-//     -webkit-border-radius: 10px;
-
-//     &.cloned-button img {
-//       @include inline-block;
-//       float: none;
-//       position: relative;
-//       height: 16px;
-//       width: 16px;
-//       top: -1px;
-//     }
-
-//     &.with_icon span.icon {
-//       margin-top: -5px;
-//       position: relative;
-//       top: 3px;
-//       left: -1px;
-//     }
-//   }
-
-//   span.icon {
-//     vertical-align: -2px;
-//     margin-bottom: -2px;
-//     margin-left: -4px;
-//   }
-// }
-
 #new_element button.button {
   float: right;
 }
@@ -368,6 +319,8 @@ div.selectboxit-container {
   text-align: left;
   top: -2px;
 
+  a { text-decoration: none }
+
   div.selectboxit {
     @include default-button-style;
     width: auto;
@@ -395,10 +348,10 @@ div.selectboxit-container {
     }
 
     &.long {
-      width: 240px;
+      width: 230px;
 
       .selectboxit-text {
-        max-width: 220px !important;
+        max-width: 210px !important;
       }
     }
 
@@ -427,6 +380,8 @@ div.selectboxit-container {
         font-size: 10px;
         line-height: 14px;
       }
+
+      .selectboxit-arrow-container { width: 16px }
     }
 
     &:focus {
@@ -434,7 +389,7 @@ div.selectboxit-container {
     }
 
     /* Dropdown List Box Text */
-    span.selectboxit-text {
+    .selectboxit-text {
       font: $default-font-style;
       overflow: hidden;
       float: left;
@@ -445,29 +400,30 @@ div.selectboxit-container {
     }
 
     /* Dropdown List Down Arrow Container (if an image is not used) */
-    span.selectboxit-arrow-container {
+    .selectboxit-arrow-container {
       /* Positions the down arrow */
-      width: 16px;
+      width: 24px;
       padding: 0 0.25em 0 0;
       margin-left: 0.5em;
       position: absolute;
       right: 0;
-      top: 7px;
+      top: 3px;
       border-left: 1px solid darken($medium-gray, 10%);
-      height: auto !important;
-
-      /* Dropdown List Down Arrow */
-      span.selectboxit-arrow {
-        /* Horizontally centers the down arrow */
-        margin-right: auto;
-        margin-left: auto;
-        width: 16px;
-        height: 15px;
-        text-indent: -99999px;
-        overflow: hidden;
-        display: block;
-        background: url('ui-icons_666666_256x240.png') -127px -17px no-repeat;
-      }
+      height: 23px !important;
+    }
+
+    /* Dropdown List Down Arrow */
+    .selectboxit-arrow {
+      /* Horizontally centers the down arrow */
+      margin-right: auto;
+      margin-left: auto;
+      margin-top: 4.5px !important;
+      width: 16px;
+      height: 15px;
+      text-indent: -99999px;
+      overflow: hidden;
+      display: block;
+      background: url('ui-icons_666666_256x240.png') -127px -17px no-repeat;
     }
   }
 

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

@@ -54,7 +54,7 @@
   }
 
   &.create {
-    background-position: -192px -168px;
+    background-position: -191px -168px;
   }
 
   &.crop {
@@ -70,7 +70,7 @@
   }
 
   &.destroy {
-    background-position: -224px -168px;
+    background-position: -224px -169px;
   }
 
   &.edit {
@@ -158,11 +158,11 @@
   }
 
   &.offline {
-    background-position: -255px -104px;
+    background-position: -255px -105px;
   }
 
   &.online {
-    background-position: -224px -104px;
+    background-position: -224px -105px;
   }
 
   &.pdf {
@@ -214,7 +214,7 @@
   }
 
   &.tick, &.true {
-    background-position: -32px -72px;
+    background-position: -32px -73px;
   }
 
   &.trash {

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

@@ -63,7 +63,6 @@
   padding: 4px 40px 4px 8px;
   overflow: hidden;
   font: $default-font-style;
-  line-height: 8 * $default-padding;
 
   * {
     @include box-sizing;
@@ -99,7 +98,6 @@
       a {
         @include default-button-style;
         font-weight: normal;
-        line-height: 34px;
         text-decoration: none !important;
       }
     }