alchemy_cms 2.4.beta2 → 2.4.rc1

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

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 #top_menu {
   position: fixed;
   top: 0;

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

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 .icon {
   @include inline-block;
   background: url('icons.png') no-repeat;
@@ -209,6 +207,26 @@
     background-position: -96px -136px;
   }
 
+  &.tag_add {
+    background-position: -384px -168px;
+  }
+
+  &.tag {
+    background-position: -288px -168px;
+  }
+
+  &.tag_label {
+    background: url('ui-icons_666666_256x240.png') -240px -97px;
+  }
+
+  &.tag_edit {
+    background-position: -352px -168px;
+  }
+
+  &.tag_delete {
+    background-position: -320px -168px;
+  }
+
   &.text {
     background-position: -448px -136px;
   }

data/app/assets/stylesheets/alchemy/{jquery-ui.alchemy.css.scss → jquery-ui.scss}

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 /*
  * jQuery UI CSS Framework 1.8.7
  *
@@ -1293,6 +1291,9 @@
   margin: 0;
   display: block;
   float: left;
+  background-color: white;
+  @include box-shadow(0 4px 16px $dark-gray);
+  border: $default-border;
 }
 
 #alchemy .ui-menu .ui-menu {
@@ -1319,7 +1320,9 @@
 #alchemy .ui-menu .ui-menu-item a.ui-state-hover,
 #alchemy .ui-menu .ui-menu-item a.ui-state-active {
   font-weight: normal;
-  margin: -1px;
+  cursor: pointer;
+  background-color: #e6f0f5;
+  color: $text-color;
 }
 
 /*

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

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 div#alchemy_greeting {
   width: 370px;
   margin-right: auto;
@@ -21,12 +19,14 @@ div#alchemy_greeting {
 }
 
 div.login_signup_box {
-  width: 360px;
+  width: 390px;
   padding: 4*$default-padding;
   border: $default-border;
   background-color: $medium-gray;
   @include rounded-corner;
   margin: 2em auto;
+
+  input[type="text"], input.thin_border { width: 240px }
 }
 
 html.no-js {

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

@@ -1,7 +1,6 @@
 /*
  *= require_self
  */
-
 @import "alchemy/defaults";
 
 @mixin transition {

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

@@ -1,41 +1,3 @@
-@import "compass/css3";
-@import "compass/css3/user-interface";
-@import "sassy-buttons";
-
-$text-color: #333333;
-$light-blue: #C6DBE7;
-$blue: darken($light-blue, 15%);
-$very-light-blue: lighten($light-blue, 12%);
-$light-gray: #EDEDED;
-$medium-gray: #E3E3E3;
-$dark-gray: #666666;
-
-$default-padding: 4px;
-$default-margin: $default-padding;
-
-$default-font-face: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
-$default-font-size: 12px;
-$default-font-style: $default-font-size $default-font-face;
-
-$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-hover-bg-color: #e6f0f5;
-$button-border-color: #9A9A9A;
-$button-hover-border-color: #888888;
-$button-text-shadow: #f2f2f2 1px 1px 0;
-
-$sb-base-color:      $light-gray;
-$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: 0.3em 0;
-
 @mixin rounded-corner($radius: $default-border-radius) {
   @include border-radius($radius);
 }
@@ -69,7 +31,8 @@ $default-form-field-margin: 0.3em 0;
 }
 
 @mixin default-button-style {
-  @include sassy-button('shiny');
+  @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);
+
   border-color: $button-border-color;
   margin: $default-form-field-margin;
 }

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

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 span.icon.module {
   width: 24px;
   height: 24px;
@@ -26,6 +24,10 @@ span.module.languages {
   background-position: -200px 0;
 }
 
+span.module.tags {
+  background-position: -280px 0;
+}
+
 span.module.exit {
   background-position: -160px 0;
 }

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

@@ -0,0 +1,51 @@
+@mixin message {
+  padding: 8px 8px 8px 32px;
+  line-height: 17px;
+  border-width: 1px;
+  border-style: solid;
+  @include rounded-corner;
+  position: relative;
+  margin-bottom: 8px;
+
+  h2 { margin-top: 0 }
+
+  span.icon {
+    position: absolute;
+    left: 8px;
+    top: 8px;
+  }
+
+  &.footnote {
+    font-size: 10px;
+    margin: 16px;
+  }
+
+  ol {
+    margin: 0 0 8px;
+    padding-left: 20px;
+
+    li {
+      text-indent: 0;
+      margin-bottom: 4px;
+    }
+  }
+}
+
+div.info {
+  @include message;
+  color: $text-color;
+  background-color: #eaf4f9;
+  border-color: #0b5c84;
+}
+
+div.error {
+  @include message;
+  background-color: #f1c9ca;
+  color: #931f23;
+}
+
+div.warning {
+  @include message;
+  background-color: #f7efb8;
+  color: #756f47;
+}

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

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 div.pagination {
   clear: both;
   zoom: 1;

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

@@ -1,7 +1,7 @@
 /*
-*= require alchemy/base
-*= require_self
-*/
+ *= require_self
+ */
+@import "alchemy/defaults";
 
 div#main_menu,
 div#top_menu,

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

@@ -0,0 +1,63 @@
+#toolbar div.search_field {
+  position: relative;
+  float: left;
+  margin-bottom: $default-margin;
+}
+
+div#image_assign_filter_and_image_sizing form div.search_field {
+  margin-right: 4px;
+  float: left;
+  position: relative;
+}
+
+#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;
+}
+
+td#tags_tag_list {
+  text-align: left;
+
+  ul.tags {
+    max-height: 10em;
+    padding: 1px;
+    margin: 0;
+    margin-top: 2px;
+    overflow: auto;
+    text-align: left;
+    list-style-type: none;
+
+    li {
+      background-color: white;
+      padding: 4px;
+      margin: 0;
+
+      &.odd {
+        background-color: #eaf3f9;
+      }
+    }
+  }
+
+  .js_filter_field_box {
+    float: none;
+    margin: 0;
+
+    .js_filter_field {
+      width: 260px;
+      border-radius: 3px;
+      -o-border-radius: 3px;
+      -ms-border-radius: 3px;
+      -moz-border-radius: 3px;
+      -webkit-border-radius: 3px;
+    }
+
+    label {
+      display: none
+    }
+  }
+}

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

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 div#sort_panel {
   background: $medium-gray;
   padding: 60px 0 8px 0;
