alchemy_cms 2.1 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/README.md CHANGED
@@ -7,8 +7,6 @@ Alchemy CMS
7
7
  About
8
8
  -----
9
9
 
10
- **CAUTION: This branch is a beta development branch. For productive environments use [master](https://github.com/magiclabs/alchemy_cms) branch.**
11
-
12
10
  Features
13
11
  --------
14
12
 
@@ -46,14 +44,14 @@ Features
46
44
  - Completely free:
47
45
  - BSD License
48
46
  - No Enterprise Licences, or Community Editions
49
- - Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy/wiki/Software-Requirements))
47
+ - Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy_cms/wiki/Software-Requirements))
50
48
 
51
49
  Rails Version
52
50
  -------------
53
51
 
54
52
  This branch of Alchemy runs with Rails 3.1.3.
55
53
 
56
- If you are looking for a Rails 3 compatible version check the master branch.
54
+ If you are looking for a Rails 3 compatible version check the rails-3 branch.
57
55
 
58
56
  If you are looking for a Rails 2 compatible version check the rails-2 branch.
59
57
 
@@ -67,7 +65,7 @@ Installation
67
65
 
68
66
  Use the installer (recommended):
69
67
 
70
- gem install alchemy_cms --pre
68
+ gem install alchemy_cms
71
69
  alchemy new my_magicpage
72
70
 
73
71
  Start the local server:
@@ -95,7 +93,7 @@ Add to existing Rails project
95
93
 
96
94
  In your Gemfile:
97
95
 
98
- gem 'alchemy_cms', '~> 2.1.beta7', :git => 'git://github.com/magiclabs/alchemy_cms.git', :branch => 'next_stable'
96
+ gem 'alchemy_cms', '~> 2.1'
99
97
 
100
98
  Run in terminal:
101
99
 
data/alchemy_cms.gemspec CHANGED
@@ -3,34 +3,34 @@ $:.push File.expand_path("../lib", __FILE__)
3
3
  require "alchemy/version"
4
4
 
5
5
  Gem::Specification.new do |s|
6
- s.name = "alchemy_cms"
7
- s.version = Alchemy::VERSION
8
- s.platform = Gem::Platform::RUBY
9
- s.authors = ["Thomas von Deyen", "Robin Böning", "Carsten Fregin"]
10
- s.email = ["alchemy@magiclabs.de"]
11
- s.homepage = "http://alchemy-cms.com"
12
- s.summary = %q{An extremly flexbile CMS for Rails 3.}
13
- s.description = %q{Alchemy is an awesome Rails CMS with an extremely flexible content storing architecture.}
14
- s.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
15
- s.license = 'BSD New'
6
+ s.name = "alchemy_cms"
7
+ s.version = Alchemy::VERSION
8
+ s.platform = Gem::Platform::RUBY
9
+ s.authors = ["Thomas von Deyen", "Robin Böning", "Carsten Fregin"]
10
+ s.email = ["alchemy@magiclabs.de"]
11
+ s.homepage = "http://alchemy-cms.com"
12
+ s.summary = %q{An extremly flexbile CMS for Rails 3.1.}
13
+ s.description = %q{Alchemy is a Rails 3 CMS with a flexible content storing architecture.}
14
+ s.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
15
+ s.license = 'BSD New'
16
16
 
17
- s.files = `git ls-files`.split("\n")
18
- s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
19
- s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
20
- s.require_paths = ["lib"]
17
+ s.files = `git ls-files`.split("\n")
18
+ s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
19
+ s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
20
+ s.require_paths = ["lib"]
21
21
 
22
- s.add_runtime_dependency(%q<rails>, ["~> 3.1"])
23
- s.add_runtime_dependency(%q<authlogic>)
24
- s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
25
- s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
26
- s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.0.9"])
27
- s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0"])
28
- s.add_runtime_dependency(%q<acts_as_ferret>, ["~> 0.5"])
29
- s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1"])
30
- s.add_runtime_dependency(%q<magiclabs-userstamp>, ["~> 2.0.2"])
31
- s.add_runtime_dependency(%q<dynamic_form>, ["~> 1.1"])
32
- s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0.16"])
33
- s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
22
+ s.add_runtime_dependency(%q<rails>, ["~> 3.1.3"])
23
+ s.add_runtime_dependency(%q<authlogic>)
24
+ s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
25
+ s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
26
+ s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.0.9"])
27
+ s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0"])
28
+ s.add_runtime_dependency(%q<acts_as_ferret>, ["~> 0.5"])
29
+ s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1"])
30
+ s.add_runtime_dependency(%q<magiclabs-userstamp>, ["~> 2.0.2"])
31
+ s.add_runtime_dependency(%q<dynamic_form>, ["~> 1.1"])
32
+ s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0.16"])
33
+ s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
34
34
 
