alchemy_cms 2.4.1 → 2.5.0.b2

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 1.9.3
 branches:
   only:
-    - 2.4-stable
+    - master
 before_script:
   - sudo spec/support/ci/install_phantomjs
   - "export PATH=phantomjs/bin:$PATH"

data/README.md

@@ -1,13 +1,15 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.4-stable)](http://travis-ci.org/magiclabs/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
 [![Maintenance Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)](http://stillmaintained.com/magiclabs/alchemy_cms)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/magiclabs/alchemy_cms)
 
 About
 -----
 
+**This branch is a beta development branch. For productive environments use the current rubygems version, or the [latest stable branch (2.4-stable)](https://github.com/magiclabs/alchemy_cms/tree/2.4-stable).**
+
 Alchemy is a powerful, userfriendly and flexible Rails 3 CMS.
 
 Read more on the [website](http://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com).
@@ -54,7 +56,7 @@ Installation
 
 Use the installer (recommended):
 
-    gem install alchemy_cms
+    gem install alchemy_cms --pre
     alchemy new my_magicpage
 
 Start the local server:
@@ -63,22 +65,12 @@ Start the local server:
 
 Then just switch to your browser and open `http://localhost:3000`
 
-Upgrading
-------------
-
-After updating Alchemy you should run the upgrader.
-
-Run in terminal:
-
-    rake alchemy:upgrade
-
-
 Add to existing Rails project
 -----------------------------
 
 In your Gemfile:
 
-    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms', :branch => '2.4-stable'
+    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms'
 
 Run in terminal:
 
@@ -91,6 +83,16 @@ Just paste this in your `app/controllers/application_controller.rb`
 
 `helper Alchemy::PagesHelper`
 
+Upgrading
+---------
+
+After updating Alchemy you should run the upgrader.
+
+Run in terminal:
+
+    rake alchemy:upgrade
+
+
 Tipps
 -----
 
@@ -111,10 +113,9 @@ Resources
 
 * Homepage: <http://alchemy-cms.com>
 * Live-Demo: <http://demo.alchemy-cms.com> (user: demo, password: demo)
-* Wiki: <http://wiki.alchemy-cms.com>
-* API Documentation: <http://api.alchemy-cms.com>
-* Issue-Tracker: <http://issues.alchemy-cms.com>
-* Sourcecode: <http://source.alchemy-cms.com>
+* API Documentation: <http://rubydoc.info/github/magiclabs/alchemy_cms>
+* Issue-Tracker: <https://github.com/magiclabs/alchemy_cms/issues>
+* Sourcecode: <https://github.com/magiclabs/alchemy_cms>
 * User Group: <http://groups.google.com/group/alchemy-cms>
 * Changelog: <http://revision.io/alchemy_cms>
 

data/alchemy_cms.gemspec

@@ -16,9 +16,6 @@ Gem::Specification.new do |s|
   s.license               = 'BSD New'
   s.post_install_message  = <<-POST_INSTALL
 
-_______.-=` Alchemy CMS Post Install Message ´=-._______
-
-
  If you are installing Alchemy the first time
  ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
   $ bundle exec rake alchemy:install
@@ -28,9 +25,6 @@ _______.-=` Alchemy CMS Post Install Message ´=-._______
  ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
   $ bundle exec rake alchemy:upgrade
 
-
-♥ ♥ ♥ ♥ ♥ ♥ ♥ Thanks for using Alchemy CMS ♥ ♥ ♥ ♥ ♥ ♥ ♥
-
 POST_INSTALL
 
   s.files                 = `git ls-files`.split("\n")
@@ -38,15 +32,15 @@ POST_INSTALL
   s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths         = ["lib"]
 
-  s.add_runtime_dependency %q<rails>,                      ["~> 3.2.11"]
+  s.add_runtime_dependency %q<rails>,                      ["~> 3.2.8"]
   s.add_runtime_dependency %q<authlogic>,                  ["~> 3.1.3"]
   s.add_runtime_dependency %q<awesome_nested_set>,         ["~> 2.0"]
   s.add_runtime_dependency %q<acts-as-taggable-on>,        ["~> 2.1"]
   s.add_runtime_dependency %q<declarative_authorization>,  ["= 0.5.5"]
-  s.add_runtime_dependency %q<tvdeyen-fleximage>,          ["~> 1.2.0"]
+  s.add_runtime_dependency %q<dragonfly>,                  ["~> 0.9.12"]
   s.add_runtime_dependency %q<kaminari>,                   ["~> 0.13.0"]
   s.add_runtime_dependency %q<acts_as_ferret>,             ["~> 0.5"]
-  s.add_runtime_dependency %q<acts_as_list>,               ["~> 0.1"]
+  s.add_runtime_dependency %q<acts_as_list>,               ["~> 0.1.9"]
   s.add_runtime_dependency %q<magiclabs-userstamp>,        ["~> 2.0.2"]
   s.add_runtime_dependency %q<dynamic_form>,               ["~> 1.1"]
   s.add_runtime_dependency %q<jquery-rails>,               ["~> 2.1.3"]
@@ -60,8 +54,9 @@ POST_INSTALL
   s.add_development_dependency %q<bumpy>
   s.add_development_dependency %q<capybara>
   s.add_development_dependency %q<factory_girl_rails>
-  s.add_development_dependency %q<rspec-rails>,            ['2.12.0']
+  s.add_development_dependency %q<rspec-rails>
   s.add_development_dependency %q<sqlite3>
   s.add_development_dependency %q<yard>
+  s.add_development_dependency %q<redcarpet>
 
 end

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

@@ -224,6 +224,16 @@ div.image_spinner {
     }
   }
 
+  &.info {
+    top: auto;
+    left: 4px;
+    bottom: 24px;
+
+    a {
+      background: image-url('alchemy/icons.png') no-repeat -64px -168px;
+    }
+  }
+
   a {
     display: block;
     width: 16px;
@@ -284,3 +294,20 @@ div#tag_list {
     }
   }
 }
+
+div#pictures_page_list {
+
+  h2 { margin: 0 8px }
+  h3 { padding: 0 }
+
+  ul.list {
+    height: 100px;
+    overflow: auto;
+    margin: 8px;
+    background-color: $medium-gray;
+
+    ul { padding: 0 4px }
+  }
+
+  li.even, li.odd { padding: 4px }
+}

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

