alchemy_cms 2.9.1 → 3.0.0.rc5

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

@@ -5,13 +5,7 @@
   margin-bottom: 8px;
   border: 1px solid #d08f91;
   color: #690001;
-  @extend .rounded-border;
-
-  &.ajax_status_code.warning {
-    border-color: #c4c19c;
-    color: #726d23;
-    background-color: #f3f0c1;
-  }
+  @extend %rounded-border;
 
   h2 {
     font-size: 1.2em;
@@ -22,19 +16,15 @@
   }
 }
 
-div.field_with_errors {
-  display: inline;
-}
-
 div#errors, div.errors {
   margin-bottom: 8px;
   padding: 8px 8px 4px 28px;
   border-width: 1px;
   border-style: solid;
-  @extend .rounded-border;
-  border-color: #c49c9c;
-  color: #592e2e;
-  background-color: #efd3d3;
+  @extend %rounded-border;
+  border-color: $error_border_color;
+  color: $error_text_color;
+  background-color: $error_background_color;
   display: none;
 
   ul {

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

@@ -13,7 +13,7 @@ div#flash_notices {
       position: absolute;
       right: 2*$default-padding;
       top: 2*$default-padding;
-      @extend .alchemy-icon-cross:before;
+      @extend .icon-cross:before;
       font-size: 14px;
       font-family: 'Alchemy Icons';
     }
