caboose-cms 0.5.235 → 0.5.236

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDI4ODk5NDNkN2EwZmFjYmJjNjU1NGIwMjg2ZGJmMDE4NTAzNWY1YQ==
+    MmJhOGVmMjM4NDEyNWU3NDllNmI0M2Y5MDAzNTQ5MzcyY2VkZDI5MQ==
   data.tar.gz: !binary |-
-    ZWU5MTQ3ZmZiZWQ2NzRiYTgzNzcwZTU4ZjFlZDk3OGMyMThhOTAxOQ==
+    MDE0MmZkZjIxZjBjYzc2MWUwNzU2YTgxNzk5YjExZjhjYzI3MmVlZA==
 SHA512:
   metadata.gz: !binary |-
-    OTk5NzVhNjFiOTc5NDg1NDVjZWE2Mzk3YWNkMjkyNDBlZWY0MDBkMmU2OWQ5
-    ZDEyMWQxNGUyNWZlYWM0NjA4NjRmNTZmMjk2YTNlNWM3OTgyYmZiZTEwZmJi
-    MGZlMTgxMDViNzc1Njk5ZTY4MWUwMmYzNjRiMTJiMjc4YWQ3ZmU=
+    ZmUxYjA5ZWUzY2Q5MzRiZDYxOTFiZDkyMGFkOGMzNDBlNDYzMTk4ZTllNGRk
+    YzJiM2Y0NmYyZTE0ZjljNTJlNDM3Y2E4ZjIyYzg1MTQ4NjM4ZWQzMDNkMmIw
+    OGM1ZjBlNzFkY2VlOWNkNjk4OGI1NjhiZTI0ZGNmZmU4MzgyOWQ=
   data.tar.gz: !binary |-
-    ODdhOWM1NjY4MWU0NTQwNzg3ODNhMTQ5ZTliYjE4N2U2ZDFmNDYwYTcwNWFk
-    MjdiYjg0MjNhNjhmOGU2NTg2N2E2OTQ4ZThlMTQzYjA4MGI4NzlkMzJmNDM0
-    Mjc3ZjQxNWE0ZDIxZWI5YzllNjJkMDY4ZWQ2OWZkZjdjMzQxYzM=
+    YmIyMjhmMmZhMWI1M2FmMWRmZTc4MWUwNTE0NWU1M2FmOTQ4Y2I2MDlmMTE5
+    MjRiOWEwNDE4ZGI5OTE4YzRkNmQ3MjdmODVkNGM5Y2FhMzdjZWIxYmNjMzBi
+    ZTU2YzVlZDBjODhiYzY1NWVhMzVhZjc0Y2ZmZTVmODMwMDU5Njk=

data/app/assets/javascripts/caboose/admin_media_index.js

@@ -237,7 +237,10 @@ MediaController.prototype = {
           .addClass('media')          
           .data('media_id', m.id)
           .click(function(e) { that.select_media($(this).data('media_id')); })
-          .append($('<span/>').addClass('name').html(m.name));
+          .append($('<span/>').addClass('name').html(m.name).click(function(e) {
+            e.stopPropagation();
+            that.edit_media_description($(this).parent().data('media_id'));
+          }))          
         if (m.image_urls)
           li.append($('<img/>').attr('src', m.image_urls.tiny_url));                                      
         if (that.selected_media.indexOf(m.id) > -1)
@@ -330,6 +333,39 @@ MediaController.prototype = {
     });    
   },
   
+  edit_media_description: function(media_id)
+  {
+    var that = this;
+    caboose_modal_url('/admin/media/' + media_id + '/description');
+    
+    //var div = $('<div/>').attr('id', 'media_' + media_id + '_description');
+    //$('#media').append(div);
+    //new ModelBinder({
+    //  name: 'Media',
+    //  id: media_id,
+    //  update_url: '/admin/media/' + media_id,
+    //  authenticity_token: that.authenticity_token,
+    //  attributes: [
+    //    {
+    //      name: 'description', nice_name: 'Description', type: 'textarea', value: '', width: 400, height: 100, fixed_placeholder: true,        
+    //      after_update: function() { $('#media_' + media_id + '_description_container').remove(); },
+    //      after_cancel: function() { $('#media_' + media_id + '_description_container').remove(); }          
+    //    }
+    //  ]      
+    //});
+    //var options = {      
+    //  iframe: true,
+    //  innerWidth: 200,
+    //  innerHeight:  50,
+    //  scrolling: false,
+    //  transition: 'fade',
+    //  closeButton: false,
+    //  onComplete: caboose_fix_colorbox,
+    //  opacity: 0.50       
+    //};
+    //setTimeout(function() { $('#media_' + media_id + '_description_container').colorbox(options); }, 2000);
+  },
+  
   //============================================================================
   
   select_category: function(cat_id)

data/app/controllers/caboose/media_controller.rb

@@ -62,6 +62,13 @@ module Caboose
       @media = Media.find(params[:id])
       render :layout => 'caboose/admin'
     end
+    
+    # GET /admin/media/:id/description
+    def admin_edit_description
+      return unless user_is_allowed('media', 'edit')
+      @media = Media.find(params[:id])
+      render :layout => 'caboose/modal'
+    end
             
     # PUT /admin/media/:id
     def admin_update

data/app/views/caboose/media/admin_edit_description.html.erb

@@ -0,0 +1,32 @@
+<%
+m = @media
+%>
+<h1>Edit Description</h1>
+<p><div id='media_<%= m.id %>_description' ></div></p>
+
+<div id='message'></div>
+<p><input type='button' value='Close' onclick="modal.close();" /></p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(600);
+});
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'Media',
+    id: <%= m.id %>,
+    update_url: '/admin/media/<%= m.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [      
+      { name: 'description' , nice_name: 'Description' , type: 'textarea' , value: <%= raw Caboose.json(m.description) %>, width: 560, height: 200, fixed_placeholder: false }      
+    ]
+  });
+});
+
+</script>
+<% end %>

data/app/views/caboose/media/admin_index.html.erb

@@ -16,6 +16,7 @@
 <% end %>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
 <%= javascript_include_tag 'caboose/admin_media_index.js' %>
 <%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
 

data/config/routes.rb

@@ -215,6 +215,7 @@ Caboose::Engine.routes.draw do
   get     "/admin/media/json"           => "media#admin_json"
   get     "/admin/media/:id/process"    => "media#admin_process"
   get     "/admin/media/:id/finished"   => "media#admin_process_finished"
+  get     "/admin/media/:id/description" => "media#admin_edit_description"
   get     "/admin/media/:id"            => "media#admin_edit"  
   put     "/admin/media/:id"            => "media#admin_update"
   post    "/admin/media/:id/image"      => "media#admin_update_image"  

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.235'
+  VERSION = '0.5.236'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.235
+  version: 0.5.236
 platform: ruby
 authors:
 - William Barry
@@ -881,6 +881,7 @@ files:
 - app/views/caboose/login/reset_password_form.html.erb
 - app/views/caboose/login_mailer/forgot_password_email.html.erb
 - app/views/caboose/media/admin_edit.html.erb
+- app/views/caboose/media/admin_edit_description.html.erb
 - app/views/caboose/media/admin_index.html.erb
 - app/views/caboose/modal/index.html.erb
 - app/views/caboose/modification_value_input_fields/admin_edit.html.erb