@@ -95,16 +95,6 @@ ul {
   float: left;
 }
 
-/* @group overlay */
-
-#user_list li.table_row div.table_left span.icon img {
-  width: 16px;
-  height: 16px;
-  position: relative;
-  top: 1px;
-  left: -1px;
-}
-
 span.updated_at {
   float: right;
 }
@@ -311,16 +301,6 @@ li.odd {
   background-color: #eaf3f9;
 }
 
-ul.list li.table_row {
-  display: block;
-  margin: 0 0 8px;
-  background-color: #ffffff;
-  position: relative;
-  line-height: 18px;
-  float: left;
-  width: 100%;
-}
-
 ul.list {
   margin: 0;
   padding: 2*$default-padding;
@@ -355,19 +335,6 @@ ul.list li.legend {
   float: left;
 }
 
-ul.list div.detail_row {
-  background-color: $medium-gray;
-  font-size: 10px;
-  margin-top: 3px;
-  padding: $default-padding;
-  overflow: hidden;
-}
-
-ul.list div.detail_row div {
-  padding-top: 1px;
-  padding-bottom: 1px;
-}
-
 ul.list span.right {
   float: right;
 }
@@ -394,24 +361,6 @@ table td.tools .icon, table td.icon .icon {
   margin-right: 4px;
 }
 
-.list li.table_row div.table_right span {
-  float: left;
-  text-align: left;
-}
-
-.list li.table_row div.table_center {
-  float: none;
-  padding-left: 24px;
-}
-
-.list div.table_left {
-  float: left;
-}
-
-.list div.table_right {
-  float: right;
-}
-
 #archive_all {
   padding: 4*$default-padding;
 

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

@@ -184,7 +184,7 @@ div.element_editor {
 
   .foot_note {
     padding: $default-padding;
-    background-color: #fffdef;
+    background-color: $light_yellow;
     @include rounded-corner;
     margin-bottom: 1em;
   }
@@ -257,7 +257,6 @@ a.element_move_button {
 .element_head {
   padding: 8px 0 6px;
   position: relative;
-  overflow: hidden;
   margin-bottom: 0;
   border-top-color: #e3e3e3;
   height: 20px;
@@ -808,3 +807,39 @@ textarea.default_tinymce, textarea.custom_tinymce {
     line-height: 24px;
   }
 }
+
+a.element_hint {
+  position: absolute;
+  right: 32px;
+  top: 8px;
+  width: 16px;
+  height: 16px;
+
+  &:hover span.bubble { display: block }
+
+  span.bubble {
+    display: none;
+    background: $light_yellow;
+    @include rounded-corner;
+    @include box-shadow(0 4px 24px $dark-gray);
+    position: absolute;
+    right: -25px;
+    top: 26px;
+    z-index: 100;
+    padding: 8px;
+    line-height: 1.5em;
+    min-width: 180px;
+
+    &:before {
+      content: '';
+      position: absolute;
+      top: -8px;
+      right: 24px;
+      width: 0px;
+      height: 0px;
+      border-style: solid;
+      border-width: 0 8px 8px 8px;
+      border-color: transparent transparent $light_yellow transparent;
+    }
+  }
+}

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

@@ -123,6 +123,10 @@
     background-position: -352px -39px;
   }
 
+  &.hint {
+    background-position: -446px -105px;
+  }
+
   &.image {
     background-position: -224px -136px;
   }

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

@@ -24,6 +24,10 @@ span.module.languages {
   background-position: -200px 0;
 }
 
+span.module.sites {
+  background-position: -316px 0;
+}
+
 span.module.tags {
   background-position: -280px 0;
 }

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

@@ -237,7 +237,7 @@ span.page_status {
   margin: 2px 2px 0 4px;
 
   &.restricted {
-    background:  -258px -39px;
+    background-position: -258px -39px;
   }
 
   &.not_restricted {

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

@@ -136,7 +136,7 @@ table tr td.icon {
 }
 
 table.list tr:hover td {
-  background-color: #fffdef;
+  background-color: $light_yellow;
 }
 
 td.file_type {

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

@@ -5,6 +5,7 @@ $very-light-blue: lighten($light-blue, 12%);
 $light-gray: #EDEDED;
 $medium-gray: #E3E3E3;
 $dark-gray: #666666;
+$light_yellow: #ffffdc;
 
 $default-padding: 4px;
 $default-margin: $default-padding;

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

@@ -1,6 +1,7 @@
 module Alchemy
   module Admin
     class PagesController < Alchemy::Admin::BaseController
+      include Alchemy::FerretSearch
 
       helper "alchemy/pages"
 

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

@@ -10,7 +10,7 @@ module Alchemy
       def index
         @size = params[:size].present? ? params[:size] : 'medium'
         @pictures = Picture.scoped
-        @pictures = @pictures.tagged_with(params[:tagged_with], :any => true) if params[:tagged_with].present?
+        @pictures = @pictures.tagged_with(params[:tagged_with]) if params[:tagged_with].present?
         case params[:filter]
           when 'recent'
             @pictures = @pictures.recent
@@ -46,7 +46,7 @@ module Alchemy
           :upload_hash => params[:upload_hash]
         )
         @picture.name = @picture.humanized_name
-        @picture.save
+        @picture.save!
         @size = params[:size] || 'medium'
         if in_overlay?
           @while_assigning = true
@@ -58,12 +58,13 @@ module Alchemy
         end
         @pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
         @message = t('Picture uploaded succesfully', :name => @picture.name)
-        # Are we using the Flash uploader? Or the plain html file uploader?
+        # Are we using the single file uploader?
         if params[Rails.application.config.session_options[:key]].blank?
           flash[:notice] = @message
-          #redirect_to :back
-          #TODO temporary workaround; has to be fixed.
           redirect_to admin_pictures_path(:filter => 'last_upload')
+        else
+          # Or the mutliple file uploader?
+          render # create.js.erb template
         end
       end
 
@@ -103,14 +104,19 @@ module Alchemy
       def delete_multiple
         if request.delete? && params[:picture_ids].present?
           pictures = Picture.find(params[:picture_ids])
-          names = pictures.map(&:name).to_sentence
+          names = []
           pictures.each do |picture|
+            next unless picture.deletable?
+            names << picture.name
             picture.destroy
           end
-          flash[:notice] = t("Pictures deleted successfully", :names => names)
+          flash[:notice] = t("Pictures deleted successfully", :names => names.to_sentence)
         else
           flash[:notice] = t("Could not delete Pictures")
         end
+      rescue Exception => e
+        flash[:error] = e.message
+      ensure
         redirect_to_index
       end
 
@@ -119,8 +125,11 @@ module Alchemy
         name = @picture.name
         @picture.destroy
         flash[:notice] = t("Picture deleted successfully", :name => name)
+      rescue Exception => e
+        flash[:error] = e.message
+      ensure
         @redirect_url = admin_pictures_path(:per_page => params[:per_page], :page => params[:page], :query => params[:query])
-        render :action => :redirect
+        render :redirect
       end
 
       def flush
@@ -133,6 +142,11 @@ module Alchemy
         render :layout => false
       end
 
+      def info
+        @picture = Picture.find(params[:id])
+        render :layout => false
+      end
+
     private
 
       def pictures_per_page_for_size(size)