alchemy_cms 2.5.0.b9 → 2.5.0.rc3

data/alchemy_cms.gemspec

@@ -33,7 +33,8 @@ POST_INSTALL
   s.require_paths         = ["lib"]
 
   s.add_runtime_dependency %q<rails>,                      ["~> 3.2.11"]
-  s.add_runtime_dependency %q<authlogic>,                  ["~> 3.1.3"]
+  s.add_runtime_dependency %q<devise>,                     ["~> 2.2.3"]
+  s.add_runtime_dependency %q<devise-encryptable>,         ["~> 0.1.1"]
   s.add_runtime_dependency %q<awesome_nested_set>,         ["~> 2.0"]
   s.add_runtime_dependency %q<acts-as-taggable-on>,        ["~> 2.1"]
   s.add_runtime_dependency %q<declarative_authorization>,  ["= 0.5.5"]

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

@@ -114,33 +114,6 @@ if (typeof(Alchemy) === 'undefined') {
       Alchemy.Buttons.enable($element);
     },
 
-    resizeFrame: function() {
-      var options = {
-        left: 65,
-        right: 0
-      };
-      var $mainFrame = $('#main_content');
-      var $topFrame = $('#top_menu');
-      var view_height = $(window).height();
-      var view_width = $(window).width();
-      var topFrameHeight = $topFrame.height();
-      var mainFrameHeight = view_height - topFrameHeight;
-      var width = view_width - options.left - options.right;
-      if ($mainFrame.length > 0) {
-        $mainFrame.css({
-          top: topFrameHeight,
-          width: width,
-          height: mainFrameHeight
-        });
-      }
-      if ($topFrame.length > 0) {
-        $topFrame.css({
-          width: width,
-          height: topFrameHeight
-        });
-      }
-    },
-
     SelectBox: function(scope) {
       $('select.alchemy_selectbox', scope).selectBoxIt();
     },

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

@@ -20,7 +20,7 @@ if (typeof(Alchemy) === 'undefined') {
     },
 
     fade: function() {
-      $('.flash.notice, .flash.warn', '#flash_notices').delay(5000).hide('drop', {
+      $('.flash.notice, .flash.warn, .flash.alert', '#flash_notices').delay(5000).hide('drop', {
         direction: "up"
       }, 400, function() {
         $(this).remove();

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

@@ -6,7 +6,6 @@ Alchemy.GUI =
     Alchemy.SelectBox()
     Alchemy.Datepicker()
     Alchemy.Buttons.observe()
-    Alchemy.resizeFrame()
 
   initElement: ($el) ->
     Alchemy.ElementDirtyObserver($el)

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

@@ -26,7 +26,3 @@ $ ->
     url = Alchemy.current_url
     delimiter = if url.match(/\?/) then '&' else '?'
     window.location = url + delimiter + 'locale=' + $(this).val()
-
-# Resize the Alchemy frame on every browser resize.
-jQuery(window).resize ->
-  Alchemy.resizeFrame()

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

@@ -34,7 +34,6 @@ if (typeof(Alchemy) === 'undefined') {
       });
       $('#sort_panel .button').click(Alchemy.pleaseWaitOverlay);
       Alchemy.PageSorter.disableButton();
-      Alchemy.resizeFrame();
     },
 
     disableButton: function() {

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

@@ -4,6 +4,7 @@
  */
 @import "alchemy/defaults";
 @import "alchemy/base";
+@import "alchemy/toolbar";
 @import "alchemy/archive";
 @import "alchemy/dashboard";
 @import "alchemy/elements";

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

@@ -4,7 +4,6 @@ div#image_assign_filter_and_image_sizing {
 }
 
 #picture_archive {
-  padding: 4 * $default-padding;
 
   .selected_item_tools {
     margin: -4*$default-padding;
@@ -133,7 +132,7 @@ div#image_assign_filter_and_image_sizing {
 }
 
 #pictures {
-  padding-right: 232px;
+  margin-right: 232px;
 
   .picture_thumbnail {
     margin: 0 8px 8px 0;
@@ -243,11 +242,13 @@ div.image_spinner {
 }
 
 div#library_sidebar {
+  @include box-sizing(border-box);
   position: absolute;
   border-left: 1px solid $default-border-color;
   top: 0;
   right: 0;
-  width: 200px;
+  width: 232px;
+  padding-top: 96px;
   padding: 0 4*$default-padding;
   height: 100%;
   z-index: 1;
@@ -266,7 +267,8 @@ div#filter_bar {
 }
 
 div#tag_list {
-  height: 90%;
+  @include box-sizing(border-box);
+  height: 85%;
 
   .js_filter_field_box {
 
@@ -277,8 +279,8 @@ div#tag_list {
   ul {
     list-style-type: none;
     padding: 0;
-    margin: $default-margin 0 3*$default-margin 0;
-    height: inherit;
+    margin: $default-margin 0;
+    height: 95%;
     width: 204px;
     overflow-x: hidden;
     overflow-y: auto;

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

@@ -215,71 +215,6 @@ div#user_list_legend {
   width: 370px;
 }
 
-#toolbar {
-  z-index: 10;
-  padding: 4px;
-  height: 44px;
-  background: $medium-gray url('shading.png') repeat-x 0 -40px;
-  margin-right: 0px;
-  border: $default-border;
-  border-top-style: none;
-  border-right-style: none;
-  @include bottom-left-rounded-border;
-  position: relative;
-  margin-left: 5px;
-}
-
-#toolbar form {
-  margin: 0 0 0 8px;
-  float: right;
-  text-align: center;
-}
-
-#toolbar div.button_with_label form {
-  float: none;
-  margin: 0;
-  @include inline-block;
-  line-height: 5px;
-}
-
-#toolbar div.button_with_label form label {
-  margin-top: $default-margin;
-}
-
-#toolbar div p {
-  float: right;
-  margin: 3px $default-margin 0 0;
-  padding: 0;
-}
-
-div#toolbar div.toolbar_spacer {
-  float: left;
-  width: 1px;
-  height: 37px;
-  border-right-style: dotted;
-  border-right-width: 1px;
-  margin-right: 2*$default-margin;
-  margin-left: $default-margin;
-}
-
-div#toolbar a.button {
-  width: 25px;
-  height: 21px;
-  text-decoration: none;
-  float: right;
-  border-width: 0;
-  border-style: none;
-  font-size: 0;
-  padding: 0;
-  background-repeat: no-repeat;
-  background-position: 0 0;
-}
-
-div#toolbar a.button:active {
-  text-decoration: none;
-  background-position: 0 -21px;
-}
-
 #page_sorting_panel p {
   margin-top: 1em;
 }
