spud_photos 0.0.3 → 0.1

data/app/assets/javascripts/spud/admin/photos.js

@@ -10,25 +10,32 @@ Spud.Admin.Photos = new function(){
     $('.spud_admin_photo_ui_thumbs_sortable').sortable({
       connectWith:'.spud_admin_photo_ui_thumbs_sortable'
     });
-    $('body').on('submit', '#spud_admin_photo_album_form', self.submittedPhotoAlbumForm)
+    $('body').on('submit', '#spud_admin_photo_album_form', self.submittedPhotoAlbumForm);
+    $('body').on('submit', '#spud_admin_photo_gallery_form', self.submittedPhotoGalleryForm);
     $('body').on('submit', '#spud_admin_photo_form', self.submittedPhotoForm);
     $('body').on('click', '.spud_admin_photos_btn_remove', self.clickedPhotoRemoveFromLibrary)
     $('body').on('click', '.spud_admin_photo_ui_thumbs_selectable .spud_admin_photo_ui_thumb', self.selectedPhotoUiThumb);
     $('body').on('click', '#spud_admin_photo_album_action_library', self.clickedPhotoLibrary);
 
     // html5 drag and drop file 
-    var droparea = document.getElementById('spud_admin_photos_selected');
-    droparea.addEventListener('dragenter', self.stopDndPropagation, false);
-    droparea.addEventListener('dragexit', self.stopDndPropagation, false);
-    droparea.addEventListener('dragover', self.stopDndPropagation, false);
-    droparea.addEventListener('drop', self.droppedFile, false);
+    if(FormData){
+      $('#spud_admin_photo_upload_queue').show();
+      var droparea = document.getElementById('spud_admin_photo_upload_queue');
+      droparea.addEventListener('dragenter', self.stopDndPropagation, false);
+      droparea.addEventListener('dragexit', self.stopDndPropagation, false);
+      droparea.addEventListener('dragover', self.stopDndPropagation, false);
+      droparea.addEventListener('drop', self.droppedFile, false);
+    }
   };
 