35
35
  s.add_development_dependency(%q<rspec-rails>, ["~> 2.8"])
36
36
  s.add_development_dependency(%q<sqlite3>)
@@ -145,3 +145,11 @@ $default-border: 1px solid #AFAFAF;
145
145
  opacity: $opacity/100;
146
146
  filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{$opacity})");
147
147
  }
148
+
149
+ @mixin disable-user-select {
150
+ -webkit-user-select: none;
151
+ -moz-user-select: none;
152
+ -ms-user-select: none;
153
+ -o-user-select: none;
154
+ user-select: none;
155
+ }
@@ -466,9 +466,7 @@ h2#sitemap_heading span.page_infos {
466
466
  table td.tools .icon, table td.icon .icon {
467
467
  width: 16px;
468
468
  height: 16px;
469
- -webkit-user-select: none;
470
- -moz-user-select: none;
471
- user-select: none;
469
+ @include disable-user-select;
472
470
  margin-top: 0;
473
471
  background-repeat: no-repeat;
474
472
  display: inline;
@@ -45,6 +45,7 @@ input.button,
45
45
  a.button,
46
46
  button.button {
47
47
  @include button-styles;
48
+ @include disable-user-select;
48
49
  }
49
50
 
50
51
  #new_element button.button {
@@ -200,6 +201,7 @@ div#toolbar label, div#overlay_toolbar label {
200
201
  margin-top: $default-margin;
201
202
  display: block;
202
203
  line-height: 13px;
204
+ @include disable-user-select;
203
205
  }
204
206
 
205
207
  div.button_with_label:hover label {
@@ -280,9 +282,7 @@ a.icon_button {
280
282
  margin-right: 8px;
281
283
  border: 1px solid #9a9a9a;
282
284
  @include rounded-corner;
283
- -webkit-user-select: none;
284
- -moz-user-select: none;
285
- user-select: none;
285
+ @include disable-user-select;
286
286
  overflow: hidden;
287
287
  position: relative;
288
288
 
@@ -237,9 +237,7 @@ a.element_move_button {
237
237
  border-top-color: #e3e3e3;
238
238
  height: 20px;
239
239
  background-color: #e5dcca;
240
- -moz-user-select: none;
241
- -webkit-user-select: none;
242
- user-select: none;
240
+ @include disable-user-select;
243
241
  }
244
242
 
245
243
  form.add_gallery_to_index {
@@ -257,9 +255,7 @@ div.picture_gallery_images {
257
255
  }
258
256
 
259
257
  div.picture_thumbnail div.picture_image img.img_paddingtop {
260
- -moz-user-select: none;
261
- -webkit-user-select: none;
262
- user-select: none;
258
+ @include disable-user-select;
263
259
  }
264
260
 
265
261
  /* @group add moclecule */
@@ -506,9 +502,7 @@ div.essence_picture_editor:hover .picture_tool_delete {
506
502
  top: 4px;
507
503
  left: 4px;
508
504
  background-color: transparent;
509
- -webkit-user-select: none;
510
- -moz-user-select: none;
511
- user-select: none;
505
+ @include disable-user-select;
512
506
  }
513
507
 
514
508
  .dragable_picture .picture_handle {
@@ -20,6 +20,7 @@ body#alchemy {
20
20
  left: 65px;
21
21
  z-index: 5;
22
22
  width: 100%;
23
+ @include disable-user-select;
23
24
  }
24
25
 
25
26
  #left_menu {
@@ -34,15 +35,13 @@ body#alchemy {
34
35
  border-right: $default-border;
35
36
  background: $light-blue;
36
37
  font-size: 10px;
38
+ @include disable-user-select;
37
39
 
38
40
  label {
39
41
  display: block;
40
42
  }
41
43
 
42
44
  a {
43
- -webkit-user-select: none;
44
- -moz-user-select: none;
45
- user-select: none;
46
45
  text-shadow: #fff 0 0px 4px;
47
46
  }
48
47
  }
@@ -191,10 +190,7 @@ div#user_info {
191
190
  padding: 0 8px;
192
191
  background-color: $medium-gray;
193
192
  text-shadow: #fff 0 1px 2px;
194
- -webkit-user-select: none;
195
- -moz-user-select: none;
196
- -o-user-select: none;
197
- user-select: none;
193
+ @include disable-user-select;
198
194
  cursor: default;
199
195
  line-height: 20px;
200
196
  float: left;
@@ -258,10 +254,7 @@ div#user_info {
258
254
  color: $text-color;
259
255
  background-color: $medium-gray;
260
256
  text-shadow: #fff 0 1px 2px;
261
- -webkit-user-select: none;
262
- -moz-user-select: none;
263
- -o-user-select: none;
264
- user-select: none;
257
+ @include disable-user-select;
265
258
  cursor: default;
266
259
  z-index: 10;
267
260
  }
@@ -13,6 +13,7 @@
13
13
  position: relative;
14
14
  zoom: 1;
15
15
  font-size: 11px;
16
+ @include disable-user-select;
16
17
  }