@@ -21,7 +21,7 @@ div#flash_notices {
 }
 
 div.flash {
-  @extend .rounded-border;
+  @extend %rounded-border;
   @include opacity(0.95);
   padding: 8px 8px 8px 30px;
   font-weight: bold;
@@ -31,6 +31,7 @@ div.flash {
   margin: $default-margin;
   position: relative;
   min-height: 1.3em;
+  word-break: break-all;
 
   span.icon {
     position: absolute;
@@ -39,9 +40,9 @@ div.flash {
   }
 
   &.notice {
-    border-color: #9cc4a1;
-    color: #2e5934;
-    background-color: #e2efd3;
+    border-color: $success_border_color;
+    color: $success_text_color;
+    background-color: $success_background_color;
   }
 
   &.error {
@@ -51,14 +52,14 @@ div.flash {
   }
 
   &.info {
-    border-color: #8392b5;
-    color: #233772;
-    background-color: #cadbf3;
+    border-color: $info_border_color;
+    color: $info_text_color;
+    background-color: $info_background_color;
   }
 
   &.warn, &.warning, &.alert {
-    border-color: #c4c19c;
-    color: #726d23;
-    background-color: #f3f0c1;
+    border-color: $warning_border_color;
+    color: $warning_text_color;
+    background-color: $warning_background_color;
   }
 }

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

@@ -0,0 +1,56 @@
+textarea, input[type="text"], input[type="email"], input[type="password"], .thin_border, .input_field {
+  @extend %default-input-style;
+
+  &.dirty {
+    background-color: #fff8df;
+  }
+}
+
+textarea {
+  height: auto;
+  padding: 4px 8px !important;
+  line-height: 19px !important;
+}
+
+input#search_input_field {
+  width: 224px;
+  text-align: left;
+  @include border-radius(21px);
+  padding: 3px 26px;
+  margin: 0;
+  height: 29px;
+}
+
+div.search_field span.icon, div.js_filter_field_box span.icon {
+  position: absolute;
+  left: 8px;
+  top: 8px;
+}
+
+.js_filter_field_box {
+  position: absolute;
+  right: 4px;
+  top: 4px;
+
+  .js_filter_field {
+    width: 220px;
+    text-align: left;
+    @include border-radius(3px);
+    padding: 3px 24px;
+    height: 29px;
+    margin: 0;
+  }
+
+  label {
+    font-size: 10px;
+    display: block;
+    text-align: center;
+    padding-top: 3px;
+  }
+}
+
+.autocomplete_tag_list {
+  position: relative;
+
+  label { position: absolute }
+}

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

@@ -0,0 +1,161 @@
+form {
+
+  #main_content > &.alchemy {
+    max-width: 600px;
+    padding: 2*$default-padding;
+    margin: 2em auto;
+  }
+
+  &.button-with-confirm {
+    display: inline-block;
+    margin: 0;
+    padding: 0;
+  }
+
+  &.edit_page textarea {
+    height: 67px;
+  }
+
+  > h2 {
+    @include form-heading;
+  }
+
+  .control-label {
+    @include form-label;
+  }
+
+  .input {
+    padding: $default-padding 0;
+    @include pie-clearfix;
+
+    input[type="text"],
+    input[type="email"],
+    input[type="password"],
+    textarea,
+    .select2-container,
+    .autocomplete_tag_list {
+      width: $form-right-width;
+      float: right;
+    }
+
+    .autocomplete_tag_list {
+
+      .select2-container, .select2-choices {
+        width: 100%;
+      }
+    }
+
+    ::-webkit-input-placeholder {
+      line-height: 16px;
+    }
+
+    &.select, &.grouped_select {
+
+      .select2-container {
+        margin: 4px 0;
+      }
+    }
+
+    &.boolean {
+      margin-left: $form-left-width;
+
+      label {
+        width: 100%;
+        text-align: left;
+        padding: 0;
+        margin: $default-margin 0;
+        float: none;
+        margin-left: 4px;
+      }
+    }
+
+    label.checkbox {
+      display: block;
+      margin: $default-margin 0;
+
+      input {
+        margin-right: $default-margin;
+        margin-left: $default-margin;
+      }
+    }
+
+    &.field_with_errors {
+
+      input[type="text"],
+      input[type="email"],
+      input[type="password"],
+      textarea,
+      .select2-choices {
+        @extend %field-with-error
+      }
+
+      .select2-choice, .select2-choices {
+        border-color: $error_border_color;
+        color: $error_text_color;
+        margin-bottom: 4px;
+
+        input[type="text"] {
+          @include box-shadow(none);
+        }
+      }
+
+      label { color: $error_text_color }
+    }
+
+    small.error {
+      color: $error_text_color;
+      display: block;
+      margin-left: $form-left-width;
+      line-height: 1.5em;
+      clear: both;
+      text-align: right;
+      margin-bottom: 0.25em;
+    }
+  }
+
+  .control_group {
+    width: $form-right-width;
+    padding-top: 6px;
+    float: right;
+  }
+
+  .foot_note, .input .hint {
+    margin-left: $form-left-width;
+  }
+
+  .submit {
+    padding: $default-padding 0;
+    text-align: right;
+  }
+}
+
+textarea#essence_picture_caption {
+  height: 61px;
+}
+
+.resource_info {
+
+  h2 {
+    @include form-heading;
+  }
+
+  .value {
+    overflow: hidden;
+
+    label {
+      @include form-label;
+    }
+
+    p {
+      @include form-value-display;
+    }
+  }
+}
+
+// styles for link overlay selects
+.window_form {
+
+  .select2-container {
+    width: 100%;
+  }
+}

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

@@ -45,8 +45,6 @@
     display: block;
     padding-top: 7px;
     @extend .left-rounded-border;
-    margin-bottom: 1px;
-    margin-top: 1px;
     border: 1px none #afafaf;
     border-right-style: none;
     padding-bottom: 5px;
@@ -83,7 +81,7 @@
 }
 
 div#overlay {
-  visibility: hidden;
+  display: none;
   position: fixed;
   left: 0px;
   top: 0px;
@@ -92,6 +90,11 @@ div#overlay {
   z-index: 400000;
   background-color: rgba(229, 229, 229, 0.4);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = #40E5E5E5, endColorstr = #40E5E5E5);
+
+  .spinner {
+    top: 50%;
+    left: 50%;
+  }
 }
 
 div#overlay_text_box {
@@ -164,7 +167,7 @@ div#user_info {
   padding: 0 8px;
   background-color: $light-blue;
 
-  .selectboxit-container {
+  .select2-container {
     margin-right: 2 * $default-margin;
   }
 }
@@ -172,7 +175,6 @@ div#user_info {
 #sub_navigation {
   height: 22px;
   line-height: 21px;
-  padding-left: 5px;
   background: $light-blue;
   border-bottom: $default-border;
   padding-top: 4px;
