burp_cms 1.3.22 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f0fb10d354b262a4418476e434a2e49fcf8174f
-  data.tar.gz: bde87ac8d54cbe975170907d33e84a04342d6776
+  metadata.gz: 7eb5a2a04169b04a4ca36e4874d43359156d4ac7
+  data.tar.gz: c493348b8edb342492f771f94e19e319a669cbc2
 SHA512:
-  metadata.gz: 6702dc61821c6d867c271c7c4071b2a9d2c7925cd30d0f737a6c0bafb1d7d59809d18d2481282f01ae3112b60884332fce0af513ab36cdbae4057c2e3e4d3d43
-  data.tar.gz: 6a9da3b0243d2030c862f4f6562bc24a76e47629b204fb0cb1504f1cc67af14f9d4560ec54a8be3a80e36b058dc6675542b7605fde629c5e92d81c2ccb0aac8c
+  metadata.gz: 351d8d0f2bcc0657ffa87227776cacd733b0dc9489c051ee3c11e1ac989cd8c26b7b05f337b7d60b45f28b969ec72a9bd2cb5327203d52297963a36f5c27026f
+  data.tar.gz: 551b8d61164d2f5708b8ad1999fb2f13a2360146a33e9779601d4be9ac34b54db6b53f95868c2dcfbfc3ea573cba414ace675871c3956545205b1e5b878a8dde

data/app/assets/javascripts/burp/lib/fileupload.js

@@ -1205,7 +1205,7 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
         if(window['jQuery']) {
           var csrf_token = jQuery('meta[name=csrf-token]').attr('content');
           if(csrf_token) {
-            xhr.setRequestHeader("X-CSRF-Token", encodeURIComponent(csrf_token));
+            xhr.setRequestHeader("X-CSRF-Token", csrf_token);
           }
         }
         

data/app/assets/stylesheets/burp/application.less

@@ -28,6 +28,10 @@ body > .container {
   padding: 60px 0px 100px;
 }
 
+.container > .row {
+  margin: 0px 20px;
+}
+
 .controls > .input > textarea {
   width: 500px;
 }
@@ -50,6 +54,8 @@ span.buttons {
   display: block;
 }
 
+
+
 td {
   padding: 1px 50px 1px 0px; 
 }

data/app/assets/stylesheets/burp/views/pages/index.less