-  this.submittedPhotoAlbumForm = function(){
-    var ids = $('#spud_admin_photos_selected .spud_admin_photo_ui_thumb').map(function(i, el){ return $(el).attr('rel') } );
-    $('#spud_photo_album_order').val(ids.toArray().join());
+  this.submittedPhotoAlbumForm = function(e){
+
   };
 
+  this.submittedPhotoGalleryForm = function(e){
+    $('#spud_admin_photo_albums_available .spud_admin_photo_ui_thumb').remove();
+  }
+
   this.clickedPhotoRemoveFromLibrary = function(e){
     $(this).parents('.spud_admin_photo_ui_thumb').fadeOut(200, function(){
       $(this).remove();
@@ -202,7 +209,7 @@ Spud.Admin.Photos = new function(){
       }
     });
     dialog.dialog({
-      width: 660,
+      width: 675,
       modal: true,
       height: 450,
       title: 'My Photo Library',

data/app/assets/stylesheets/spud/admin/photos.css

@@ -1,16 +1,5 @@
-.spud_admin_photos_selection_left{
-  width: 520px;
-  margin-right: 18px;
-  float: left;
-}
-.spud_admin_photos_selection_right{
-  width: 400px;
-  float: left;
-}
-.spud_admin_photos_selection_left h4, .spud_admin_photos_selection_right h4{
-  font-weight: normal;
-  margin: 15px 0;
-}
+/* Thumbnails
+---------------------------- */
 .spud_admin_photo_ui_thumbs{
   height: 300px;
   padding: 0;
@@ -75,11 +64,6 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.spud_admin_photo_ui_thumb input[type=checkbox]{
-  position: absolute;
-  top: 4px;
-  left: 4px;
-}
 .spud_admin_photo_ui_thumb_controls{
   position: absolute;
   bottom: 0;
@@ -105,24 +89,9 @@
   display: inline-block;
   margin: 0 4px;
 }
-.spud_admin_photos_album_fieldset{
-  position: relative;
-}
-.spud_admin_photos_album_fieldset .spud_admin_photo_create{
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-#spud_admin_photo_album_actions{
-
-}
 
 /* Upload Queue
 ---------------------------- */
-#spud_admin_photo_album_form{
-
-}
 .spud_admin_photo_progress{
   margin: 10px 0;
 }
@@ -136,4 +105,23 @@
   float: right;
   border: 1px solid #cacaca;
   overflow-y: scroll;
+}
+ 
+/* Gallery Form
+---------------------------- */
+.spud_admin_photos_selection_left{
+  width: 520px;
+  margin-right: 18px;
+  float: left;
+}
+.spud_admin_photos_selection_right{
+  width: 400px;
+  float: left;
+}
+.spud_admin_photos_selection_left h4, .spud_admin_photos_selection_right h4{
+  font-weight: normal;
+  margin: 15px 0;
+}
+#spud_admin_photo_gallery_form .spud_admin_photo_ui_thumb_controls{
+  display: none;
 }

data/app/controllers/spud/admin/photo_albums_controller.rb

@@ -1,6 +1,7 @@
 class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
 
   before_filter :get_album, :only => [:show, :edit, :update, :destroy, :library]
+  add_breadcrumb 'Photo Albums', :spud_admin_photo_albums_path
   respond_to :html, :json, :xml
   layout 'spud/admin/spud_photos'
 
@@ -22,7 +23,6 @@ class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
     @photo_album = SpudPhotoAlbum.new(params[:spud_photo_album])
     if @photo_album.save
       set_photo_order
-      @photo_album.spud_photo_albums_photos = photo_albums_photos
     end
     respond_with @photo_album, :location => spud_admin_photo_albums_path
   end
@@ -52,7 +52,7 @@ class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
   private
 
   def set_photo_order
-    order_ids = params[:spud_photo_album_order].split(',')
+    order_ids = params[:spud_photo_album][:photo_ids] || []
     @photo_album.spud_photo_albums_photos.each do |obj|
       logger.debug "##### ID: #{obj.spud_photo_id.to_s}"
       index = order_ids.index(obj.spud_photo_id.to_s)

data/app/controllers/spud/admin/photo_galleries_controller.rb

@@ -2,6 +2,7 @@ class Spud::Admin::PhotoGalleriesController < Spud::Admin::ApplicationController
 
   before_filter :get_gallery, :only => [:show, :edit, :update, :destroy]
   before_filter :get_albums, :only => [:new, :create, :edit, :update]
+  add_breadcrumb 'Photo Galleries', :spud_admin_photo_galleries_path
   respond_to :html, :json, :xml
   layout 'spud/admin/spud_photos'
 

data/app/views/spud/admin/photo_albums/_album.html.erb

@@ -1,7 +1,7 @@
 <div id="spud_admin_photo_album_<%= album.id %>" class="spud_admin_photo_ui_thumb" style="background-image:url('<%= album.top_photo_url(:spud_admin_small) %>')">
   <h5><%= album.title %></h5>
   <div style="display:none;">
-    <%= check_box_tag 'spud_photo_gallery[album_ids][]', album.id, (@photo_gallery && @photo_gallery.album_ids.include?(album.id)) %>
+    <%= hidden_field_tag 'spud_photo_gallery[album_ids][]', album.id %>
   </div>
   <div class="spud_admin_photo_ui_thumb_controls">
     <%= link_to 'Edit', edit_spud_admin_photo_album_path(album), :class => 'spud_admin_photos_btn_edit' %>

data/app/views/spud/admin/photo_albums/_form.html.erb

@@ -2,8 +2,6 @@
   
   <%= error_messages_for(f.object) %>
   
-  <%= hidden_field_tag :spud_photo_album_order %>
-
   <fieldset>
     <legend>Photo Album Info</legend>  
     <div class="control-group">
@@ -18,9 +16,10 @@
     <legend>Selected Photos</legend>
     <div id="spud_admin_photo_album_actions" class="control-group">
       <%= link_to "Photo Library", spud_admin_photos_path, :class => "btn btn-primary", :id => 'spud_admin_photo_album_action_library' %>
-      <%= link_to "Upload Photo", new_spud_admin_photo_path, :class => "ajax btn btn-primary", :title => "New Photo" %>
+      <%= link_to "Upload Photo", new_spud_admin_photo_path, :class => "ajax btn btn-success", :title => "New Photo" %>
     </div>
     <div id="spud_admin_photo_upload_queue">
+      <p>Drag and drop photos here to upload</p>
       <h5 id="spud_admin_photo_upload_queue_label">Queued Uploads: <span>0</span></h5>
       <div id="spud_admin_photo_upload_queue_bars"></div>
     </div>

data/app/views/spud/admin/photo_galleries/_form.html.erb

@@ -1,6 +1,6 @@
 <%= form_for @photo_gallery, :url => path, :html => {:class => 'form-horizontal', :id => 'spud_admin_photo_gallery_form'} do |f| %> 
   
-  <%=error_messages_for(f.object)%>
+  <%= error_messages_for(f.object) %>
   
   <fieldset>
     <legend>Gallery Info</legend>  
@@ -31,10 +31,9 @@
     </div>
   </fieldset>
 
-
   <div class="form-actions">
     <%= f.submit "Save Photo Gallery", :class=>"btn btn-primary form-btn", "data-loading-text" => "Saving..." %> 
-    or <%=link_to "cancel", request.referer, :class => "btn" %>
+    or <%= link_to "cancel", request.referer, :class => "btn" %>
   </div>
 
 <% end %>

data/lib/spud_photos/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Photos
-	  VERSION = "0.0.3"
+	  VERSION = "0.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_photos
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: '0.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70189045047420 !ruby/object:Gem::Requirement
+  requirement: &70266355207680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70189045047420
+  version_requirements: *70266355207680
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70189045046840 !ruby/object:Gem::Requirement
+  requirement: &70266355207040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70189045046840
+  version_requirements: *70266355207040
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70189045045960 !ruby/object:Gem::Requirement
+  requirement: &70266355206380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189045045960
+  version_requirements: *70266355206380
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70189045045160 !ruby/object:Gem::Requirement
+  requirement: &70266355205840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,7 +57,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189045045160
+  version_requirements: *70266355205840
 description: Spud Photos is a feature complete photo management/gallery for the spud
   engine. Manage multiple galleries, albums, and photos. Use HTML 5 to drag and drop
   many images at once.
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4384740055791320075
+      hash: 355640415439906538
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4384740055791320075
+      hash: 355640415439906538
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10