gluttonberg-core 2.5.4 → 2.5.5

data/app/views/gluttonberg/public/members/_form.html.haml

@@ -1,5 +1,5 @@
 %h2
-  Register for 
+  Register for
 #new_user
   = form_for @member, :url => members_path ,  :html => {:id => "register_form"} do |f|
     - if @member && @member.errors.any?
@@ -8,13 +8,13 @@
           - @member.errors.full_messages.each do |msg|
             %li
               = msg
-              
+
     .form_element
       = f.label :first_name
       = f.text_field :first_name , :class => "required"
     .form_element
       = f.label :last_name
-      = f.text_field :last_name , :class => "required"  
+      = f.text_field :last_name , :class => "required"
 
     .form_element
       = f.label :email
@@ -29,28 +29,28 @@
       = f.password_field :password_confirmation  , :class => "required"  , :id => "password_confirmation" , :equalto => "#password"
 
 
-    
+
     .form_element.terms
       %a{:href=>"/about/guidelines_for_use",:target=>"_blank"}
-        = f.label :term_and_conditions 
+        = f.label :term_and_conditions
       = f.check_box :term_and_conditions , :class => "required"
-      
+
     .form_element.reg_submit
       = f.submit
-      = image_tag("/assets/spinner.gif" , :id => "user_submit_progress" , :style => "display:none" )
+      = image_tag("/assets/gb_spinner.gif" , :id => "user_submit_progress" , :style => "display:none" )
 
 
 #form_hidden_field
-      
+
 :javascript
   $(document).ready(function() {
-    
+
     $("form#register_form").validate({
       rules: {
         "user[term_and_conditions]" : {
           required: true
         }
-        
+
       },
       messages: {
         "user[first_name]": {
@@ -65,19 +65,18 @@
         "user[password_confirmation]": {
         required: "#{t('validation_messages.password_confirmation_required')}"
         },
-        
+
         "user[term_and_conditions]" : {
           required: "#{t('validation_messages.term_and_conditions_required')}"
-        }  
-        
+        }
+
       }  ,
           submitHandler: function(form) {
-            
+
             $("#user_submit_progress").show();
            }
     });
-    
-    
-    
+
+
+
   });
-  

data/app/views/gluttonberg/public/members/edit.html.haml

@@ -1,12 +1,12 @@
 %h1
   Welcome, #{current_member.first_name}
-  
+
 #sub_nav.manual
   %ul
     %li.current#view_ideasNav
       %a{:href=>"/member/profile"}
         Your Details
-    
+
 #complete_profile
   = form_for @member, :url => member_profile_path, :method => :put ,  :html => {:multipart => true, :id => "register_form"} do |f|
     - if @member.errors.any?
@@ -16,41 +16,41 @@
             %li
               = msg
     = f.hidden_field(:return_url, :value => "/member/profile")
-    
+
     .form_element
       = f.label :email
       = f.text_field :email
-    
+
     .form_element
       = f.label :password
       = f.password_field :password
-    
+
     .form_element
       = f.label :password_confirmation
       = f.password_field :password_confirmation
-    
+
     .form_element
       = f.label "Profile Image"
       = f.file_field :image , :class => ""
-      
+
     .form_element
       = f.submit
-      = image_tag("/assets/spinner.gif" , :id => "user_submit_progress" , :style => "display:none" )
+      = image_tag("/assets/gb_spinner.gif" , :id => "user_submit_progress" , :style => "display:none" )
 
 
 #form_hidden_field
-  
+
 
 
 :javascript
   $(document).ready(function() {
-    
+
     $("form#register_form").validate({
       rules: {
         "user[term_and_conditions]" : {
           required: true
         }
-        
+
       },
       messages: {
         "user[first_name]": {
@@ -65,18 +65,18 @@
         "user[password_confirmation]": {
         required: "#{t('validation_messages.password_confirmation_required')}"
         },
-        
+
         "user[term_and_conditions]" : {
           required: "#{t('validation_messages.term_and_conditions_required')}"
-        }  
-        
+        }
+
       }  ,
           submitHandler: function(form) {
-            
+
             $("#user_submit_progress").show();
            }
     });
-    
-    
-    
+
+
+
   });

data/app/views/gluttonberg/public/members/show.html.haml

@@ -3,9 +3,9 @@
     %li.current#view_ideasNav
       %a{:href=>"/member/profile"}
         Your Details
-    
-    
-        
+
+
+
 %h1
   Welcome, #{current_member.first_name}
 
@@ -14,10 +14,10 @@
     = link_to "Update your details", member_profile_edit_path
   .avatar
     - if current_user.blank?
-      = image_tag("/images/comment/missing.png", :class => "comment_image")
+      = image_tag("/assets/gb_missing.png", :class => "comment_image")
     - else
       = image_tag(current_member.image.url(:thumb))
-  
+
   %dl
     %dt
       Name:
@@ -27,9 +27,9 @@
       Email:
     %dd
       = current_member.email
-    
-      
+
+
   - unless current_member.profile_confirmed
     .confirm
       = link_to "resend confirmation email", member_resend_confirmation_path
-  
+

data/app/views/gluttonberg/public/pages/restrict_site_access.html.haml

@@ -9,9 +9,9 @@
       %meta{:content => "", :name => "author"}
       = csrf_meta_tag
       / Le styles
