alchemy_cms 2.4.1 → 2.5.0.b2
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 +18 -17
- data/alchemy_cms.gemspec +5 -10
- data/app/assets/images/alchemy/icons.png +0 -0
- data/app/assets/stylesheets/alchemy/archive.scss +27 -0
- data/app/assets/stylesheets/alchemy/base.scss +0 -51
- data/app/assets/stylesheets/alchemy/elements.scss +37 -2
- data/app/assets/stylesheets/alchemy/icons.scss +4 -0
- data/app/assets/stylesheets/alchemy/modules.scss +4 -0
- data/app/assets/stylesheets/alchemy/sitemap.scss +1 -1
- data/app/assets/stylesheets/alchemy/tables.scss +1 -1
- data/app/assets/stylesheets/alchemy/variables.scss +1 -0
- data/app/controllers/alchemy/admin/pages_controller.rb +1 -0
- data/app/controllers/alchemy/admin/pictures_controller.rb +22 -8
- data/app/controllers/alchemy/admin/resources_controller.rb +1 -1
- data/app/controllers/alchemy/admin/sites_controller.rb +6 -0
- data/app/controllers/alchemy/base_controller.rb +8 -0
- data/app/controllers/alchemy/elements_controller.rb +33 -3
- data/app/controllers/alchemy/messages_controller.rb +47 -40
- data/app/controllers/alchemy/pages_controller.rb +8 -31
- data/app/controllers/alchemy/pictures_controller.rb +64 -30
- data/app/helpers/alchemy/admin/base_helper.rb +7 -0
- data/app/helpers/alchemy/admin/pages_helper.rb +12 -0
- data/app/helpers/alchemy/elements_helper.rb +2 -0
- data/app/helpers/alchemy/pages_helper.rb +30 -10
- data/app/helpers/alchemy/url_helper.rb +1 -0
- data/app/models/alchemy/content.rb +1 -2
- data/app/models/alchemy/element.rb +47 -2
- data/app/models/alchemy/language.rb +27 -14
- data/app/models/alchemy/page.rb +1 -1
- data/app/models/alchemy/picture.rb +46 -41
- data/app/models/alchemy/site.rb +44 -0
- data/app/views/alchemy/admin/elements/_element_head.html.erb +1 -0
- data/app/views/alchemy/admin/languages/index.html.erb +23 -0
- data/app/views/alchemy/admin/pages/edit.html.erb +27 -1
- data/app/views/alchemy/admin/pages/fold.js.erb +1 -0
- data/app/views/alchemy/admin/partials/_upload_form.html.erb +2 -0
- data/app/views/alchemy/admin/pictures/_picture.html.erb +24 -2
- data/app/views/alchemy/admin/pictures/_tag_list.html.erb +5 -4
- data/app/views/alchemy/admin/pictures/create.js.erb +1 -9
- data/app/views/alchemy/admin/pictures/info.html.erb +42 -0
- data/app/views/alchemy/admin/resources/_form.html.erb +0 -2
- data/app/views/alchemy/admin/resources/_resource.html.erb +2 -1
- data/app/views/alchemy/admin/resources/index.html.erb +2 -1
- data/app/views/alchemy/elements/show.html.erb +1 -6
- data/app/views/alchemy/elements/show.js.erb +4 -10
- data/app/views/alchemy/essences/_essence_link_view.html.erb +1 -0
- data/app/views/alchemy/search/_form.html.erb +9 -6
- data/app/views/alchemy/search/_result.html.erb +1 -1
- data/bin/alchemy +13 -120
- data/config/alchemy/config.yml +7 -11
- data/config/alchemy/modules.yml +24 -12
- data/config/authorization_rules.rb +6 -2
- data/config/initializers/dragonfly.rb +20 -0
- data/config/locales/alchemy.de.yml +57 -28
- data/config/locales/alchemy.en.yml +18 -4
- data/config/routes.rb +4 -2
- data/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb +21 -0
- data/db/migrate/20121205155004_create_alchemy_sites.rb +14 -0
- data/db/migrate/20121211163003_add_public_to_alchemy_sites.rb +6 -0
- data/lib/alchemy/capistrano.rb +7 -2
- data/lib/alchemy/ferret_search.rb +84 -0
- data/lib/alchemy/picture_attributes.rb +29 -0
- data/lib/alchemy/seeder.rb +10 -16
- data/lib/alchemy/upgrader.rb +59 -8
- data/lib/alchemy/version.rb +1 -1
- data/lib/alchemy_cms.rb +7 -4
- data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt +3 -0
- data/lib/rails/generators/alchemy/elements/elements_generator.rb +5 -1
- data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +1 -0
- data/lib/rails/generators/alchemy/scaffold/files/{pages.html.erb → application.html.erb} +0 -0
- data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb +11 -20
- data/lib/rails/templates/alchemy.rb +1 -7
- data/lib/tasks/{database.rake → alchemy/db.rake} +1 -1
- data/lib/tasks/{install.rake → alchemy/install.rake} +9 -14
- data/lib/tasks/{upgrade.rake → alchemy/upgrade.rake} +1 -1
- data/spec/controllers/elements_controller_spec.rb +24 -9
- data/spec/controllers/pictures_controller_spec.rb +11 -8
- data/{app → spec/dummy/app}/views/alchemy/elements/_article_editor.html.erb +0 -0
- data/{app → spec/dummy/app}/views/alchemy/elements/_article_view.html.erb +0 -0
- data/{app → spec/dummy/app}/views/alchemy/elements/_headline_view.html.erb +0 -0
- data/{app → spec/dummy/app}/views/alchemy/elements/_news_view.html.erb +0 -0
- data/{app → spec/dummy/app}/views/alchemy/elements/_searchresult_view.html.erb +0 -0
- data/{app → spec/dummy/app}/views/alchemy/page_layouts/_standard.html.erb +0 -0
- data/spec/dummy/config/alchemy/elements.yml +86 -0
- data/spec/dummy/config/alchemy/page_layouts.yml +26 -0
- data/spec/dummy/config/application.rb +1 -1
- data/spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb +21 -0
- data/spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb +14 -0
- data/spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb +6 -0
- data/spec/dummy/db/schema.rb +21 -6
- data/spec/factories.rb +6 -2
- data/spec/integration/translation_integration_spec.rb +4 -18
- data/spec/models/element_spec.rb +4 -4
- data/spec/models/picture_spec.rb +37 -20
- data/spec/models/site_spec.rb +69 -0
- data/spec/routing_spec.rb +115 -115
- data/spec/spec_helper.rb +1 -3
- data/spec/support/alchemy/specs_helpers.rb +4 -4
- data/vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js +1 -1
- metadata +72 -96
- data/app/assets/stylesheets/alchemy/standard_set.css +0 -440
- data/app/views/alchemy/elements/_bild_editor.html.erb +0 -1
- data/app/views/alchemy/elements/_bild_text_editor.html.erb +0 -7
- data/app/views/alchemy/elements/_bild_text_view.html.erb +0 -9
- data/app/views/alchemy/elements/_bild_view.html.erb +0 -9
- data/app/views/alchemy/elements/_claim_editor.html.erb +0 -1
- data/app/views/alchemy/elements/_claim_view.html.erb +0 -1
- data/app/views/alchemy/elements/_contactform_editor.html.erb +0 -4
- data/app/views/alchemy/elements/_contactform_view.html.erb +0 -78
- data/app/views/alchemy/elements/_download_editor.html.erb +0 -4
- data/app/views/alchemy/elements/_download_view.html.erb +0 -7
- data/app/views/alchemy/elements/_footnote_editor.html.erb +0 -1
- data/app/views/alchemy/elements/_footnote_view.html.erb +0 -5
- data/app/views/alchemy/elements/_header_editor.html.erb +0 -1
- data/app/views/alchemy/elements/_header_view.html.erb +0 -1
- data/app/views/alchemy/elements/_headline_editor.html.erb +0 -1
- data/app/views/alchemy/elements/_image_mosaic_editor.html.erb +0 -3
- data/app/views/alchemy/elements/_image_mosaic_view.html.erb +0 -14
- data/app/views/alchemy/elements/_intro_editor.html.erb +0 -1
- data/app/views/alchemy/elements/_intro_image_text_editor.html.erb +0 -3
- data/app/views/alchemy/elements/_intro_image_text_view.html.erb +0 -16
- data/app/views/alchemy/elements/_intro_view.html.erb +0 -3
- data/app/views/alchemy/elements/_news_editor.html.erb +0 -3
- data/app/views/alchemy/elements/_searchresult_editor.html.erb +0 -4
- data/app/views/alchemy/elements/_sitemap_editor.html.erb +0 -3
- data/app/views/alchemy/elements/_sitemap_view.html.erb +0 -38
- data/app/views/alchemy/elements/_sitename_editor.html.erb +0 -1
- data/app/views/alchemy/elements/_sitename_view.html.erb +0 -1
- data/app/views/alchemy/elements/_subheadline_editor.html.erb +0 -1
- data/app/views/alchemy/elements/_subheadline_view.html.erb +0 -5
- data/app/views/alchemy/elements/_text_editor.html.erb +0 -1
- data/app/views/alchemy/elements/_text_view.html.erb +0 -3
- data/app/views/alchemy/page_layouts/_contact.html.erb +0 -14
- data/app/views/alchemy/page_layouts/_external.html.erb +0 -0
- data/app/views/alchemy/page_layouts/_intro.html.erb +0 -14
- data/app/views/alchemy/page_layouts/_layout_footer.html.erb +0 -14
- data/app/views/alchemy/page_layouts/_layout_header.html.erb +0 -14
- data/app/views/alchemy/page_layouts/_news.html.erb +0 -14
- data/app/views/alchemy/page_layouts/_newsletter_layout.html.erb +0 -1
- data/app/views/alchemy/page_layouts/_search.html.erb +0 -14
- data/app/views/alchemy/pictures/show.gif.flexi +0 -19
- data/app/views/alchemy/pictures/show.jpg.flexi +0 -19
- data/app/views/alchemy/pictures/show.png.flexi +0 -19
- data/app/views/alchemy/pictures/thumbnail.png.flexi +0 -13
- data/app/views/alchemy/pictures/zoom.jpg.flexi +0 -3
- data/app/views/alchemy/pictures/zoom.png.flexi +0 -3
- data/app/views/layouts/alchemy/pages.html.erb +0 -51
- data/config/alchemy/elements.yml +0 -274
- data/config/alchemy/page_layouts.yml +0 -75
- data/config/asset_packages.yml +0 -30
- data/config/initializers/localeapp.rb +0 -9
- data/lib/rails/generators/alchemy/plugin/files/translation.pot +0 -3
- data/lib/rails/generators/alchemy/plugin/files/translation_de.po +0 -3
- data/lib/rails/generators/alchemy/plugin/files/translation_en.po +0 -3
- data/lib/rails/generators/alchemy/plugin/plugin_generator.rb +0 -37
- data/lib/rails/generators/alchemy/plugin/templates/authorization_rules.rb +0 -34
- data/lib/rails/generators/alchemy/plugin/templates/config.yml +0 -30
- data/lib/rails/generators/alchemy/plugin/templates/init.rb +0 -1
- data/lib/rails/generators/alchemy/plugin/templates/plugin.rb +0 -0
- data/lib/rails/generators/alchemy/plugin/templates/routes.rb +0 -10
- data/lib/tasks/fleximage.rake +0 -154
- data/spec/dummy/app/views/layouts/.gitkeep +0 -0
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_editor_by_name(element, 'image', :image_size => "900x300", :crop => true) %>
|
@@ -1,9 +0,0 @@
|
|
1
|
-
<div class="bild_text" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
|
2
|
-
<%- image = element.contents.find_by_name("image") -%>
|
3
|
-
<div class="image <%= image.essence.css_class %>">
|
4
|
-
<%= render_essence_view(image, :image_size => "450x1000", :crop => true) %>
|
5
|
-
</div>
|
6
|
-
<div class="text">
|
7
|
-
<%= render_essence_view_by_name(element, 'text') %>
|
8
|
-
</div>
|
9
|
-
</div>
|
@@ -1,9 +0,0 @@
|
|
1
|
-
<div class="bild" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
|
2
|
-
<div class="bild_images">
|
3
|
-
<%- element.contents.find_all_by_essence_type("Alchemy::EssencePicture").each do |essence| -%>
|
4
|
-
<div class="bild_image">
|
5
|
-
<%= render_essence_view(essence, :image_size => "900x300", :crop => true) %>
|
6
|
-
</div>
|
7
|
-
<%- end -%>
|
8
|
-
</div>
|
9
|
-
</div>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_editor_by_name(element, 'claim') %>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_view_by_name(element, 'claim') %>
|
@@ -1,78 +0,0 @@
|
|
1
|
-
<%= form_for(@message ||= Alchemy::Message.new, :html => {:id => "contact", "data-alchemy-element" => (@preview_mode ? element.id : nil)}) do |f| %>
|
2
|
-
<%= f.error_messages %>
|
3
|
-
<%= f.hidden_field "contact_form_id", :value => element.id %>
|
4
|
-
<table class="contactform">
|
5
|
-
<tr>
|
6
|
-
<td class="label">
|
7
|
-
<%= f.label :salutation, t('contactform.labels.salutation') %>
|
8
|
-
</td>
|
9
|
-
<td class="field">
|
10
|
-
<%= f.select(
|
11
|
-
:salutation,
|
12
|
-
[
|
13
|
-
[t('contactform.labels.mr')],
|
14
|
-
[t('contactform.labels.mrs')]
|
15
|
-
],
|
16
|
-
:prompt => t('contactform.labels.choose'),
|
17
|
-
:class => "select"
|
18
|
-
) %>
|
19
|
-
</td>
|
20
|
-
</tr>
|
21
|
-
<tr>
|
22
|
-
<td class="label">
|
23
|
-
<%= f.label :firstname, t('contactform.labels.firstname') %>
|
24
|
-
</td>
|
25
|
-
<td class="field">
|
26
|
-
<%= f.text_field(:firstname, :class => "field") %>
|
27
|
-
</td>
|
28
|
-
</tr>
|
29
|
-
<tr>
|
30
|
-
<td class="label">
|
31
|
-
<%= f.label :lastname, t('contactform.labels.lastname') + '*' %>
|
32
|
-
</td>
|
33
|
-
<td class="field">
|
34
|
-
<%= f.text_field(:lastname, :class => "field", :required => true) %>
|
35
|
-
</td>
|
36
|
-
</tr>
|
37
|
-
<tr>
|
38
|
-
<td class="label">
|
39
|
-
<%= f.label :address, t('contactform.labels.address') %>
|
40
|
-
</td>
|
41
|
-
<td class="field">
|
42
|
-
<%= f.text_field :address, :class => 'field' %>
|
43
|
-
</td>
|
44
|
-
</tr>
|
45
|
-
<tr>
|
46
|
-
<td class="label">
|
47
|
-
<%= f.label :zip, t('contactform.labels.zip') %>
|
48
|
-
</td>
|
49
|
-
<td class="field">
|
50
|
-
<%= f.text_field :zip, :class => 'field short' %>
|
51
|
-
<%= f.text_field :city, :class => 'field medium' %>
|
52
|
-
</td>
|
53
|
-
</tr>
|
54
|
-
<tr>
|
55
|
-
<td class="label">
|
56
|
-
<%= f.label :phone, t('contactform.labels.phone') %>
|
57
|
-
</td>
|
58
|
-
<td class="field">
|
59
|
-
<%= f.text_field :phone, :class => 'field' %>
|
60
|
-
</td>
|
61
|
-
</tr>
|
62
|
-
<tr>
|
63
|
-
<td class="label">
|
64
|
-
<%= f.label :email, t('contactform.labels.email') + '*' %>
|
65
|
-
</td>
|
66
|
-
<td class="field">
|
67
|
-
<%= f.email_field :email, :class => 'field', :required => true %>
|
68
|
-
</td>
|
69
|
-
</tr>
|
70
|
-
</table>
|
71
|
-
<div id="message">
|
72
|
-
<%= f.text_area :message %>
|
73
|
-
</div>
|
74
|
-
<p class="foot_notice">*) <%= t('contactform.labels.mandatory_fields') %></p>
|
75
|
-
<p class="right">
|
76
|
-
<%= f.button t('contactform.labels.send'), :name => nil, :class => 'button' %>
|
77
|
-
</p>
|
78
|
-
<% end %>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_editor_by_name(element, 'note') %>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_editor_by_name(element, 'image', :image_size => '900x300', :crop => true) %>
|
@@ -1 +0,0 @@
|
|
1
|
-
<span class="header_image" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>><%= render_essence_view_by_type(element, "Alchemy::EssencePicture", 1, {:image_size => '900x300', :crop => true}) %></span>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_editor_by_name(element, 'headline') %>
|
@@ -1,14 +0,0 @@
|
|
1
|
-
<div class="image_mosaic" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
|
2
|
-
<div class="image_mosaic_images">
|
3
|
-
<%- element.contents.gallery_pictures.each do |image| -%>
|
4
|
-
<div class="image_mosaic_image">
|
5
|
-
<%= render_essence_view(image, :image_size => '300x200', :crop => true) %>
|
6
|
-
</div>
|
7
|
-
<%- end -%>
|
8
|
-
</div>
|
9
|
-
<% if element.ingredient(:show_caption) %>
|
10
|
-
<div class="caption">
|
11
|
-
<%= render_essence_view_by_name(element, 'caption') %>
|
12
|
-
</div>
|
13
|
-
<% end %>
|
14
|
-
</div>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_editor_by_name(element, 'intro') %>
|
@@ -1,16 +0,0 @@
|
|
1
|
-
<div class="article" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
|
2
|
-
<h1 class="headline">
|
3
|
-
<%= render_essence_view_by_name(element, 'headline') %>
|
4
|
-
</h1>
|
5
|
-
<div class="text_bild_container">
|
6
|
-
<%- image = element.contents.essence_pictures.first -%>
|
7
|
-
<%- if image -%>
|
8
|
-
<div class="image <%= image.essence.css_class %>">
|
9
|
-
<%= render_essence_view(image, :image_size => "450x300", :crop => true) %>
|
10
|
-
</div>
|
11
|
-
<%- end -%>
|
12
|
-
<div class="text">
|
13
|
-
<%= render_essence_view_by_name(element, 'text') %>
|
14
|
-
</div>
|
15
|
-
</div>
|
16
|
-
</div>
|
@@ -1,38 +0,0 @@
|
|
1
|
-
<ul id="<%= element_dom_id(element) %>" class="sitemap" <%= element_preview_code(element) -%>>
|
2
|
-
<%- pages ||= [@root_page] -%>
|
3
|
-
<%- pages.each do |page| -%>
|
4
|
-
<%- position = "" -%>
|
5
|
-
<%- position = position + "last" if pages.last == page -%>
|
6
|
-
<%- position = position + "first" if pages.first == page -%>
|
7
|
-
<%- if page.public? -%>
|
8
|
-
<%- if (configuration(:sitemap)[:show_flag] == true && page.sitemap? ) -%>
|
9
|
-
<li id="sitemap_item_<%= page.urlname %>" <%= render_classes([position, page.page_layout]) %>>
|
10
|
-
<%= link_to(
|
11
|
-
h(page.name),
|
12
|
-
{
|
13
|
-
:controller => "pages",
|
14
|
-
:action => 'show',
|
15
|
-
:urlname => page.urlname
|
16
|
-
}
|
17
|
-
) %>
|
18
|
-
<%- elsif configuration(:sitemap)[:show_flag] == false -%>
|
19
|
-
<li id="sitemap_item_<%= page.urlname %>" <%= render_classes([position, page.page_layout]) %>>
|
20
|
-
<%= link_to(
|
21
|
-
h(page.name),
|
22
|
-
{
|
23
|
-
:controller => "pages",
|
24
|
-
:action => 'show',
|
25
|
-
:urlname => page.urlname
|
26
|
-
}
|
27
|
-
) %>
|
28
|
-
<%- end -%>
|
29
|
-
<%= render(:partial => "alchemy/elements/sitemap_view", :locals => {:pages => page.children, :element => element}) unless page.children.empty? %>
|
30
|
-
</li>
|
31
|
-
<%- else #page not public -%>
|
32
|
-
<li>
|
33
|
-
<span><%= page.sitemap? ? page.name : " " %></span>
|
34
|
-
<%= render(:partial => "alchemy/elements/sitemap_view", :locals => {:pages => page.children, :element => element}) unless page.children.empty? %>
|
35
|
-
</li>
|
36
|
-
<%- end -%>
|
37
|
-
<%- end -%>
|
38
|
-
</ul>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_editor_by_name(element, 'name') %>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_view_by_name(element, 'name') -%>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_editor_by_name(element, 'subheadline') %>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_essence_editor_by_name(element, 'text') %>
|
@@ -1,14 +0,0 @@
|
|
1
|
-
<div id="header">
|
2
|
-
<div id="header_image">
|
3
|
-
<%= render_elements(:only => 'header', :fallback => {:for => 'header', :from => 'layout_header'}) %>
|
4
|
-
</div>
|
5
|
-
<%- claim = render_elements :only => ["claim"] -%>
|
6
|
-
<%- if !claim.blank? -%>
|
7
|
-
<div id="claim">
|
8
|
-
<%= claim %>
|
9
|
-
</div>
|
10
|
-
<%- end -%>
|
11
|
-
</div>
|
12
|
-
<div id="content">
|
13
|
-
<%= render_elements %>
|
14
|
-
</div>
|
File without changes
|
@@ -1,14 +0,0 @@
|
|
1
|
-
<div id="header">
|
2
|
-
<div id="header_image">
|
3
|
-
<%= render_elements(:only => 'header', :fallback => {:for => 'header', :from => 'layout_header'}) %>
|
4
|
-
</div>
|
5
|
-
<%- claim = render_elements :only => ["claim"] -%>
|
6
|
-
<%- if !claim.blank? -%>
|
7
|
-
<div id="claim">
|
8
|
-
<%= claim %>
|
9
|
-
</div>
|
10
|
-
<%- end -%>
|
11
|
-
</div>
|
12
|
-
<div id="content" class="intropage">
|
13
|
-
<%= render_elements(:except => ['header', 'claim']) %>
|
14
|
-
</div>
|
@@ -1,14 +0,0 @@
|
|
1
|
-
<div id="header">
|
2
|
-
<div id="header_image">
|
3
|
-
<%= render_elements(:only => 'header', :fallback => {:for => 'header', :from => 'layout_header'}) %>
|
4
|
-
</div>
|
5
|
-
<%- claim = render_elements :only => ["claim"] -%>
|
6
|
-
<%- if !claim.blank? -%>
|
7
|
-
<div id="claim">
|
8
|
-
<%= claim %>
|
9
|
-
</div>
|
10
|
-
<%- end -%>
|
11
|
-
</div>
|
12
|
-
<div id="content">
|
13
|
-
|
14
|
-
</div>
|
@@ -1,14 +0,0 @@
|
|
1
|
-
<div id="header">
|
2
|
-
<div id="header_image">
|
3
|
-
<%= render_elements(:only => 'header', :fallback => {:for => 'header', :from => 'layout_header'}) %>
|
4
|
-
</div>
|
5
|
-
<%- claim = render_elements :only => ["claim"] -%>
|
6
|
-
<%- if !claim.blank? -%>
|
7
|
-
<div id="claim">
|
8
|
-
<%= claim %>
|
9
|
-
</div>
|
10
|
-
<%- end -%>
|
11
|
-
</div>
|
12
|
-
<div id="content">
|
13
|
-
|
14
|
-
</div>
|
@@ -1,14 +0,0 @@
|
|
1
|
-
<div id="header">
|
2
|
-
<div id="header_image">
|
3
|
-
<%= render_elements(:only => 'header', :fallback => {:for => 'header', :from => 'layout_header'}) %>
|
4
|
-
</div>
|
5
|
-
<%- claim = render_elements :only => ["claim"] -%>
|
6
|
-
<%- if !claim.blank? -%>
|
7
|
-
<div id="claim">
|
8
|
-
<%= claim %>
|
9
|
-
</div>
|
10
|
-
<%- end -%>
|
11
|
-
</div>
|
12
|
-
<div id="content">
|
13
|
-
<%= render_elements %>
|
14
|
-
</div>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_elements %>
|
@@ -1,14 +0,0 @@
|
|
1
|
-
<div id="header">
|
2
|
-
<div id="header_image">
|
3
|
-
<%= render_elements(:only => 'header', :fallback => {:for => 'header', :from => 'layout_header'}) %>
|
4
|
-
</div>
|
5
|
-
<%- claim = render_elements :only => ["claim"] -%>
|
6
|
-
<%- if !claim.blank? -%>
|
7
|
-
<div id="claim">
|
8
|
-
<%= claim %>
|
9
|
-
</div>
|
10
|
-
<%- end -%>
|
11
|
-
</div>
|
12
|
-
<div id="content">
|
13
|
-
<%= render_elements %>
|
14
|
-
</div>
|
@@ -1,19 +0,0 @@
|
|
1
|
-
@picture.operate do |image|
|
2
|
-
|
3
|
-
if !@crop_from.blank? && !@crop_size.blank? && !@size.blank?
|
4
|
-
image.crop(
|
5
|
-
:from => @crop_from,
|
6
|
-
:size => @crop_size
|
7
|
-
)
|
8
|
-
image.resize(@size, :upsample => @upsample)
|
9
|
-
elsif !@size.blank?
|
10
|
-
image.resize(@size, :upsample => @upsample, :crop => @crop, :padding => @padding)
|
11
|
-
end
|
12
|
-
image.image_overlay(@overlay[:file], :alignment => @overlay[:alignment]) unless @overlay.nil?
|
13
|
-
unless @options.blank?
|
14
|
-
image.border(@options[:border]) unless @options[:border].nil?
|
15
|
-
image.shadow(@options[:shadow]) unless @options[:shadow].nil?
|
16
|
-
end
|
17
|
-
image
|
18
|
-
|
19
|
-
end
|
@@ -1,19 +0,0 @@
|
|
1
|
-
@picture.operate do |image|
|
2
|
-
|
3
|
-
if !@crop_from.blank? && !@crop_size.blank? && !@size.blank?
|
4
|
-
image.crop(
|
5
|
-
:from => @crop_from,
|
6
|
-
:size => @crop_size
|
7
|
-
)
|
8
|
-
image.resize(@size, :upsample => @upsample)
|
9
|
-
elsif !@size.blank?
|
10
|
-
image.resize(@size, :upsample => @upsample, :crop => @crop, :padding => @padding)
|
11
|
-
end
|
12
|
-
image.image_overlay(@overlay[:file], :alignment => @overlay[:alignment]) unless @overlay.nil?
|
13
|
-
unless @options.blank?
|
14
|
-
image.border(@options[:border]) unless @options[:border].nil?
|
15
|
-
image.shadow(@options[:shadow]) unless @options[:shadow].nil?
|
16
|
-
end
|
17
|
-
image
|
18
|
-
|
19
|
-
end
|
@@ -1,19 +0,0 @@
|
|
1
|
-
@picture.operate do |image|
|
2
|
-
|
3
|
-
if !@crop_from.blank? && !@crop_size.blank? && !@size.blank?
|
4
|
-
image.crop(
|
5
|
-
:from => @crop_from,
|
6
|
-
:size => @crop_size
|
7
|
-
)
|
8
|
-
image.resize(@size, :upsample => @upsample)
|
9
|
-
elsif !@size.blank?
|
10
|
-
image.resize(@size, :upsample => @upsample, :crop => @crop, :padding => @padding)
|
11
|
-
end
|
12
|
-
image.image_overlay(@overlay[:file], :alignment => @overlay[:alignment]) unless @overlay.nil?
|
13
|
-
unless @options.blank?
|
14
|
-
image.border(@options[:border]) unless @options[:border].nil?
|
15
|
-
image.shadow(@options[:shadow]) unless @options[:shadow].nil?
|
16
|
-
end
|
17
|
-
image
|
18
|
-
|
19
|
-
end
|