gluttonberg-core 2.5.4 → 2.5.5

data/app/assets/javascripts/gb_application.js

@@ -7,15 +7,15 @@ $(document).ready(function() {
   init_setting_dropdown_ajax();
   initPublishedDateTime();
   initBulkDeleteAsset();
-  
+
   $("#wrapper p#contextualHelp a").click(Help.click);
-  
+
   if ($('table').length > 0) {
     $('table').find('tr:last').css('background-image', 'none !important');
   }
 
   $("form.validation").validate();
-  
+
   if( $('.page_flash').length > 0){
     if($(".model-error").length > 0){
       $('.page_flash').remove();
@@ -23,11 +23,11 @@ $(document).ready(function() {
       $('.page_flash').insertBefore(".page-header");
     }
   }
-  
+
   $("ul.nav a.active").each(function(){
     $(this).parent("li").addClass('active')
   });
-  
+
 });
 
 function initBetterSlugManagement() {
@@ -42,16 +42,16 @@ function initBetterSlugManagement() {
   var slugLength = 0;
   var slug = "";
   var currentSlug = "";
-    
+
   if (typeof doNotEdit == 'string') {
     doNotEdit = true;
     editPage = true;
   } else {
     doNotEdit = false;
   }
-  
+
   $('#page_slug_holder .domain').html($.trim(str));
-  
+
   pt.keyup(function(){
     if (!doNotEdit) {
       slug = pt.attr('value').toLowerCase().replace(/\s/gim, '_').replace(regex, '')
@@ -59,7 +59,7 @@ function initBetterSlugManagement() {
       hs.attr('value', slug);
     };
   })
-  
+
   pb.click(function(){
     hs.show();
     ps.hide();
@@ -90,7 +90,7 @@ function initBetterSlugManagement() {
         ps.show();
         pb.show();
         if (!editPage) {
-          doNotEdit = false; 
+          doNotEdit = false;
         }
       } else {
         hs.hide();
@@ -101,7 +101,7 @@ function initBetterSlugManagement() {
       };
     };
   })
-  
+
 }
 
 
@@ -113,7 +113,7 @@ function enable_jwysiwyg_on(selector) {
 
       // General options
       theme: "advanced",
-      plugins: "autolink,lists,style,table,advhr,advimage,advlink,gb_assets,inlinepopups,insertdatetime,preview,paste,fullscreen,advlist,wordcount",
+      plugins: "autolink,lists,style,table,advhr,advlink,gb_assets,inlinepopups,insertdatetime,preview,paste,fullscreen,advlist,wordcount",
 
       // Theme options
       theme_advanced_buttons1: "gb_assets,newdocument,|,bold,italic,underline,|,justifyleft,justifyright,styleselect,formatselect,|,attribs,removeformat,cleanup,code",
@@ -180,7 +180,7 @@ function enable_slug_management_on(src_class){
 function initClickEventsForAssetLinks(element) {
   element.find(".thumbnails a.choose_button").click(function(e) {
     var p = $(this).parent().parent().parent(".asset_selector_wrapper");
-    
+
     var link = $(this);
     AssetBrowser.showOverlay()
     $.get(link.attr("href"), null, function(markup) {
@@ -238,7 +238,7 @@ var AssetBrowser = {
     if (Wysiwyg != undefined) {
       AssetBrowser.Wysiwyg = Wysiwyg;
     }
-    // its used for category filtering on assets and collections  
+    // its used for category filtering on assets and collections
     AssetBrowser.filter = $("#filter_" + $(link).attr("rel"));
 
     if ($(link).is(".logo_setting")) {
@@ -302,7 +302,7 @@ var AssetBrowser = {
       "margin-top": "-" + (($(window).height()*0.9)/2) + "px",
       "margin-left": "-" + (($(window).width()*0.7)/2) + "px"
     })
-    
+
     $(".modal-body").css({
       "max-height": (($(window).height()*0.9) - 135) + "px",
       "height": (($(window).height()*0.9) - 135) + "px"
@@ -361,7 +361,7 @@ var AssetBrowser = {
   updateDisplay: function(markup) {
     AssetBrowser.display.html(markup);
     AssetBrowser.display.find("a").click(AssetBrowser.click);
-    
+
     try {
       $("form.validation").validate();
     } catch(ex) {}
@@ -414,7 +414,7 @@ var AssetBrowser = {
         auto_save_asset(AssetBrowser.logo_setting_url, id); //auto save if it is required
       } else {
         if (AssetBrowser.actualLink.hasClass("add_image_to_gallery")) {
-          
+
           $.ajax({
             url: AssetBrowser.actualLink.attr("data_url"),
             data: 'asset_id=' + id,
@@ -636,7 +636,7 @@ function ajaxFileUpload(link) {
         secureuri:use secure protocol
         success: call back function when the ajax complete
         error: callback function when the ajax failed
-        
+
             */
   $.ajaxFileUpload({
     url: '/admin/add_asset_using_ajax',
@@ -653,7 +653,7 @@ function ajaxFileUpload(link) {
         }
       }
 
-      
+
       new_id = data["asset_id"]
       file_path = data["url"]
       jwysiwyg_image = data["jwysiwyg_image"];
@@ -667,16 +667,16 @@ function ajaxFileUpload(link) {
         } else {
           AssetBrowser.link_parent.prepend("<img src='" + file_path + "' />")
         }
-      }catch(e){}  
+      }catch(e){}
       if(data["category"] == "image")
         insert_image_in_wysiwyg(jwysiwyg_image,data["category"],data["title"]);
       else
         insert_image_in_wysiwyg(file_path,data["category"],data["title"]);
-        
+
       data_id = $(this).attr("data_id");
       url = AssetBrowser.logo_setting_url;
       auto_save_asset(url, new_id); // only if autosave is required
-      
+
       if (AssetBrowser.actualLink.hasClass("add_image_to_gallery")) {
         $.ajax({
           url: AssetBrowser.actualLink.attr("data_url"),
@@ -691,8 +691,8 @@ function ajaxFileUpload(link) {
           }
         });
       }
-      
-      
+
+
       AssetBrowser.close();
     },
     error: function(data, status, e) {
@@ -735,11 +735,11 @@ function updateCoords(c) {
 
 function initPublishedDateTime() {
 
-  
+
   $(".publishing_state").change(function(){
     updatePublishedDateField()
   })
-  
+
   function updatePublishedDateField(){
     if($(".publishing_state").val()=="published"){
       $(".published_at").show()
@@ -783,7 +783,7 @@ function initBulkDeleteAsset(){
       }
     }
   });
-  
+
   $(".select_all_assets").click(function(e){
     var status = $(".select_all_assets").is(':checked');
     $(".select_asset_checkbox").attr('checked', status);
@@ -797,9 +797,9 @@ function initBulkDeleteAsset(){
       selected_assets_ids = [];
       $(".delete_selected_assets").hide();
     }
-    
+
   });
-  
+
   $(".delete_selected_assets").click(function(e){
     if(selected_assets_ids == null || selected_assets_ids.length <= 0){
       alert("Please select at least one asset.")
@@ -810,7 +810,7 @@ function initBulkDeleteAsset(){
         $("form#delete_selected_assets_form").submit();
       }
     }
-    
+
   });
 }
 

data/app/assets/javascripts/jcrop/css/{jquery-Jcrop.css → gb_jquery-Jcrop.css}

@@ -5,7 +5,7 @@
 {
 	font-size: 0px;
 	position: absolute;
-	background: white url('Jcrop.gif') top left repeat;
+	background: white url('gb_Jcrop.gif') top left repeat;
 }
 .jcrop-vline { height: 100%; width: 1px !important; }
 .jcrop-hline { width: 100%; height: 1px !important; }

data/app/assets/stylesheets/{admin-ie7.sass → gb_admin-ie7.sass}

@@ -61,7 +61,7 @@ input.collection
 /* Assets Dialog ----------------------------------------------------
 
 #assetsDialogOverlay, #overlay
-  background: url("/assets/library/dialog_overlay.png") repeat
+  background: url("/assets/gb_dialog_overlay.png") repeat
   width: 100%
   height: 100%
   position: relative

data/app/assets/stylesheets/{admin-override.sass → gb_admin-override.sass}

@@ -32,7 +32,7 @@ a.brand-img
 body
   :padding
     :top 160px !important
-  background: url(/assets/bg.png) repeat
+  background: url(/assets/gb_bg.png) repeat
 
 .navbar-fixed-top
   z-index: 1035
@@ -93,19 +93,19 @@ body
         background-repeat: no-repeat
 
       a#dashboard_nav
-        background-image: url('/assets/icon_dashboard.png')
+        background-image: url('/assets/gb_icon_dashboard.png')
 
       a#content_nav
-        background-image: url('/assets/icon_content.png')
+        background-image: url('/assets/gb_icon_content.png')
 
       a#library_nav
-        background-image: url('/assets/icon_library.png')
+        background-image: url('/assets/gb_icon_library.png')
 
       a#membership_nav
-        background-image: url('/assets/icon_members.png')
+        background-image: url('/assets/gb_icon_members.png')
 
       a#settings_nav
-        background-image: url('/assets/icon_settings.png')
+        background-image: url('/assets/gb_icon_settings.png')
 
 .dash-left
   background: #fff
@@ -130,42 +130,42 @@ body
 
 .nav-list > li > a
   padding: 3px 10px 3px 35px
-  background-image: url(/assets/icon_default.png)
+  background-image: url(/assets/gb_icon_default.png)
   background-position: 15px 5px
   background-repeat: no-repeat
 
 .nav-list a.blog
-  background-image: url(/assets/icon_blog.png)
+  background-image: url(/assets/gb_icon_blog.png)
   background-position: 15px 5px
   background-repeat: no-repeat
 
 .nav-list a.pages
-  background-image: url(/assets/icon_pages.png)
+  background-image: url(/assets/gb_icon_pages.png)
   background-position: 15px 5px
   background-repeat: no-repeat
 
 .nav-list a#groupsNav
-  background-image: url(/assets/icon_member.png)
+  background-image: url(/assets/gb_icon_member.png)
   background-position: 15px 5px
   background-repeat: no-repeat
 
 .nav-list a#membersNav
-  background-image: url(/assets/icon_member.png)
+  background-image: url(/assets/gb_icon_member.png)
   background-position: 15px 5px
   background-repeat: no-repeat
 
 .nav-list a.upload
-  background-image: url(/assets/icon_upload.png)
+  background-image: url(/assets/gb_icon_upload.png)
   background-position: 15px 5px
   background-repeat: no-repeat
 
 .nav-list a.collections
-  background-image: url(/assets/icon_collection.png)
+  background-image: url(/assets/gb_icon_collection.png)
   background-position: 15px 5px
   background-repeat: no-repeat
 
 .nav-list a.assets
-  background-image: url(/assets/icon_asset.png)
+  background-image: url(/assets/gb_icon_asset.png)
   background-position: 15px 5px
   background-repeat: no-repeat
 
@@ -185,10 +185,10 @@ body
   margin: 0 0 3px 0
 
 .dashboard a.edit
-  background-image: url(/assets/icon_blog.png)
+  background-image: url(/assets/gb_icon_blog.png)
 
 .dashboard a.add
-  background-image: url(/assets/icon_add.png)
+  background-image: url(/assets/gb_icon_add.png)
 
 
 
@@ -354,7 +354,7 @@ ul.thumbnails
 
 
 .ui-draggable
-  background: url('/assets/drag_handle.png') no-repeat
+  background: url('/assets/gb_drag_handle.png') no-repeat
   width: 11px
   height: 10px
   display: block
@@ -362,7 +362,7 @@ ul.thumbnails
   margin: 2px 15px 0 0
   cursor: move
   &.home, &.page
-    background: url('/assets/drag_handle.png') no-repeat
+    background: url('/assets/gb_drag_handle.png') no-repeat
     width: 11px
     height: 10px
     display: block
@@ -426,11 +426,11 @@ form .span5
 
 
 legend.expandable
-  background: url('/assets/arrow.png') top right no-repeat
+  background: url('/assets/gb_arrow.png') top right no-repeat
   cursor: pointer
 
 legend.collapsed
-  background: url('/assets/arrow.png') bottom right no-repeat
+  background: url('/assets/gb_arrow.png') bottom right no-repeat
 
 //
   For tags autocomplete
@@ -499,10 +499,10 @@ table
         display: inline-block
         &:hover, &.desc:hover, &.current.asc
           :padding-right 25px
-          background: url("/assets/library/sort_by_asc.png") right no-repeat
+          background: url("/assets/library/gb_sort_by_asc.png") right no-repeat
         &:hover, &.asc:hover, &.current.desc
           :padding-right 25px
-          background: url("/assets/library/sort_by_desc.png") right no-repeat
+          background: url("/assets/library/gb_sort_by_desc.png") right no-repeat
 
 #page_slug_holder
   .domain

data/app/views/gluttonberg/admin/asset_library/assets/_browser_root.html.haml

@@ -1,4 +1,4 @@
-= image_tag("/assets/spinner.gif" , :id => "progress_ajax_upload" , :style => "display:none")
+= image_tag("/assets/gb_spinner.gif" , :id => "progress_ajax_upload" , :style => "display:none")
 
 %ul.nav.nav-tabs#asset_tabs
   %li.active

data/app/views/gluttonberg/admin/content/galleries/_images_list.html.haml

@@ -18,4 +18,4 @@
           %td.controls
             = link_to "Edit image" ,  edit_admin_asset_path(gallery_item.image.id)  , :target => "_blank"
             = link_to "Detach", "javascript:;" , :class => "delete_gallery_item" , :rel => gallery_item.id , "data-url" => remove_image_admin_gallery_path(gallery_item.id) , :title => "Detach this image from the photo gallery"
-            = image_tag("/assets/spinner.gif" , :id => "progress_#{gallery_item.id}" , :style => "display:none")
+            = image_tag("/assets/gb_spinner.gif" , :id => "progress_#{gallery_item.id}" , :style => "display:none")

data/app/views/gluttonberg/admin/settings/generic_settings/index.html.haml

@@ -28,7 +28,7 @@
               = select_tag :home , options_from_collection_for_select(@pages, "id", "name" , selected = @current_home_page_id.to_s )  ,  { :include_blank => true , :class => "home_page_setting_dropdown"  , :rel => admin_page_update_home_path(1)  }
 
             %td.controls
-              = image_tag("/assets/spinner.gif" , :id => "progress_home_page" , :style => "display:none")
+              = image_tag("/assets/gb_spinner.gif" , :id => "progress_home_page" , :style => "display:none")
           - for setting in @settings
             - i += 1
             %tr{ :class => "#{cycle("even", "odd")}"}
@@ -45,7 +45,7 @@
                 - else
                   = gb_editable_field setting, :value , :update_url => admin_generic_setting_path( setting)
 
-                = image_tag("/assets/spinner.gif" , :id => "progress_#{setting.id}" , :style => "display:none")
+                = image_tag("/assets/gb_spinner.gif" , :id => "progress_#{setting.id}" , :style => "display:none")
               %td.controls
                 - if setting.delete_able
                   = link_to 'Delete', delete_admin_generic_setting_path(setting)

data/app/views/gluttonberg/admin/shared/delete.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,13 +22,13 @@
         }
       /[if lt IE 9]
         <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
-            
+
   %body#login
     .container-fluid
       .row
         .span5.offset4
           %div#form.well
-      
+
             = form_tag(@options[:url], :method => "delete") do
               %h1= @options[:title]
               %p.message= @options[:message].html_safe
@@ -37,12 +37,12 @@
               %p.controls
                 - unless @do_not_delete
                   = submit_tag("Delete", :class => "btn btn-danger")
-                  or 
+                  or
                   = link_to("<strong>Cancel</strong>".html_safe, @options[:return_url])
                 - else
                   = link_to("<strong>Ok</strong>".html_safe, @options[:return_url])
 
     %script{:src => "/assets/jquery.js"}
-    %script{:src => "/assets/bootstrap.js"}
-    = javascript_include_tag "jgb_login"
+    %script{:src => "/assets/gb_bootstrap.js"}
+    = javascript_include_tag "gb_login"
     = custom_javascript_include_tag