alchemy_cms 2.4.rc4 → 2.4.0

data/.travis.yml

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

data/README.md

@@ -1,16 +1,14 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.4-stable)](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.3-stable)](https://github.com/magiclabs/alchemy_cms/tree/2.3-stable).**
-
-Alchemy is a Rails 3 CMS with a flexible content storing architecture.
+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).
 
@@ -56,7 +54,7 @@ Installation
 
 Use the installer (recommended):
 
-    gem install alchemy_cms --pre
+    gem install alchemy_cms
     alchemy new my_magicpage
 
 Start the local server:
@@ -80,7 +78,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms'
+    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms', :branch => '2.4-stable'
 
 Run in terminal:
 

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

@@ -224,7 +224,7 @@ div.element_editor {
 
 #alchemy .ui-dialog div.element_editor form {
   margin: 0;
-  padding: 0 8px;
+  padding: 8px 8px 0 8px;
 }
 
 div.element_tools {
@@ -626,7 +626,6 @@ div.content_text_editor input.text_short {
 
 div.content_editor {
   margin-bottom: 8px;
-  margin-top: 8px;
   position: relative;
 
   input.thin_border {

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

@@ -147,9 +147,12 @@ div#user_info {
   position: absolute;
   z-index: 10;
   line-height: 27px;
+  height: 29px;
   font-size: 11px;
-  right: 10px;
+  right: 0;
   top: -3px;
+  padding: 0 8px;
+  background-color: $light-blue;
 
   .selectboxit-container {
     margin-right: 2 * $default-margin;

data/app/views/alchemy/essences/_essence_richtext_editor.html.erb

@@ -1,5 +1,5 @@
 <% cache(content) do -%>
-<div class="content_editor content_rtf_editor" id="<%= content_dom_id(content) %>">
+<div class="content_editor essence_richtext" id="<%= content_dom_id(content) %>">
   <%= label_and_remove_link(content) %>
   <div class="tinymce_container">
     <% if content.has_custom_tinymce_config? && content.settings[:tinymce] -%>

data/app/views/alchemy/essences/_essence_text_editor.html.erb

@@ -1,5 +1,5 @@
 <% cache(content) do %>
-  <div class="content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
+  <div class="essence_text content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
 
     <% if content.settings[:display_as].present? %>
 

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.4.rc4"
+  VERSION = "2.4.0"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/elements/templates/editor.html.erb

@@ -1,3 +1,4 @@
+<%- if @element['contents'].present? -%>
 <%%= element_editor_for(element) do |el| -%>
 <%- if @element['picture_gallery'] -%>
   <%%= render_picture_gallery_editor(element, :max_images => nil, :crop => true) %>
@@ -12,3 +13,4 @@
   <p><%%= render_new_content_link(element) %></p>
 <%- end -%>
 <%%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.haml

@@ -1,3 +1,4 @@
+<%- if @element['contents'].present? -%>
 = element_editor_for(element) do |el|
 <%- if @element['picture_gallery'] -%>
   = render_picture_gallery_editor(element, :max_images => nil, :crop => true)
@@ -11,3 +12,4 @@
 
   %p= render_new_content_link(element)
 <% end -%>
+<% end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.slim

@@ -1,3 +1,4 @@
+<%- if @element['contents'].present? -%>
 = element_editor_for(element) do |el|
 <%- if @element['picture_gallery'] -%>
   = render_picture_gallery_editor(element, :max_images => nil, :crop => true)
@@ -11,3 +12,4 @@
 
   p= render_new_content_link(element)
 <% end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.erb

@@ -1,3 +1,4 @@
+<%- if @element['contents'].present? -%>
 <%%= element_view_for(element) do |el| -%>
 <%- if @element["picture_gallery"] -%>
   <div class="<%= @element_name %>_images">
@@ -18,3 +19,4 @@
   <%- end -%>
 <%- end -%>
 <%%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.haml

@@ -1,3 +1,4 @@
+<%- if @element['contents'].present? -%>
 = element_view_for(element) do |el|
 <%- if @element["picture_gallery"] -%>
   .<%= @element_name %>_images
@@ -13,3 +14,4 @@
   = el.render :<%= content["name"] %>
   <%- end -%>
 <%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.slim

@@ -1,3 +1,4 @@
+<%- if @element['contents'].present? -%>
 = element_view_for(element) do |el|
 <%- if @element["picture_gallery"] -%>
   .<%= @element_name %>_images
@@ -13,3 +14,4 @@
   = el.render :<%= content["name"] %>
   <%- end -%>
 <%- end -%>
+<%- end -%>

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.rc4
-  prerelease: 4
+  version: 2.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1095,9 +1095,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3242922462543667303
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: