alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -2,6 +2,7 @@ select {
   @include button-defaults;
   height: 29px;
   padding: 0.4em 0.6em;
+  max-width: 100%;
 }
 
 .select2-container {

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

@@ -18,6 +18,17 @@
   }
 }
 
+#sitemap-wrapper {
+  position: relative;
+  min-height: 100%;
+
+  .loading .spinner {
+    position: absolute !important;
+    top: 50% !important;
+    left: 50% !important;
+  }
+}
+
 .sitemap_pagename_link {
   background-color: #fff;
   color: black;
@@ -218,7 +229,7 @@ div.page_infos {
 
 #sub_navigation .page_status_and_name .page_status {
   float: none;
-  @include inline-block(-1px);
+  @include inline-block(-3px);
   margin-left: 2px;
 }
 

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

@@ -101,7 +101,7 @@
   @extend %gradiated-toolbar;
   border-bottom: $default-border;
 
-  a.button {
+  .button {
     width: 25px;
     height: 21px;
     text-decoration: none;
@@ -119,7 +119,7 @@
     }
   }
 
-  form {
+  .remote-search-form {
     float: right;
     margin-right: 8px;
 

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

@@ -1,42 +1,53 @@
-a#uploadswitcher, a.underline {
-  text-decoration: underline;
+.upload-button {
+  @include inline-block(top);
 }
 
-.upload-container {
-
-  label {
-    @include button-defaults;
-    text-align: center;
-    width: 80px;
-  }
-  input { display: none }
+.fileupload {
+  width: 0.1px;
+  height: 0.1px;
+  opacity: 0;
+  overflow: hidden;
+  position: absolute;
+  z-index: -1;
 }
 
-#dropbox {
-  display: inline-block;
-  background: $medium-gray;
-  border: $default-border;
-  @extend %rounded-border;
-  padding: $default-padding 2*$default-padding;
-  text-align: center;
-  line-height: 19px;
-  width: 364px;
-  margin-left: 4px;
-
-  &.dragover {
-    background: $dark-gray;
-    color: $light-gray;
-    border-color: $light-gray;
+.dragover,
+#main_content.dragover {
+  position: relative;
+
+  &:after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 20;
+    width: 100%;
+    height: 100%;
+    background-color: rgba($dark-gray, 0.6);
+    background-image: url('data:image/svg+xml;utf8,%3Csvg%20style%3D%22enable-background%3Anew%200%200%2064%2046.9%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xml%3Aspace%3D%22preserve%22%20version%3D%221.1%22%20y%3D%220px%22%20x%3D%220px%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2064%2046.9%22%3E%3Cpath%20fill%3D%22%23ededed%22%20d%3D%22m21.3%2024.5c0-0.3%200.1-0.6%200.3-0.8l11.8-11.7c0.2-0.2%200.5-0.3%200.8-0.3s0.6%200.1%200.8%200.3l11.7%2011.7c0.2%200.3%200.3%200.5%200.3%200.8s-0.1%200.6-0.3%200.8-0.5%200.3-0.8%200.3h-7.5v11.7c0%200.3-0.1%200.5-0.3%200.8-0.2%200.2-0.5%200.3-0.8%200.3h-6.4c-0.3%200-0.5-0.1-0.8-0.3s-0.3-0.5-0.3-0.8v-11.7h-7.5c-0.3%200-0.5-0.1-0.8-0.3s-0.2-0.5-0.2-0.8m-21.3%209.6c0%203.5%201.3%206.6%203.8%209%202.5%202.5%205.5%203.8%209%203.8h36.3c4.1%200%207.6-1.5%2010.6-4.4%202.8-2.9%204.3-6.4%204.3-10.5%200-2.9-0.8-5.6-2.3-8-1.6-2.4-3.6-4.3-6.3-5.5%200-0.7%200.1-1.1%200.1-1.4%200-4.7-1.7-8.7-5-12.1-3.3-3.3-7.4-5-12.1-5-3.5%200-6.6%201-9.5%202.9s-5%204.5-6.3%207.7c-1.6-1.4-3.4-2.1-5.5-2.1-2.4%200-4.4%200.8-6%202.5-1.7%201.7-2.5%203.7-2.5%206%200%201.7%200.5%203.2%201.4%204.6-2.9%200.7-5.3%202.2-7.1%204.5-2%202.4-2.9%205.1-2.9%208%22%2F%3E%3C%2Fsvg%3E');
+    background-position: center;
+    background-size: 64px 47px;
+    background-repeat: no-repeat;
+    pointer-events: none;
   }
 }
 
 .overall-upload {
-  display: none;
+  box-sizing: border-box;
+  position: fixed;
+  bottom: -100%;
+  left: 0;
+  z-index: 150;
+  width: 100%;
+  height: auto;
+  padding: 8px;
   overflow: hidden;
-  @include border-radius($default-border-radius);
-  background-color: $medium-gray;
-  border: $default-border;
-  margin-bottom: 2*$default-margin;
+  background-color: rgba($dark-gray, 0.6);
+  transition: all 250ms ease-in-out;
+
+  &.visible {
+    bottom: 0;
+  }
 
   .progress {
     width: 0%;
@@ -47,75 +58,74 @@ a#uploadswitcher, a.underline {
     text-indent: 2*$default-padding;
     overflow: visible;
     white-space: nowrap;
+    @include border-radius($default-border-radius);
   }
 }
 
-#uploadProgressContainer {
+.upload-progress-container {
   overflow-x: hidden;
   overflow-y: auto;
-  height: 234px;
-}
-
-#uploadProgressContainer .progressWrapper {
-  padding: 2*$default-padding;
-  background-color: $medium-gray;
-  position: relative;
-  margin-bottom: 8px;
-  border: 1px solid #9e9e9e;
-  @extend %rounded-border;
-}
+  max-height: 236px;
+
+  .progress-wrapper {
+    padding: 2*$default-padding;
+    background-color: $medium-gray;
+    position: relative;
+    margin-top: 8px;
+    @extend %rounded-border;
+  }
 
-#uploadProgressContainer .progressName,
-#uploadProgressContainer .progressBarStatus {
-  margin-bottom: 4px;
-}
+  .progress-name,
+  .progress-bar-status {
+    margin-bottom: 4px;
+  }
 
-#uploadProgressContainer .progressBarStatus {
-  font-size: 10px;
-}
+  .progress-name {
+    text-shadow: 0 1px 2px #ffffff;
+  }
 