@@ -209,7 +211,7 @@ div#user_info {
       border: 1px solid #f0c8d1;
       background-color: #f0c8d1;
       color: #ac3d57;
-      @extend .rounded-border;
+      @extend %rounded-border;
       margin-right: 2px;
       padding: 2px 3px;
       line-height: 11px;

data/app/assets/stylesheets/alchemy/icon-font.css.scss

@@ -9,26 +9,26 @@
   font-style: normal;
 }
 
-.alchemy-icon-plus,
-.alchemy-icon-minus,
-.alchemy-icon-cross,
-.alchemy-icon-plus-2,
-.alchemy-icon-minus-2,
-.alchemy-icon-pencil,
-.alchemy-icon-tag,
-.alchemy-icon-info,
-.alchemy-icon-warning,
-.alchemy-icon-checkmark,
-.alchemy-icon-ccw,
-.alchemy-icon-trash,
-.alchemy-icon-cross-2,
-.alchemy-icon-pictures,
-.alchemy-icon-menu,
-.alchemy-icon-magnifying-glass,
-.alchemy-icon-fullscreen-exit,
-.alchemy-icon-help,
-.alchemy-icon-fullscreen,
-.alchemy-icon-cog {
+.icon-plus,
+.icon-minus,
+.icon-cross,
+.icon-plus-2,
+.icon-minus-2,
+.icon-pencil,
+.icon-tag,
+.icon-info,
+.icon-warning,
+.icon-checkmark,
+.icon-ccw,
+.icon-trash,
+.icon-cross-2,
+.icon-pictures,
+.icon-menu,
+.icon-magnifying-glass,
+.icon-fullscreen-exit,
+.icon-help,
+.icon-fullscreen,
+.icon-cog {
   font-family: 'Alchemy Icons';
   speak: none;
   font-size: 12px;
@@ -45,23 +45,23 @@
   @include inline-block;
 }
 
-.alchemy-icon-plus:before { content: "\e000" }
-.alchemy-icon-minus:before { content: "\e001" }
-.alchemy-icon-cross:before { content: "\e004" }
-.alchemy-icon-plus-2:before { content: "\e005" }
-.alchemy-icon-minus-2:before { content: "\e006" }
-.alchemy-icon-pencil:before { content: "\e007" }
-.alchemy-icon-tag:before { content: "\e034" }
-.alchemy-icon-info:before { content: "\e008" }
-.alchemy-icon-warning:before { content: "\e009" }
-.alchemy-icon-checkmark:before { content: "\e00a" }
-.alchemy-icon-ccw:before { content: "\e00b" }
-.alchemy-icon-trash:before { content: "\f014" }
-.alchemy-icon-cross-2:before { content: "\e00e" }
-.alchemy-icon-pictures:before { content: "\e00f" }
-.alchemy-icon-menu:before { content: "\e010" }
-.alchemy-icon-magnifying-glass:before { content: "\e011" }
-.alchemy-icon-fullscreen-exit:before { content: "\e01e" }
-.alchemy-icon-help:before { content: "\e00c" }
-.alchemy-icon-fullscreen:before { content: "\e01d" }
-.alchemy-icon-cog:before { content: "\f013" }
+.icon-plus:before { content: "\e000" }
+.icon-minus:before { content: "\e001" }
+.icon-cross:before { content: "\e004" }
+.icon-plus-2:before { content: "\e005" }
+.icon-minus-2:before { content: "\e006" }
+.icon-pencil:before { content: "\e007" }
+.icon-tag:before { content: "\e034" }
+.icon-info:before { content: "\e008" }
+.icon-warning:before { content: "\e009" }
+.icon-checkmark:before { content: "\e00a" }
+.icon-ccw:before { content: "\e00b" }
+.icon-trash:before { content: "\f014" }
+.icon-cross-2:before { content: "\e00e" }
+.icon-pictures:before { content: "\e00f" }
+.icon-menu:before { content: "\e010" }
+.icon-magnifying-glass:before { content: "\e011" }
+.icon-fullscreen-exit:before { content: "\e01e" }
+.icon-help:before { content: "\e00c" }
+.icon-fullscreen:before { content: "\e01d" }
+.icon-cog:before { content: "\f013" }