camaleon_cms 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d04da9c72bd60007ce6782ea3b4dee7283d482e
-  data.tar.gz: b097e968fc8eb8110ad743253adffb5a7c193410
+  metadata.gz: 131a13eefc84861802b2115956ae6dd952a34b04
+  data.tar.gz: f66a3b0b3b430310afd29eea8f2ab31ff5520ab0
 SHA512:
-  metadata.gz: 0e5e8e7c6fbd11ede07e3af21a39513ebb7a8b573a71edced3bfc8275d68afd95b0368ac681b430a0de464f84f57fe9e3296691fb7353ee95b03acbf77aa33fe
-  data.tar.gz: 1850c3e2d6ee182f9b57588448333c424dcb60a1a3dde5c63debaf95fd5f42b2e771111584c8b812c0fa80ccceea4cb0e0cf45b7c5fa612792f2e0d5e4a6d435
+  metadata.gz: 149b43772e79e4f34b89606db246b88122f7e3aad450b657d7fc0a0f097722b0ce0b56ad1eb3b6a7d38bab04042890210b4f82493c2d3302ca1bc40fb7bd6058
+  data.tar.gz: 5c86f3f41673b761f2d78616a4afe158c5f499b4055520d5a4b6016781540977d65d9556955d1d5343bf0a50c2514a636cac91ca586b84948015f8ce105d5d71

data/app/assets/javascripts/admin/modal.js

@@ -80,12 +80,12 @@ jQuery(function(){
  * modal_size: "modal-lg", "modal-sm", ""(default as normal "")
  * callback: function evaluated after modal shown
  * type: modal color (primary|default|success)
- * zindex: Integer zindex position (default nil)
+ * zindex: Integer zindex position (default null)
  * on_submit: Function executed after submit button click (if this is present, enable the submit button beside cancel button)
  * return modal object
  */
 function open_modal(settings){
-    var def = {title: "", content: null, url: null, show_footer: false, mode: "inline", ajax_params: {}, zindex: nil, modal_size: "", type: '', modal_settings:{}, on_submit: null, callback: function(){}}
+    var def = {title: "", content: null, url: null, show_footer: false, mode: "inline", ajax_params: {}, zindex: null, modal_size: "", type: '', modal_settings:{}, on_submit: null, callback: function(){}}
     settings = $.extend({}, def, settings);
     var modal = $('<div id="ow_inline_modal" class="modal fade modal-'+settings.type+'">'+
         '<div class="modal-dialog '+settings.modal_size+'">'+
@@ -161,4 +161,4 @@ function wait_modal(){
 }
 var loading_modal = new wait_modal();
 function showLoading(){ $("body > .modal").not("#pleaseWaitDialog").hide(); loading_modal.show(); }
-function hideLoading(){ loading_modal.hide(); $("body > .modal").not("#pleaseWaitDialog").show(); }
+function hideLoading(){ loading_modal.hide(); $("body > .modal").not("#pleaseWaitDialog").show(); }

data/app/controllers/concerns/frontend_concern.rb

@@ -9,8 +9,9 @@
 module FrontendConcern extend ActiveSupport::Concern
   # visiting sitemap.xml
   def sitemap
-    r = {layout: (params[:format] == "html" ? (self.send :_layout) : false), render: "sitemap"}
+    r = {layout: (params[:format] == "html" ? (self.send :_layout) : false), render: "sitemap", custom: "", format: params[:format]}
     hooks_run("on_render_sitemap", r)
+    @custom_sitemap = r[:custom]
     render r[:render], layout: r[:layout]
   end
 

data/app/views/default_theme/sitemap.html.erb

@@ -16,4 +16,5 @@
             <% end %>
         </li>
     <% end %>
+    <%= raw @custom_sitemap %>
 </ul>

data/app/views/default_theme/sitemap.xml.builder

@@ -44,5 +44,5 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
       end
     end
   end
-
+  instance_eval(@custom_sitemap)
 end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Owen Peredo Diaz