alchemy_cms 2.5.0.rc3 → 2.5.0

data/.travis.yml

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

data/README.md

@@ -1,15 +1,10 @@
-Alchemy CMS
-===========
+![Alchemy CMS](http://alchemy-cms.com/assets/alchemy_logo.png)
 
-[![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)
+[![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).
@@ -20,7 +15,8 @@ Features
 - Highly flexible Templating
 - Gorgious End-User centric interface
 - Multilingual
-- SEO
+- Multidomain
+- SEO friendly
 - Access Control
 - Fulltext Search
 - RSS Feeds
@@ -28,15 +24,15 @@ Features
 - Attachments and downloads
 - Powerful image rendering
 - Extendable
-- Integrates in exsiting Rails Apps
+- Integrates in existing Rails Apps
 - Caching
 - BSD License
-- Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy_cms/wiki/Software-Requirements))
+- Hostable on any Server that supports Ruby on Rails, a SQL Database and ImageMagick
 
 Rails Version
 -------------
 
-This version of Alchemy runs with Rails 3.2.8+.
+This version of Alchemy runs with Rails 3.2.11+.
 
 If you are looking for a Rails 3.1 compatible version check the [2.1-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.1-stable).
 
@@ -47,7 +43,7 @@ If you are looking for a Rails 2.3 compatible version check the [1.6-stable bran
 Ruby Version
 ------------
 
-Alchemy runs with Ruby 1.9.2 and Ruby 1.9.3.
+Alchemy runs with Ruby 1.9.2 and Ruby 1.9.3 only.
 
 For a Ruby 1.8.7 compatible version use the [2.3-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.3-stable).
 
@@ -56,8 +52,9 @@ Installation
 
 Use the installer (recommended):
 
-    gem install alchemy_cms --pre
+    gem install alchemy_cms
     alchemy new my_magicpage
+    cd my_magicpage
 
 Start the local server:
 
@@ -70,18 +67,21 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms'
+    gem 'alchemy_cms', '~> 2.5.0', github: 'magiclabs/alchemy_cms', branch: '2.5-stable'
 
 Run in terminal:
 
-    bundle update
-    rake alchemy:install
+    bundle install
+    bundle exec rake alchemy:install
 
-Note: If you did not mounted Alchemy on the root route `'/'`, then you have to add Alchemy's view helpers manually to your app.
+### Note:
+If you did not mounted Alchemy on the root route `'/'`, then you have to add Alchemy's view helpers manually to your app.
 
 Just paste this in your `app/controllers/application_controller.rb`
 
-`helper Alchemy::PagesHelper`
+```
+helper Alchemy::PagesHelper
+```
 
 Upgrading
 ---------
@@ -90,23 +90,16 @@ After updating Alchemy you should run the upgrader.
 
 Run in terminal:
 
-    rake alchemy:upgrade
+    bundle exec rake alchemy:upgrade
 
 
 Tipps
 -----
 
-1. This generator creates all necessary folders and files needed for creating your own page layouts and elements for your website:
-
-        rails generate alchemy:scaffold
-
-2. If you use the ferret full text search (enabled by default), then please add a job to your crontab that reindexes the ferret index.
-
-        cd /path/to/your/alchemy && RAILS_ENV=production rake ferret:rebuild_index > /dev/null
-
-3. You can easily create your element files (for view and editor) depending on the `elements.yml` with this generator:
+- Read the guidelines: http://guides.alchemy-cms.com.
+- Read the documentation: http://rubydoc.info/github/magiclabs/alchemy_cms
+- Ask the community: http://groups.google.com/group/alchemy-cms
 
-        rails generate alchemy:elements --skip
 
 Resources
 ---------

data/alchemy_cms.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors               = ["Thomas von Deyen", "Robin Boening", "Marc Schettke", "Hendrik Mans", "Carsten Fregin"]
   s.email                 = ["alchemy@magiclabs.de"]
   s.homepage              = "http://alchemy-cms.com"
-  s.summary               = %q{An extremly flexbile CMS for Rails 3.2}
-  s.description           = %q{Alchemy is a Rails 3 CMS with a flexible content storing architecture.}
+  s.summary               = %q{A powerful, userfriendly and flexible CMS for Rails 3}
+  s.description           = %q{Alchemy is a powerful, userfriendly and flexible Rails 3 CMS.}
   s.requirements         << 'ImageMagick (libmagick), v6.6 or greater.'
   s.required_ruby_version = '~> 1.9.2'
   s.license               = 'BSD New'
@@ -45,6 +45,7 @@ POST_INSTALL
   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"]
+  s.add_runtime_dependency %q<jquery-ui-rails>,            ["~> 3.0.1"]
   s.add_runtime_dependency %q<attachment_magic>,           ["~> 0.2.1"]
   s.add_runtime_dependency %q<sass-rails>,                 ['~> 3.2.3']
   s.add_runtime_dependency %q<coffee-rails>,               ['~> 3.2.1']

data/app/assets/javascripts/alchemy/alchemy.base.js

@@ -130,6 +130,13 @@ if (typeof(Alchemy) === 'undefined') {
       $('#cells').tabs('select', 'cell_' + cell_name);
     },
 
+    buildTabbedCells: function(label) {
+      var $cells = $('<div id="cells"/>');
+      $('#cell_for_other_elements').wrap($cells);
+      $('#cells').prepend('<ul><li><a href="#cell_for_other_elements">'+label+'</a></li></ul>');
+      $('#cells').tabs().tabs('paging', { follow: true, followOnSelect: true } );
+    },
+
     debug: function(e) {
       if (window['console']) {
         console.debug(e);

data/app/assets/javascripts/alchemy/alchemy.datepicker.js

@@ -7,7 +7,7 @@ if (typeof(Alchemy) === 'undefined') {
   $.extend(Alchemy, {
 
     Datepicker: function(selector) {
-      var browserHasDatepicker = Alchemy.isiOS || (Alchemy.isChrome && Alchemy.ChromeVersion >= 20);
+      var browserHasDatepicker = Alchemy.isiOS;
       var datepicker_options = {
         dateFormat: 'yy-mm-dd',
         changeMonth: true,
@@ -37,7 +37,8 @@ if (typeof(Alchemy) === 'undefined') {
         });
       }
       if (!browserHasDatepicker) {
-        $(selector).datepicker(datepicker_options);
+        // Disables the browsers default Datepicker.
+        $(selector).datepicker(datepicker_options).prop('type','text');
       }
     }
 

data/app/assets/javascripts/alchemy/alchemy.image_cropper.js

@@ -10,7 +10,7 @@ if (typeof(Alchemy) === 'undefined') {
 
   Alchemy.ImageCropper = {
 
-    init: function(box, size_x, size_y, default_box, ratio) {
+    init: function(box, size_x, size_y, default_box, ratio, true_size) {
       var crop_from_field = $('#essence_picture_crop_from');
       var crop_size_field = $('#essence_picture_crop_size');
       var options = {
@@ -20,7 +20,10 @@ if (typeof(Alchemy) === 'undefined') {
         },
         setSelect: box,
         aspectRatio: ratio ? ratio : undefined,
-        minSize: [size_x, size_y]
+        minSize: [size_x, size_y],
+        boxWidth: 800,
+        boxHeight: 600,
+        trueSize: true_size
       };
       Alchemy.ImageCropper.box = box;
       Alchemy.ImageCropper.default_box = default_box;

data/app/assets/javascripts/alchemy/alchemy.js

@@ -1,8 +1,15 @@
 // Alchemy CMS Sprockets Manifest
 // ------------------------------
 //= require jquery
-//= require jquery-ui
 //= require jquery_ujs
+//= require jquery.ui.autocomplete
+//= require jquery.ui.datepicker
+//= require jquery.ui.dialog
+//= require jquery.ui.effect-drop
+//= require jquery.ui.effect-fade
+//= require jquery.ui.resizable
+//= require jquery.ui.sortable
+//= require jquery.ui.tabs
 //= require autocomplete-rails
 //= require tiny_mce/tiny_mce
 //= require_tree ../../../../vendor/assets/javascripts/jquery_plugins/

data/app/assets/javascripts/alchemy/alchemy.menubar.js

@@ -20,7 +20,10 @@ Alchemy.loadAlchemyMenuBar = function(options) {
     build: function() {
       var self = Alchemy.Menubar;
       var bar = self._$('<div id="alchemy_menubar"/>').append('<ul/>');
-      bar.find('ul').append('<li><a href="' + options.route + '/admin">' + Alchemy.Menubar.t("to_alchemy") + '</a></li>').append('<li><a href="' + options.route + '/admin/pages/' + options.page_id + '/edit">' + Alchemy.Menubar.t("edit_page") + '</a></li>').append('<li><a href="' + options.route + '/admin/logout">' + Alchemy.Menubar.t("logout") + '</a></li>');
+      bar.find('ul')
+        .append('<li><a href="' + options.route + '/admin">' + Alchemy.Menubar.t("to_alchemy") + '</a></li>')
+        .append('<li><a href="' + options.route + '/admin/pages/' + options.page_id + '/edit">' + Alchemy.Menubar.t("edit_page") + '</a></li>')
+        .append('<li><form action="' + options.route + '/admin/logout" method="post"><input type="hidden" name="_method" value="delete"><button>' + Alchemy.Menubar.t("logout") + '</button></form></li>');
       return bar;
     },
 

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

@@ -26,14 +26,9 @@ div#image_assign_filter_and_image_sizing {
   @include rounded-corner;
 
   .thumbnail_background {
-    display: table-cell;
+    @include thumbnail-background;
     width: 160px;
     height: 120px;
-    background-color: $dark-gray;
-    text-align: center;
-    vertical-align: middle;
-    padding: 0;
-    line-height: 0;
   }
 
   .picture_name {

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

@@ -95,6 +95,8 @@ ul {
   float: left;
 }
 
+.center { text-align: center }
+
 span.updated_at {
   float: right;
 }
@@ -150,15 +152,6 @@ div#page {
   background-position: right;
 }
 
-div.tip {
-  background-color: #eff8d0;
-  border: 1px solid #cce21c;
-  padding: 2*$default-padding;
-  margin: 8px 0;
-  @include rounded-corner;
-  width: 450px;
-}
-
 #back_to_site {
   float: right;
   margin-right: 8px;
@@ -467,15 +460,42 @@ p.foot_note {
   margin-left: 22px;
 }
 
-div#jscropper {
-  padding: 2*$default-padding;
-  @include inline-block;
-}
+#alchemy .ui-dialog div#jscropper {
+  padding: 2 * $default-padding;
 
-div#crop_explain.tip {
-  margin: 8px 8px 0;
-  float: right;
-  width: 25%;
+  .thumbnail_background {
+    @include thumbnail-background;
+    width: 800px;
+    height: 600px;
+    position: relative;
+  }
+
+  .picture_content_spinner {
+    left: 400px;
+    top: 300px;
+    margin-top: -16px;
+    margin-left: -16px;
+    width: 32px;
+    height: 32px;
+  }
+
+  .jcrop-holder { @include inline-block }
+
+  img {
+    width: auto;
+    max-height: 600px;
+  }
+
+  form {
+    padding: 0;
+    text-align: right;
+    position: absolute;
+    width: 800px;
+    bottom: 2 * $default-padding;
+    left: 2 * $default-padding;
+
+    .button.with_icon { float: left }
+  }
 }
 
 textarea#essence_picture_caption {

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

@@ -1,30 +1,37 @@
 #dashboard {
   overflow: auto;
-  float: left;
   padding: 4 * $default-padding;
-  width: 450px;
+  width: 100%;
   position: relative;
+  @include box-sizing(border-box);
+  * { @include box-sizing(border-box) }
 
   h1 {
     font-size: 2em;
-    margin-bottom: 0;
-    text-shadow: #fff 1px 1px 2px;
+    margin-bottom: 8px;
   }
 
   h2 {
     padding: 0;
-    margin-bottom: 2em;
+    margin-bottom: 16px;
+  }
+
+  div.column {
+    width: 50%;
+    float: left;
+    padding-right: 16px;
   }
 
   div.widget {
-    padding: 2*$default-padding;
-    margin: 16px 0;
+    width: 100%;
+    margin-bottom: 16px;
     background-color: $medium-gray;
     border: $default-border;
-    @include rounded-corner;
+    @include top-rounded-border;
+    float: left;
 
     h2 {
-      padding-bottom: 0;
+      padding: 2 * $default-padding;
       margin-bottom: 0;
     }
 
@@ -32,32 +39,29 @@
       margin: 4px 0;
     }
 
-    ul {
+    table {
+      width: 100%;
       padding: 0;
-      list-style-type: none;
-      @include rounded-corner;
-      margin-right: -9px;
-      margin-left: -9px;
-      margin-bottom: -9px;
-      border: $default-border;
+      border-spacing: 0;
 
-      li {
-        padding: 2*$default-padding;
+      td {
+        padding: 2 * $default-padding;
         margin-bottom: 0;
         position: relative;
+        color: #aaa;
 
-        form {
-          position: absolute;
-          top: 2*$default-padding;
-          right: 2*$default-padding;
-        }
+        &:first-child { width: 40% }
+        form { float: right }
+        span { color: #333 }
       }
     }
   }
 }
 
 div#sideboard {
-  float: right;
+  right: 16px;
+  top: 82px;
+  position: absolute;
   width: 240px;
   padding: 16px;
 
@@ -72,3 +76,16 @@ div#license {
   height: 24em;
   background-color: white;
 }
+
+#update_check {
+  height: 16px;
+
+  img#load_info {
+    width: 16px;
+    height: 16px;
+    display: none;
+  }
+
+  & > span { display: none }
+  span.icon { vertical-align: top }
+}

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

@@ -485,7 +485,7 @@ form td.select .selectboxit {
     }
 
     li.selectboxit-hover, li.selectboxit-focus, li.active {
-      background-color: #e6f0f5;
+      background-color: $button-hover-bg-color;
       color: $text-color;
     }
 

data/app/assets/stylesheets/alchemy/jquery-ui.scss

@@ -1318,10 +1318,11 @@
 }
 
 #alchemy .ui-menu .ui-menu-item a.ui-state-hover,
-#alchemy .ui-menu .ui-menu-item a.ui-state-active {
+#alchemy .ui-menu .ui-menu-item a.ui-state-active,
+#alchemy .ui-menu .ui-menu-item a.ui-state-focus {
   font-weight: normal;
   cursor: pointer;
-  background-color: #e6f0f5;
+  background-color: $button-hover-bg-color;
   color: $text-color;
 }