@@ -1,7 +1,7 @@
 .burp-pages-index {
   
   table {
-    max-width: 600px;
+    max-width: 560px;
     margin: 0px 20px;
   }
   

data/app/controllers/burp/application_controller.rb

@@ -16,6 +16,11 @@ module Burp
       @body_classes += " #{(request.user_agent || '').match(/(lion)/i) ? "noscrollbars" : "scrollbars"} "
     end
     
+    helper_method :menu
+    def menu
+      Burp.menu(request)
+    end
+    
     private
     
     def access
@@ -35,7 +40,6 @@ module Burp
             username == Rails.application.config.burp_username && password == Rails.application.config.burp_password
           end
         end
-      
       end
     end
     

data/app/lib/burp/group.rb

@@ -106,5 +106,13 @@ module Burp
       to_hash.hash
     end
     
+    def self.bootstrap_nav(group)
+      %{
+      <ul class="nav">
+        #{group.children.map { |child| child.is_a?(Link) ? "<li class=\"#{child.css_class}\">#{child.to_html}</li>" : "" }.join("\n\t\t\t")}
+      </ul>
+      }.html_safe
+    end
+    
   end
 end

data/app/lib/burp/link.rb

@@ -3,11 +3,16 @@ module Burp
     
     attr_reader :id
     attr_accessor :url,:name
+    attr_accessor :css_class
 
-    def initialize(options)
-      self.name = options.keys.first
-      self.url = options.values.first
-
+    def initialize(options)      
+      self.name ||= options[:name]
+      self.url ||= options[:url]
+      self.css_class ||= options[:class]
+      
+      self.name ||= options.keys.first
+      self.url ||= options.values.first
+      
       raise ArgumentError.new("Missing a url") unless url
       raise ArgumentError.new("Missing a name") unless name
     end
@@ -21,7 +26,7 @@ module Burp
     end
 
     def to_html(request = nil,name = nil)
-      %{<a class="#{current_class(request)}" #{id ? "id='#{id}'" : ""} href="#{url}">#{name || self.name}</a>}.html_safe
+      %{<a class="#{current_class(request)} #{css_class}" #{id ? "id='#{id}'" : ""} href="#{url}">#{name || self.name}</a>}.html_safe
     end
     
     def to_param

data/app/views/burp/files/index.html.erb

@@ -34,65 +34,63 @@
 </table>
   
 
-  
-  <script type="text/javascript" charset="utf-8">
-  
-    <% content_for :inline_javascript do %>
-      
-      var uploader = new qq.FileUploader({
-          element: document.getElementById('file-uploader'),
-          action: '/burp/files',
-          sizeLimit: 1024 * 1024 * 40,
-          onComplete: function(id, fileName, responseJSON){
-            if(responseJSON.success) {
-              $.get(document.location,function(data) {
-                $('table').replaceWith($(data).find('table'));
-              });
-            } else {
-              var errorMessage = "";
-              $.each(responseJSON.errors,function(index,error) {
-                $.each(error,function(key,value) {
-                  errorMessage += value;
-                });
+<% content_for :inline_javascript do %>
+<script type="text/javascript" charset="utf-8">
+
+    
+    var uploader = new qq.FileUploader({
+        element: document.getElementById('file-uploader'),
+        action: '/burp/files',
+        sizeLimit: 1024 * 1024 * 40,
+        onComplete: function(id, fileName, responseJSON){
+          if(responseJSON.success) {
+            $.get(document.location,function(data) {
+              $('table').replaceWith($(data).find('table'));
+            });
+          } else {
+            var errorMessage = "";
+            $.each(responseJSON.errors,function(index,error) {
+              $.each(error,function(key,value) {
+                errorMessage += value;
               });
-              alert(errorMessage);
-            }
-          },
-          template: '<div class="qq-uploader">' + 
-                  '<div class="file-upload-drop-area" style="display: block;"><span>Drop files here to upload</span></div>' +
-                  '<div class="file-upload-button btn btn-large">Click here to upload</div>' +
-                  '<ul class="qq-upload-list"></ul>' + 
-               '</div>',
-      
-          // template for one item in file list
-          fileTemplate: '<li>' +
-                  '<span class="qq-upload-file"></span>' +
-                  '<span class="qq-upload-spinner"></span>' +
-                  '<span class="qq-upload-size"></span>' +
-                  '<a class="qq-upload-cancel" href="#">Cancel</a>' +
-                  '<span class="qq-upload-failed-text">Failed</span>' +
-              '</li>',        
-      
-          classes: {
-              // used to get elements from templates
-              button: 'file-upload-button',
-              drop: 'file-upload-drop-area',
-              dropActive: 'file-upload-drop-area-active',
-              list: 'qq-upload-list',
-      
-              file: 'qq-upload-file',
-              spinner: 'qq-upload-spinner',
-              size: 'qq-upload-size',
-              cancel: 'qq-upload-cancel',
-      
-              // added to list item when upload completes
-              // used in css to hide progress spinner
-              success: 'qq-upload-success',
-              fail: 'qq-upload-fail'
+            });
+            alert(errorMessage);
           }
-      });
-      
-    <% end %>
+        },
+        template: '<div class="qq-uploader">' + 
+                '<div class="file-upload-drop-area" style="display: block;"><span>Drop files here to upload</span></div>' +
+                '<div class="file-upload-button btn btn-large">Click here to upload</div>' +
+                '<ul class="qq-upload-list"></ul>' + 
+             '</div>',
     
-  </script>
+        // template for one item in file list
+        fileTemplate: '<li>' +
+                '<span class="qq-upload-file"></span>' +
+                '<span class="qq-upload-spinner"></span>' +
+                '<span class="qq-upload-size"></span>' +
+                '<a class="qq-upload-cancel" href="#">Cancel</a>' +
+                '<span class="qq-upload-failed-text">Failed</span>' +
+            '</li>',        
+    
+        classes: {
+            // used to get elements from templates
+            button: 'file-upload-button',
+            drop: 'file-upload-drop-area',
+            dropActive: 'file-upload-drop-area-active',
+            list: 'qq-upload-list',
+    
+            file: 'qq-upload-file',
+            spinner: 'qq-upload-spinner',
+            size: 'qq-upload-size',
+            cancel: 'qq-upload-cancel',
+    
+            // added to list item when upload completes
+            // used in css to hide progress spinner
+            success: 'qq-upload-success',
+            fail: 'qq-upload-fail'
+        }
+    });
+</script>
+<% end %>
+
   

data/app/views/burp/pages/index.html.erb

@@ -70,10 +70,9 @@
 </div>
 
 
+<% content_for :inline_javascript do %>
 <script type="text/javascript" charset="utf-8">
   
-  <% content_for :inline_javascript do %>
-  
   $(function() {
     
     // Popup for edit and new page
@@ -89,7 +88,6 @@
       });
     });
   });
-  
-  <% end %>
     
 </script>
+<% end %>

data/app/views/layouts/burp/application.html.erb

@@ -22,12 +22,7 @@
           </a>
           <a class="brand" href="/burp/">Burp</a>
           <div class="nav-collapse collapse">
-            <ul class="nav">
-              <li><%= link_to "Pages", "/burp/pages"  %></li>
-              <li><%= Burp::Menu.count == 1 ? (link_to "Menu", edit_menu_path(Burp::Menu.all.first)) : (link_to "Menus", "/burp/menus")  %></li>
-              <li><%= link_to "Files", "/burp/files"  %></li>
-              <li class="markdown"><%= link_to "Help", "/burp/help" %></li>
-            </ul>
+            <%= Burp::Group.bootstrap_nav(menu) %>
           </div>
         </div>
       </div>
@@ -35,6 +30,18 @@
 
     <div class="container">
       
+      <% if flash[:notice] %>
+        <div class="alert alert-success">
+          <button type="button" class="close" data-dismiss="alert">&times;</button>
+          <%= flash[:notice] %>
+        </div>
+      <% elsif flash[:alert] %>
+        <div class="alert alert-error">
+          <button type="button" class="close" data-dismiss="alert">&times;</button>
+          <%= flash[:alert] %>
+        </div>
+      <% end %>
+      
       <div class="row">
         <%= yield %>
       </div>
@@ -49,9 +56,7 @@
     </div>
     
     <%= javascript_include_tag "burp/application" %>
-    <script type="text/javascript" charset="utf-8">
-      <%= raw yield :inline_javascript %>
-    </script>
+    <%= raw yield :inline_javascript %>
   </body>
 </html>
 

data/config/routes.rb

@@ -25,6 +25,6 @@ Burp::Engine.routes.draw do
 end
 
 Rails.application.routes.draw do
-  mount Burp::Engine => "/burp"
+  mount Burp::Engine => "/burp", :as => "burp_engine"
   get '/:path' => 'burp/catch_all#show', :constraints => { :path => /.*/ }
 end

data/lib/burp/version.rb

@@ -1,3 +1,3 @@
 module Burp
-  VERSION = "1.3.22"
+  VERSION = "1.3.23"
 end

data/lib/burp_cms.rb

@@ -69,5 +69,28 @@ module Burp
     Thread.current[:thread_local_content_directory] = path
   end
   
+  def self.menu(request)
+    group = Group.new("") 
+    group.children << Link.new(:name => "Pages", :url => "/burp/pages")
+    if Burp::Menu.count == 1
+      group.children << Link.new(:name => "Menu", :url => "/burp/menus/#{Burp::Menu.all.first.name}/edit")
+    else
+      group.children << Link.new(:name => "Menus", :url => "/burp/menus")
+    end
+    group.children << Link.new(:name => "Files", :url => "/burp/files")
+    group.children << Link.new(:name => "Help", :url => "/burp/herp", :class => "markdown")
+    
+    @@menu_processors.values.each do |block|
+      block.call(group, request)
+    end
+    
+    group
+  end
+  
+  @@menu_processors = {}
+  
+  def self.add_menu_processor(name, &block)
+    @@menu_processors[name] = block
+  end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: burp_cms
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.23
 platform: ruby
 authors:
 - Darwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails