keppler 2.1.11 → 2.1.12

data/installer/core/rockets/keppler_frontend/app/controllers/keppler_frontend/app/app_controller.rb

@@ -35,7 +35,7 @@ module KepplerFrontend
     end
 
     def rocket(name, model)
-      name = name.singularize.downcase.camelize
+      name = name.downcase.camelize
       model = model.singularize.downcase.camelize
       "Keppler#{name}::#{model}".constantize
     end

data/installer/core/rockets/keppler_frontend/app/helpers/keppler_frontend/app/frontend_helper.rb

@@ -2,7 +2,7 @@ module KepplerFrontend
   module App::FrontendHelper
     # begin devise_login
     def devise_login(hash = {})
-      render 'keppler_frontend/app/partials/devise_login', hash: hash
+      render 'keppler_frontend/app/partials/devise_login', params: params
     end
     # end devise_login
   end

data/installer/core/rockets/keppler_frontend/app/models/keppler_frontend/concerns/partials/helper_file.rb

@@ -15,8 +15,8 @@ module KepplerFrontend
             head_idx = index_html.find_index(i) if i.include?("  module App::FrontendHelper")
           end
           index_html.insert(head_idx.to_i + 1, "    # begin #{name}\n")
-          index_html.insert(head_idx.to_i + 2, "    def #{name}(hash = {})\n")
-          index_html.insert(head_idx.to_i + 3, "      render 'keppler_frontend/app/partials/#{name}', hash: hash\n")
+          index_html.insert(head_idx.to_i + 2, "    def #{name}(params = {})\n")
+          index_html.insert(head_idx.to_i + 3, "      render 'keppler_frontend/app/partials/#{name}', params: params\n")
           index_html.insert(head_idx.to_i + 4, "    end\n")
           index_html.insert(head_idx.to_i + 5, "    # end #{name}\n")
           index_html = index_html.join('')
@@ -51,8 +51,8 @@ module KepplerFrontend
           end
           return if begin_idx==0
           index_html[begin_idx] = "    # begin #{helper[:name]}\n"
-          index_html[begin_idx+1] = "    def #{helper[:name]}(hash = {})\n"
-          index_html[begin_idx+2] = "      render 'keppler_frontend/app/partials/#{helper[:name]}', hash: hash\n"
+          index_html[begin_idx+1] = "    def #{helper[:name]}(params = {})\n"
+          index_html[begin_idx+2] = "      render 'keppler_frontend/app/partials/#{helper[:name]}', params: params\n"
           index_html[begin_idx+4] = "    # end #{helper[:name]}\n"
           index_html = index_html.join('')
           File.write(file, index_html)

data/installer/core/rockets/keppler_frontend/app/models/keppler_frontend/concerns/partials/html_file.rb

@@ -7,19 +7,16 @@ module KepplerFrontend
       module HtmlFile
         extend ActiveSupport::Concern
         def html_code
-          # html = File.readlines("#{url_front}/app/views/keppler_frontend/app/partials/#{underscore_name}.html.erb")
-          # html.join
-
           file = "#{url_front}/app/views/keppler_frontend/app/partials/#{underscore_name}.html.erb"
           index_html = File.readlines(file)
           begin_idx = 0
           end_idx = 0
           index_html.each do |idx|
-            begin_idx = index_html.find_index(idx) if idx.include?("<!-- begin #{name} -->\n")
-            end_idx = index_html.find_index(idx) if idx.include?("<!-- end #{name} -->\n")
+            begin_idx = index_html.find_index(idx) if idx.include?("<keppler-partial id='#{name}'>\n")
+            end_idx = index_html.find_index(idx) if idx.include?("</keppler-partial>\n")
           end
           # return if begin_idx==0
-          index_html = index_html[begin_idx+2..end_idx-2]
+          index_html = index_html[begin_idx+1..end_idx-1]
           index_html = index_html.map { |line| line[0, line.length] }
           index_html.join('')
         end
@@ -28,11 +25,9 @@ module KepplerFrontend
           file = File.open("#{url_front}/app/views/keppler_frontend/app/partials/#{underscore_name}.html.erb", "w")
           index_html = File.readlines(file)
           head_idx = 0