17
18
 
18
19
  #alchemy .selectbox.full_width .display.full_width {
@@ -22,6 +22,7 @@ table tr td.tools {
22
22
  width: 40px;
23
23
  background-color: $light-gray;
24
24
  white-space: nowrap;
25
+ @include disable-user-select;
25
26
  }
26
27
 
27
28
  td.input, td.label {
@@ -41,7 +41,6 @@
41
41
  $('#user_screensize').val(function() {
42
42
  return screen.width+'x'+screen.height;
43
43
  });
44
- Alchemy.ButtonObserver('#login .button');
45
44
  });
46
45
  </script>
47
46
  <%- end -%>
@@ -0,0 +1 @@
1
+ <%= render_essence_editor_by_name(element, 'file') %>
@@ -0,0 +1,3 @@
1
+ <div class="download" <%= element_preview_code(element) -%>>
2
+ <%= render_essence_view_by_name(element, 'file') %>
3
+ </div>
@@ -27,6 +27,7 @@
27
27
  <script type="text/javascript" charset="utf-8">
28
28
  jQuery(document).ready(function($) {
29
29
  Alchemy.SelectBox('body#alchemy select');
30
+ Alchemy.ButtonObserver('.button');
30
31
  });
31
32
  </script>
32
33
  </body>
data/bin/alchemy CHANGED
@@ -25,7 +25,7 @@ class AlchemyInstaller < Thor
25
25
  end
26
26
 
27
27
  desc "new PROJECT", "Creates a new Alchemy CMS project."
28
- method_option :scm, :type => :string, :aliases => "-s", :desc => "Type of scm to use for this project. Leave blank for none."
28
+ method_option :scm, :type => :string, :aliases => "-s", :desc => "Type of scm (git or svn) to use for this project. Leave blank for none."
29
29
  method_option :database, :type => :string, :default => 'mysql', :aliases => "-d", :desc => "Type of database to use for this project. Default mysql."
30
30
  def new(project)
31
31
  @application = project.downcase.strip.gsub(/ /, '_')
@@ -33,7 +33,7 @@ class AlchemyInstaller < Thor
33
33
 
34
34
  say "Generating new Rails App...", :yellow
35
35
 
36
- if system("rails _#{RAILS_VERSION}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT")
36
+ if system("rails _#{RAILS_VERSION}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT --old-style-hash #{options[:scm].nil? || options[:scm].empty? || options[:scm] == 'svn' ? '--skip-git' : ''}")
37
37
 
38
38
  create_database_yml if options[:database] == 'mysql'
39
39
 
@@ -1,5 +1,5 @@
1
1
  module Alchemy
2
2
 
3
- VERSION = "2.1"
3
+ VERSION = "2.1.1"
4
4
 
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: '2.1'
4
+ version: 2.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,22 +11,22 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2012-01-27 00:00:00.000000000 Z
14
+ date: 2012-01-29 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
18
- requirement: &70285756045860 !ruby/object:Gem::Requirement
18
+ requirement: &70362121763680 !ruby/object:Gem::Requirement
19
19
  none: false
