alchemy_cms 2.5.3.1 → 2.6.0.rc5

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

@@ -27,7 +27,7 @@ a {
   }
 
   &:focus {
-    @include default-focus-style(rgba(white, 0.5), none);
+    @extend %white-focus-style;
     color: black;
   }
 }
@@ -67,7 +67,7 @@ input.invalid {
 }
 
 textarea {
-  @include default-input-style;
+  @extend %default-input-style;
   margin: 0;
   resize: none;
   outline: none;
@@ -94,7 +94,7 @@ input.checkbox {
 /* Buttons */
 
 #insert, #cancel, input.button, .updateButton {
-  @include default-button-style;
+  @extend %button-defaults;
 }
 
 /* Browse */
@@ -188,7 +188,6 @@ td.charmap, #charmap a {
 
   #codeN {
     font-size: 10px;
-    font-family: "Lucida Grande", Arial, sans-serif;
     text-align: center
   }
 
@@ -216,7 +215,7 @@ td.charmap, #charmap a {
 
 .tabs {
   width: 100%;
-  height: 18px;
+  height: 27px;
   line-height: normal;
 }
 
@@ -228,14 +227,14 @@ td.charmap, #charmap a {
 
 .tabs li {
   float: left;
-  background: url('shading.png') repeat-x 0 0;
   margin: 0 2px 0 0;
-  padding: 0 0 0 10px;
+  padding: 4px 12px;
   line-height: 17px;
   height: 18px;
   display: block;
   border: 1px solid #9a9a9a;
   border-bottom-style: none;
+  @extend .top-rounded-border;
 }
 
 .tabs li.current {
@@ -247,18 +246,15 @@ td.charmap, #charmap a {
 .tabs span {
   float: left;
   display: block;
-  background: image-url('tiny_mce/themes/advanced/skins/default/img/tabs.gif') no-repeat right -36px;
-  padding: 0px 10px 0 0;
+  padding: 0;
 }
 
 .tabs .current span {
-  background: image-url('tiny_mce/themes/advanced/skins/default/img/tabs.gif') no-repeat right -54px;
+
 }
 
 .tabs a {
   text-decoration: none;
-  font-family: "Lucida Grande", Arial, sans-serif;
-  font-size: 10px;
 }
 
 .tabs a:link, .tabs a:visited, .tabs a:hover {
@@ -274,11 +270,11 @@ td.charmap, #charmap a {
 .panel_wrapper div.current {
   display: block;
   width: 100%;
-  height: 300px;
+  height: 287px;
   overflow: visible;
 }
 
-div#general_panel { height: 245px }
+div#general_panel { height: 287px }
 
 div#advanced_panel { height: 300px }
 
@@ -324,7 +320,7 @@ h3 {
 
 .title {
   font-size: 12px;
-  font-weight: bold;
+  font-weight: normal;
   color: $text-color;
 }
 
@@ -413,6 +409,12 @@ h3 {
 }
 
 #iframecontainer iframe#iframe {
-  @include default-input-style;
+  @extend %default-input-style;
   padding: 0;
 }
+
+#htmlSource {
+  margin-top: 1em;
+  height: 496px !important;
+  margin-bottom: 4px;
+}

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

@@ -2,25 +2,18 @@
   z-index: 10;
   padding: 4px;
   height: 44px;
-  background: $medium-gray url('shading.png') repeat-x 0 -40px;
+  @extend %gradiated-toolbar;
   margin-right: 0px;
   border: $default-border;
   border-top-style: none;
   border-right-style: none;
-  @include bottom-left-rounded-border;
+  @extend .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;
@@ -39,16 +32,75 @@
     padding: 0;
   }
 
-  div.toolbar_spacer {
-    float: left;
-    width: 1px;
-    height: 37px;
-    border-right-style: dotted;
-    border-right-width: 1px;
+  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;
+    }
+  }
+
+  .js_filter_field {
+    @include border-radius(15px);
+  }
+
+  .js_filter_field_box {
     margin-right: 2*$default-margin;
-    margin-left: $default-margin;
+
+    label {
+      margin: 0;
+    }
   }
 
+  .search_form {
+    position: absolute;
+    top: 4px;
+    right: 8px;
+    text-align: center;
+  }
+}
+
+.toolbar_buttons {
+  margin-right: 8px;
+  white-space: nowrap;
+
+  &.right {
+    position: absolute;
+    right: 8px;
+    top: 4px;
+    margin-left: 8px;
+  }
+}
+
+.toolbar_spacer {
+  @include inline-block;
+  width: 1px;
+  height: 37px;
+  border-right-style: dotted;
+  border-right-width: 1px;
+  margin-right: 2*$default-margin;
+  margin-left: $default-margin;
+}
+
+#overlay_toolbar {
+  @extend %gradiated-toolbar;
+  border: $default-border;
+  height: 44px;
+  border-top-style: none;
+  border-left-style: none;
+  border-right-style: none;
+  padding: $default-padding;
+
   a.button {
     width: 25px;
     height: 21px;
@@ -66,14 +118,22 @@
       background-position: 0 -21px;
     }
   }
