app/views/shared/_galleries.html.erb app/views/shared/_gallery.html.erb public/images/icons/photo.png @@ -30,6 +30,7 @@ class PeopleController < ApplicationController @some_common_connections = @common_connections[(0...Person::MAX_DEFAULT_CONTACTS)] @blog = @person.blog @posts = @person.blog.posts.paginate(:page => params[:page]) + @galleries = @person.galleries.paginate(:page => params[:page]) end respond_to do |format| format.html app/controllers/people_controller.rb @@ -29,7 +29,7 @@ module ApplicationHelper blog = menu_element("Blog", blog_path(current_person.blog)) galleries = menu_element("Galleries", person_galleries_path(current_person)) contacts = menu_element("Contacts", person_connections_path(current_person)) - links = [profile, contacts, galleries, messages, people, forum, about] + links = [profile, contacts, messages, people, forum, about] else home = menu_element("Home", home_path) people = menu_element("People", admin_people_path) @@ -53,10 +53,21 @@ module ApplicationHelper def menu_li(link, options = {}) klass = "n-#{link[:content].downcase}" - klass += " active" if current_page?(link[:href]) - content_tag(:li, menu_link_to(link, options), :class => klass) + if current_page?(link[:href]) + klass += " active" + content_tag(:li, link[:content], :class => klass) + else + content_tag(:li, menu_link_to(link, options), :class => klass) + end end + def login_block + forgot = global_prefs.can_send_mail? ? '<br />' + link_to('I forgot my password', new_password_reminder_path) : '' + content_tag(:span, link_to("Sign in", login_path) + ' or ' + + link_to("Sign up", signup_path) + + forgot) + end + # Return true if the user is viewing the site in admin view. def admin_view? params[:controller] =~ /admin/ and admin? app/helpers/application_helper.rb @@ -1,9 +1,6 @@ module PhotosHelper - def photo_title(filename) - File.basename(filename, File.extname(filename)).titleize - end def photo_id(photo) - photo_title(photo.filename).gsub(/ /,'') + photo.label_from_filename.gsub(/ /,'') end end app/helpers/photos_helper.rb @@ -1,4 +1,16 @@ # == Schema Information +# Schema version: 34 +# +# Table name: activities +# +# id :integer not null, primary key +# public :boolean +# item_id :integer +# person_id :integer +# item_type :string(255) +# created_at :datetime +# updated_at :datetime +# # Schema version: 30 # app/models/activity.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: blogs # app/models/blog.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: posts # app/models/blog_post.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: comments # app/models/comment.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: communications # app/models/communication.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: connections # app/models/connection.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: email_verifications # app/models/email_verification.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: feeds # app/models/feed.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: forums # app/models/forum.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: posts # app/models/forum_post.rb @@ -1,16 +1,15 @@ # == Schema Information -# Schema version: 28 +# Schema version: 34 # # Table name: galleries # -# id :integer(11) not null, primary key -# person_id :integer(11) -# title :string(255) -# description :string(255) -# photos_count :integer(11) default(0), not null -# primary_photo_id :integer(11) -# created_at :datetime -# updated_at :datetime +# id :integer not null, primary key +# person_id :integer +# title :string(255) +# description :string(255) +# photos_count :integer default(0), not null +# created_at :datetime +# updated_at :datetime # class Gallery < ActiveRecord::Base @@ -65,4 +64,7 @@ class Gallery < ActiveRecord::Base add_activities(:activity => activity, :person => self.person) end + def short_description + description[0..124] + end end app/models/gallery.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: communications # app/models/message.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: page_views # app/models/page_view.rb @@ -1,32 +1,27 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: people # -# id :integer not null, primary key -# email :string(255) -# name :string(255) -# remember_token :string(255) -# crypted_password :string(255) -# description :text -# remember_token_expires_at :datetime -# last_contacted_at :datetime -# last_logged_in_at :datetime -# forum_posts_count :integer default(0), not null -# blog_post_comments_count :integer default(0), not null -# wall_comments_count :integer default(0), not null -# created_at :datetime -# updated_at :datetime -# admin :boolean not null -# deactivated :boolean not null -# connection_notifications :boolean default(TRUE) -# message_notifications :boolean default(TRUE) -# wall_comment_notifications :boolean default(TRUE) -# blog_comment_notifications :boolean default(TRUE) -# email_verified :boolean -# demo :boolean -# preferences :boolean -# avatar_id :integer(11) +# id :integer not null, primary key +# email :string(255) +# name :string(255) +# remember_token :string(255) +# crypted_password :string(255) +# description :text +# remember_token_expires_at :datetime +# last_contacted_at :datetime +# last_logged_in_at :datetime +# forum_posts_count :integer default(0), not null +# blog_post_comments_count :integer default(0), not null +# wall_comments_count :integer default(0), not null +# created_at :datetime +# updated_at :datetime +# admin :boolean not null +# deactivated :boolean not null +# email_verified :boolean +# demo :boolean +# preferences :boolean # class Person < ActiveRecord::Base app/models/person.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: photos # @@ -9,14 +9,16 @@ # content_type :string(255) # filename :string(255) # thumbnail :string(255) -# size :integer(11) -# width :integer(11) -# height :integer(11) +# size :integer +# width :integer +# height :integer # created_at :datetime # updated_at :datetime -# gallery_id :integer(11) +# gallery_id :integer # title :string(255) -# position :integer(11) +# position :integer +# primary :boolean +# avatar :boolean # class Photo < ActiveRecord::Base @@ -66,6 +68,18 @@ class Photo < ActiveRecord::Base end end + def label + if self.title.nil? or (self.title.length == 0) + label_from_filename + else + self.title + end + end + + def label_from_filename + File.basename(self.filename, File.extname(self.filename)).titleize + end + def log_activity activity = Activity.create!(:item => self, :person => self.person) add_activities(:activity => activity, :person => self.person) app/models/photo.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: posts # app/models/post.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: preferences # app/models/preference.rb @@ -1,3 +1,20 @@ +# == Schema Information +# Schema version: 34 +# +# Table name: thumbnails +# +# id :integer not null, primary key +# parent_id :integer +# content_type :string(255) +# filename :string(255) +# thumbnail :string(255) +# size :integer +# width :integer +# height :integer +# created_at :datetime +# updated_at :datetime +# + class Thumbnail < ActiveRecord::Base belongs_to :photo, :foreign_key => 'parent_id' app/models/thumbnail.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 30 +# Schema version: 34 # # Table name: topics # app/models/topic.rb @@ -1,13 +1,3 @@ -<%- column_div :type => :primary do -%> - <h2> Galleries </h2> - <% if current_person?(@person)%> - <div class="button"> - <%=link_to "Add Gallery", new_gallery_path()%> - </div> - <% end %> - - <ul id="gallery_list" class="grid"> - <%= render :partial => "gallery", :collection => @galleries %> - </div > - <%= will_paginate(@galleries) %> -<%- end -%> \ No newline at end of file +<div id="tGalleries"> + <%= render :partial=>"shared/galleries", :locals => {:galleries => @galleries} %> +</div> \ No newline at end of file app/views/galleries/index.html.erb @@ -1,25 +1,25 @@ <%- column_div :type => :primary, :id => 'photos' do -%> - <h2> Photos in <%= h(@gallery.title)%> </h2> - <%if !@gallery.description.nil?%> + <h2>Photos in <%= h(@gallery.title) %> Gallery</h2> + <% if !@gallery.description.nil? %> <div class="gallery-description"> <p><strong>Description:</strong> <%=h(@gallery.description)%></p> </div> - <%end%> + <% end %> <ul> - <%=render :partial=>"shared/photo", :collection => @photos%> + <%= render :partial=>"shared/photo", :collection => @photos %> </ul> <%= will_paginate(@photos) %> <%-end-%> -<%- column_div :type => :secondary do -%> - <h2> Toolbox </h2> - <div class="toolbox"> +<%- column_div :type => :secondary, :class => 'toolbox' do -%> + <h2>Toolbox</h2> + <div> <ul> <% if current_person?(@gallery.person)%> - <li><%=link_to "Add photo", new_gallery_photo_path(@gallery)%></li> - <li><%=link_to "Edit gallery", edit_gallery_path()%> </li> + <li class='button'><%= link_to "Add photo", new_gallery_photo_path(@gallery) %></li> + <li class='button'><%= link_to "Edit gallery", edit_gallery_path() %></li> <% end %> - <li><%=link_to "#{h(@gallery.person.name)}'s gallery list", person_galleries_path(@gallery.person)%> </li> + <li class='button'><%= link_to "#{h(@gallery.person.name)}'s gallery list", person_path(@gallery.person, :anchor => 'tGalleries') %></li> </ul> </div> <%- end-%> \ No newline at end of file app/views/galleries/show.html.erb @@ -19,17 +19,8 @@ <%= render :partial => 'wall' %> <% end %> - <% tabs.create('tPhotos', 'Photos') do %> - <h2><%= @person.name %>'s Photos</h2> - <div class="button_container"> - <div class="button"><%= link_to "Add Photo", new_photo_path() %></div> - <div class="clear"></div> - </div> - <% unless @person.photos.empty? %> - <ul class=""> - <%=render :partial=>"shared/photo", :collection => @person.photos%> - </ul> - <% end %> + <% tabs.create('tGalleries', 'Galleries') do %> + <%=render :partial=>"shared/galleries", :locals => {:galleries => @galleries} %> <% end %> <%= tabs.render %> app/views/people/show.html.erb @@ -4,34 +4,23 @@ <div class="adminMsgLink"> <%= email_link @person, :use_image => false, :to_all => true %><br /> <hr /> - <%- if admin_view? -%> - <%= link_to("Standard View", home_path) %> - <%- else -%> - <%= link_to("Admin View", admin_preferences_path) %> - <%- end -%> + <%= link_to_if(admin_view?, "Standard View", home_path) do + link_to("Admin View", admin_preferences_path) + end -%> </div> <%- end -%> <%- end -%> - <div id="header"> <h1><a href="/" title="Homepage"><%= image_tag "logo-insoshi-2.png" %></a></h1> + <p class="welcome"> + <%= link_to_if logged_in?, "Sign out", logout_path do + login_block + end %> + </p> + <div id="header"> <ul id="nav"> <%- menu.each do |link| -%> <%= menu_li link %> <%- end -%> </ul> - - <p class="welcome"> - <%- if logged_in? -%> - <%= link_to "Sign out", logout_path %> - <%- else -%> - <%= link_to "Sign in", login_path %> or - <%= link_to "Sign up", signup_path %> - <%- if global_prefs.can_send_mail? -%> - <br /> - <%= link_to "I forgot my password", - new_password_reminder_path %> - <%- end -%> - <%- end -%> - </p> </div> </div> \ No newline at end of file app/views/shared/_header.html.erb @@ -1,11 +1,15 @@ <li> - <p class="gallPhotoTitle"> - <%= link_to photo_title(photo.filename), '#gpu' + photo_id(photo), :rel => 'facebox' %> - <div style="display: none;" id="gpu<%= photo_id(photo) -%>"><%= image_tag photo.public_filename -%> <div class="gpuTitle"><%= photo_title(photo.filename) -%> </div></div> + <p class='gallPhotoTitle'> + <%= link_to photo.label, '#gpu' + photo_id(photo), :rel => 'facebox' %> + <div style="display: none;" id="gpu<%= photo_id(photo) -%>"><%= image_tag photo.public_filename -%> <div class="gpuTitle"><%= photo.label -%> </div></div> </p> - <p class='gallPhoto'> + <div class='gallPhoto'> <%= image_tag(photo.public_filename(:thumbnail)) %> - <%= link_to image_tag("icons/picture_edit.png", :class => 'actioner'), edit_photo_path(photo) %> - <%= link_to image_tag("icons/picture_delete.png", :class => 'actioner'), photo_path(photo), :method => :delete %> - </p> + </div> + <div class='gallPhotoMeta'> + <%= link_to image_tag("icons/picture_edit.png", :class => 'actioner'), edit_photo_path(photo) %> + <%= link_to image_tag("icons/picture_delete.png", :class => 'actioner'), photo_path(photo), :method => :delete %> + <%= link_to image_tag("default_thumbnail.png", :class => 'actioner', :style => 'height: 16px;'), set_avatar_photo_path(photo.id), :method => :put, :title => 'Select as your avatar' %> + <%= link_to image_tag("icons/photo.png", :class => 'actioner', :style => 'height: 16px;'), set_primary_photo_path(photo.id), :method => :put, :title => 'Select as gallery thumbnail' %> + </div> </li> \ No newline at end of file app/views/shared/_photo.html.erb @@ -18,6 +18,7 @@ body { #content { width: 744px; float: left; + padding-bottom: 10px; } .col1 { float: left; @@ -39,7 +40,7 @@ body { padding-bottom: 1px; } -#header h1 { +#header-wrap h1 { float: left; margin-top: 12px; margin-bottom: 12px; @@ -49,31 +50,32 @@ body { /* Header-nav */ #nav { - margin: 44px 0 0 0; + margin: 10px; width: 560px; float: right; } -#nav li { - background: #6AA2FD url(/images/header-grad-lt.jpg) bottom repeat-x; +#nav li, p.welcome { + background: none; float: left; - height: 36px; - line-height: 36px; + height: 24px; + line-height: 24px; list-style-type: none; margin: 0 0 1px 0; padding: 0; text-align: center; width: 70px; } -#nav li a { +#nav li a, p.welcome a { color: #fff; display: block; - height: 36px; + height: 24px; font-size: 12px; } -#nav li a:hover { - background: url(/images/header-grad-inv-lt.jpg) top repeat-x; +#nav li a:hover, p.welcome a:hover { + background: #4A70B1; + font-weight: bold; } -#nav li.active a, #nav li.active a:hover { +#nav li.active { background: #FFF5B5; color: #6AA2FD; border-bottom: 1px solid #6AA2FD; @@ -94,13 +96,13 @@ body { /* Welcome message */ p.welcome { - position: absolute; - right: 0; - text-align: right; - top: 12px; + float: right; + margin: 10px 10px 0px 0px; +} +p.welcome a { + text-decoration: none; + font-weight: normal; } - - /* Site elements */ @@ -269,7 +271,7 @@ p.welcome { padding: 0; width: 78px; } -#message-nav li.active a, #message-nav li a:hover { +#message-nav li a:hover { background: url(/images/silver-grad-inv.jpg) bottom repeat-x; } #message-nav li.compose { @@ -298,7 +300,10 @@ p.welcome { /* Gallery list */ #gallery_list li { - margin-bottom: 5px; + background: url(/images/blue-grad.jpg) bottom repeat-x; + border: 1px solid #ccc; + height: 80px; + margin: 10px 0 12px 0px; width: 300px; } #gallery_list li div, #gallery_list li p { @@ -317,6 +322,7 @@ div.toolbox ul li { font-size: 12px; list-style: disc inside; background: none; + padding-left: 0px } div.photo, div.photo-small { @@ -332,13 +338,6 @@ div.gallery-description { div.photo-small:hover { background-color: #ccccff; } -#gallery_list ul li { - list-style-type: none; - background: none; - margin: 0px; - padding-left: 10px; - padding-right: 10px; -} /* Bug fixes */ form, div, h2, ul, li {zoom: 1;} @@ -425,21 +424,24 @@ ul.ui-tabs-nav li { #tRecentActivity p.meta {font-variant: small-caps;} #tRecentActivity ul li, #tWall ul li, #tWall ul li div {display: block; border-bottom: none;} #tWall form, form#admin_preferences, form#admin_forums, form.edit_photo, .col2 form {border-bottom: none;} -#tPhotos ul li, #photos ul li { +#tGalleries .profile-image { + margin-top: 4px; +} +#photos ul li { background: url(/images/blue-grad.jpg) bottom repeat-x; - margin: 10px; + margin: 10px 10px 0px 0px; float: left; display: inline; - width: 125px; - height: 120px; + width: 140px; + height: 110px; border: 1px solid #ccc; padding: 4px; overflow: hidden; } -#tPhotos ul li img, #photos ul li img { +#photos ul li img { vertical-align: top; } -#tPhotos form, , #photos form { +#photos form { margin-top: 20px; border-bottom: none; } @@ -447,7 +449,13 @@ ul.ui-tabs-nav li { height: 35px; } .gallPhoto { + float: left; + width: 80px; +} +.gallPhotoMeta { height: 72px; + float: left; + width: 60px; } .gpuTitle { font-weight: bold; public/stylesheets/skin.css @@ -254,7 +254,7 @@ div.button { float: left; margin-right: 20px; } -div.button a { +.button a { background: #4A70B1 url(/images/header-grad-lt.jpg) bottom repeat-x; padding: 3px 12px; } @@ -352,7 +352,7 @@ strong { font-weight: bold; } .disabled {color: #c0c0c0;} /* greyed out to emphasize unavailability */ #new_form_subject form {border-bottom: none;} -#new_form_subject input, #photos .button, #tPhotos .button {width: 138px; vertical-align: top;} +#new_form_subject input, #photos .button, #tGalleries .button {width: 138px; vertical-align: top;} #new_form_subject .button {width: 72px;} .button a, .button {color: #ffffff;} .button_container {margin: 10px 0px;} \ No newline at end of file public/stylesheets/typography.css @@ -1,4 +1,7 @@ (in /Users/williamlazar/Sites/insoshi) + /fckeditor/check_spelling {:action=>"check_spelling", :controller=>"fckeditor"} + /fckeditor/command {:action=>"command", :controller=>"fckeditor"} + /fckeditor/upload {:action=>"upload", :controller=>"fckeditor"} categories GET /categories {:action=>"index", :controller=>"categories"} formatted_categories GET /categories.:format {:action=>"index", :controller=>"categories"} POST /categories {:action=>"create", :controller=>"categories"} @@ -105,6 +108,10 @@ formatted_new_photo GET /photos/new.:format {:action=>"new", :controller=>"photos"} edit_photo GET /photos/:id/edit {:action=>"edit", :controller=>"photos"} formatted_edit_photo GET /photos/:id/edit.:format {:action=>"edit", :controller=>"photos"} + set_primary_photo PUT /photos/:id/set_primary {:action=>"set_primary", :controller=>"photos"} + formatted_set_primary_photo PUT /photos/:id/set_primary.:format {:action=>"set_primary", :controller=>"photos"} + set_avatar_photo PUT /photos/:id/set_avatar {:action=>"set_avatar", :controller=>"photos"} + formatted_set_avatar_photo PUT /photos/:id/set_avatar.:format {:action=>"set_avatar", :controller=>"photos"} photo GET /photos/:id {:action=>"show", :controller=>"photos"} formatted_photo GET /photos/:id.:format {:action=>"show", :controller=>"photos"} PUT /photos/:id {:action=>"update", :controller=>"photos"} @@ -123,22 +130,34 @@ PUT /session.:format {:action=>"update", :controller=>"sessions"} DELETE /session {:action=>"destroy", :controller=>"sessions"} DELETE /session.:format {:action=>"destroy", :controller=>"sessions"} - trash_messages GET /messages/trash {:action=>"trash", :controller=>"messages"} - formatted_trash_messages GET /messages/trash.:format {:action=>"trash", :controller=>"messages"} + POST /galleries {:action=>"create", :controller=>"galleries"} + POST /galleries.:format {:action=>"create", :controller=>"galleries"} + new_galleries GET /galleries/new {:action=>"new", :controller=>"galleries"} + formatted_new_galleries GET /galleries/new.:format {:action=>"new", :controller=>"galleries"} + edit_galleries GET /galleries/edit {:action=>"edit", :controller=>"galleries"} + formatted_edit_galleries GET /galleries/edit.:format {:action=>"edit", :controller=>"galleries"} + GET /galleries {:action=>"show", :controller=>"galleries"} + GET /galleries.:format {:action=>"show", :controller=>"galleries"} + PUT /galleries {:action=>"update", :controller=>"galleries"} + PUT /galleries.:format {:action=>"update", :controller=>"galleries"} + DELETE /galleries {:action=>"destroy", :controller=>"galleries"} + DELETE /galleries.:format {:action=>"destroy", :controller=>"galleries"} sent_messages GET /messages/sent {:action=>"sent", :controller=>"messages"} formatted_sent_messages GET /messages/sent.:format {:action=>"sent", :controller=>"messages"} + trash_messages GET /messages/trash {:action=>"trash", :controller=>"messages"} + formatted_trash_messages GET /messages/trash.:format {:action=>"trash", :controller=>"messages"} messages GET /messages {:action=>"index", :controller=>"messages"} formatted_messages GET /messages.:format {:action=>"index", :controller=>"messages"} POST /messages {:action=>"create", :controller=>"messages"} POST /messages.:format {:action=>"create", :controller=>"messages"} new_message GET /messages/new {:action=>"new", :controller=>"messages"} formatted_new_message GET /messages/new.:format {:action=>"new", :controller=>"messages"} - undestroy_message PUT /messages/:id/undestroy {:action=>"undestroy", :controller=>"messages"} - formatted_undestroy_message PUT /messages/:id/undestroy.:format {:action=>"undestroy", :controller=>"messages"} edit_message GET /messages/:id/edit {:action=>"edit", :controller=>"messages"} formatted_edit_message GET /messages/:id/edit.:format {:action=>"edit", :controller=>"messages"} reply_message GET /messages/:id/reply {:action=>"reply", :controller=>"messages"} formatted_reply_message GET /messages/:id/reply.:format {:action=>"reply", :controller=>"messages"} + undestroy_message PUT /messages/:id/undestroy {:action=>"undestroy", :controller=>"messages"} + formatted_undestroy_message PUT /messages/:id/undestroy.:format {:action=>"undestroy", :controller=>"messages"} message GET /messages/:id {:action=>"show", :controller=>"messages"} formatted_message GET /messages/:id.:format {:action=>"show", :controller=>"messages"} PUT /messages/:id {:action=>"update", :controller=>"messages"} @@ -191,20 +210,20 @@ PUT /people/:person_id/messages/:id.:format {:action=>"update", :controller=>"messages"} DELETE /people/:person_id/messages/:id {:action=>"destroy", :controller=>"messages"} DELETE /people/:person_id/messages/:id.:format {:action=>"destroy", :controller=>"messages"} - person_photos GET /people/:person_id/photos {:action=>"index", :controller=>"photos"} - formatted_person_photos GET /people/:person_id/photos.:format {:action=>"index", :controller=>"photos"} - POST /people/:person_id/photos {:action=>"create", :controller=>"photos"} - POST /people/:person_id/photos.:format {:action=>"create", :controller=>"photos"} - new_person_photo GET /people/:person_id/photos/new {:action=>"new", :controller=>"photos"} - formatted_new_person_photo GET /people/:person_id/photos/new.:format {:action=>"new", :controller=>"photos"} - edit_person_photo GET /people/:person_id/photos/:id/edit {:action=>"edit", :controller=>"photos"} - formatted_edit_person_photo GET /people/:person_id/photos/:id/edit.:format {:action=>"edit", :controller=>"photos"} - person_photo GET /people/:person_id/photos/:id {:action=>"show", :controller=>"photos"} - formatted_person_photo GET /people/:person_id/photos/:id.:format {:action=>"show", :controller=>"photos"} - PUT /people/:person_id/photos/:id {:action=>"update", :controller=>"photos"} - PUT /people/:person_id/photos/:id.:format {:action=>"update", :controller=>"photos"} - DELETE /people/:person_id/photos/:id {:action=>"destroy", :controller=>"photos"} - DELETE /people/:person_id/photos/:id.:format {:action=>"destroy", :controller=>"photos"} + person_galleries GET /people/:person_id/galleries {:action=>"index", :controller=>"galleries"} + formatted_person_galleries GET /people/:person_id/galleries.:format {:action=>"index", :controller=>"galleries"} + POST /people/:person_id/galleries {:action=>"create", :controller=>"galleries"} + POST /people/:person_id/galleries.:format {:action=>"create", :controller=>"galleries"} + new_person_gallery GET /people/:person_id/galleries/new {:action=>"new", :controller=>"galleries"} + formatted_new_person_gallery GET /people/:person_id/galleries/new.:format {:action=>"new", :controller=>"galleries"} + edit_person_gallery GET /people/:person_id/galleries/:id/edit {:action=>"edit", :controller=>"galleries"} + formatted_edit_person_gallery GET /people/:person_id/galleries/:id/edit.:format {:action=>"edit", :controller=>"galleries"} + person_gallery GET /people/:person_id/galleries/:id {:action=>"show", :controller=>"galleries"} + formatted_person_gallery GET /people/:person_id/galleries/:id.:format {:action=>"show", :controller=>"galleries"} + PUT /people/:person_id/galleries/:id {:action=>"update", :controller=>"galleries"} + PUT /people/:person_id/galleries/:id.:format {:action=>"update", :controller=>"galleries"} + DELETE /people/:person_id/galleries/:id {:action=>"destroy", :controller=>"galleries"} + DELETE /people/:person_id/galleries/:id.:format {:action=>"destroy", :controller=>"galleries"} person_connections GET /people/:person_id/connections {:action=>"index", :controller=>"connections"} formatted_person_connections GET /people/:person_id/connections.:format {:action=>"index", :controller=>"connections"} POST /people/:person_id/connections {:action=>"create", :controller=>"connections"} @@ -233,6 +252,34 @@ PUT /people/:person_id/comments/:id.:format {:action=>"update", :controller=>"comments"} DELETE /people/:person_id/comments/:id {:action=>"destroy", :controller=>"comments"} DELETE /people/:person_id/comments/:id.:format {:action=>"destroy", :controller=>"comments"} + galleries GET /galleries {:action=>"index", :controller=>"galleries"} + formatted_galleries GET /galleries.:format {:action=>"index", :controller=>"galleries"} + POST /galleries {:action=>"create", :controller=>"galleries"} + POST /galleries.:format {:action=>"create", :controller=>"galleries"} + new_gallery GET /galleries/new {:action=>"new", :controller=>"galleries"} + formatted_new_gallery GET /galleries/new.:format {:action=>"new", :controller=>"galleries"} + edit_gallery GET /galleries/:id/edit {:action=>"edit", :controller=>"galleries"} + formatted_edit_gallery GET /galleries/:id/edit.:format {:action=>"edit", :controller=>"galleries"} + gallery GET /galleries/:id {:action=>"show", :controller=>"galleries"} + formatted_gallery GET /galleries/:id.:format {:action=>"show", :controller=>"galleries"} + PUT /galleries/:id {:action=>"update", :controller=>"galleries"} + PUT /galleries/:id.:format {:action=>"update", :controller=>"galleries"} + DELETE /galleries/:id {:action=>"destroy", :controller=>"galleries"} + DELETE /galleries/:id.:format {:action=>"destroy", :controller=>"galleries"} + gallery_photos GET /galleries/:gallery_id/photos {:action=>"index", :controller=>"photos"} + formatted_gallery_photos GET /galleries/:gallery_id/photos.:format {:action=>"index", :controller=>"photos"} + POST /galleries/:gallery_id/photos {:action=>"create", :controller=>"photos"} + POST /galleries/:gallery_id/photos.:format {:action=>"create", :controller=>"photos"} + new_gallery_photo GET /galleries/:gallery_id/photos/new {:action=>"new", :controller=>"photos"} + formatted_new_gallery_photo GET /galleries/:gallery_id/photos/new.:format {:action=>"new", :controller=>"photos"} + edit_gallery_photo GET /galleries/:gallery_id/photos/:id/edit {:action=>"edit", :controller=>"photos"} + formatted_edit_gallery_photo GET /galleries/:gallery_id/photos/:id/edit.:format {:action=>"edit", :controller=>"photos"} + gallery_photo GET /galleries/:gallery_id/photos/:id {:action=>"show", :controller=>"photos"} + formatted_gallery_photo GET /galleries/:gallery_id/photos/:id.:format {:action=>"show", :controller=>"photos"} + PUT /galleries/:gallery_id/photos/:id {:action=>"update", :controller=>"photos"} + PUT /galleries/:gallery_id/photos/:id.:format {:action=>"update", :controller=>"photos"} + DELETE /galleries/:gallery_id/photos/:id {:action=>"destroy", :controller=>"photos"} + DELETE /galleries/:gallery_id/photos/:id.:format {:action=>"destroy", :controller=>"photos"} admin_people GET /admin/people {:action=>"index", :controller=>"admin/people"} formatted_admin_people GET /admin/people.:format {:action=>"index", :controller=>"admin/people"} POST /admin/people {:action=>"create", :controller=>"admin/people"} @@ -373,22 +420,6 @@ formatted_edit_admin_forum_topic_post GET /admin/forums/:forum_id/topics/:top PUT /forums/:forum_id/topics/:id.:format {:action=>"update", :controller=>"topics"} DELETE /forums/:forum_id/topics/:id {:action=>"destroy", :controller=>"topics"} DELETE /forums/:forum_id/topics/:id.:format {:action=>"destroy", :controller=>"topics"} - GET /forums/:forum_id/topics/:topic_id/posts {:action=>"index", :controller=>"posts"} - GET /forums/:forum_id/topics/:topic_id/posts.:format {:action=>"index", :controller=>"posts"} - POST /forums/:forum_id/topics/:topic_id/posts {:action=>"create", :controller=>"posts"} - POST /forums/:forum_id/topics/:topic_id/posts.:format {:action=>"create", :controller=>"posts"} - GET /forums/:forum_id/topics/:topic_id/posts/new {:action=>"new", :controller=>"posts"} - GET /forums/:forum_id/topics/:topic_id/posts/new.:format {:action=>"new", :controller=>"posts"} - GET /forums/:forum_id/topics/:topic_id/posts/:id/edit {:action=>"edit", :controller=>"posts"} - GET /forums/:forum_id/topics/:topic_id/posts/:id/edit.:format {:action=>"edit", :controller=>"posts"} - GET /forums/:forum_id/topics/:topic_id/posts/:id {:action=>"show", :controller=>"posts"} - GET /forums/:forum_id/topics/:topic_id/posts/:id.:format {:action=>"show", :controller=>"posts"} - PUT /forums/:forum_id/topics/:topic_id/posts/:id {:action=>"update", :controller=>"posts"} - PUT /forums/:forum_id/topics/:topic_id/posts/:id.:format {:action=>"update", :controller=>"posts"} - DELETE /forums/:forum_id/topics/:topic_id/posts/:id {:action=>"destroy", :controller=>"posts"} - DELETE /forums/:forum_id/topics/:topic_id/posts/:id.:format {:action=>"destroy", :controller=>"posts"} - atom_forum_topic_posts GET /forums/:forum_id/topics/:topic_id/posts/atom {:action=>"atom", :controller=>"posts"} - formatted_atom_forum_topic_posts GET /forums/:forum_id/topics/:topic_id/posts/atom.:format {:action=>"atom", :controller=>"posts"} forum_topic_posts GET /forums/:forum_id/topics/:topic_id/posts {:action=>"index", :controller=>"posts"} formatted_forum_topic_posts GET /forums/:forum_id/topics/:topic_id/posts.:format {:action=>"index", :controller=>"posts"} POST /forums/:forum_id/topics/:topic_id/posts {:action=>"create", :controller=>"posts"} routes.txt app/views/galleries/_gallery.html.erb 7fafac8299d6eda6abb0737dbab8aaed74065541 blazar blazar+git@gmail.com http://github.com/yuki/insoshi/commit/313c98a6d88e1a4be36626574b01dde543aa4209 313c98a6d88e1a4be36626574b01dde543aa4209 2008-06-29T21:36:17-07:00 2008-06-29T21:36:17-07:00 gallery and photo work 1cccdbdd47330e8f04b619d76bffd9580edb48b6 blazar blazar+git@gmail.com