-      %link{:href => "/assets/bootstrap.css", :rel => "stylesheet"}
-      %link{:href => "/assets/bootstrap-responsive.css", :rel => "stylesheet"}
-      %link{:href => "/assets/admin-override.css", :rel => "stylesheet"}
+      %link{:href => "/assets/gb_bootstrap.css", :rel => "stylesheet"}
+      %link{:href => "/assets/gb_bootstrap-responsive.css", :rel => "stylesheet"}
+      %link{:href => "/assets/gb_admin-override.css", :rel => "stylesheet"}
       :css
         body {
           padding-top: 60px;
@@ -22,7 +22,7 @@
         }
       /[if lt IE 9]
         <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
-            
+
   %body#login
     .container-fluid
       .row
@@ -30,7 +30,7 @@
           = backend_logo("/assets/gb_logo.png" , {:height => "46px"})
           %h1#login_title
             = Gluttonberg::Setting.get_setting("title")
-    
+
           %div#form.well
             %p
               This site is currently offline.
@@ -43,15 +43,15 @@
                   = password_field_tag 'password', nil, :class => "span4" , :value => "", :title=>"Password"
                 .control-group
                   = submit_tag('Enter', :class => "btn btn-success", :disable_with => "Logging you in...")
-              
-          &copy; 
+
+          &copy;
           %a{:href => "http://freerangefuture.com", :target => "_blank"}
             Freerange Future
           2012
-      
-    
+
+
 
     %script{:src => "/assets/jquery.js"}
-    %script{:src => "/assets/bootstrap.js"}
-    = javascript_include_tag "jgb_login"
-    = custom_javascript_include_tag    
+    %script{:src => "/assets/gb_bootstrap.js"}
+    = javascript_include_tag "gb_login"
+    = custom_javascript_include_tag

data/app/views/layouts/bare.html.haml

@@ -9,8 +9,8 @@
       %meta{:content => "", :name => "author"}
       = csrf_meta_tag
       / Le styles
-      %link{:href => "/assets/bootstrap.css", :rel => "stylesheet"}
-      %link{:href => "/assets/admin-override.css", :rel => "stylesheet"}
+      %link{:href => "/assets/gb_bootstrap.css", :rel => "stylesheet"}
+      %link{:href => "/assets/gb_admin-override.css", :rel => "stylesheet"}
       :css
         body {
           padding-top: 60px;
@@ -21,12 +21,12 @@
         }
       /[if lt IE 9]
         <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
-            
+
   %body#login
     .container
       = yield
-    
+
 
     %script{:src => "/assets/jquery.js"}
-    %script{:src => "/assets/bootstrap.js"}
+    %script{:src => "/assets/gb_bootstrap.js"}
     = custom_javascript_include_tag

data/app/views/layouts/gluttonberg.html.haml

@@ -9,10 +9,10 @@
       %meta{:content => "", :name => "author"}
       = csrf_meta_tag
       / Le styles
-      %link{:href => "/assets/bootstrap.css", :rel => "stylesheet"}
-      %link{:href => "/assets/jcrop/css/jquery-Jcrop.css", :rel => "stylesheet"}
-      %link{:href => "/assets/admin-override.css", :rel => "stylesheet"}
-      = javascript_include_tag "jquery-1-7-1", "bootstrap", "bootstrap-datepicker", "jquery-dimensions-min" , "jquery-ui-1-8-23-custom-min" , "jquery-validate" , "jquery-dragTree" , "rails" , "gb_tags" , "jeditable" , "ajaxfileupload" , "expander" , "/assets/jcrop/js/jquery-Jcrop-min"
+      %link{:href => "/assets/gb_bootstrap.css", :rel => "stylesheet"}
+      %link{:href => "/assets/jcrop/css/gb_jquery-Jcrop.css", :rel => "stylesheet"}
+      %link{:href => "/assets/gb_admin-override.css", :rel => "stylesheet"}
+      = javascript_include_tag "jquery-1-7-1", "gb_bootstrap", "gb_bootstrap-datepicker", "jquery-dimensions-min" , "jquery-ui-1-8-23-custom-min" , "jquery-validate" , "gb_jquery-dragTree" , "rails" , "gb_tags" , "gb_jeditable" , "gb_ajaxfileupload" , "gb_expander" , "/assets/jcrop/js/jquery-Jcrop-min"
 
       = wysiwyg_js_css_link_tag
       = javascript_include_tag "gb_application" ,  :charset => "utf-8"

data/lib/generators/gluttonberg/resource/templates/backend_view_index.html.haml

@@ -20,12 +20,14 @@
           - form_tag(admin_<%=plural_name%>_path, :method => :get  , :id => "list_search_form") do
             = text_field_tag :query, params[:query]
             = submit_tag "Search" , :class => "button"
+
         <%end%>
 
       - if @<%= plural_name %>.empty?
         %p.empty
           No <%= plural_class_name %>
       - else
+
         <% if draggable? %>
         %table{:id => 'pages_table', :class => "table table-bordered #{(can?(:reorder , <%=class_name%>) ? "#{drag_tree_table_class} " : " " )}", :cellpadding => 0, :cellspacing => 0, :rel => "" , :summary => "<%= plural_name %>" , :rel => drag_tree_url }
         <%else%>

data/lib/gluttonberg/version.rb

@@ -1,3 +1,3 @@
 module Gluttonberg
-  VERSION = "2.5.4"
+  VERSION = "2.5.5"
 end