alchemy_cms 2.9.1 → 3.0.0.rc5

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

@@ -0,0 +1,8 @@
+window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
+
+Alchemy.showMenubar = ->
+  menubar = document.getElementById('alchemy_menubar')
+  if (typeof(menubar) != 'undefined' && menubar != null)
+    menubar.style.display = "block"
+
+Alchemy.showMenubar()

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

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

data/app/assets/javascripts/tinymce/plugins/alchemy_link/plugin.min.js

@@ -0,0 +1,19 @@
+tinymce.PluginManager.add('alchemy_link', function(editor, url) {
+  editor.addButton('alchemy_link', {
+    icon: 'link',
+    tooltip: 'Insert/edit link',
+    shortcut: 'Ctrl+K',
+    stateSelector: 'a[href]',
+    onclick: function () {
+      var link_object = {
+        node: editor.selection.getNode(),
+        bookmark: editor.selection.getBookmark(),
+        selection: editor.selection,
+        editor: editor
+      };
+      var link_dialog = new Alchemy.LinkDialog(link_object);
+      editor.focus();
+      link_dialog.open();
+    }
+  });
+});

data/app/assets/stylesheets/alchemy/{defaults.scss → _defaults.scss}

@@ -1,6 +1,8 @@
 @import "compass/css3";
 @import "compass/css3/user-interface";
+@import "compass/utilities/general/clearfix";
 @import "sassy-buttons";
 @import "alchemy/variables";
+@import "alchemy/mixins";
 @import "alchemy/extends";
 @import "alchemy/icon-font";

data/app/assets/stylesheets/alchemy/{extends.scss → _extends.scss}

@@ -1,24 +1,7 @@
-// Some few mixins
-
-@mixin default-focus-style($bg-color: $very-light-blue, $border: 1px solid $blue) {
-  background-color: $bg-color;
-  border: $border;
-  @include box-shadow(0 0 6px $blue, inset 0 0 4px $light-blue);
-  outline: none;
-  @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;
-    padding: 1px !important;
-  }
+%rounded-border {
+  @include border-radius($default-border-radius);
 }
 
-// Extends without base classes. They are the better mixins ;)
-
 %text-overflow {
   white-space: nowrap;
   overflow: hidden;
@@ -31,7 +14,7 @@
 %tooltip {
   display: none;
   background: $light_yellow;
-  @extend .rounded-border;
+  @extend %rounded-border;
   @include box-shadow(0 4px 24px $dark-gray);
   position: absolute;
   right: -25px;
@@ -65,7 +48,7 @@
 }
 
 %button-defaults {
-  @include sassy-button('shiny', $sb-border-radius, $sb-font-size, $sb-base-color, $sb-second-color, $sb-text-color, $sb-text-style, $sb-pseudo-states, $sb-ie-support);
+  @include sassy-button('simple', $sb-border-radius, $sb-font-size, $sb-base-color, $sb-second-color, $sb-text-color, $sb-text-style, $sb-pseudo-states, $sb-ie-support);
   border-color: $button-border-color;
   margin: $default-form-field-margin;
 }
@@ -92,12 +75,12 @@
 %default-input-style {
   @include box-sizing(border-box);
   $border-inset-color: lighten($default-border-color, 20%);
-  @extend .rounded-border;
-  @include box-shadow(inset 1px 1px 2px $medium-gray);
+  @extend %rounded-border;
+  @include box-shadow(inset 0px 1px 1px $medium-gray);
   font: $default-font-style;
   padding: 1px 2*$default-padding;
   margin: $default-form-field-margin;
-  background: #fff;
+  background: rgba(#fff, 0.9);
   border-top: 1px solid $default-border-color;
   border-left: 1px solid $default-border-color;
   border-bottom: 1px solid $border-inset-color;
@@ -115,45 +98,8 @@
   &:focus {
     @extend %blue-focus-style;
   }
-
-  &.with_error { @extend %field-with-error }
 }
 
 %gradiated-toolbar {
   background: $medium-gray;
-  @include background(linear-gradient(top, $medium-gray 85%, darken($medium-gray, 10) 100%));
-}
-
-%progressbar {
-  @include background-image(linear-gradient(top, rgba(lighten($light-gray, 10), .5) 5%, rgba($light-gray, 0.5) 65%, rgba(darken($medium-gray, 10), 0.5) 90%));
-}
-
-// Useful base classes
-
-.rounded-border {
-  @include border-radius($default-border-radius);
-}
-
-.top-rounded-border {
-  @include border-top-radius($default-border-radius);
-}
-
-.left-rounded-border {
-  @include border-left-radius($default-border-radius);
-}
-
-.right-rounded-border {
-  @include border-right-radius($default-border-radius);
-}
-
-.bottom-rounded-border {
-  @include border-bottom-radius($default-border-radius);
-}
-
-.bottom-left-rounded-border {
-  @include border-bottom-left-radius($default-border-radius);
-}
-
-.disable-user-select {
-  @include user-select(none);
 }

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

@@ -0,0 +1,112 @@
+@mixin default-focus-style($bg-color: $very-light-blue, $border: 1px solid $blue) {
+  background-color: $bg-color;
+  border: $border;
+  @include box-shadow(0 0 6px $blue, inset 0 0 4px $light-blue);
+  outline: none;
+  @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;
+    padding: 1px !important;
+  }
+}
+
+@mixin default-label-style {
+  font-size: 10px;
+  text-shadow: #fff 0 1px 2px;
+  margin-top: $default-margin;
+  display: block;
+  line-height: 100%;
+  @extend .disable-user-select;
+  clear: both;
+}
+
+@mixin form-label {
+  @extend .border-box-sizing;
+  width: $form-left-width;
+  padding-right: 2*$default-padding;
+  padding-top: $default-padding + 1;
+  margin-top: 4px;
+  vertical-align: top;
+  line-height: 19px;
+  word-break: normal;
+  float: left;
+  text-align: right;
+}
+
+@mixin form-heading {
+  border-bottom: 1px solid #CECECE;
+  padding-right: 8px;
+  margin-top: 8px;
+  text-align: right;
+  font-weight: normal;
+  color: #585858;
+  text-transform: uppercase;
+}
+
+@mixin form-value-display {
+  float: right;
+  width: $form-right-width;
+  margin: $default-form-field-margin;
+  padding: $default-padding 2*$default-padding;
+  line-height: 21px;
+  min-height: 29px;
+  background: white;
+  @extend %rounded-border;
+  @extend .border-box-sizing;
+}
+
+@mixin animate-left {
+  -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 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;
+}
+
+@mixin drop-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;
+}
+
+@mixin box-sizing($box-sizing-type: content-box) {
+  -webkit-box-sizing: $box-sizing-type;
+  -moz-box-sizing: $box-sizing-type;
+  box-sizing: $box-sizing-type;
+}
+
+@mixin tag-base($margin: 2*$default-margin 0, $padding: $default-padding 4*$default-padding $default-padding 6*$default-padding) {
+  padding: $padding;
+  margin: $margin;
+  background-color: $medium-gray;
+  overflow: hidden;
+  position: relative;
+  @extend %rounded-border;
+
+  &:before {
+    position: absolute;
+    left: 8px;
+    top: 8px;
+    font-family: 'Alchemy Icons';
+    @extend .icon-tag:before;
+    line-height: 8px;
+  }
+}