-#uploadProgressContainer .progressName {
-  text-shadow: 0 1px 2px #ffffff;
-}
+  .progress-bar-status {
+    font-size: 10px;
+  }
 
-#uploadProgressContainer .progressBarContainer {
-  background-color: #f9f9f9;
-  border: 1px solid #9e9e9e;
-  @extend %rounded-border;
-  height: 16px;
-  overflow: hidden;
-  width: 100%;
-}
+  .progress-bar-container {
+    background-color: #f9f9f9;
+    @extend %rounded-border;
+    height: 16px;
+    overflow: hidden;
+    width: 100%;
+  }
 
-#uploadProgressContainer .progressBarInProgress {
-  background-color: $info_background_color;
-  height: 16px;
-  width: 0;
-}
+  .progress-bar-in-progress {
+    background-color: $info_background_color;
+    height: 16px;
+    width: 0;
+  }
 
-#uploadProgressContainer .progressBarComplete {
-  background-color: $success_background_color;
-  height: 16px;
-  width: 0;
-}
+  .progress-bar-complete {
+    background-color: $success_background_color;
+    height: 16px;
+    width: 0;
+  }
 
-#uploadProgressContainer .progressBarError {
-  background-color: $error_background_color;
-  height: 16px;
-  width: 0;
-}
+  .progress-bar-error {
+    background-color: $error_background_color;
+    height: 16px;
+    width: 0;
+  }
 
-#uploadProgressContainer .progressBarCanceled {
-  background-color: #c9c9c9;
-  height: 16px;
-  width: 0;
-}
+  .progress-bar-canceled {
+    background-color: #c9c9c9;
+    height: 16px;
+    width: 0;
+  }
 
-#uploadProgressContainer .progressCancel {
-  @extend .icon-cross;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  top: 8px;
-  right: 4px;
+  .progress-cancel {
+    @extend .icon-cross;
+    width: 16px;
+    height: 16px;
+    position: absolute;
+    top: 8px;
+    right: 4px;
+  }
 }

data/app/assets/stylesheets/alchemy/welcome.sass

@@ -0,0 +1,49 @@
+body
+  background: #f2f2f2
+  color: #7f8c8d
+  font-family: 'Open Sans', Helvetica, Arial, sans-serif
+  font-weight: normal
+  font-size: 15px
+  line-height: 22px
+
+h3
+  color: #34495e
+  font-family: 'Bitter', serif
+  font-weight: normal
+  font-size: 25px
+  line-height: 1.2
+  margin-bottom: 20px
+  padding-top: 20px
+
+.container
+  position: absolute
+  top: 50%
+  left: 50%
+  width: 600px
+  margin-top: -50px
+  transform: translateY(-50%) translateX(-300px)
+
+ul
+  line-height: 1.6
+  margin-bottom: 17px
+  padding: 0
+  padding-left: 20px
+  margin: 0px
+  list-style-position: outside
+
+li
+  color: #2980b9
+  font-weight: 600
+  margin-bottom: 12px
+  background-color: none
+  border-bottom: 0 none
+  line-height: 22px
+
+a
+  color: #87ab5a
+  text-decoration: underline
+  transition: all 0.1s ease-in-out
+
+  &:hover
+    color: #2980b9
+    text-decoration: underline

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

