optimacms 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 534b652b869e30a22d9f380291344d807540e5ff
-  data.tar.gz: 2371405e1a2b66cddfc315a18f3469672c468ba8
+  metadata.gz: 9114c48f0dfd82c25b0880f4776a0e3c4c981d38
+  data.tar.gz: 82a92a7e9b7aeba9cc3fe132e306f532bf4021ad
 SHA512:
-  metadata.gz: fe792e4911d5096bc374218c1ba101f671315aa07f403762bdfe6f27d7689cdc034a91a3f1e3f35229160e6ba3bc40f6b686537c1160d05ad3f8e66d0b46800a
-  data.tar.gz: 1b5ed811054e04c2ded2d5996abd49133f3c5194e2ab00390923d460f96fd3fc1c26aeaf6c2c12ca6a0a5136b860cbfc15ed3af27e2370d79024ede7f9633263
+  metadata.gz: 515bd0a4c299478540e73272822535b3b948a175521925e76d2ba9cdb4481e1aae48f70c1103462d833fb0874906a89f04b7f27d2f6e2ca6d101c0df31e35a5b
+  data.tar.gz: 38b448846a0c87b39017afc88a7f7108cd0129d8b34224a722bc7e4fab71d5110b92850621afe94d8240d5842e6db6501f6bdb225f2b42742e33d79486160e42

data/app/controllers/optimacms/admin/templates_controller.rb

@@ -119,7 +119,8 @@ module Optimacms
       #@res = false
 
       if @res
-        redirect_to url_list, success: 'Successfully updated'
+        u = params[:continue]=="1" ? edit_template_path(@item) : url_list
+        redirect_to u, success: 'Successfully updated'
       else
         render :edit
       end

data/app/inputs/fake_input.rb

@@ -0,0 +1,6 @@
+class FakeInput < SimpleForm::Inputs::StringInput
+  # This method only create a basic input without reading any value from object
+  def input
+    template.text_field_tag(attribute_name, input_options.delete(:value), input_html_options)
+  end
+end

data/app/views/optimacms/admin/templates/_form.html.haml

@@ -5,6 +5,8 @@ File: #{@item.path}
     = horizontal_simple_form_for @item, {:html => { :class => "form-horizontal", :role => "form" }}.merge((@modal==1 ? {remote: true}: {}))  do |f|
       = render 'optimacms/admin/shared/form_errors', :object=>@item
 
+      = f.input :continue, as: :fake, input_html: {value: "0"}
+
       = f.input :parent_id, as: :hidden
 
       = f.input :title, label: "Title"
@@ -24,4 +26,18 @@ File: #{@item.path}
 
 
 
-      = f.button :submit_cancel, 'Save', :cancel=>@url_back
+      -#= f.button :submit_cancel, 'Save', :cancel=>@url_back
+      = f.button :save_continue_cancel, 'Save', :cancel=>@url_back
+
+
+:javascript
+
+  $( document ).ready(function() {
+    $('#mainform a.btn-save-continue').click(function(e){
+      e.preventDefault();
+      console.log("click");
+      var f = $(this).closest("form");
+      f.find("input[name='continue']").val("1");
+      f.submit();
+    });
+  });

data/app/views/optimacms/admin/templates/_js_editor_panel_blocks.html.haml

@@ -10,7 +10,6 @@
 
   function load_panel_blocks(path){
     var lang = get_current_tab_lang();
-    console.log("lang="+lang);
 
     //
     var r = Math.random();

data/config/locales/simple_form.en.yml

@@ -1,4 +1,5 @@
 en:
   simple_form:
     buttons:
-      cancel: "Back"
+      cancel: "Back"
+      save_continue: "Save&Continue"

data/config/locales/simple_form.ru.yml

@@ -1,4 +1,5 @@
 ru:
   simple_form:
     buttons:
-      cancel: "Отмена"
+      cancel: "Отмена"
+      save_continue: "Сохранить&Продолжить"

data/lib/optimacms/simple_form_extensions/button_components.rb

@@ -24,6 +24,31 @@ module Optimacms
         end
       end
 
+      def save_continue_cancel(*args, &block)
+        template.content_tag :div, :class => "form-group" do
+          template.content_tag :div, :class => "col-sm-offset-1 col-sm-6" do
+            options = args.extract_options!
+
+            # class
+            options[:class] = [options[:class], 'btn', 'btn-primary', 'btn-lg'].compact
+
+            #
+            args << options
+
+            buttons = submit(*args, &block) + '&nbsp;&nbsp;'.html_safe+
+                template.link_to(I18n.t('simple_form.buttons.save_continue'), '#', {class: options[:class]+['btn-save-continue']})
+
+            # with cancel link
+            if cancel = options.delete(:cancel)
+              (buttons+'&nbsp;&nbsp;'.html_safe + template.link_to(I18n.t('simple_form.buttons.cancel'), cancel)).html_safe
+            else
+              buttons.html_safe
+            end
+
+          end
+        end
+      end
+
     end
 
     SimpleForm::FormBuilder.send :include, ButtonComponents

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.2.13"
+  VERSION = "0.2.14"
 end