@@ -303,7 +238,7 @@ li.odd {
 
 ul.list {
   margin: 0;
-  padding: 2*$default-padding;
+  padding: 0;
   list-style-type: none;
 }
 
@@ -361,15 +296,6 @@ table td.tools .icon, table td.icon .icon {
   margin-right: 4px;
 }
 
-#archive_all {
-  padding: 4*$default-padding;
-
-  .padding_left_right {
-    padding-right: 8px;
-    padding-left: 8px;
-  }
-}
-
 div.spinner {
   background-color: #ffffff;
   width: 100%;
@@ -519,22 +445,6 @@ div#images {
   overflow: visible;
 }
 
-#toolbar_links {
-  line-height: 21px;
-  margin-left: 8px;
-  float: left;
-}
-
-div#toolbar_buttons {
-  float: left;
-  margin-right: 6px;
-}
-
-div#toolbar_buttons_right {
-  float: right;
-  margin-left: 8px;
-}
-
 p.foot_note {
   font-size: 10px;
   line-height: 1.5em;
@@ -889,9 +799,10 @@ select#url_protocol.medium {
   width: 76px;
 }
 
-#alchemy .ui-dialog-content p.buttons {
+#alchemy .ui-dialog .ui-dialog-content .buttons {
   text-align: right;
   margin: 0;
