burp_cms 1.3.27 → 1.3.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7186ead87817c836e3294af30a16f0c5aed33985
-  data.tar.gz: b16fabb54d3abcec8c5259737f140ee01fc9cc6f
+  metadata.gz: 31599760bf773b202d9e50a501ca6c538d0b9004
+  data.tar.gz: 8ca7fe77ffaddf14f113eb0a887140b4996a143b
 SHA512:
-  metadata.gz: 7ee43bd72d08a82b27b770176d8f3dd25c7592a36f447d99fca874f224a17709bcb02de3c7433f7dc17828cd1426cf33fe7d30c695a23e679e4c2abcc7e89099
-  data.tar.gz: 0e0349ac20ccfc9f4391eff8407932dd3e26541c5a7a837114e4fcd67a1cc8b62c8824c5bcd57dd56126b7b98325bd2c837b92e73771ec7eb806af5e9e28a4e0
+  metadata.gz: 498a92d94b46a494b0f3a13fc53ea7aac510d4fccc3c9a155dd2d8d7817a9eba2493816cddf362c71d00c35e8ac5a260092c6ee557a2ab6469b1ac122c095d44
+  data.tar.gz: 0c4c18d1b040946cae3800e45631f0efd0cb1164fe7dbea527ef45db6cfdb5532d0bda213a3df0c9cca59a028ea187904e55d48b3810b9f24d6302aa5ce5abb6

data/app/assets/javascripts/burp/cms_helper.js

@@ -8,27 +8,30 @@
     
     var snippetComments = $("*:not(iframe)").contents().filter(function() {
       try {
-        return this.nodeType == 8 && this.data.match(/snippet data-type=\"start\"/);
+        return this.nodeType === 8 && this.data.match(/snippet data-type=\"start\"/);
       } catch (e) {
         // Yay for not being allow to look at dom elements with external content, aka iframes
         return false;
       }
     });
+    
     snippetComments.map(function() {
       
-      var name = this.data.match(/snippet data-type=\"start\" data-name=\"(.*?)\"/)[1];
+      var name = this.data.match(/data-name=\"(.*?)\"/)[1];
+      var pageId = this.data.match(/data-page-id=\"(.*?)\"/)[1];
       
       snippets.names.push(name);
       
       snippets.snippets[name] = {
+        pageId:pageId,
         comment:this,
         elements:function() {
           
           var snippetElements = [];
           var element = this.comment;
           while(element.nextSibling) {
-            element = element.nextSibling
-            if(element.nodeType == 8 && element.data.match(/snippet data-type=\"end\"/)) {
+            element = element.nextSibling;
+            if(element.nodeType === 8 && element.data.match(/snippet data-type=\"end\"/)) {
               break;
             }
             snippetElements.push(element);

data/app/assets/packages/burp/editing/js/main.js

@@ -250,7 +250,7 @@ $(function() {
     
     $.adminDock.footer.addButton({ icon: 'save', text: 'Save', secondary: true, click:function() {
       
-      var path = window.burp_path || window.location.pathname;
+      var path = window.burp_path || snippets().snippets[snippetName].pageId || window.location.pathname;
       if(path === "/") {
         path = "/$root";
       }

data/app/controllers/burp/pages_controller.rb

@@ -85,13 +85,20 @@ module Burp
           end
         end
         
-        @page.save
-          
-        respond_to do |format|
-          format.html {
-            redirect_to pages_path
-          }
-          format.json { render :json =>  {:success => true} }
+        if @page.save          
+          respond_to do |format|
+            format.html {
+              redirect_to pages_path
+            }
+            format.json { render :json =>  {:success => true} }
+          end
+        else
+          respond_to do |format|
+            format.html {
+              render :edit
+            }
+            format.json { render :json =>  {:success => false} }
+          end
         end
       end
     end

data/app/lib/burp/page.rb

@@ -3,15 +3,16 @@ module Burp
 
   class Page 
 
-    attr_accessor :snippets,:title
+    attr_accessor :snippets, :title, :page_id
 
     def initialize(options = {})
       @snippets = options[:snippets] || {}
       @title = options[:title] || ""
+      @page_id = options[:page_id] || ""
     end
 
     def [](location_name)
-      ("<!-- snippet data-type=\"start\" data-name=\"#{location_name}\" -->"+(@snippets[location_name.to_sym] || "<h2>#{location_name.to_s}</h2>")+"<!-- snippet data-type=\"end\" data-name=\"#{location_name}\" -->").html_safe
+      ("<!-- snippet data-type=\"start\" data-page-id=\"#{page_id}\" data-name=\"#{location_name}\" -->"+(@snippets[location_name.to_sym] || "<h2>#{location_name.to_s}</h2>")+"<!-- snippet data-type=\"end\" data-name=\"#{location_name}\" -->").html_safe
     end
 
     def []=(location_name,value)

data/lib/burp/version.rb

@@ -1,3 +1,3 @@
 module Burp
-  VERSION = "1.3.27"
+  VERSION = "1.3.28"
 end

data/lib/burp_cms.rb

@@ -16,7 +16,7 @@ module Burp
   def self.find_page(path)
     page_model = Burp::PageModel.find(path)
     if page_model 
-      Page.new(:snippets => page_model.snippets, :title => page_model.title)
+      Page.new(:snippets => page_model.snippets, :title => page_model.title, :page_id => page_model.id)
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: burp_cms
 version: !ruby/object:Gem::Version
-  version: 1.3.27
+  version: 1.3.28
 platform: ruby
 authors:
 - Darwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails