alchemy_cms 2.4.beta2 → 2.4.rc1

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

@@ -172,7 +172,7 @@ if (typeof(Alchemy) === 'undefined') {
 
       queueComplete: function(numFilesUploaded) {
         var $status = $("#upload_info");
-        if (Alchemy.Uploader.locale == 'en') {
+        if (Alchemy.locale === 'en') {
           $status.text(numFilesUploaded + " file" + (numFilesUploaded === 1 ? "" : "s") + " uploaded.");
         } else {
           $status.text(numFilesUploaded + " Datei" + (numFilesUploaded === 1 ? "" : "en") + " hochgeladen.");

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

@@ -45,7 +45,7 @@ Alchemy.Uploader = {
         },
         onQueueStart: function(files) {
           var $status = $("#upload_info");
-          if (Alchemy.Uploader.locale == 'en') {
+          if (Alchemy.locale === 'en') {
             $status.text(files + " file" + (files === 1 ? "" : "s") + " queued.");
           } else {
             $status.text(files + " Datei" + (files === 1 ? "" : "en") + " in der Warteschlange.");
@@ -57,7 +57,7 @@ Alchemy.Uploader = {
         },
         onQueueComplete: function(files, status) {
           var $status = $("#upload_info");
-          if (Alchemy.Uploader.locale == 'en') {
+          if (Alchemy.locale === 'en') {
             $status.text(files + " file" + (files === 1 ? "" : "s") + " uploaded.");
           } else {
             $status.text(files + " Datei" + (files === 1 ? "" : "en") + " hochgeladen.");
@@ -125,7 +125,7 @@ Alchemy.Uploader = {
           file_upload_limit: settings.file_upload_limit,
           file_queue_limit: 0,
           custom_settings: {
-            language: settings.locale
+            language: Alchemy.locale
           },
           debug: false,
           button_image_url: "/assets/alchemy/swfupload/browse_button.png",
@@ -162,8 +162,6 @@ Alchemy.Uploader = {
       }
     }
 
-    self.locale = settings.locale;
-
     if (self.HTML5uploadPossible()) {
       $('#swf_upload_container').hide();
       $('#explain_step3').hide();
@@ -264,7 +262,7 @@ Alchemy.Uploader = {
       var self = Alchemy.Uploader;
       var translation = self.translation[id];
       if (translation) {
-        return translation[self.locale];
+        return translation[Alchemy.locale];
       } else {
         return id;
       }

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

@@ -1,2 +1,3 @@
 //= require alchemy/alchemy.jquery_loader
+//= require alchemy/alchemy.browser
 //= require alchemy/alchemy.preview

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

@@ -0,0 +1,25 @@
+/*  Alchemy CMS Sprockets Manifest
+ *  -------------------------------
+ *= require_self
+ */
+@import "alchemy/defaults";
+@import "alchemy/base";
+@import "alchemy/archive";
+@import "alchemy/dashboard";
+@import "alchemy/elements";
+@import "alchemy/errors";
+@import "alchemy/flash";
+@import "alchemy/form_elements";
+@import "alchemy/frame";
+@import "alchemy/icons";
+@import "alchemy/login";
+@import "alchemy/modules";
+@import "alchemy/notices";
+@import "alchemy/pagination";
+@import "alchemy/search";
+@import "alchemy/sitemap";
+@import "alchemy/tables";
+@import "alchemy/upload";
+@import "alchemy/jquery-ui";
+@import "jquery.Jcrop.min";
+@import "alchemy/custom";

data/app/assets/stylesheets/alchemy/{archive.css.scss → archive.scss}

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 div#image_assign_filter_and_image_sizing {
   width: 100%;
   height: 40px;

data/app/assets/stylesheets/alchemy/{base.css.scss → base.scss}

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 html {
   height: 100%;
 }
@@ -118,16 +116,6 @@ a.drop_down_select img {
   margin-right: 4px;
 }
 
-#alchemy a.search_field_clear {
-  width: 16px;
-  height: 16px;
-  background: url('ui-icons_666666_256x240.png') no-repeat -80px -128px;
-  position: absolute;
-  right: 8px;
-  top: 7px;
-  @include rounded-corner;
-}
-
 #language_select {
   margin-bottom: 4px;
 }
@@ -144,22 +132,6 @@ div.edit_source_buttons {
   clear: both;
 }
 
-div.info {
-  padding: 8px 8px 8px 32px;
-  line-height: 17px;
-  color: $text-color;
-  border: 1px solid #0b5c84;
-  @include rounded-corner;
-  background-color: #eaf4f9;
-  position: relative;
-  margin-bottom: 8px;
-}
-
-div.info.footnote {
-  font-size: 10px;
-  margin: 16px;
-}
-
 div#page {
   height: auto !important;
   height: 100%;
@@ -203,7 +175,7 @@ div.tip {
 }
 
 #page_names textarea {
-  height: 78px;
+  height: 56px;
 }
 
 div#new_page_from_clipboard {
@@ -284,12 +256,6 @@ div#user_list_legend {
   margin-top: $default-margin;
 }
 
-#toolbar div.search_field {
-  position: relative;
-  float: left;
-  margin-bottom: $default-margin;
-}
-
 #toolbar div p {
   float: right;
   margin: 3px $default-margin 0 0;
@@ -328,12 +294,6 @@ div#toolbar a.button:active {
   margin-top: 1em;
 }
 
-div.info span.icon.info {
-  position: absolute;
-  top: 8px;
-  left: 8px;
-}
-
 div.table_right span.tools a.icon_button img {
   left: -1px;
 }
@@ -749,12 +709,6 @@ input#user_admin {
   }
 }
 
-div#image_assign_filter_and_image_sizing form div.search_field {
-  margin-right: 4px;
-  float: left;
-  position: relative;
-}
-
 div#image_assign_filter_and_image_sizing form input.button {
   float: right;
 }
@@ -1038,16 +992,6 @@ select#url_protocol.medium {
   background-color: #d1d1d1;
 }
 
-div.info ol {
-  margin: 0 0 8px;
-  padding-left: 20px;
-}
-
-div.info ol li {
-  text-indent: 0;
-  margin-bottom: 4px;
-}
-
 div#overlay_toolbar {
   background: $medium-gray url('shading.png') repeat-x 0 -42px;
   border: $default-border;

data/app/assets/stylesheets/alchemy/{dashboard.css.scss → dashboard.scss}

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 #dashboard {
   overflow: auto;
   float: left;

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

@@ -0,0 +1,5 @@
+@import "compass/css3";
+@import "compass/css3/user-interface";
+@import "sassy-buttons";
+@import "alchemy/variables";
+@import "alchemy/mixins";

data/app/assets/stylesheets/alchemy/{elements.css.scss → elements.scss}

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 .element_heading .preview_text_quote {
   font-size: 10px;
   font-style: italic;
@@ -112,13 +110,14 @@ img.add_element_spinner {
 }
 
 .element_foot {
-  padding: 2*$default-padding;
+  padding: 2 * $default-padding;
   border-top-style: none;
   position: relative;
   background-color: #e5dcca;
   width: 100%;
-  height: 27px;
+  height: 29px;
   margin-left: -8px;
+  margin-right: -8px;
 
   .element_tools {
     float: left;
@@ -174,33 +173,8 @@ 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;
-  }
-
-  div.error, div.warning {
-    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;
-    }
-  }
-
-  div.warning {
-    background-color: #f7efb8;
-    color: #756f47;
+    border-color: $blue;
+    @include box-shadow(0 0 4px $blue);
   }
 
   .validation_notice {
@@ -229,6 +203,23 @@ div.element_editor {
       margin-right: 8px;
     }
   }
+
+  .autocomplete_tag_list {
+    background-color: #e5dcca;
+    margin: 0 -8px 1px -8px;
+    padding: 2 * $default-padding;
+
+    label {
+      top: 17px;
+      left: 14px;
+    }
+
+    input[data-autocomplete] {
+      padding-left: 25px;
+      width: 357px;
+      background-color: #F1EAD9;
+    }
+  }
 }
 
 #alchemy .ui-dialog div.element_editor form {
@@ -323,7 +314,7 @@ div#element_area .sortable_cell {
   top: 5px;
 }
 