-          index_html.insert(head_idx.to_i + 1, "<!-- begin #{name} -->\n")
-          index_html.insert(head_idx.to_i + 2, "<div id='#{name}'>\n")
-          index_html.insert(head_idx.to_i + 3, "  <h1> #{name} partial </h1>")
-          index_html.insert(head_idx.to_i + 4, "\n</div>\n")
-          index_html.insert(head_idx.to_i + 5, "<!-- end #{name} -->\n")
+          index_html.insert(head_idx.to_i + 1, "<keppler-partial id='#{name}'>\n")
+          index_html.insert(head_idx.to_i + 2, "  <h1> #{name} partial </h1>")
+          index_html.insert(head_idx.to_i + 3, "\n</keppler-partial>\n")
           index_html = index_html.join('')
           File.write(file, index_html)
           file.close
@@ -52,13 +47,12 @@ module KepplerFrontend
           end_idx = 0
           default_idx = 0
           index_html.each do |idx|
-            begin_idx = index_html.find_index(idx) if idx.include?("<!-- begin #{name} -->\n")
-            end_idx = index_html.find_index(idx) if idx.include?("<!-- end #{name} -->\n")
+            begin_idx = index_html.find_index(idx) if idx.include?("<keppler-partial id='#{name}'>\n")
+            end_idx = index_html.find_index(idx) if idx.include?("</keppler-partial>\n")
             default_idx = index_html.find_index(idx) if idx.include?("  <h1> #{name} partial </h1>")
           end
-          index_html[begin_idx] = "<!-- begin #{html[:name]} -->\n"
-          index_html[begin_idx+1] = "<div id='#{html[:name]}'>\n"
-          index_html[end_idx] = "<!-- end #{html[:name]} -->\n"
+          index_html[begin_idx] = "<keppler-partial id='#{html[:name]}'>\n"
+          index_html[end_idx] = "</keppler-partial>"
           index_html[default_idx] = "  <h1> #{html[:name]} partial </h1>\n" unless default_idx.eql?(0)
           index_html = index_html.join('')
           File.write(file, index_html)
@@ -77,13 +71,13 @@ module KepplerFrontend
           begin_idx = 0
           end_idx = 0
           code_html.each do |i|
-            begin_idx = code_html.find_index(i) if i.include?("<!-- begin #{name} -->\n")
-            end_idx = code_html.find_index(i) if i.include?("<!-- end #{name} -->\n")
+            begin_idx = code_html.find_index(i) if i.include?("<keppler-partial id='#{name}'>\n")
+            end_idx = code_html.find_index(i) if i.include?("</keppler-partial>\n")
           end
           # return if begin_idx==0
-          code_html.slice!(begin_idx+2..end_idx-2)
+          code_html.slice!(begin_idx+1..end_idx-1)
           code.split("\n").each_with_index do |line, i|
-            code_html.insert(begin_idx+(i+2), "  #{line}\n")
+            code_html.insert(begin_idx+(i+1), "#{line}\n")
           end
           code_html = code_html.join('')
           File.write(file, code_html)

data/installer/core/rockets/keppler_frontend/app/models/keppler_frontend/concerns/partials/scss_file.rb

@@ -78,7 +78,7 @@ module KepplerFrontend
           # return if begin_idx==0
           code_css.slice!(begin_idx+2..end_idx-2)
           code.split("\n").each_with_index do |line, i|
-            code_css.insert(begin_idx+(i+2), "  #{line}\n")
+            code_css.insert(begin_idx+(i+2), "#{line}\n")
           end
           code_css = code_css.join('')
           File.write(file, code_css)

data/installer/core/rockets/keppler_frontend/app/views/keppler_frontend/admin/views/_editor_assets.html.haml

@@ -101,30 +101,32 @@
                   %i.fa.fa-save
 .control-sidebar-bg
 :javascript
