alchemy_cms 4.1.0.rc1 → 4.1.0

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

@@ -9,10 +9,15 @@ button, input[type="submit"], a.button, input.button {
 
     &:focus {
       @include default-focus-style(
-        $border-color: $secondary-button-text-color,
-        $box-shadow: 0 0 2px $button-text-color
+        $border-color: $button-focus-border-color,
+        $box-shadow: $button-focus-box-shadow
       );
     }
+
+    &:active, &:active:focus {
+      border-color: $button-hover-border-color;
+      box-shadow: none;
+    }
   }
 
   &.small {
@@ -148,7 +153,7 @@ button.icon_button {
   .icon_button {
     width: 29px;
     height: 29px;
-    line-height: 27px;
+    line-height: 24px;
   }
 
   label {
@@ -161,7 +166,7 @@ button.icon_button {
     z-index: 30;
     background-color: $tooltip-background-color;
     color: $white;
-    padding: $default-padding 2*$default-padding;
+    padding: $default-padding 2*$default-padding 1.5*$default-padding;
     line-height: 1;
     box-shadow: 0 0 4px $default-border-color;
     white-space: nowrap;

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

@@ -192,7 +192,7 @@
   }
 
   .message {
-    margin: 2*$default-margin;
+    margin: 2*$default-margin 0;
   }
 
   .foot_note {
@@ -337,6 +337,7 @@
       $background-color: $medium-gray,
       $hover-color: darken($medium-gray, 5%),
       $border: 1px solid #c0c0c0,
+      $box-shadow: none,
       $hover-border-color: #c0c0c0,
       $line-height: 30px,
       $padding: 0,

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

@@ -16,10 +16,6 @@ form {
     height: 67px;
   }
 
-  > h2 {
-    @include form-heading;
-  }
-
   .control-label {
     @include form-label;
   }

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

@@ -89,8 +89,7 @@ div#overlay_text_box {
 }
 
 #archive_all {
-  height: calc(100% - 4px);
-  padding-bottom: 60px;
+  height: 100%;
 
   &.with_tag_filter {
 
@@ -102,14 +101,6 @@ div#overlay_text_box {
       margin-right: 242px;
     }
   }
-
-  &.resources-table-wrapper {
-    padding-top: 47px;
-
-    > table {
-      padding-bottom: 60px;
-    }
-  }
 }
 
 #user_info {

data/app/assets/stylesheets/alchemy/jquery.datetimepicker.scss

@@ -32,6 +32,7 @@
 /*For IE8 or lower*/
 .xdsoft_datetimepicker button {
   border: none !important;
+  box-shadow: none;
 }
 
 .xdsoft_noselect {

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

@@ -1,3 +1,13 @@
+ul, ol {
+  padding-left: 16px;
+  margin-top: 1em;
+  margin-bottom: 1em;
+
+  li {
+    margin-bottom: 0.5em;
+  }
+}
+
 ul.list {
   margin: 0;
   padding: 0;

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

@@ -63,6 +63,7 @@
           $hover-color: $blue,
           $hover-border-color: $white,
           $border: 1px solid $white,
+          $box-shadow: none,
           $padding: 0.5em 0,
           $margin: 0,
           $color: $white

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

@@ -9,12 +9,7 @@ div.message {
   margin-bottom: 8px;
   text-align: left;
 
-  h1 {
-    font-size: 1.2em;
-    margin: 8px 0;
-  }
-
-  h1, h2 { margin-top: 0 }
+  h1, h2, h3 { margin-top: 0 }
 
   .icon {
     position: absolute;
@@ -31,7 +26,10 @@ div.message {
   a {
     text-decoration: underline;
 
-    &:hover { color: #000 }
+    &:hover {
+      color: inherit;
+      text-decoration: none;
+    }
   }
 
   ol {

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

@@ -1,12 +1,13 @@
 .pagination {
-  background: $light_gray;
   position: fixed;
+  display: flex;
+  align-items: center;
+  background: $light_gray;
   bottom: 0;
   right: 0;
   width: 100%;
   left: 0px;
   height: 52px;
-  line-height: 35px;
   padding: 2*$default-padding;
   padding-left: $main-menu-width + 10px;
   text-align: left;
@@ -18,6 +19,7 @@
     font-weight: bold;
     color: $icon-color;
     padding: $default-padding 2*$default-padding;
+    margin: 0 $default-margin/2;
   }
 
   a:hover {
@@ -28,15 +30,12 @@
 
   span a { padding: 0 }
 
-  .page { padding: 0px 8px }
-
   .current {
-    color: $blue;
-    border: 1px solid $blue;
+    color: $text-color;
+    border: 1px solid $text-color;
     text-shadow: 0px 1px 1px #fff;
     cursor: default;
     border-radius: $default-border-radius;
-    padding: 5px 8px;
   }
 
   .previous_page {
@@ -55,6 +54,7 @@
     border: none;
     background: transparent;
     cursor: default;
+    margin: 0;
   }
 
   .icon {
@@ -62,6 +62,11 @@
   }
 }
 
+.per-page-select-form {
+  margin-left: auto;
+  display: inline;
+}
+
 #assign_image_list .pagination, #assign_file_list .pagination {
   position: absolute;
   padding-left: 8px;

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

@@ -1,9 +1,5 @@
 .resource_info {
 
-  h2 {
-    @include form-heading;
-  }
-
   .value {
     @include clearfix;
     position: relative;

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

@@ -89,9 +89,12 @@
   }
 
   .search_field .icon,
-  .js_filter_field_box .icon,
+  .js_filter_field_box .icon {
+    top: 18px;
+  }
+
   .search_field_clear,
   .js_filter_field_clear {
-    top: 18px;
+    top: 16px;
   }
 }

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

@@ -7,6 +7,7 @@ select {
     $hover-border-color: darken($default-border-color, 10%),
     $padding: 0 2*$default-padding,
     $border: 1px solid $default-border-color,
+    $box-shadow: none,
     $color: $text-color,
     $margin: 0);
   height: $form-field-height;
@@ -31,6 +32,7 @@ select {
         $hover-border-color: darken($default-border-color, 10%),
         $padding: $form-field-padding,
         $border: 1px solid $default-border-color,
+        $box-shadow: none,
         $color: $text-color,
         $margin: 0);
       background-image: none;
@@ -190,8 +192,8 @@ select {
       padding: 4px 0;
 
       &.select2-highlighted {
-        background: $button-hover-bg-color;
-        color: $button-text-color;
+        background: $select-hover-bg-color;
+        color: $select-hover-text-color;
       }
 
       &.select2-result-with-children {

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

@@ -211,16 +211,6 @@
   display: inline-block;
 }
 
-#create_language_tree_form {
-  width: 80%;
-  max-width: 500px;
-  margin: 2em auto;
-  padding: 4*$default-padding;
-  border: $default-border;
-  background: $medium-gray;
-  border-radius: $default-border-radius;
-}
-
 #sitemap_heading {
   padding: 0;
 

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

@@ -186,3 +186,26 @@ td#user_roles {
     min-width: 40%;
   }
 }
+
+.resources-table-wrapper {
+  padding-top: 50px;
+
+  table {
+    padding-bottom: 60px;
+  }
+}
+
+.resources-header {
+  position: fixed;
+  width: 100%;
+  top: $top-menu-height;
+  left: $main-menu-width + 9px;
+  z-index: 2;
+  margin: 0 -8px;
+  padding: 8px 16px;
+  background-color: $light-gray;
+
+  > h2, > h3 {
+    margin-bottom: 0;
+  }
+}

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

@@ -0,0 +1,55 @@
+h1, .h1,
+h2, .h2,
+h3, .h3,
+h4, .h4,
+h5, .h5 {
+  padding: 0;
+  margin: 1em 0;
+}
+
+h1, .h1,
+h2, .h2,
+h3, .h3,
+h4, .h4 {
+  font-weight: bold;
+}
+
+h1, .h1 {
+  font-size: 1.5rem;
+}
+
+h2, .h2 {
+  font-size: 1.25rem;
+}
+
+h3, .h3 {
+  font-size: 1.125rem;
+}
+
+h4, .h4,
+h5, .h5 {
+  font-size: 1rem;
+}
+
+h5, .h5 {
+  font-weight: normal;
+}
+
+p {
+  margin: 0 0 2*$default-margin 0;
+  white-space: normal;
+
+  a {
+    color: $anchor-color;
+  }
+}
+
+kbd {
+  font-family: Courier, monospaced;
+  background: $medium-gray;
+  border: $default-border;
+  padding: 0.25em 0.5em;
+  vertical-align: top;
+  margin-right: 1ex;
+  border-radius: $default-border-radius;
+}

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -467,11 +467,13 @@ div.mce-fullscreen {
     }
 
     button {
-      padding: 0.3em 1.5em;
+      padding: $button-padding;
       width: auto !important;
       height: auto !important;
+      line-height: 1;
       border: 1px solid $button-border-color;
       background-color: $button-bg-color;
+      box-shadow: $button-box-shadow;
     }
 
     .mce-txt {
@@ -530,10 +532,10 @@ body .mce-abs-layout-item {
 .mce-tooltip {
   position: absolute;
   padding: 5px;
+  transition-delay: .3s;
 }
 
 .mce-tooltip-inner {
-  font-size: 11px;
   background-color: $tooltip-background-color;
   color: $white;
   max-width: 200px;
@@ -656,7 +658,7 @@ body .mce-abs-layout-item {
   display: inline-block;
   *display: inline;
   *zoom: 1;
-  box-shadow: $button-box-shadow;
+  box-shadow: none;
   background-color: $light-gray;
 
   &:focus,
@@ -687,6 +689,7 @@ body .mce-abs-layout-item {
     overflow: visible;
     -webkit-appearance: none;
     border-radius: inherit;
+    box-shadow: none;
 
     &:focus {
       box-shadow: none;

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -21,7 +21,7 @@ module Alchemy
 
         @attachments = @attachments
           .page(params[:page] || 1)
-          .per(15)
+          .per(items_per_page)
 
         if in_overlay?
           archive_overlay

data/app/controllers/alchemy/admin/base_controller.rb

@@ -110,7 +110,8 @@ module Alchemy
       end
 
       def per_page_value_for_screen_size
-        return 25 if session[:screen_size].blank?
+        Alchemy::Deprecation.warn("#per_page_value_for_screen_size is deprecated, please use #items_per_page instead")
+        return items_per_page if session[:screen_size].blank?
         screen_height = session[:screen_size].split('x').last.to_i
         (screen_height / 50) - 12
       end

data/app/controllers/alchemy/admin/languages_controller.rb

@@ -5,7 +5,7 @@ module Alchemy
     class LanguagesController < ResourcesController
       def index
         @query = Language.on_current_site.ransack(search_filter_params[:q])
-        @languages = @query.result.page(params[:page] || 1).per(per_page_value_for_screen_size)
+        @languages = @query.result.page(params[:page] || 1).per(items_per_page)
       end
 
       def new

data/app/controllers/alchemy/admin/pictures_controller.rb

@@ -15,7 +15,11 @@ module Alchemy
       def index
         @size = params[:size].present? ? params[:size] : 'medium'
         @query = Picture.ransack(search_filter_params[:q])
-        @pictures = Picture.search_by(search_filter_params, @query, pictures_per_page_for_size(@size))
+        @pictures = Picture.search_by(
+          search_filter_params,
+          @query,
+          items_per_page
+        )
 
         if in_overlay?
           archive_overlay
@@ -108,18 +112,35 @@ module Alchemy
         redirect_to_index
       end
 
+      def items_per_page
+        if in_overlay?
+          case params[:size]
+          when 'small' then 25
+          when 'large' then 4
+          else
+            9
+          end
+        else
+          cookies[:alchemy_pictures_per_page] = params[:per_page] ||
+                                                cookies[:alchemy_pictures_per_page] ||
+                                                pictures_per_page_for_size(params[:size])
+        end
+      end
+
+      def items_per_page_options
+        per_page = pictures_per_page_for_size(@size)
+        [per_page, per_page * 2, per_page * 4]
+      end
+
       private
 
       def pictures_per_page_for_size(size)
         case size
-        when 'small'
-          per_page = in_overlay? ? 25 : (per_page_value_for_screen_size * 2.9).floor
-        when 'large'
-          per_page = in_overlay? ? 4 : (per_page_value_for_screen_size / 1.7).floor + 1
+        when 'small' then 60
+        when 'large' then 12
         else
-          per_page = in_overlay? ? 9 : (per_page_value_for_screen_size / 1.0).ceil + 4
+          20
         end
-        per_page
       end
 
       def in_overlay?