20
20
  requirements:
21
21
  - - ~>
22
22
  - !ruby/object:Gem::Version
23
- version: '3.1'
23
+ version: 3.1.3
24
24
  type: :runtime
25
25
  prerelease: false
26
- version_requirements: *70285756045860
26
+ version_requirements: *70362121763680
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: authlogic
29
- requirement: &70285756045440 !ruby/object:Gem::Requirement
29
+ requirement: &70362121763060 !ruby/object:Gem::Requirement
30
30
  none: false
31
31
  requirements:
32
32
  - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
34
34
  version: '0'
35
35
  type: :runtime
36
36
  prerelease: false
37
- version_requirements: *70285756045440
37
+ version_requirements: *70362121763060
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: awesome_nested_set
40
- requirement: &70285756061260 !ruby/object:Gem::Requirement
40
+ requirement: &70362121762500 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ~>
@@ -45,10 +45,10 @@ dependencies:
45
45
  version: '2.0'
46
46
  type: :runtime
47
47
  prerelease: false
48
- version_requirements: *70285756061260
48
+ version_requirements: *70362121762500
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: declarative_authorization
51
- requirement: &70285756060720 !ruby/object:Gem::Requirement
51
+ requirement: &70362121761980 !ruby/object:Gem::Requirement
52
52
  none: false
53
53
  requirements:
54
54
  - - ~>
@@ -56,10 +56,10 @@ dependencies:
56
56
  version: 0.5.4
57
57
  type: :runtime
58
58
  prerelease: false
59
- version_requirements: *70285756060720
59
+ version_requirements: *70362121761980
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: tvdeyen-fleximage
62
- requirement: &70285756060240 !ruby/object:Gem::Requirement
62
+ requirement: &70362121761320 !ruby/object:Gem::Requirement
63
63
  none: false
64
64
  requirements:
65
65
  - - ~>
@@ -67,10 +67,10 @@ dependencies:
67
67
  version: 1.0.9
68
68
  type: :runtime
69
69
  prerelease: false
70
- version_requirements: *70285756060240
70
+ version_requirements: *70362121761320
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: will_paginate
73
- requirement: &70285756059740 !ruby/object:Gem::Requirement
73
+ requirement: &70362121760820 !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
76
76
  - - ~>
@@ -78,10 +78,10 @@ dependencies:
78
78
  version: '3.0'
79
79
  type: :runtime
80
80
  prerelease: false
81
- version_requirements: *70285756059740
81
+ version_requirements: *70362121760820
82
82
  - !ruby/object:Gem::Dependency
83
83
  name: acts_as_ferret
84
- requirement: &70285756059240 !ruby/object:Gem::Requirement
84
+ requirement: &70362121760340 !ruby/object:Gem::Requirement
85
85
  none: false
86
86
  requirements:
87
87
  - - ~>
@@ -89,10 +89,10 @@ dependencies:
89
89
  version: '0.5'
90
90
  type: :runtime
91
91
  prerelease: false
92
- version_requirements: *70285756059240
92
+ version_requirements: *70362121760340
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: acts_as_list
95
- requirement: &70285756058760 !ruby/object:Gem::Requirement
95
+ requirement: &70362121683540 !ruby/object:Gem::Requirement
96
96
  none: false
97
97
  requirements:
98
98
  - - ~>
@@ -100,10 +100,10 @@ dependencies:
100
100
  version: '0.1'
101
101
  type: :runtime
102
102
  prerelease: false
103
- version_requirements: *70285756058760
103
+ version_requirements: *70362121683540
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: magiclabs-userstamp
106
- requirement: &70285756058280 !ruby/object:Gem::Requirement
106
+ requirement: &70362121682980 !ruby/object:Gem::Requirement
107
107
  none: false
108
108
  requirements:
109
109
  - - ~>
@@ -111,10 +111,10 @@ dependencies:
111
111
  version: 2.0.2
112
112
  type: :runtime
113
113
  prerelease: false
114
- version_requirements: *70285756058280
114
+ version_requirements: *70362121682980
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: dynamic_form
117
- requirement: &70285756057800 !ruby/object:Gem::Requirement
117
+ requirement: &70362121682480 !ruby/object:Gem::Requirement
118
118
  none: false
