alchemy_cms 2.4.rc4 → 2.4.0
Sign up to get free protection for your applications and to get access to all the features.
- data/.travis.yml +1 -1
- data/README.md +4 -6
- data/app/assets/stylesheets/alchemy/elements.scss +1 -2
- data/app/assets/stylesheets/alchemy/frame.scss +4 -1
- data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_text_editor.html.erb +1 -1
- data/lib/alchemy/version.rb +1 -1
- data/lib/rails/generators/alchemy/elements/templates/editor.html.erb +2 -0
- data/lib/rails/generators/alchemy/elements/templates/editor.html.haml +2 -0
- data/lib/rails/generators/alchemy/elements/templates/editor.html.slim +2 -0
- data/lib/rails/generators/alchemy/elements/templates/view.html.erb +2 -0
- data/lib/rails/generators/alchemy/elements/templates/view.html.haml +2 -0
- data/lib/rails/generators/alchemy/elements/templates/view.html.slim +2 -0
- metadata +8 -5
data/.travis.yml
CHANGED
data/README.md
CHANGED
@@ -1,16 +1,14 @@
|
|
1
1
|
Alchemy CMS
|
2
2
|
===========
|
3
3
|
|
4
|
-
[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=
|
4
|
+
[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.4-stable)](http://travis-ci.org/magiclabs/alchemy_cms)
|
5
5
|
[![Maintenance Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)](http://stillmaintained.com/magiclabs/alchemy_cms)
|
6
6
|
[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/magiclabs/alchemy_cms)
|
7
7
|
|
8
8
|
About
|
9
9
|
-----
|
10
10
|
|
11
|
-
|
12
|
-
|
13
|
-
Alchemy is a Rails 3 CMS with a flexible content storing architecture.
|
11
|
+
Alchemy is a powerful, userfriendly and flexible Rails 3 CMS.
|
14
12
|
|
15
13
|
Read more on the [website](http://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com).
|
16
14
|
|
@@ -56,7 +54,7 @@ Installation
|
|
56
54
|
|
57
55
|
Use the installer (recommended):
|
58
56
|
|
59
|
-
gem install alchemy_cms
|
57
|
+
gem install alchemy_cms
|
60
58
|
alchemy new my_magicpage
|
61
59
|
|
62
60
|
Start the local server:
|
@@ -80,7 +78,7 @@ Add to existing Rails project
|
|
80
78
|
|
81
79
|
In your Gemfile:
|
82
80
|
|
83
|
-
gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms'
|
81
|
+
gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms', :branch => '2.4-stable'
|
84
82
|
|
85
83
|
Run in terminal:
|
86
84
|
|
@@ -224,7 +224,7 @@ div.element_editor {
|
|
224
224
|
|
225
225
|
#alchemy .ui-dialog div.element_editor form {
|
226
226
|
margin: 0;
|
227
|
-
padding: 0 8px;
|
227
|
+
padding: 8px 8px 0 8px;
|
228
228
|
}
|
229
229
|
|
230
230
|
div.element_tools {
|
@@ -626,7 +626,6 @@ div.content_text_editor input.text_short {
|
|
626
626
|
|
627
627
|
div.content_editor {
|
628
628
|
margin-bottom: 8px;
|
629
|
-
margin-top: 8px;
|
630
629
|
position: relative;
|
631
630
|
|
632
631
|
input.thin_border {
|
@@ -147,9 +147,12 @@ div#user_info {
|
|
147
147
|
position: absolute;
|
148
148
|
z-index: 10;
|
149
149
|
line-height: 27px;
|
150
|
+
height: 29px;
|
150
151
|
font-size: 11px;
|
151
|
-
right:
|
152
|
+
right: 0;
|
152
153
|
top: -3px;
|
154
|
+
padding: 0 8px;
|
155
|
+
background-color: $light-blue;
|
153
156
|
|
154
157
|
.selectboxit-container {
|
155
158
|
margin-right: 2 * $default-margin;
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<% cache(content) do -%>
|
2
|
-
<div class="content_editor
|
2
|
+
<div class="content_editor essence_richtext" id="<%= content_dom_id(content) %>">
|
3
3
|
<%= label_and_remove_link(content) %>
|
4
4
|
<div class="tinymce_container">
|
5
5
|
<% if content.has_custom_tinymce_config? && content.settings[:tinymce] -%>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<% cache(content) do %>
|
2
|
-
<div class="content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
|
2
|
+
<div class="essence_text content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
|
3
3
|
|
4
4
|
<% if content.settings[:display_as].present? %>
|
5
5
|
|
data/lib/alchemy/version.rb
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
<%- if @element['contents'].present? -%>
|
1
2
|
<%%= element_editor_for(element) do |el| -%>
|
2
3
|
<%- if @element['picture_gallery'] -%>
|
3
4
|
<%%= render_picture_gallery_editor(element, :max_images => nil, :crop => true) %>
|
@@ -12,3 +13,4 @@
|
|
12
13
|
<p><%%= render_new_content_link(element) %></p>
|
13
14
|
<%- end -%>
|
14
15
|
<%%- end -%>
|
16
|
+
<%- end -%>
|
@@ -1,3 +1,4 @@
|
|
1
|
+
<%- if @element['contents'].present? -%>
|
1
2
|
= element_editor_for(element) do |el|
|
2
3
|
<%- if @element['picture_gallery'] -%>
|
3
4
|
= render_picture_gallery_editor(element, :max_images => nil, :crop => true)
|
@@ -11,3 +12,4 @@
|
|
11
12
|
|
12
13
|
%p= render_new_content_link(element)
|
13
14
|
<% end -%>
|
15
|
+
<% end -%>
|
@@ -1,3 +1,4 @@
|
|
1
|
+
<%- if @element['contents'].present? -%>
|
1
2
|
= element_editor_for(element) do |el|
|
2
3
|
<%- if @element['picture_gallery'] -%>
|
3
4
|
= render_picture_gallery_editor(element, :max_images => nil, :crop => true)
|
@@ -11,3 +12,4 @@
|
|
11
12
|
|
12
13
|
p= render_new_content_link(element)
|
13
14
|
<% end -%>
|
15
|
+
<%- end -%>
|
metadata
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: alchemy_cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.4.
|
5
|
-
prerelease:
|
4
|
+
version: 2.4.0
|
5
|
+
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Thomas von Deyen
|
@@ -13,7 +13,7 @@ authors:
|
|
13
13
|
autorequire:
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
|
-
date: 2012-
|
16
|
+
date: 2012-12-01 00:00:00.000000000 Z
|
17
17
|
dependencies:
|
18
18
|
- !ruby/object:Gem::Dependency
|
19
19
|
name: rails
|
@@ -1095,9 +1095,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
1095
1095
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
1096
1096
|
none: false
|
1097
1097
|
requirements:
|
1098
|
-
- - ! '
|
1098
|
+
- - ! '>='
|
1099
1099
|
- !ruby/object:Gem::Version
|
1100
|
-
version:
|
1100
|
+
version: '0'
|
1101
|
+
segments:
|
1102
|
+
- 0
|
1103
|
+
hash: 3242922462543667303
|
1101
1104
|
requirements:
|
1102
1105
|
- ImageMagick (libmagick), v6.6 or greater.
|
1103
1106
|
rubyforge_project:
|