@@ -1,10 +1,14 @@
 module Alchemy
   module Admin
     class AttachmentsController < ResourcesController
+      include UploaderResponses
+
       helper 'alchemy/admin/tags'
 
       def index
-        @attachments = Attachment.all
+        @query = Attachment.ransack(params[:q])
+        @attachments = @query.result
+
         if params[:only].present?
           @attachments = @attachments.where("file_mime_type LIKE '%#{params[:only]}%'")
         end
@@ -14,7 +18,11 @@ module Alchemy
         if params[:tagged_with].present?
           @attachments = @attachments.tagged_with(params[:tagged_with])
         end
-        @attachments = @attachments.find_paginated(params, 15, sort_order)
+
+        @attachments = @attachments
+          .page(params[:page] || 1)
+          .per(15)
+
         @options = options_from_params
         if in_overlay?
           archive_overlay
@@ -26,24 +34,12 @@ module Alchemy
         render :show
       end
 
-      def new
-        @attachment = Attachment.new
-        if in_overlay?
-          set_instance_variables
-        end
-      end
-
       def create
         @attachment = Attachment.new(attachment_attributes)
         if @attachment.save
-          if in_overlay?
-            set_instance_variables
-          end
-          message = _t('File uploaded succesfully', name: @attachment.name)
-          render json: {files: [@attachment.to_jq_upload], growl_message: message}, status: :created
+          render succesful_uploader_response(file: @attachment)
         else
-          message = _t('File upload error', error: @attachment.errors[:file].join)
-          render json: {files: [@attachment.to_jq_upload], growl_message: message}, status: :unprocessable_entity
+          render failed_uploader_response(file: @attachment)
         end
       end
 
@@ -51,8 +47,12 @@ module Alchemy
         @attachment.update_attributes(attachment_attributes)
         render_errors_or_redirect(
           @attachment,
-          admin_attachments_path(page: params[:page], query: params[:query], per_page: params[:per_page]),
-          _t("File successfully updated")
+          admin_attachments_path(
+            per_page: params[:per_page],
+            page: params[:page],
+            q: params[:q]
+          ),
+          Alchemy.t("File successfully updated")
         )
       end
 
@@ -62,14 +62,14 @@ module Alchemy
         @url = admin_attachments_url(
           per_page: params[:per_page],
           page: params[:page],
-          query: params[:query]
+          q: params[:q]
         )
-        flash[:notice] = _t('File deleted successfully', name: name)
+        flash[:notice] = Alchemy.t('File deleted successfully', name: name)
       end
 
       def download
         @attachment = Attachment.find(params[:id])
-        send_data @attachment.file.data, {
+        send_file @attachment.file.path, {
           filename: @attachment.file_name,
           type: @attachment.file_mime_type
         }
@@ -93,14 +93,6 @@ module Alchemy
       def attachment_attributes
         params.require(:attachment).permit(:file, :name, :file_name, :tag_list)
       end
-
-      def set_instance_variables
-        @while_assigning = true
-        @content = Content.find_by(id: params[:content_id])
-        @swap = params[:swap]
-        @options = options_from_params
-      end
-
     end
   end
 end

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

@@ -4,7 +4,8 @@ module Alchemy
       include Userstamp
       include Alchemy::Locale
 
-      before_filter { enforce_ssl if ssl_required? && !request.ssl? }
+      before_action { enforce_ssl if ssl_required? && !request.ssl? }
+      before_action :load_locked_pages
 
       helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
 
@@ -50,9 +51,9 @@ module Alchemy
         @notice = e.message[0..255]
         @trace = e.backtrace[0..50]
         if request.xhr?
-          render :action => "error_notice"
+          render action: "error_notice"
         else
-          render '500', :status => 500
+          render '500', status: 500
         end
       end
 
@@ -106,7 +107,7 @@ module Alchemy
       #
       def render_errors_or_redirect(object, redirect_url, flash_notice)
         if object.errors.empty?
-          flash[:notice] = _t(flash_notice)
+          flash[:notice] = Alchemy.t(flash_notice)
           do_redirect_to redirect_url
         else
           render action: (params[:action] == 'update' ? 'edit' : 'new')
@@ -163,6 +164,24 @@ module Alchemy
         controller_path == 'alchemy/admin/pages' && action_name == 'show'
       end
 
+      def load_locked_pages
+        @locked_pages = Page.from_current_site.locked_by(current_alchemy_user)
+      end
+
+      # Returns the current site.
+      #
+      def current_alchemy_site
+        @current_alchemy_site ||= begin
+          site_id = params[:site_id] || session[:site_id]
+          if site_id.nil?
+            session.delete :site_id
+            Site.find_for_host(request.host)
+          else
+            session[:site_id] = site_id
+            Site.find(site_id)
+          end
+        end
+      end
     end
   end
 end