119
119
  requirements:
120
120
  - - ~>
@@ -122,10 +122,10 @@ dependencies:
122
122
  version: '1.1'
123
123
  type: :runtime
124
124
  prerelease: false
125
- version_requirements: *70285756057800
125
+ version_requirements: *70362121682480
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: jquery-rails
128
- requirement: &70285756057320 !ruby/object:Gem::Requirement
128
+ requirement: &70362121681960 !ruby/object:Gem::Requirement
129
129
  none: false
130
130
  requirements:
131
131
  - - ~>
@@ -133,10 +133,10 @@ dependencies:
133
133
  version: 1.0.16
134
134
  type: :runtime
135
135
  prerelease: false
136
- version_requirements: *70285756057320
136
+ version_requirements: *70362121681960
137
137
  - !ruby/object:Gem::Dependency
138
138
  name: attachment_magic
139
- requirement: &70285756056840 !ruby/object:Gem::Requirement
139
+ requirement: &70362121681440 !ruby/object:Gem::Requirement
140
140
  none: false
141
141
  requirements:
142
142
  - - ~>
@@ -144,10 +144,10 @@ dependencies:
144
144
  version: 0.2.1
145
145
  type: :runtime
146
146
  prerelease: false
147
- version_requirements: *70285756056840
147
+ version_requirements: *70362121681440
148
148
  - !ruby/object:Gem::Dependency
149
149
  name: rspec-rails
150
- requirement: &70285756056360 !ruby/object:Gem::Requirement
150
+ requirement: &70362121680920 !ruby/object:Gem::Requirement
151
151
  none: false
152
152
  requirements:
153
153
  - - ~>
@@ -155,10 +155,10 @@ dependencies:
155
155
  version: '2.8'
156
156
  type: :development
157
157
  prerelease: false
158
- version_requirements: *70285756056360
158
+ version_requirements: *70362121680920
159
159
  - !ruby/object:Gem::Dependency
160
160
  name: sqlite3
161
- requirement: &70285756055980 !ruby/object:Gem::Requirement
161
+ requirement: &70362121680540 !ruby/object:Gem::Requirement
162
162
  none: false
163
163
  requirements:
164
164
  - - ! '>='
@@ -166,9 +166,8 @@ dependencies:
166
166
  version: '0'
167
167
  type: :development
168
168
  prerelease: false
169
- version_requirements: *70285756055980
170
- description: Alchemy is an awesome Rails CMS with an extremely flexible content storing
171
- architecture.
169
+ version_requirements: *70362121680540
170
+ description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
172
171
  email:
173
172
  - alchemy@magiclabs.de
174
173
  executables:
@@ -517,6 +516,8 @@ files:
517
516
  - app/views/alchemy/user_sessions/login.html.erb
518
517
  - app/views/alchemy/user_sessions/logout.html.erb
519
518
  - app/views/alchemy/user_sessions/signup.html.erb
519
+ - app/views/elements/_download_editor.html.erb
520
+ - app/views/elements/_download_view.html.erb
520
521
  - app/views/layouts/alchemy/admin.html.erb
521
522
  - app/views/layouts/alchemy/login.html.erb
522
523
  - app/views/layouts/alchemy/pages.html.erb
@@ -806,7 +807,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
806
807
  version: '0'
807
808
  segments:
808
809
  - 0
809
- hash: -2746034174098475999
810
+ hash: 395153038709539496
810
811
  required_rubygems_version: !ruby/object:Gem::Requirement
811
812
  none: false
812
813
  requirements:
@@ -815,14 +816,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
815
816
  version: '0'
816
817
  segments:
817
818
  - 0
818
- hash: -2746034174098475999
819
+ hash: 395153038709539496
819
820
  requirements:
820
821
  - ImageMagick (libmagick), v6.6 or greater.
821
822
  rubyforge_project:
822
823
  rubygems_version: 1.8.10
823
824
  signing_key:
824
825
  specification_version: 3
825
- summary: An extremly flexbile CMS for Rails 3.
826
+ summary: An extremly flexbile CMS for Rails 3.1.
826
827
  test_files:
827
828
  - spec/alchemy_spec.rb
828
829
  - spec/config_spec.rb