Merge pull request #1649 from tvdeyen/adjust-install-generator

Adjust install generator to latest changes
AlchemyCMS · Oct 21, 2019 · c723067 · c723067
2 parents 5af8727 + 4e8d770
commit c723067
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/...hemy/install/files/_article_view.html.erb → ...s/alchemy/install/files/_article.html.erb b/...hemy/install/files/_article_view.html.erb → ...s/alchemy/install/files/_article.html.erb
@@ -1,5 +1,5 @@
-<%- cache(element) do -%>
-  <%= element_view_for(element, tag: 'article') do |el| -%>
+<%- cache(article) do -%>
+  <%= element_view_for(article, tag: 'article') do |el| -%>
     <h2><%= el.render :headline %></h2>
     <%= el.render :picture, size: '1200x600' %>
     <%= el.render :text %>

diff --git a/lib/rails/generators/alchemy/install/files/_article_editor.html.erb b/lib/rails/generators/alchemy/install/files/_article_editor.html.erb
diff --git a/lib/rails/generators/alchemy/install/install_generator.rb b/lib/rails/generators/alchemy/install/install_generator.rb
@@ -41,13 +41,7 @@ def copy_demo_views
           create_file "app/assets/stylesheets/application.css", "/*\n#{stylesheet_require} */\n"
         end
 
-        [
-          "_article_editor.html.erb",
-          "_article_view.html.erb"
-        ].each do |file|
-          copy_file file, "app/views/alchemy/elements/#{file}"
-        end
-
+        copy_file "_article.html.erb", "app/views/alchemy/elements/_article.html.erb"
         copy_file "_standard.html.erb", "app/views/alchemy/page_layouts/_standard.html.erb"
 
         %w(de en es).each do |locale|