@@ -95,6 +93,7 @@ div.sitemap_page:hover a.sitemap_pagename_link {
 }
 
 div.sitemap_left_images {
+  width: 16px;
   margin-top: 3px;
   float: left;
   margin-right: 8px;

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

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 table {
   border-style: none;
   border-spacing: 0 $default-padding;
@@ -9,7 +7,6 @@ table {
 
   td, th {
     padding: $default-padding;
-    white-space: nowrap;
     vertical-align: top;
     line-height: 18px;
 
@@ -19,6 +16,7 @@ table {
   }
 
   th {
+    white-space: nowrap;
     text-align: left;
     height: 22px;
     vertical-align: top;
@@ -45,6 +43,10 @@ td.input, td.submit, td.select, td.value {
   }
 }
 
+td.input {
+  .autocomplete_tag_list { float: right }
+}
+
 td.submit p.foot_note { float: left; padding-top: 1em }
 
 td.label {
@@ -171,6 +173,12 @@ td.role {
   width: 10%;
 }
 
+th.count, td.count {
+  width: 120px;
+  text-align: right;
+  padding-right: 16px;
+}
+
 table td.rights {
   width: 60px;
 }
@@ -194,4 +202,9 @@ table tr.even td {
 th.icon, td.icon {
   background: none;
   display: table-cell;
+  vertical-align: top;
+}
+
+td.file_name {
+  word-break: break-all;
 }

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

@@ -1,3 +1,6 @@
+/*
+ *= require_self
+ */
 @import "alchemy/defaults";
 
 body, td, pre {

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

@@ -1,3 +1,6 @@
+/*
+ *= require_self
+ */
 @import "alchemy/defaults";
 
 /* Generic */

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

@@ -1,5 +1,3 @@
-@import "alchemy/defaults";
-
 a#uploadswitcher, a.underline {
   text-decoration: underline;
 }

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

@@ -0,0 +1,33 @@
+$text-color: #333333;
+$light-blue: #C6DBE7;
+$blue: darken($light-blue, 15%);
+$very-light-blue: lighten($light-blue, 12%);
+$light-gray: #EDEDED;
+$medium-gray: #E3E3E3;
+$dark-gray: #666666;
+
+$default-padding: 4px;
+$default-margin: $default-padding;
+
+$default-font-face: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
+$default-font-size: 12px;
+$default-font-style: $default-font-size $default-font-face;
+
+$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-hover-bg-color: #e6f0f5;
+$button-border-color: #9A9A9A;
+$button-hover-border-color: #888888;
+$button-text-shadow: #f2f2f2 1px 1px 0;
+
+$sb-base-color:      $light-gray;
+$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: 0.3em 0;

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

@@ -66,8 +66,7 @@ module Alchemy
         @element = Element.find_by_id(params[:id])
         if @element.save_contents(params)
           @page = @element.page
-          @element.public = !params[:public].nil?
-          @element_validated = @element.save!
+          @element_validated = @element.update_attributes!(params[:element])
         else
           @element_validated = false
           @notice = t('Validation failed')

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

@@ -0,0 +1,64 @@
+module Alchemy
+  module Admin
+    class TagsController < BaseController
+
+      before_filter :load_tag, :only => [:edit, :update, :destroy]
+
+      def index
+        @tags = ActsAsTaggableOn::Tag.where(
+          "name LIKE '%#{params[:query]}%'"
+        ).page(params[:page] || 1).per(per_page_value_for_screen_size).order("name ASC")
+      end
+
+      def new
+        @tag = ActsAsTaggableOn::Tag.new
+        render :layout => false
+      end
+
+      def create
+        @tag = ActsAsTaggableOn::Tag.create(params[:tag])
+        render_errors_or_redirect @tag, admin_tags_path, t('New Tag Created')
+      end
+
+      def edit
+        @tags = ActsAsTaggableOn::Tag.order("name ASC").all - [@tag]
+        render :layout => false
+      end
+
+      def update
+        if params[:replace]
+          @new_tag = ActsAsTaggableOn::Tag.find(params[:tag][:merge_to])
+          Tag.replace(@tag, @new_tag)
+          operation_text = t('Replaced Tag %{old_tag} with %{new_tag}') % {:old_tag => @tag.name, :new_tag => @new_tag.name}
+          @tag.destroy
+        else
+          @tag.update_attributes(params[:tag])
+          @tag.save
+          operation_text = t(:successfully_updated_tag)
+        end
+        render_errors_or_redirect @tag, admin_tags_path, operation_text
+      end
+
+      def destroy
+        if request.delete?
+          @tag.destroy
+          flash[:notice] = t(:successfully_deleted_tag)
+        end
+        @redirect_url = admin_tags_path
+        render :action => :redirect
+      end
+
+      def autocomplete
+        items = ActsAsTaggableOn::Tag.where(['LOWER(name) LIKE ?', "#{params[:term].downcase}%"])
+        render :json => json_for_autocomplete(items, :name)
+      end
+
+    private
+
+      def load_tag
+        @tag = ActsAsTaggableOn::Tag.find(params[:id])
+      end
+
+    end
+  end
+end