-}
 
-div#toolbar_buttons {
-  float: left;
-  margin-right: 6px;
-}
+  .search_field {
+    width: 225px;
+  }
+
+  form {
+    float: right;
+    width: 310px;
+    margin-top: 2px;
+    padding: 0 !important;
+    margin-right: 0;
 
-div#toolbar_buttons_right {
-  float: right;
-  margin-left: 8px;
+    .button {
+      position: absolute;
+      top: 2px;
+      right: 4px;
+    }
+  }
 }

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

@@ -14,7 +14,7 @@ a#uploadswitcher, a.underline {
   position: relative;
   margin-bottom: 8px;
   border: 1px solid #9e9e9e;
-  @include rounded-corner;
+  @extend .rounded-border;
 }
 
 #uploadProgressContainer .progressName,
@@ -31,34 +31,39 @@ a#uploadswitcher, a.underline {
 }
 
 #uploadProgressContainer .progressBarContainer {
-  background: #F9F9F9 url('shading.png') repeat-x 0 0;
+  background-color: #F9F9F9;
+  @include background-image(linear-gradient(top, darken($medium-gray, 10) 5%, $light-gray 35%, lighten($light-gray, 10) 90%));
   border: 1px solid #9E9E9E;
-  @include rounded-corner;
+  @extend .rounded-border;
   height: 16px;
   overflow: hidden;
   width: 100%;
 }
 
 #uploadProgressContainer .progressBarInProgress {
-  background: #77AAD5 url('shading.png') repeat-x 0 -75px;
+  background-color: #77AAD5;
+  @extend %progressbar;
   height: 16px;
   width: 0;
 }
 
 #uploadProgressContainer .progressBarComplete {
-  background: #00D827 url('shading.png') repeat-x 0 -75px;
+  background-color: #00D827;
+  @extend %progressbar;
   height: 16px;
   width: 0;
 }
 
 #uploadProgressContainer .progressBarError {
-  background: #F00 url('shading.png') repeat-x 0 -75px;
+  background-color: #F00;
+  @extend %progressbar;
   height: 16px;
   width: 0;
 }
 
 #uploadProgressContainer .progressBarCanceled {
-  background: #E4E4E4 url('shading.png') repeat-x 0 -75px;
+  background-color: #E4E4E4;
+  @extend %progressbar;
   height: 16px;
   width: 0;
 }
@@ -66,7 +71,7 @@ a#uploadswitcher, a.underline {
 #uploadProgressContainer .progressCancel {
   background: #f1f1f1 url('icons.png') no-repeat -1px -72px;
   border: 1px solid #9e9e9e;
-  @include rounded-corner;
+  @extend .rounded-border;
   width: 15px;
   height: 16px;
   position: absolute;