+  padding: 0;
 
   label {
     float: left;

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

@@ -710,12 +710,12 @@ div.content_editor {
     label { margin-bottom: 4px }
 
     .selectboxit-container {
-      box-sizing: border-box;
+      @include box-sizing(border-box);
       width: 100%;
     }
 
     .selectboxit {
-      box-sizing: border-box;
+      @include box-sizing(border-box);
       width: 100% !important;
       height: 100%;
     }

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

@@ -4,6 +4,21 @@ div#flash_notices {
   z-index: 400000;
   width: 348px;
   top: 0;
+
+  .flash.error {
+    cursor: pointer;
+    padding-right: 24px;
+
+    &: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;
+    }
+  }
 }
 
 div.flash {
@@ -34,17 +49,6 @@ 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 {
@@ -53,7 +57,7 @@ div.flash {
     background-color: #cadbf3;
   }
 
-  &.warn, &.warning {
+  &.warn, &.warning, &.alert {
     border-color: #c4c19c;
     color: #726d23;
     background-color: #f3f0c1;

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

@@ -1,7 +1,9 @@
 #top_menu {
+  @include box-sizing(border-box);
   position: fixed;
   top: 0;
-  left: 65px;
+  margin-left: 65px;
+  padding-right: 65px;
   z-index: 5;
   width: 100%;
   @include disable-user-select;
@@ -135,11 +137,14 @@ div#overlay_text_box {
 }
 
 #main_content {
+  @include box-sizing(border-box);
   background-color: $light-gray;
-  position: absolute;
-  left: 65px;
+  padding-top: 96px;
+  padding-right: 4 * $default-padding;
+  padding-bottom: 4 * $default-padding;
+  padding-left: 82px;
   z-index: 0;
-  width: 93%;
+  width: 100%;
   height: 100%;
 }
 
@@ -149,7 +154,7 @@ div#user_info {
   line-height: 27px;
   height: 29px;
   font-size: 11px;
-  right: 0;
+  right: 65px;
   top: -3px;
   padding: 0 8px;
   background-color: $light-blue;

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

@@ -235,7 +235,7 @@
     background-position: -448px -136px;
   }
 
-  &.tick, &.true {
+  &.tick, &.true, &.notice {
     background-position: -32px -73px;
   }
 
@@ -295,7 +295,7 @@
     background-position: -31px -137px;
   }
 
-  &.warning, &.warn {
+  &.warning, &.warn, &.alert {
     background-position: 0 -168px;
   }
 

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

@@ -1,11 +1,11 @@
 div.pagination {
-  clear: both;
-  zoom: 1;
-  text-align: right;
+  background: $light_gray;
+  width: 100%;
+  left: 82px;
   line-height: 24px;
   height: 24px;
-  width: 100%;
-  margin-top: 4*$default-padding;
+  padding: 2 * $default-padding 0;
+  text-align: right;
 
   a, span, em {
     font-size: $default-font-size;

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

@@ -42,12 +42,12 @@ td.label, td.input, td.submit, td.select, td.value, td.note {
 td.select {
 
   .selectboxit-container {
-    box-sizing: border-box;
+    @include box-sizing(border-box);
     width: 100%;
   }
 
   .selectboxit {
-    box-sizing: border-box;
+    @include box-sizing(border-box);
     width: 100% !important;
     height: 100%;
   }

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

@@ -0,0 +1,79 @@
+#toolbar {
+  z-index: 10;
+  padding: 4px;
+  height: 44px;
+  background: $medium-gray url('shading.png') repeat-x 0 -40px;
+  margin-right: 0px;
+  border: $default-border;
+  border-top-style: none;
+  border-right-style: none;
+  @include bottom-left-rounded-border;
+  position: relative;
+  margin-left: 5px;
+
+  form {
+    margin: 0 8px;
+    float: right;
+    text-align: center;
+  }
+
+  div.button_with_label {
+
+    form {
+      float: none;
+      margin: 0;
+      @include inline-block;
+      line-height: 5px;
+
+      select { margin: 0 }
+
+      label {
+        margin-top: $default-margin;
+      }
+    }
+  }
+
+  div p {
+    float: right;
+    margin: 3px $default-margin 0 0;
+    padding: 0;
+  }
+
+  div.toolbar_spacer {
+    float: left;
+    width: 1px;
+    height: 37px;
+    border-right-style: dotted;
+    border-right-width: 1px;
+    margin-right: 2*$default-margin;
+    margin-left: $default-margin;
+  }
+
+  a.button {
+    width: 25px;
+    height: 21px;
+    text-decoration: none;
+    float: right;
+    border-width: 0;
+    border-style: none;
+    font-size: 0;
+    padding: 0;
+    background-repeat: no-repeat;
+    background-position: 0 0;
+
+    &:active {
+      text-decoration: none;
+      background-position: 0 -21px;
+    }
+  }
+}
+
+div#toolbar_buttons {
+  float: left;
+  margin-right: 6px;
+}
+
+div#toolbar_buttons_right {
+  float: right;
+  margin-left: 8px;
+}