data/app/assets/stylesheets/alchemy/{variables.scss → _variables.scss}

@@ -1,41 +1,61 @@
 $text-color: #333333;
-$light-blue: #C6DBE7;
+$light-blue: #cddce5; // #c6dbe7
 $blue: darken($light-blue, 15%);
 $very-light-blue: lighten($light-blue, 12%);
-$light-gray: #EDEDED;
-$medium-gray: #E3E3E3;
+$light-gray: #ededed;
+$medium-gray: #e3e3e3;
 $dark-gray: #666666;
 $light_yellow: #ffffdc;
 $linked-color: #ffd77a;
 $white: #f2f2f2;
 
-$default-padding: 4px;
-$default-margin: $default-padding;
-
 $default-font-face: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
 $mono-font-face: Menlo, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
 $default-font-size: 12px;
 $default-font-style: $default-font-size $default-font-face;
 
-$default-border-color: #AFAFAF;
+$dialog-header-height: 36px;
+$header-color: $light-blue;
+$header-text-color: $text-color;
+$header-font-size: $default-font-size;
+
+$default-padding: 4px;
+$default-margin: $default-padding;
+
+$default-border-color: #afafaf;
 $default-border-width: 1px;
 $default-border-style: solid;
 $default-border: $default-border-width $default-border-style $default-border-color;
 $default-border-radius: 3px;
 
-$button-bg-color: #F7F7F7;
+$button-bg-color: #f7f7f7;
 $button-hover-bg-color: #e6f0f5;
-$button-border-color: #9A9A9A;
+$button-border-color: #9a9a9a;
 $button-hover-border-color: #888888;
 $button-text-shadow: $white 1px 1px 0;
 
-$sb-base-color:      $light-gray;
+$sb-base-color:      $white;
 $sb-border-radius:   $default-border-radius;
 $sb-font-size:       $default-font-size;
 $sb-text-color:      $text-color;
 $sb-ie-support:      true;
 $default-form-field-margin: $default-padding 0;
 
