app/controllers/admin/albums_controller.rb app/controllers/admin/photos_controller.rb app/controllers/admin/users_controller.rb app/controllers/manage/albums/photos_controller.rb app/controllers/manage/albums_controller.rb app/views/manage/albums/_album.html.erb app/views/manage/albums/_form.html.erb app/views/manage/albums/edit.html.erb app/views/manage/albums/index.html.erb app/views/manage/albums/new.html.erb app/views/manage/albums/photos/_form.html.erb app/views/manage/albums/photos/_photo.html.erb app/views/manage/albums/photos/edit.html.erb app/views/manage/albums/photos/index.html.erb app/views/manage/albums/photos/show.html.erb app/views/manage/albums/photos/thumb.html.erb app/views/manage/albums/show.html.erb app/views/manage/users/change_password.html.erb app/views/users/_user.html.erb app/views/users/albums/index.html.erb app/views/users/albums/photos/index.html.erb app/views/users/albums/photos/show.html.erb app/views/users/albums/show.html.erb app/views/users/index.html.erb @@ -1,203 +1,23 @@ -== Welcome to Rails - -Rails is a web-application and persistence framework that includes everything -needed to create database-backed web-applications according to the -Model-View-Control pattern of separation. This pattern splits the view (also -called the presentation) into "dumb" templates that are primarily responsible -for inserting pre-built data in between HTML tags. The model contains the -"smart" domain objects (such as Account, Product, Person, Post) that holds all -the business logic and knows how to persist themselves to a database. The -controller handles the incoming requests (such as Save New Account, Update -Product, Show Post) by manipulating the model and directing data to the view. - -In Rails, the model is handled by what's called an object-relational mapping -layer entitled Active Record. This layer allows you to present the data from -database rows as objects and embellish these data objects with business logic -methods. You can read more about Active Record in -link:files/vendor/rails/activerecord/README.html. - -The controller and view are handled by the Action Pack, which handles both -layers by its two parts: Action View and Action Controller. These two layers -are bundled in a single package due to their heavy interdependence. This is -unlike the relationship between the Active Record and Action Pack that is much -more separate. Each of these packages can be used independently outside of -Rails. You can read more about Action Pack in -link:files/vendor/rails/actionpack/README.html. - - -== Getting Started - -1. At the command prompt, start a new Rails application using the <tt>rails</tt> command - and your application name. Ex: rails myapp - (If you've downloaded Rails in a complete tgz or zip, this step is already done) -2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options) -3. Go to http://localhost:3000/ and get "Welcome aboard: You’re riding the Rails!" -4. Follow the guidelines to start developing your application - - -== Web Servers - -By default, Rails will try to use Mongrel and lighttpd if they are installed, otherwise -Rails will use WEBrick, the webserver that ships with Ruby. When you run script/server, -Rails will check if Mongrel exists, then lighttpd and finally fall back to WEBrick. This ensures -that you can always get up and running quickly. - -Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is -suitable for development and deployment of Rails applications. If you have Ruby Gems installed, -getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>. -More info at: http://mongrel.rubyforge.org - -If Mongrel is not installed, Rails will look for lighttpd. It's considerably faster than -Mongrel and WEBrick and also suited for production use, but requires additional -installation and currently only works well on OS X/Unix (Windows users are encouraged -to start with Mongrel). We recommend version 1.4.11 and higher. You can download it from -http://www.lighttpd.net. - -And finally, if neither Mongrel or lighttpd are installed, Rails will use the built-in Ruby -web server, WEBrick. WEBrick is a small Ruby web server suitable for development, but not -for production. - -But of course its also possible to run Rails on any platform that supports FCGI. -Apache, LiteSpeed, IIS are just a few. For more information on FCGI, -please visit: http://wiki.rubyonrails.com/rails/pages/FastCGI - - -== Debugging Rails - -Sometimes your application goes wrong. Fortunately there are a lot of tools that -will help you debug it and get it back on the rails. - -First area to check is the application log files. Have "tail -f" commands running -on the server.log and development.log. Rails will automatically display debugging -and runtime information to these files. Debugging info will also be shown in the -browser on requests from 127.0.0.1. - -You can also log your own messages directly into the log file from your code using -the Ruby logger class from inside your controllers. Example: - - class WeblogController < ActionController::Base - def destroy - @weblog = Weblog.find(params[:id]) - @weblog.destroy - logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!") - end - end - -The result will be a message in your log file along the lines of: - - Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1 - -More information on how to use the logger is at http://www.ruby-doc.org/core/ - -Also, Ruby documentation can be found at http://www.ruby-lang.org/ including: - -* The Learning Ruby (Pickaxe) Book: http://www.ruby-doc.org/docs/ProgrammingRuby/ -* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide) - -These two online (and free) books will bring you up to speed on the Ruby language -and also on programming in general. - - -== Debugger - -Debugger support is available through the debugger command when you start your Mongrel or -Webrick server with --debugger. This means that you can break out of execution at any point -in the code, investigate and change the model, AND then resume execution! Example: - - class WeblogController < ActionController::Base - def index - @posts = Post.find(:all) - debugger - end - end - -So the controller will accept the action, run the first line, then present you -with a IRB prompt in the server window. Here you can do things like: - - >> @posts.inspect - => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>, - #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]" - >> @posts.first.title = "hello from a debugger" - => "hello from a debugger" - -...and even better is that you can examine how your runtime objects actually work: - - >> f = @posts.first - => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}> - >> f. - Display all 152 possibilities? (y or n) - -Finally, when you're ready to resume execution, you enter "cont" - - -== Console - -You can interact with the domain model by starting the console through <tt>script/console</tt>. -Here you'll have all parts of the application configured, just like it is when the -application is running. You can inspect domain models, change values, and save to the -database. Starting the script without arguments will launch it in the development environment. -Passing an argument will specify a different environment, like <tt>script/console production</tt>. - -To reload your controllers and models after launching the console run <tt>reload!</tt> - - -== Description of Contents - -app - Holds all the code that's specific to this particular application. - -app/controllers - Holds controllers that should be named like weblogs_controller.rb for - automated URL mapping. All controllers should descend from ApplicationController - which itself descends from ActionController::Base. - -app/models - Holds models that should be named like post.rb. - Most models will descend from ActiveRecord::Base. - -app/views - Holds the template files for the view that should be named like - weblogs/index.erb for the WeblogsController#index action. All views use eRuby - syntax. - -app/views/layouts - Holds the template files for layouts to be used with views. This models the common - header/footer method of wrapping views. In your views, define a layout using the - <tt>layout :default</tt> and create a file named default.erb. Inside default.erb, - call <% yield %> to render the view using this layout. - -app/helpers - Holds view helpers that should be named like weblogs_helper.rb. These are generated - for you automatically when using script/generate for controllers. Helpers can be used to - wrap functionality for your views into methods. - -config - Configuration files for the Rails environment, the routing map, the database, and other dependencies. - -db - Contains the database schema in schema.rb. db/migrate contains all - the sequence of Migrations for your schema. - -doc - This directory is where your application documentation will be stored when generated - using <tt>rake doc:app</tt> - -lib - Application specific libraries. Basically, any kind of custom code that doesn't - belong under controllers, models, or helpers. This directory is in the load path. - -public - The directory available for the web server. Contains subdirectories for images, stylesheets, - and javascripts. Also contains the dispatchers and the default HTML files. This should be - set as the DOCUMENT_ROOT of your web server. - -script - Helper scripts for automation and generation. - -test - Unit and functional tests along with fixtures. When using the script/generate scripts, template - test files will be generated for you and placed in this directory. - -vendor - External libraries that the application depends on. Also includes the plugins subdirectory. - This directory is in the load path. +Albumdy +------- + +Yet another open source photo gallery application. + +There are many existing photo gallery apps around, but none I could find demonstrating the following key technologies: +- Built with Ruby on Rails: http://www.rubyonrails.org/ +- CSS layout with Blueprint CSS: http://code.google.com/p/blueprintcss/ +- Client side scripting with the popular and unobtrusive jQuery: http://jquery.com/ +- Lightboxing effects using Leandro Vieira Pinho's jQuery lightBox: http://leandrovieira.com/projects/jquery/lightbox/ +- Textboxing effects using Cody Lindley's ThickBox: http://jquery.com/demo/thickbox/ +- Thin controllers with James Golick's resource_controller: http://jamesgolick.com/resource_controller +- File uploads and thumbnail generation with Rick Olson's attachment_fu: http://github.com/technoweenie/attachment_fu +- User Registration with Rick Olson's restful_authentication: http://github.com/technoweenie/restful-authentication +- Plugin management for Git with Cristi Balan's Braid: http://github.com/evilchelu/braid +- Project hosting with GitHub: http://github.com/ +- Organized nested routes as described in Regulators!!! Mount up: http://giantrobots.thoughtbot.com/2008/7/10/regulators-mount-up + +There are several other technologies I am considering migrating to or at least checking out within the context of this application: +- Probably swapping attachment_fu for Thoughtbot's paperclip: http://www.thoughtbot.com/projects/paperclip +- Possibly using Hampton Catlin's HAML: http://haml.hamptoncatlin.com/ + +Grab the source from http://github.com/rapind/albumdy \ No newline at end of file README @@ -1,12 +1,17 @@ class AlbumsController < ResourceController::Base + belongs_to :user + actions :index, :show + index.flash 'Albums' + show.flash 'Album' + private #-------------- - # Defining the collection explicitly for paging and to only return visibles + # Defining the collection explicitly for paging and limit to visible albums def collection - @collection ||= end_of_association_chain.paginate :conditions => 'visible = true', :page => params[:page], :per_page => 10, :order => 'created_at DESC' + @collection ||= end_of_association_chain.paginate :conditions => 'visible = 1', :page => params[:page], :per_page => 10, :order => 'created_at DESC' end end app/controllers/albums_controller.rb @@ -2,11 +2,14 @@ class PhotosController < ResourceController::Base actions :index, :show + index.flash 'Photos' + show.flash 'Photo' + private #-------------- - # Defining the collection explicitly for paging and to only return visibles + # Defining the collection explicitly for paging and limit to visible photos def collection - @collection ||= end_of_association_chain.paginate :conditions => 'visible = true', :page => params[:page], :per_page => 10, :order => 'created_at DESC' + @collection ||= end_of_association_chain.paginate :conditions => 'visible = 1', :page => params[:page], :per_page => 10, :order => 'created_at DESC' end end \ No newline at end of file app/controllers/photos_controller.rb @@ -1,4 +1,6 @@ class Users::AlbumsController < ResourceController::Base + belongs_to :user actions :index, :show + end app/controllers/users/albums_controller.rb @@ -1,6 +1,6 @@ class UsersController < ResourceController::Base - actions :index, :show, :new, :create, :activate, :forgot_password, :reset_password + actions :index, :new, :create, :activate, :forget_password, :reset_password # registration def new @@ -86,12 +86,12 @@ class UsersController < ResourceController::Base def find_user @user = User.find(params[:id]) end - + private #-------------- - # Defining the collection explicitly for paging and to only return visibles + # Defining the collection explicitly for paging and limit to visible users def collection - @collection ||= end_of_association_chain.paginate :conditions => 'visible = true', :page => params[:page], :per_page => 10, :order => 'created_at DESC' + @collection ||= end_of_association_chain.paginate :conditions => 'visible = 1', :page => params[:page], :per_page => 10, :order => 'created_at DESC' end end app/controllers/users_controller.rb @@ -4,5 +4,6 @@ class Album < ActiveRecord::Base acts_as_list :scope => :user has_many :photos, :dependent => :destroy, :order => 'position' + has_many :visible_photos, :class_name => 'Photo', :conditions => 'visible = 1', :order => 'position' end app/models/album.rb @@ -2,6 +2,7 @@ require 'digest/sha1' class User < ActiveRecord::Base has_many :albums, :dependent => :destroy, :order => 'position' + has_many :visible_albums, :class_name => 'Album', :conditions => 'visible = 1', :order => 'position' # Virtual attribute for the unencrypted password attr_accessor :password app/models/user.rb @@ -1,14 +1,14 @@ <li id="album_<%= album.id %>"> <div class="span-5 first"> - <%= link_to image_tag(album.photos.blank? ? 'empty.gif' : album.photos.first.public_filename(:album_cover), :size => '180x180', :class => 'album_cover', :alt => h(album.title), :title => h(album.title)), album %> + <%= link_to image_tag(album.photos.blank? ? 'empty.gif' : album.photos.first.public_filename(:album_cover), :size => '180x180', :class => 'album_cover', :alt => h(album.title), :title => h(album.title)), album_path(album) %> </div> - <div class="span-6 last"> + <div class="span-5 last"> <p> - <%= link_to h(album.title), album %><br /> + <%= link_to h(album.title), album_path(album) %><br /> <small><%= h album.created_at.strftime("%b %d, %Y") %></small> </p> <p> - <%= h truncate(album.description, 240) %> + <%= h truncate(album.description, 200) %> </p> </div> </li> \ No newline at end of file app/views/albums/_album.html.erb @@ -1,12 +1,5 @@ <h1>Albums</h1> <hr> -<h2> - <%= link_to 'Create New Album', "#{new_album_path}?width=315&height=340", :title => 'Create New Album', :class => 'thickbox' %> -</h2> - -<fieldset> - <legend>Albums</legend> - <ul id="albums"> - <%= render :partial => "album", :collection => @albums %> - </ul> -</fieldset> \ No newline at end of file +<ul id="albums"> + <%= render :partial => "album", :collection => @albums %> +</ul> \ No newline at end of file app/views/albums/index.html.erb @@ -1,152 +1,19 @@ <script type="text/javascript"> -// file upload object -var swfu; - $(function() { - // binds / rebinds lightbox to photo clicks - function bindLightBox() { - $('#photos a[@rel*=show]').lightBox(); - } - - // bind the lightbox as son as we're loaded. - bindLightBox(); - - // file upload settings - var settings = { - flash_url : "/assets/swfupload_f9.swf", - upload_url: "<%= album_photos_path(@album) %>", - file_size_limit : "50 MB", - file_types : "*.*", - file_types_description : "All Images", - file_upload_limit : 50, - file_queue_limit : 0, - custom_settings : { - progressTarget : "fsUploadProgress", - cancelButtonId : "btnCancel" - }, - debug: false, - - // The event handler functions are defined in handlers.js - file_queued_handler : fileQueued, - file_queue_error_handler : fileQueueError, - file_dialog_complete_handler : fileDialogComplete, - upload_start_handler : uploadStart, - upload_progress_handler : uploadProgress, - upload_error_handler : uploadError, - upload_success_handler : uploadSuccess, - upload_complete_handler : uploadComplete, - queue_complete_handler : queueComplete // Queue plugin event - }; - - // init the file upload object - swfu = new SWFUpload(settings); - - - // append each new photo as they are uploaded to the list of photos via ajax - function uploadComplete(file) { - $.get("<%= thumb_album_photos_path(@album) %>?filename=" + file.name, function(data){ - $("#photos").append(data); - - // re-bind lightbox to the photos elements - bindLightBox(); - }); - } + // binds lightbox to photo clicks + $('#photos a[@rel*=show]').lightBox(); - // Capture clicks within the photos list. - // This allows us to trap events from dynamically added ajax content within it. - $('#photos').click(function(e) { - - if( $(e.target).is('a[@rel*=remove]') ) { - // remove link clicked, launch ajax remove - - // get the parent div so we can remove it on successful deletion - var thumb = $(e.target).parents("li"); - - // send the ajax delete request. This requires passing a _method=delete - // param for the browser REST compatibility that rails supports. - $.post(e.target.href, {_method:"delete", authenticity_token:"<%= form_authenticity_token %>"}, function(data) { - // remove the thumbnail from the display on success - thumb.remove(); - - // re-bind lightbox to the photos elements so we have a correct count - bindLightBox(); - }); - - } else if( $(e.target).is('a[@rel*=edit]') ) { - // edit link clicked, launch thickbox - tb_show(e.target.title, e.target.href); - - } - - // cancel the click - return false; - - }); - - - // allows for photo sorting within an album by dragging them around. - // updates the order on the fly using ajax - // this is by far the trickiest JS in the app - $("#photos").sortable({ - placeholder: "ui-selected", - opacity: 0.7, - update: function(e, ui) { - // determine the end position for the element that was moved - - // end order as an array - var end_order = $(this).sortable('serialize').replace(/photo\[\]\=/g, '').split('&'); - console.log('End order: ' + end_order); - - // id of element that was moved (element is in the ui.helper object) - var moved_photo_id = ui.helper.attr('id').replace('photo_', ''); // parse photo_ from the id - console.log('Moved photo id: ' + moved_photo_id); - - // determine the end position of the moved element - var end_position = 0; - // loop through all order elements - for (var y=0; y<end_order.length; y++) { - // if the ids match, then we have the new index - if (end_order[y] === moved_photo_id) { - end_position = y; - break; // found it, bail - } - } - // increment it to match our backend which starts the list at 1 instead of 0 - end_position++; - console.log('End position: ' + end_position); - - // ajax post to save the position change - // we're passing the parent album, the moved photo, and the new position of the photo - $.post('/albums/<%= @album.id %>/photos/' + moved_photo_id + '/update_position', {_method:"put", authenticity_token:"<%= form_authenticity_token %>", position:end_position}, function(data) { - - // re-bind lightbox so the photos elements are in the right order for next / prev buttons - bindLightBox(); - }); - - }, - revert: true - }); - }); </script> <h1> <%= h @album.title %> </h1> -<p> - <%= link_to 'Edit', "#{edit_album_path(@album)}?width=315&height=340", :title => h(@album.title), :class => 'thickbox' %> | <%= link_to 'Remove', @album, :confirm => "Are you sure want to remove this album and all of it's photos?", :method => :delete %> | <%= link_to "Back", albums_path %> -</p> -<form id="form1" action="#" method="post" enctype="multipart/form-data"> - <div> - <input type="button" value="Upload Photos" onclick="swfu.selectFiles()" style="font-size:8pt; border-width:1px; margin-bottom:10px; padding:2px 3px;" /> - <input id="btnCancel" type="button" value="Cancel All Uploads" onclick="swfu.cancelQueue();" disabled="disabled" style="font-size:8pt; border-width:1px; margin-bottom:10px; padding:2px 3px;" /> - </div> -</form> +<hr> <fieldset> - <legend>Photos - Drag photos to change their display order</legend> + <legend>Photos</legend> <ul id="photos"> - <%= render :partial => "photos/photo", :collection => @album.photos %> + <%= render :partial => "/photos/photo", :collection => @album.visible_photos %> </ul> -</fieldset> -<div id="divStatus" style="display:none"></div> \ No newline at end of file +</fieldset> \ No newline at end of file app/views/albums/show.html.erb @@ -1,5 +1,5 @@ <% if user_logged_in? -%> - <%= link_to 'Manage Your Albums', manage_user_albums_path(current_user) %> + <%= link_to 'Manage Your Albums', manage_albums_path %> | <%=link_to 'Recent Users', users_path %> | @@ -11,5 +11,5 @@ | <%= link_to 'Login', "#{login_path}?height=250&width=320", :title => 'Let me in', :class => 'thickbox' %> | - <%= link_to "Get the Source", 'http://github.com' %> + <%= link_to "Get the Source", 'http://github.com/rapind/albumdy' %> <% end -%> \ No newline at end of file app/views/layouts/_default.html.erb @@ -9,7 +9,7 @@ <li>Built with <%= link_to 'Ruby on Rails', 'http://www.rubyonrails.org/', :target => '_new', :rel => 'nofollow' %></li> <li>CSS layout with <%= link_to 'Blueprint CSS', 'http://code.google.com/p/blueprintcss/', :target => '_new', :rel => 'nofollow' %></li> <li>Client side scripting with the popular and unobtrusive <%= link_to 'jQuery', 'http://jquery.com/', :target => '_new', :rel => 'nofollow' %></li> - <li>Lightboxing effects using <%= link_to "Leandro Vieira Pinho's jQuery lightBox", 'http://jquery.com/', :target => '_new', :rel => 'nofollow' %></li> + <li>Lightboxing effects using <%= link_to "Leandro Vieira Pinho's jQuery lightBox", 'http://leandrovieira.com/projects/jquery/lightbox/', :target => '_new', :rel => 'nofollow' %></li> <li>Textboxing effects using <%= link_to "Cody Lindley's ThickBox", 'http://jquery.com/demo/thickbox/', :target => '_new', :rel => 'nofollow' %></li> <li>Thin controllers with <%= link_to "James Golick's resource_controller", 'http://jamesgolick.com/resource_controller', :target => '_new', :rel => 'nofollow' %></li> <li>File uploads and thumbnail generation with <%= link_to "Rick Olson's attachment_fu", 'http://github.com/technoweenie/attachment_fu/wikis', :target => '_new', :rel => 'nofollow' %></li> @@ -23,10 +23,9 @@ There are several other technologies I am considering migrating to or at least checking out within the context of this application: <ul> <li>Probably swapping attachment_fu for <%= link_to "Thoughtbot's paperclip", 'http://www.thoughtbot.com/projects/paperclip', :target => '_new', :rel => 'nofollow' %> to reduce the complexity attachment_fu adds. Depending on whether paperclip adds <%= link_to 'Amazon S3', 'http://aws.amazon.com/s3', :target => '_new', :rel => 'nofolow' %> support.</li> - <li>Possibly swapping resource_controller for <%= link_to "Hampton Catlin's make_resourcerful", 'http://mr.hamptoncatlin.com/', :target => '_new', :rel => 'nofollow' %>, but right now I prefer resource_controller.</li> <li>Possibly using <%= link_to "Hampton Catlin's HAML", 'http://haml.hamptoncatlin.com/', :target => '_new', :rel => 'nofollow' %> for the views. I've used it before, but I'm already so comfortable with HTML that it really didn't add any value for me. Still, it's a great idea.</li> </ul> </p> <h2> - Grab the source from <%= link_to "http://github.com/", 'http://github.com/' %> + Grab the source from <%= link_to "http://github.com/rapind/albumdy", 'http://github.com/rapind/albumdy' %> </h2> \ No newline at end of file app/views/main/index.html.erb @@ -1,6 +1,3 @@ <li class="photo_li" id="photo_<%= photo.id %>"> - <%= link_to image_tag(photo.public_filename(:thumb), :size => '100x100', :alt => h(photo.title), :title => h(photo.title)), photo.public_filename, :title => h(photo.title), :rel => 'show' %> - <div align="center"> - <%= link_to 'Edit', "#{edit_album_photo_url(photo.album, photo)}?width=315&height=530", :title => h(photo.title), :rel => 'edit' %> | <%= link_to 'Remove', album_photo_path(photo.album, photo), :rel => 'remove' %> - </div> + <%= link_to image_tag(photo.public_filename(:thumb), :size => '100x100', :alt => h(photo.title), :title => h(photo.title)), photo.public_filename, :title => h(photo.title), :rel => 'show' %> </li> \ No newline at end of file app/views/photos/_photo.html.erb @@ -1,49 +1,16 @@ <script type="text/javascript"> - var swfu; - window.onload = function() { - var settings = { - flash_url : "/assets/swfupload_f9.swf", - upload_url: "<%= album_photos_path(@album) %>", - file_size_limit : "50 MB", - file_types : "*.*", - file_types_description : "All Images", - file_upload_limit : 50, - file_queue_limit : 0, - custom_settings : { - progressTarget : "fsUploadProgress", - cancelButtonId : "btnCancel" - }, - debug: false, - - // The event handler functions are defined in handlers.js - file_queued_handler : fileQueued, - file_queue_error_handler : fileQueueError, - file_dialog_complete_handler : fileDialogComplete, - upload_start_handler : uploadStart, - upload_progress_handler : uploadProgress, - upload_error_handler : uploadError, - upload_success_handler : uploadSuccess, - upload_complete_handler : uploadComplete, - queue_complete_handler : queueComplete // Queue plugin event - }; - - swfu = new SWFUpload(settings); - }; +$(function() { + + // binds lightbox to photo clicks + $('#photos a[@rel*=show]').lightBox(); + +}); </script> <h1> - Upload Photos for <%= h @album.title %> + Photos </h1> <hr> -<p> - <%= link_to "Back", album_path(@album) %> -</p> -<form id="form1" action="#" method="post" enctype="multipart/form-data"> - <div> - <input type="button" value="Upload Photos" onclick="swfu.selectFiles()" style="font-size:8pt; border-width:1px; margin-bottom:10px; padding:2px 3px;" /> - <input id="btnCancel" type="button" value="Cancel All Uploads" onclick="swfu.cancelQueue();" disabled="disabled" style="font-size:8pt; border-width:1px; margin-bottom:10px; padding:2px 3px;" /> - </div> - <fieldset class="queue" id="fsUploadProgress"> - <legend>Upload Queue</legend> - </fieldset> -</form> \ No newline at end of file +<ul id="photos"> + <%= render :partial => "photo", :collection => @photos %> +</ul> \ No newline at end of file app/views/photos/index.html.erb @@ -1 +1 @@ -Show \ No newline at end of file +Photo root \ No newline at end of file app/views/photos/show.html.erb @@ -0,0 +1 @@ +User \ No newline at end of file app/views/users/show.html.erb @@ -1,19 +1,20 @@ -# SQLite version 3.x -# gem install sqlite3-ruby (not necessary on OS X Leopard) +login: &login + adapter: mysql + username: root + password: + socket: /tmp/mysql.sock + development: - adapter: sqlite3 - database: db/development.sqlite3 - timeout: 5000 + <<: *login + database: albumdy_development -# Warning: The database defined as 'test' will be erased and -# re-generated from your development database when you run 'rake'. -# Do not set this db to the same as development or production. test: - adapter: sqlite3 - database: db/test.sqlite3 - timeout: 5000 + <<: *login + database: albumdy_test production: - adapter: sqlite3 - database: db/production.sqlite3 - timeout: 5000 + adapter: mysql + username: root + password: 210474dr44 + socket: /var/run/mysqld/mysqld.sock + database: albumdy \ No newline at end of file config/database.yml @@ -1,25 +1,26 @@ ActionController::Routing::Routes.draw do |map| + # admin section to manage all users, albums, and photos. + # simple management operations means we don't need deeply nested routes. + map.namespace :admin do |admin| + admin.resources :users, :has_many => :albums + admin.resources :albums, :has_many => :photos + admin.resources :photos + end + # management section where user's manage their albums and photos map.namespace :manage do |manage| - manage.resources :users do |user| - user.resources :albums do |album| - album.resources :photos, :collection => { :thumb => :get }, :member => { :update_position => :put } - end + manage.resources :users + manage.resources :albums do |album| + album.resources :photos, :controller => 'albums/photos', :collection => { :thumb => :get }, :member => { :update_position => :put } end end - # public view of users, their albums and the photos within - map.resources :users do |user| - user.resources :albums do |album| - album.resources :photos - end - end + # public view of users and the albums they own + map.resources :users, :has_many => :albums - # public view of albums and the photos within - map.resources :albums do |album| - album.resources :photos - end + # public view of albums + map.resources :albums # public view of photos map.resources :photos config/routes.rb @@ -13,7 +13,7 @@ class CreateUsers < ActiveRecord::Migration t.string :full_name, :limit => 64 t.string :web_site_url, :limit => 255 - t.boolean :visible, :null => false, :default => false + t.boolean :visible, :null => false, :default => true t.integer :albums_count, :null => false, :default => 0 t.timestamps db/migrate/001_create_users.rb @@ -5,7 +5,7 @@ class CreateAlbums < ActiveRecord::Migration t.integer :position, :null => false, :default => 1 t.string :title, :limit => 255, :null => false t.text :description - t.boolean :visible, :null => false, :default => false + t.boolean :visible, :null => false, :default => true t.integer :photos_count, :null => false, :default => 0 t.timestamps db/migrate/002_create_albums.rb @@ -11,7 +11,7 @@ class CreatePhotos < ActiveRecord::Migration # attachment_fu fields t.integer :parent_id, :size, :width, :height t.string :content_type, :filename, :thumbnail - t.boolean :visible, :null => false, :default => false + t.boolean :visible, :null => false, :default => true t.timestamps end db/migrate/003_create_photos.rb @@ -1,2 +0,0 @@ -Use this README file to introduce your application and point to useful places in the API for learning more. -Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries. doc/README_FOR_APP @@ -113,8 +113,8 @@ textarea { list-style-type: none; float:left; margin-bottom:22px; - margin-left:11px; - margin-right:11px; + margin-left:13px; + margin-right:13px; } .album_cover { @@ -131,9 +131,9 @@ textarea { border:1px solid #2A2A2A; float:left; margin-bottom:22px; - margin-left:11px; - margin-right:11px; - padding:3px 3px 8px; + margin-left:6px; + margin-right:5px; + padding:3px 3px 3px; } public/stylesheets/application.css app/controllers/albums/photos_controller.rb app/controllers/manage/users/albums/photos/photos_controller.rb app/controllers/manage/users/albums_controller.rb app/controllers/users/albums/photos_controller.rb app/views/albums/_form.html.erb app/views/albums/edit.html.erb app/views/albums/new.html.erb app/views/photos/_form.html.erb app/views/photos/edit.html.erb app/views/photos/thumb.html.erb app/views/users/change_password.html.erb app/views/users/edit.html.erb 7834dc12f23914fc851f22e608b7fc853ee2b519 Dave Rapin dave@rapin.com http://github.com/rapind/albumdy/commit/5f75e02b2c7924d3da0054e6860cc1177e288ed1 5f75e02b2c7924d3da0054e6860cc1177e288ed1 2008-08-04T06:57:39-07:00 2008-08-04T06:57:39-07:00 readme updated 7a9c7f257385fc8d79ee6661a9973ec5c177b49e Dave Rapin dave@rapin.com