-span.linkable_text_essence_tools {
+span.linkable_essence_tools {
   position: absolute;
   bottom: 0;
   right: 2px;
@@ -383,10 +374,6 @@ a.fold_element {
   height: 18px;
 }
 
-a.icon_button.linked {
-  background-color: #ffd77a;
-}
-
 .edit_images_bottom a.linked {
   position: relative;
   @include rounded-corner;
@@ -587,7 +574,7 @@ table.content_editor_table {
 
 a.new_content_link {
   float: none;
-  margin-bottom: 8px !important;
+  margin-bottom: 12px !important;
   margin-top: 4px !important;
 }
 

data/app/assets/stylesheets/alchemy/{errors.css.scss → errors.scss}

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 #errorExplanation {
   background: #ffdfdf;
   padding: 2*$default-padding;

data/app/assets/stylesheets/alchemy/{flash.css.scss → flash.scss}

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 div#flash_notices {
   position: fixed;
   right: 0;

data/app/assets/stylesheets/alchemy/{form_elements.css.scss → form_elements.scss}

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 @mixin default-label-style {
   font-size: 10px;
   text-shadow: #fff 0 1px 2px;
@@ -135,12 +133,18 @@ button, input[type="submit"], a.button, input.button {
     }
 
     &:hover {
-      background-color: #f7f7f7;
+      background-color: #D3D3D3;
       border: 1px solid #9a9a9a;
       cursor: default;
     }
   }
 
+  &.linked {
+    @include sassy-button('matte', $sb-border-radius, $sb-font-size, #ffd77a, $sb-second-color, $sb-text-color, $sb-text-style, $sb-pseudo-states, $sb-ie-support);
+    padding: 3px;
+    border-color: $default-border-color;
+  }
+
   &:focus {
     @include default-focus-style;
   }
@@ -304,7 +308,7 @@ select {
  */
 
 form td.select div.selectboxit {
-  width: 200px;
+  width: 208px;
 
   .selectboxit-text {
     max-width: 180px !important;
@@ -325,12 +329,20 @@ div.selectboxit-container {
     @include default-button-style;
     width: auto;
     height: 15px;
-    padding: 6px 0 6px 18px;
+    padding: 6px 0 6px 10px;
     margin: 0;
     @include inline-block;
     overflow: hidden;
     white-space: nowrap;
 
+    &.very_short {
+      width: 80px;
+
+      .selectboxit-text {
+        max-width: 60px !important;
+      }
+    }
+
     &.short {
       width: 80px;
 
@@ -340,7 +352,7 @@ div.selectboxit-container {
     }
 
     &.medium {
-      width: 140px;
+      width: 148px;
 
       .selectboxit-text {
         max-width: 120px !important;
@@ -348,7 +360,7 @@ div.selectboxit-container {
     }
 
     &.long {
-      width: 230px;
+      width: 238px;
 
       .selectboxit-text {
         max-width: 210px !important;
@@ -356,7 +368,7 @@ div.selectboxit-container {
     }
 
     &.very_long {
-      width: 300px;
+      width: 308px;
 
       .selectboxit-text {
         max-width: 280px !important;
@@ -364,7 +376,7 @@ div.selectboxit-container {
     }
 
     &.full_width {
-      width: 416px;
+      width: 424px;
 
       .selectboxit-text {
         max-width: 396px !important;
@@ -402,7 +414,7 @@ div.selectboxit-container {
     /* Dropdown List Down Arrow Container (if an image is not used) */
     .selectboxit-arrow-container {
       /* Positions the down arrow */
-      width: 24px;
+      width: 20px;
       padding: 0 0.25em 0 0;
       margin-left: 0.5em;
       position: absolute;
@@ -453,7 +465,7 @@ div.selectboxit-container {
       white-space: nowrap;
       list-style: none;
       margin: 0;
-      padding: 0.5em 1.5em;
+      padding: 6px 10px;
     }
 
     li.selectboxit-hover, li.selectboxit-focus {
@@ -473,7 +485,7 @@ div.selectboxit-container {
 
     /* Dropdown List Optgroup Options */
     .selectboxit-optgroup-option {
-      text-indent: 20px;
+      text-indent: 10px;
     }
 
     /* Dropdown List Optgroup Header hover psuedo class */
@@ -482,3 +494,18 @@ div.selectboxit-container {
     }
   }
 }
+
+.autocomplete_tag_list {
+  position: relative;
+
+  label {
+    position: absolute;
+    top: 8px;
+    left: 6px;
+  }
+
+  input[data-autocomplete] {
+    width: 220px;
+    padding-left: 24px;
+  }
+}