@@ -92,7 +97,7 @@ object.swfupload {
 #dropbox {
   background: $medium-gray;
   border: $default-border;
-  @include rounded-corner;
+  @extend .rounded-border;
   padding: $default-padding;
   margin-bottom: 2*$default-padding;
   text-align: center;

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

@@ -6,6 +6,7 @@ $light-gray: #EDEDED;
 $medium-gray: #E3E3E3;
 $dark-gray: #666666;
 $light_yellow: #ffffdc;
+$linked-color: #ffd77a;
 
 $default-padding: 4px;
 $default-margin: $default-padding;

data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss

@@ -26,7 +26,7 @@
   position: absolute;
   direction: ltr;
   border: $default-border;
-  @include rounded-corner;
+  @extend .rounded-border;
 }
 
 .alchemy .mceWrapper {
@@ -199,12 +199,13 @@ a.mceMove {
 }
 
 .alchemy .mceClose {
-  right: 8px;
-  background: image-url("alchemy/ui-icons_666666_256x240.png") -96px -128px;
+  @extend .icon-cancel;
   width: 16px;
   height: 16px;
-  top: 6px;
-
+  top: 7px;
+  right: 8px;
+  text-align: center;
+  &:before { font-size: 16px }
 }
 
 .alchemy .mceMin {
@@ -217,8 +218,9 @@ a.mceMove {
   right: 28px;
   width: 16px;
   height: 16px;
-  background: image-url("alchemy/ui-icons_666666_256x240.png") -49px -80px;
+  @extend .icon-exit-fullscreen;
   top: 6px;
+  padding-top: 3px;
 }
 
 .alchemy .mceMax {
@@ -226,14 +228,16 @@ a.mceMove {
   right: 28px;
   width: 16px;
   height: 16px;
-  background: image-url("alchemy/ui-icons_666666_256x240.png") -32px -80px;
+  @extend .icon-fullscreen;
   top: 6px;
+  padding-top: 3px;
 }
 
 .alchemy .mceClose, .alchemy .mceMin, .alchemy .mceMed, .alchemy .mceMax {
+
   &:hover {
     border: 1px solid $button-hover-border-color;
-    @include rounded-corner;
+    @extend .rounded-border;
     background-color: $button-hover-bg-color;
     color: $text-color;
     font-weight: normal;
@@ -242,22 +246,15 @@ a.mceMove {
 
 .alchemy .mceClose {
   &:hover {
-    background-position: -97px -129px;
-    right: 6px;
+    top: 6px;
+    right: 7px;
   }
 }
 
-.alchemy .mceMax {
-  &:hover {
-    background-position: -33px -81px;
-    right: 26px;
-  }
-}
-
-.alchemy .mceMed {
+.alchemy .mceMax, .alchemy .mceMed {
   &:hover {
-    background-position: -50px -81px;
-    right: 26px;
+    top: 5px;
+    right: 27px;
   }
 }
 
@@ -370,7 +367,7 @@ a.mceMove {
 /* Alert/Confirm */
 
 .alchemy .mceButton {
-  @include default-button-style;
+  @extend %button-defaults;
   bottom: 10px;
   // width: 80px;
   // height: 25px;

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

@@ -1,14 +1,18 @@
 module Alchemy
   module Admin
-    class AttachmentsController < Alchemy::Admin::BaseController
+    class AttachmentsController < ResourcesController
+      helper 'alchemy/admin/tags'
 
       protect_from_forgery :except => [:create]
 
       def index
+        @attachments = Attachment.scoped
+        @attachments = @attachments.tagged_with(params[:tagged_with]) if params[:tagged_with].present?
+        @attachments = @attachments.find_paginated(params, 15, sort_order)
         if in_overlay?
           archive_overlay
         else
-          @attachments = Attachment.find_paginated(params, per_page_value_for_screen_size)
+          # render index.html.erb
         end
       end
 
@@ -24,17 +28,14 @@ module Alchemy
       end
 
       def create
-        @attachment = Attachment.create(
-          :uploaded_data => params[:Filedata],
-          :name => params[:Filedata].original_filename
-        )
+        @attachment = Attachment.create!(:file => params[:Filedata])
         if in_overlay?
           @while_assigning = true
           @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
           @swap = params[:swap]
           @options = hashified_options
         end
-        @attachments = Attachment.find_paginated(params, per_page_value_for_screen_size)
+        @attachments = Attachment.find_paginated(params, per_page_value_for_screen_size, sort_order)
         @message = _t('File %{name} uploaded succesfully', :name => @attachment.name)
         # Are we using the Flash uploader? Or the plain html file uploader?
         if params[Rails.application.config.session_options[:key]].blank?
@@ -45,18 +46,18 @@ module Alchemy
 
       def edit
         @attachment = Attachment.find(params[:id])
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def update
         @attachment = Attachment.find(params[:id])
         oldname = @attachment.name
-        if @attachment.update_attributes(params[:attachment])
-          flash[:notice] = _t("File renamed successfully from: '%{from}' to '%{to}'", :from => oldname, :to => @attachment.name)
-        else
-          render :action => "edit"
-        end
-        redirect_to admin_attachments_path(:page => params[:page], :query => params[:query], :per_page => params[:per_page])
+        @attachment.update_attributes(params[:attachment])
+        render_errors_or_redirect(
+          @attachment,
+          admin_attachments_path(:page => params[:page], :query => params[:query], :per_page => params[:per_page]),
+          _t("File successfully updated")
+        )
       end
 
       def destroy
@@ -68,23 +69,15 @@ module Alchemy
 
       def show
         @attachment = Attachment.find(params[:id])
-        send_file(
-          @attachment.public_filename,
-          {
-            :name => @attachment.filename,
-            :type => @attachment.content_type,
-            :disposition => 'inline'
-          }
-        )
+        render layout: !request.xhr?
       end
 
       def download
         @attachment = Attachment.find(params[:id])
-        send_file(
-          @attachment.full_filename, {
-            :name => @attachment.filename,
-            :type => @attachment.content_type,
-            :disposition => 'attachment'
+        send_data(
+          @attachment.file.data, {
+            :filename => @attachment.file_name,
+            :type => @attachment.file_mime_type
           }
         )
       end
@@ -92,22 +85,19 @@ module Alchemy
     private
 
       def in_overlay?
-        !params[:content_id].blank?
+        params[:content_id].present?
       end
 
       def archive_overlay
-        @content = Content.find(params[:content_id])
-        @options = params[:options]
-        if !params[:only].blank?
-          condition = "filename LIKE '%.#{params[:only].join("' OR filename LIKE '%.")}'"
-        elsif !params[:except].blank?
-          condition = "filename NOT LIKE '%.#{params[:except].join("' OR filename NOT LIKE '%.")}'"
-        else
-          condition = ""
-        end
-        @attachments = Attachment.where(condition).order(:name)
+        @content = Content.find(params[:content_id], select: 'id')
+        @options = hashified_options
         respond_to do |format|
-          format.html { render :partial => 'archive_overlay' }
+          format.html {
+            render partial: 'archive_overlay'
+          }
+          format.js {
+            render action: 'archive_overlay'
+          }
         end
       end