-  $('a[data-toggle="tab"]').on('shown.bs.tab', function (ev) {
-    var tab = ev.target.innerText;
-    var id = `#{@view.id}`;
+  $(document).on('turbolinks:load', function() {
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (ev) {
+      var tab = ev.target.innerText;
+      var id = `#{@view.id}`;
 
-    if (tab === '') {
-      tab = `#{@view.name}.html.erb`
-    }
-
-    $(document).bind('keydown', function(e) {
-      if(e.ctrlKey && (e.which == 83)) {
-        e.preventDefault();
-        save()
+      if (tab === '') {
+        tab = `#{@view.name}.html.erb`
       }
-    });
 
-    function save() {
-      if ( tab === `#{@view.name}.html.erb` ) {
-        codeHTML.save(id);
-      } else if (tab === `#{@view.name}.scss` ) {
-        codeCSS.save(id);
-      } else if (tab === `#{@view.name}.js` ) {
-        codeJs.save(id);
-      } else if (tab === 'Action') {
-        codeAction.save(id);
+      $(document).bind('keydown', function(e) {
+        if(e.ctrlKey && (e.which == 83)) {
+          e.preventDefault();
+          save()
+        }
+      });
+
+      function save() {
+        if ( tab === `#{@view.name}.html.erb` ) {
+          codeHTML.save(id);
+        } else if (tab === `#{@view.name}.scss` ) {
+          codeCSS.save(id);
+        } else if (tab === `#{@view.name}.js` ) {
+          codeJs.save(id);
+        } else if (tab === 'Action') {
+          codeAction.save(id);
+        }
       }
-    }
-  })
+    })
+  });

data/installer/core/rockets/keppler_frontend/app/views/keppler_frontend/admin/views/_editor_themes.html.haml

@@ -31,30 +31,32 @@
 .control-sidebar-bg
 
 :javascript
-  $('a[data-toggle="tab"]').on('shown.bs.tab', function (ev) {
-    var tab = ev.target.innerText;
-    var id = `#{@view.id}`;
+  $(document).on('turbolinks:load', function() {
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (ev) {
+      var tab = ev.target.innerText;
+      var id = `#{@view.id}`;
 
-    if (tab === '') {
-      tab = `#{@view.name}.html.erb`
-    }
-
-    $(document).bind('keydown', function(e) {
-      if(e.ctrlKey && (e.which == 83)) {
-        e.preventDefault();
-        save()
+      if (tab === '') {
+        tab = `#{@view.name}.html.erb`
       }
-    });
 
-    function save() {
-      if ( tab === `#{@view.name}.html.erb` ) {
-        codeHTML.save(id);
-      } else if (tab === `#{@view.name}.scss` ) {
-        codeCSS.save(id);
-      } else if (tab === `#{@view.name}.js` ) {
-        codeJs.save(id);
-      } else if (tab === 'Action') {
-        codeAction.save(id);
+      $(document).bind('keydown', function(e) {
+        if(e.ctrlKey && (e.which == 83)) {
+          e.preventDefault();
+          save()
+        }
+      });
+
+      function save() {
+        if ( tab === `#{@view.name}.html.erb` ) {
+          codeHTML.save(id);
+        } else if (tab === `#{@view.name}.scss` ) {
+          codeCSS.save(id);
+        } else if (tab === `#{@view.name}.js` ) {
+          codeJs.save(id);
+        } else if (tab === 'Action') {
+          codeAction.save(id);
+        }
       }
-    }
-  })
+    })
+  }

data/installer/core/rockets/keppler_frontend/app/views/keppler_frontend/admin/views/_editor_views.html.haml

@@ -65,7 +65,7 @@
             .row
               .col-lg-6
                 %h4.box-title
-                  = truncate(partial.name, length: 30, omission: '...')
+                  = truncate(partial.name, length: 15, omission: '...')
               .col-lg-3
                 %span.box-title
                   %a.btn.btn-default.pull-right{onclick: "copyPartial('#{partial.id}')"}
@@ -78,24 +78,26 @@
 .control-sidebar-bg
 
 :javascript
-  $('a[data-toggle="tab"]').on('shown.bs.tab', function (ev) {
-    $(document).bind('keydown',function(e) {
-      if(e.ctrlKey && (e.which == 83)) {
-        e.preventDefault();
-        var tab = e.target.innerText;
-        if (tab==='') {
-          var tab = `#{@view.name}.html.erb`;
+  $(document).on('turbolinks:load', function() {
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (ev) {
+      $(document).bind('keydown',function(e) {
+        if(e.ctrlKey && (e.which == 83)) {
+          e.preventDefault();
+          var tab = e.target.innerText;
+          if (tab==='') {
+            var tab = `#{@view.name}.html.erb`;
+          }
+          var id = `#{@view.id}`
+          if ( tab === `#{@view.name}.html.erb`) {
+            codeHTML.save(id);
+          } else if (tab === `#{@view.name}.scss`) {
+            codeCSS.save(id);
+          } else if (tab === `#{@view.name}.js`) {
+            codeJs.save(id);
+          } else if (tab === 'Action') {
+            codeAction.save(id);
+          }
         }
-        var id = `#{@view.id}`
-        if ( tab === `#{@view.name}.html.erb`) {
-          codeHTML.save(id);
-        } else if (tab === `#{@view.name}.scss`) {
-          codeCSS.save(id);
-        } else if (tab === `#{@view.name}.js`) {
-          codeJs.save(id);
-        } else if (tab === 'Action') {
-          codeAction.save(id);
-        }
-      }
-    });
-  })
+      });
+    })
+  }

data/installer/core/rockets/keppler_frontend/app/views/keppler_frontend/admin/views/index.html.haml

@@ -68,14 +68,15 @@
     = render "description"
 
 :javascript
-  $(document).ready(function(){
-    $('#view').click(function() {
-      $('#upload_file_view').click()
-      $('#upload_file_view').change(function() {
-        $('.waiting').css('display', 'block')
-        $('#upload_form_view').submit()
-      })
-    });
+  (function() {
+    $(document).on('turbolinks:load', function() {});
+      $('#view').click(function() {
+        $('#upload_file_view').click()
+        $('#upload_file_view').change(function() {
+          $('.waiting').css('display', 'block')
+          $('#upload_form_view').submit()
+        })
+      });
 
-    renderImg();
-  });
+      renderImg();
+    }).call(this);

data/installer/core/rockets/keppler_frontend/app/views/keppler_frontend/app/partials/_devise_login.html.erb

@@ -1,42 +1,42 @@
 <!-- begin devise_login -->
-<div id='devise_login'>
-  <%- unless current_user %>
-    <%= form_for(User.new, :as => User.new, :url => session_path(User.new), :html => { :role => 'form'}) do |f| %>
-      <%= f.text_field :path, type: :hidden, class: "form-control validate", :value => "#{controller_path}##{action_name}" %>
-      <div class="form-group">
-        <label for="inputEmail3" class="col-sm-2 control-label">Email</label>
-        <div class="col-sm-10">
-          <%= f.email_field :email, :autofocus => true, class: "form-control validate", :placeholder => "Email" %>
-        </div>
+<keppler-partial id='devise_login'>
+<%- unless current_user %>
+  <%= form_for(User.new, :as => User.new, :url => session_path(User.new), :html => { :role => 'form'}) do |f| %>
+    <%= f.text_field :path, type: :hidden, class: "form-control validate", :value => "#{controller_path}##{action_name}" %>
+    <div class="form-group">
+      <label for="inputEmail3" class="col-sm-2 control-label">Email</label>
+      <div class="col-sm-10">
+        <%= f.email_field :email, :autofocus => true, class: "form-control validate", :placeholder => "Email" %>
       </div>
-      <div class="form-group">
-        <label for="inputPassword3" class="col-sm-2 control-label">Password</label>
-        <div class="col-sm-10">
-          <%= f.password_field :password, :autofocus => true, class: "form-control validate #{'invalid' if flash[:alert]}", :placeholder => "Password" %>
-        </div>
+    </div>
+    <div class="form-group">
+      <label for="inputPassword3" class="col-sm-2 control-label">Password</label>
+      <div class="col-sm-10">
+        <%= f.password_field :password, :autofocus => true, class: "form-control validate #{'invalid' if flash[:alert]}", :placeholder => "Password" %>
       </div>
-      <div class="form-group has-feedback">
-        <div class="devise-errors center-align">
-          <%- flash.each do |name, msg| %>
-            <%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
-          <% end %>
-        </div>
+    </div>
+    <div class="form-group has-feedback">
+      <div class="devise-errors center-align">
+        <%- flash.each do |name, msg| %>
+          <%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
+        <% end %>
       </div>
-      <div class="form-group">
-        <div class="col-sm-offset-2 col-sm-10">
-          <div class="checkbox">
-            <label>
-              <input type="checkbox"> Remember me
-            </label>
-          </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <div class="checkbox">
+          <label>
+            <input type="checkbox"> Remember me
+          </label>
         </div>
       </div>
-      <div class="form-group">
-        <div class="col-sm-offset-2 col-sm-10">
-          <%= f.submit t("devise.sessions.log_in"), class: 'btn btn-primary' %>
-        </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= f.submit t("devise.sessions.log_in"), class: 'btn btn-primary' %>
       </div>
-    <% end %>
-  <%- end %>
-</div>
+    </div>
+  <% end %>
+<%- end %>
+</keppler-partial>
 <!-- end devise_login -->

data/installer/core/rockets/keppler_frontend/app/views/layouts/keppler_frontend/app/layouts/application.html.erb

@@ -12,5 +12,4 @@
       <!-- Keppler Section -->
     </keppler-footer>
   </body>
-  <!--  <%= keppler_editor %> -->
 </html>

data/installer/core/rockets/keppler_frontend/app/views/layouts/themes/keppler_default/application.html.erb

@@ -14,6 +14,5 @@
       <!-- Keppler Footer -->
     </keppler-footer>
   </body>
-  <!--  <%= keppler_editor %> -->
 </html>