+$success_border_color: #9cc4a1;
+$success_text_color: #2e5934;
+$success_background_color: #e2efd3;
+
+$info_border_color: #8392b5;
+$info_text_color: #233772;
+$info_background_color: #cadbf3;
+
+$warning_border_color: #c4c19c;
+$warning_text_color: #726d23;
+$warning_background_color: #f3f0c1;
+
 $error_border_color: #c49c9c;
-$error_text_color: #592e2e;
+$error_text_color: #a23434;
 $error_background_color: #efd3d3;
+
+$form-left-width: 35%;
+$form-right-width: 65%;

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

@@ -4,21 +4,24 @@
  */
 
 @import "alchemy/defaults";
+@import "alchemy/archive";
 @import "alchemy/base";
+@import "alchemy/buttons";
+@import "alchemy/dialogs";
 @import "alchemy/toolbar";
-@import "alchemy/archive";
 @import "alchemy/dashboard";
 @import "alchemy/elements";
 @import "alchemy/errors";
 @import "alchemy/flash";
-@import "alchemy/form_elements";
+@import "alchemy/forms";
+@import "alchemy/form_fields";
 @import "alchemy/frame";
 @import "alchemy/icons";
-@import "alchemy/login";
 @import "alchemy/modules";
 @import "alchemy/notices";
 @import "alchemy/pagination";
 @import "alchemy/search";
+@import "alchemy/selects";
 @import "alchemy/sitemap";
 @import "alchemy/tables";
 @import "alchemy/upload";

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

@@ -16,12 +16,18 @@ div#image_assign_filter_and_image_sizing {
 
 #zoomed_picture_background {
   text-align: center;
-  width: 100%;
   height: 100%;
-  position: absolute;
+
+  .spinner {
+    position: absolute !important;
+    left: 50% !important;
+    top: 50% !important;
+  }
 
   .zoomed_picture {
-    max-height: 99%;
+    max-width: 100%;
+    max-height: 100%;
+    margin-bottom: -4px;
   }
 }
 
@@ -34,7 +40,7 @@ div#image_assign_filter_and_image_sizing {
   display: inline-block;
   border: 1px solid #c0c0c0;
   position: relative;
-  @extend .rounded-border;
+  @extend %rounded-border;
 
   .thumbnail_background {
     @extend %thumbnail-background;
@@ -218,7 +224,7 @@ div#library_sidebar {
   }
 }
 
-.alchemy_overlay #library_sidebar {
+.alchemy-dialog #library_sidebar {
   position: absolute;
 }
 
@@ -276,25 +282,11 @@ div#filter_bar {
     overflow-y: auto;
 
     li {
+      @include tag-base;
       display: block;
-      padding: $default-padding 4*$default-padding $default-padding 6*$default-padding ;
-      margin: 2*$default-margin 0;
-      background-color: $medium-gray;
-      @extend .rounded-border;
-      overflow: hidden;
-      position: relative;
 
       &:first-child { margin-top: 0 }
 
-      &:before {
-        position: absolute;
-        left: 8px;
-        top: 8px;
-        font-family: 'Alchemy Icons';
-        @extend .alchemy-icon-tag:before;
-        line-height: 8px;
-      }
-
       a {
         text-decoration: none;
         display: block;
@@ -311,7 +303,7 @@ div#filter_bar {
   }
 }
 
-div#alchemy_window_body {
+.alchemy-dialog-body {
 
   #library_sidebar {
     padding: 0 4*$default-padding;
@@ -347,20 +339,23 @@ div#alchemy_window_body {
 }
 
 div#pictures_page_list {
+  max-height: 100px;
+  overflow: auto;
 
-  h2 { margin: 0 2*$default-padding }
   h3 { padding: 0 $default-padding }
 
-  ul.list {
-    max-height: 100px;
-    overflow: auto;
-    margin: 2*$default-margin;
-    background-color: $medium-gray;
-
-    ul { padding: 0 $default-padding }
+  ul {
+    @include form-value-display;
+    list-style-type: none;
   }
 
-  li.even, li.odd { padding: $default-padding }
+  li {
+    padding: 0 $default-padding;
+
+    &.even { background: #F7F7F7 }
+
+    &:last-child { margin-bottom: 0 }
+  }
 }
 
 #overlay_file_list {
@@ -416,7 +411,7 @@ div#pictures_page_list {
 
 .tag {
   @include inline-block;
-  @extend .rounded-border;
+  @extend %rounded-border;
   padding: $default-padding 2*$default-padding $default-padding 4*$default-padding;
   margin: $default-margin/2 0;
   background-color: rgba($medium-gray, 0.85);
@@ -431,7 +426,7 @@ div#pictures_page_list {
     left: $default-padding;
     top: 2*$default-padding;
     font-family: 'Alchemy Icons';
-    @extend .alchemy-icon-tag:before;
+    @extend .icon-tag:before;
     line-height: 6px;
   }
 }