.dotest/0001 .dotest/0002 .dotest/0003 .dotest/binary .dotest/final-commit .dotest/info .dotest/keep .dotest/last .dotest/msg .dotest/msg-clean .dotest/next .dotest/patch .dotest/sign .dotest/utf8 .dotest/whitespace app/views/shared/_contact.html.erb app/views/shared/_contact_medium.html.erb app/views/shared/_contacts_grid.html.erb app/views/shared/_footer.html.erb app/views/shared/_header.html.erb configure_insoshi_local.sh doc/bills_insoshi_notes.doc public/images/tabs-blue.png public/images/tabs.png public/javascripts/jquery-fx.js public/javascripts/jquery-ui-personalized-1.5b3.packed.js public/javascripts/jquery-ui.js public/javascripts/jquery.bgiframe.js public/javascripts/jquery.dimensions.js public/javascripts/jquery.js public/javascripts/jquery.livequery.js public/javascripts/jquery.tooltip.pack.js public/javascripts/jrails.js public/stylesheets/jquery-flora.tabs.css public/stylesheets/jquery.tooltip.css test/fixtures/categories.yml test/fixtures/links.yml test/functional/categories_controller_test.rb test/functional/links_controller_test.rb test/unit/categories_test.rb test/unit/links_test.rb vendor/plugins/jrails/CHANGELOG vendor/plugins/jrails/README vendor/plugins/jrails/init.rb vendor/plugins/jrails/install.rb vendor/plugins/jrails/javascripts/jquery-fx.js vendor/plugins/jrails/javascripts/jquery-ui.js vendor/plugins/jrails/javascripts/jquery.js vendor/plugins/jrails/javascripts/jrails.js vendor/plugins/jrails/javascripts/sources/jquery-fx.js vendor/plugins/jrails/javascripts/sources/jquery-ui.js vendor/plugins/jrails/javascripts/sources/jrails.js vendor/plugins/jrails/lib/jrails.rb vendor/plugins/jrails/tasks/jrails.rake @@ -20,12 +20,20 @@ class PeopleController < ApplicationController flash[:error] = "That person is not active" redirect_to home_url and return end + @people = @contacts = @person.contacts.paginate(:page => params[:page], :per_page => RASTER_PER_PAGE) if logged_in? @some_contacts = @person.some_contacts @common_connections = current_person.common_connections_with(@person) + # gives us the same max number as in basic contacts list to show on the Profile + @some_common_connections = @common_connections[(0...Person::MAX_DEFAULT_CONTACTS)] end respond_to do |format| format.html + format.js { + render :update do |page| + page.replace_html 'contacts_grid', :partial => 'shared/contacts_grid' + end + } end end app/controllers/people_controller.rb @@ -7,9 +7,9 @@ module ActivitiesHelper when "BlogPost" post = activity.item blog = post.blog - view_blog = blog_link("View #{h person.name}'s blog", blog) - %(#{person_link(person)} made a blog post titled - #{post_link(blog, post)}.<br /> #{view_blog}.) + view_blog = blog_link("#{h person.name}'s blog", blog) + %(#{person_link_with_image(person)} posted + #{post_link(blog, post)} — #{view_blog}) when "Comment" parent = activity.item.commentable parent_type = parent.class.to_s @@ -17,28 +17,30 @@ module ActivitiesHelper when "BlogPost" post = activity.item.commentable blog = post.blog - %(#{person_link(person)} made a comment to + %(#{person_link_with_image(person)} made a comment to #{someones(blog.person, person)} - blog post #{post_link(blog, post)}.) + blog post #{post_link(blog, post)}) when "Person" - %(#{person_link(activity.item.commenter)} commented on - #{wall(activity)}.) + %(#{person_link_with_image(activity.item.commenter)} commented on + #{wall(activity)}) end when "Connection" - %(#{person_link(activity.item.person)} and - #{person_link(activity.item.contact)} - have connected.) + if activity.item.contact.admin? + %(#{person_link_with_image(activity.item.person)} has joined the system) + else + %(#{person_link_with_image(activity.item.person)} and #{person_link_with_image(activity.item.contact)} have connected) + end when "ForumPost" post = activity.item - %(#{person_link(person)} made a post on the forum topic - #{topic_link(post.topic)}.) + %(#{person_link_with_image(person)} made a post on the forum topic + #{topic_link(post.topic)}) when "Topic" - %(#{person_link(person)} created the new discussion topic - #{topic_link(activity.item)}.) + %(#{person_link_with_image(person)} created the new discussion topic + #{topic_link(activity.item)}) when "Photo" - %(#{person_link(person)}'s profile picture has changed.) + %(#{person_link_with_image(person)}'s profile picture changed) when "Person" - %(#{person_link(person)}'s description has changed.) + %(#{person_link_with_image(person)}'s description changed) else # TODO: make this a more graceful falure (?). raise "Invalid activity type #{activity_type(activity).inspect}" @@ -51,8 +53,8 @@ module ActivitiesHelper when "BlogPost" post = activity.item blog = post.blog - %(#{person_link(person)} made a - #{post_link("new blog post", blog, post)}.) + %(#{person_link_with_image(person)} made a + #{post_link("new blog post", blog, post)}) when "Comment" parent = activity.item.commentable parent_type = parent.class.to_s @@ -60,30 +62,29 @@ module ActivitiesHelper when "BlogPost" post = activity.item.commentable blog = post.blog - %(#{person_link(person)} made a comment to - #{someones(blog.person, person)} - blog post #{post_link(blog, post)}.) - %(#{person_link(person)} made a comment on - #{someones(blog.person, person)} - #{post_link("blog post", post.blog, post)}.) + %(#{person_link_with_image(person)} made a comment to #{someones(blog.person, person)} blog post #{post_link(blog, post)}) + %(#{person_link_with_image(person)} made a comment on #{someones(blog.person, person)} #{post_link("blog post", post.blog, post)}) when "Person" - %(#{person_link(activity.item.commenter)} commented on + %(#{person_link_with_image(activity.item.commenter)} commented on #{wall(activity)}.) end when "Connection" - %(#{person_link(person)} and #{person_link(activity.item.contact)} - have connected.) + if activity.item.contact.admin? + %(#{person_link_with_image(person)} has joined the system) + else + %(#{person_link_with_image(person)} and #{person_link_with_image(activity.item.contact)} have connected) + end when "ForumPost" topic = activity.item.topic # TODO: deep link this to the post - %(#{person_link(person)} made a #{topic_link("forum post", topic)}.) + %(#{person_link_with_image(person)} made a #{topic_link("forum post", topic)}) when "Topic" - %(#{person_link(person)} created a - #{topic_link("new discussion topic", activity.item)}.) + %(#{person_link_with_image(person)} created a + #{topic_link("new discussion topic", activity.item)}) when "Photo" - %(#{person_link(person)}'s profile picture has changed.) + %(#{person_link_with_image(person)}'s profile picture changed) when "Person" - %(#{person_link(person)}'s description has changed.) + %(#{person_link_with_image(person)}'s description changed) else raise "Invalid activity type #{activity_type(activity).inspect}" end @@ -152,6 +153,21 @@ module ActivitiesHelper person_path(person, :anchor => "wall")) end + # Only show member photo for certain types of activity + def posterPhoto(activity) + shouldShow = case activity_type(activity) + when "Photo" + true + when "Connection" + true + else + false + end + if shouldShow + image_link(activity.person, :image => :thumbnail) + end + end + private # Return the type of activity. app/helpers/activities_helper.rb @@ -1,6 +1,11 @@ # Methods added to this helper will be available to all templates in the application. module ApplicationHelper + ## Application-wide values + def app_name + 'Lazar Insoshi' + end + ## Menu helpers def menu @@ -11,6 +16,11 @@ module ApplicationHelper else forum = menu_element("Forums", forums_path) end + if global_prefs.about.blank? + about = '' + else + about = menu_element("About", about_url) + end resources = menu_element("Resources", "http://docs.insoshi.com/") if logged_in? and not admin_view? profile = menu_element("Profile", person_path(current_person)) @@ -19,21 +29,16 @@ module ApplicationHelper photos = menu_element("Photos", photos_path) contacts = menu_element("Contacts", person_connections_path(current_person)) - links = [home, profile, contacts, messages, blog, people, forum] + links = [home, profile, contacts, messages, blog, people, forum, about] elsif logged_in? and admin_view? home = menu_element("Home", home_path) people = menu_element("People", admin_people_path) forums = menu_element(inflect("Forum", Forum.count), admin_forums_path) preferences = menu_element("Prefs", admin_preferences_path) - links = [home, people, forums, preferences] + links = [home, people, forums, preferences, resources] else - links = [home, people] - end - if global_prefs.about.blank? - links - else - links.push(menu_element("About", about_url)) + links = [home, people, about] end end @@ -100,6 +105,7 @@ module ApplicationHelper def email_link(person, options = {}) reply = options[:replying_to] + use_image = options[:use_image].nil? || options[:use_image] if reply path = reply_message_path(reply) else @@ -108,9 +114,13 @@ module ApplicationHelper img = image_tag("icons/email.gif") action = reply.nil? ? "Send a message" : "Send reply" opts = { :class => 'email-link' } - str = link_to(img, path, opts) - str << " " - str << link_to_unless_current(action, path, opts) + if use_image + str = link_to(img, path, opts) + str << " " + str << link_to_unless_current(action, path, opts) + else + str = link_to_unless_current(action, path, opts) + end end def formatting_note app/helpers/application_helper.rb @@ -42,7 +42,20 @@ module PeopleHelper # activities_helper_spec due to an RSpec bug. link_to(h(text), person, html_options) end - + + # Same as person_link except sets up HTML needed for the image on hover effect + def person_link_with_image(text, person = nil, html_options = nil) + if person.nil? + person = text + text = person.name + elsif person.is_a?(Hash) + html_options = person + person = text + text = person.name + end + '<span class="imgHoverMarker"><img src="' + person.thumbnail + '" />' + person_link(text, person, html_options) + '</span>' + end + private # Make captioned images. app/helpers/people_helper.rb @@ -50,6 +50,7 @@ class Person < ActiveRecord::Base NUM_WALL_COMMENTS = 10 NUM_RECENT = 8 FEED_SIZE = 10 + MAX_DEFAULT_CONTACTS = 12 TIME_AGO_FOR_MOSTLY_ACTIVE = 1.month.ago # These constants should be methods, but I couldn't figure out how to use # methods in the has_many associations. I hope you can do better. @@ -67,8 +68,6 @@ class Person < ActiveRecord::Base has_many :comments, :as => :commentable, :order => 'created_at DESC', :limit => NUM_WALL_COMMENTS has_many :connections - - has_many :contacts, :through => :connections, :conditions => ACCEPTED_AND_ACTIVE, :order => 'people.created_at DESC' @@ -191,7 +190,7 @@ class Person < ActiveRecord::Base # Return some contacts for the home page. def some_contacts - contacts[(0...12)] + contacts[(0...MAX_DEFAULT_CONTACTS)] end # Contact links for the contact image raster. app/models/person.rb @@ -1,53 +1,46 @@ -<h2>Global preferences</h2> - -<p> - <b>Application name:</b> - <%=h @preferences.app_name %> -</p> - -<p> - <b>Email domain:</b> - <%=h @preferences.domain %> -</p> - -<p> - <b>Server name:</b> - <%=h @preferences.server_name %> -</p> - -<p> - <b>Smtp server:</b> - <%=h @preferences.smtp_server %> -</p> - -<p> - <b>Email notifications:</b> - <%=h @preferences.email_notifications %> -</p> - -<p> - <b>Email verifications:</b> - <%=h @preferences.email_verifications %> -</p> - -<p> - <b>Demo site:</b> - <%=h @preferences.demo %> -</p> - -<p> - <b>About text (nonblank text will lead to an 'about' link):</b> -</p> -<%= display @preferences.about %> - - -<p> - <b>Analytics (will be inserted - just before the <%= h("</body>") %> tag):</b> -</p> - <pre> -<%=h @preferences.analytics %> - </pre> - - -<%= link_to 'Edit', edit_admin_preference_path(@preferences) %> +<h2>Global preferences <div class="profileEditLink"><%= link_to 'Edit', edit_admin_preference_path(@preferences) %></div></h2> + +<div class="prefItem"> + <div class="prefLabel">Application name</div> + <div class="prefValue"><%=h @preferences.app_name %></div> +</div> + +<div class="prefItem"> + <div class="prefLabel">Email domain</div> + <div class="prefValue"><%=h @preferences.domain %></div> +</div> + +<div class="prefItem"> + <div class="prefLabel">Server name</div> + <div class="prefValue"><%=h @preferences.server_name %></div> +</div> + +<div class="prefItem"> + <div class="prefLabel">Smtp server</div> + <div class="prefValue"><%=h @preferences.smtp_server %></div> +</div> + +<div class="prefItem"> + <div class="prefLabel">Email notifications</div> + <div class="prefValue"><%=h @preferences.email_notifications %></div> +</div> + +<div class="prefItem"> + <div class="prefLabel">Email verifications</div> + <div class="prefValue"><%=h @preferences.email_verifications %></div> +</div> + +<div class="prefItem"> + <div class="prefLabel">Demo site</div> + <div class="prefValue"><%=h @preferences.demo %></div> +</div> + +<div class="prefItem"> + <b>About text (nonblank text will lead to an 'about' link)</b> + <div class="prefAbout"><%= display @preferences.about %></div> +</div> + +<div class="prefItem"> + <b>Analytics (will be inserted just before the <%= h("</body>") %> tag)</b> + <pre><%=h @preferences.analytics %></pre> +</div> \ No newline at end of file app/views/admin/preferences/show.html.erb @@ -3,7 +3,7 @@ <%- if @posts.empty? -%> <h3 class="blankslate"> - No posts yet! + Start this blog: <%- if current_person?(@blog.person) -%> <%= link_to "Write a post", new_blog_post_path(@blog) %> <%- end -%> @@ -21,11 +21,10 @@ <%- if current_person?(@blog.person) -%> <h2>Add new post</h2> - <p><%= formatting_note %></p> - <%= render :partial => 'posts/blog_form', :locals => { :url => blog_posts_path(@blog), :method => :post } %> + + <p><%= formatting_note %></p> <%- end -%> - <%= render :partial => 'shared/minifeed' %> <%- end -%> \ No newline at end of file app/views/blogs/show.html.erb @@ -2,19 +2,8 @@ <h2>Contacts for <%= h @person.name %></h2> <% unless @contacts.empty? -%> - <%= will_paginate(@contacts) %> - <ul class="grid contacts medium"> - <%- @contacts.each do |contact| -%> - <li class="vcard contact"> - <%= image_link contact, :image_options => { :class => "photo" }, - :link_options => { :class => "url" }, - :vcard => true, - :image => :bounded_icon %> - </li> - <%- end -%> - - </ul> - <%= will_paginate(@contacts) %> + <%= render :partial => 'shared/contacts_grid', + :locals => { :contacts => @contacts } %> <% else %> <h3>No contacts (yet)</h3> <% end -%> @@ -22,5 +11,5 @@ <%- end -%> <%- column_div :type => :secondary do -%> - <%= render :partial => 'shared/minifeed' %> + <%= render :partial => 'searches/box' %> <%- end -%> app/views/connections/index.html.erb @@ -1 +1,16 @@ -<%= display global_prefs.about %> \ No newline at end of file +<%- column_div :type => :primary do -%> + <h2>About <%= app_name %></h2> + <%= display global_prefs.about %> +<%- end %> + +<%- column_div :type => :secondary do -%> + <h2>Related Resources</h2> + <ul id="resourceList"> + <li><%= link_to 'Insoshi', 'http://insoshi.com' %></li> + <li><%= link_to 'Ruby on Rails', 'http://rubyonrails.com' %></li> + <li><%= link_to 'GitHub', 'http://github.com' %></li> + <li><%= link_to 'Bill Lazar', 'http://billsaysthis.com' %></li> + <li><%= link_to 'Michael Hartl', 'http://michaelhartl.com/' %></li> + <li><%= link_to 'Insoshi on GitHub', 'http://github.com/insoshi/insoshi/tree/master' %></li> + </ul> +<%- end -%> \ No newline at end of file app/views/home/about.html.erb @@ -3,48 +3,14 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>Insoshi Open Source Social Networking Platform</title> + <title><%= app_name %></title> <%= stylesheet_link_tag "default" %> - <%= javascript_include_tag :defaults %> + <%= stylesheet_link_tag "jquery-flora.tabs.css", "jquery.tooltip.css" %> + <%= javascript_include_tag "jquery.js", "jquery-ui-personalized-1.5b3.packed.js", "jquery-fx.js", "jrails.js" %> + <%= javascript_include_tag "jquery.dimensions.js", "jquery.bgiframe.js", "jquery.tooltip.pack.js", "jquery.livequery.js", "application.js" %> </head> <body class="<%= @body %>"> - <div id="header-wrap"> - <div id="header"> - <h1> - <a href="/" title="Return to Insoshi homepage"> - <%= image_tag "logo-insoshi.png" %> - </a> - </h1> - <ul id="nav"> - <%- menu.each do |link| -%> - <%= menu_li link %> - <%- end -%> - </ul> - - <p class="welcome"> - <%- if logged_in? -%> - Welcome, <%= h current_person.name %>! - (<%= link_to "Sign out", logout_path %>) - <%- if current_person.admin? -%> - <br /> - <%- if admin_view? -%> - <%= link_to("Standard view", home_path) %> - <%- else -%> - <%= link_to("Admin view", admin_preferences_path) %> - <%- end -%> - <%- end -%> - <%- 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> + <%= render :partial => 'shared/header' %> <div id="wrap"> <div id="content"> @@ -58,20 +24,10 @@ <%= content_tag :p, msg, :class => "flash #{key}" %> <% end %> <%= yield %> - <div id="footer"> - <p id="footer-nav"> - <a href="/">Home</a> | <a href="/messages">Messages</a> | <a href="/people">People</a> | <a href="/forums">Forum</a> - - </p> - <p>Powered by - <a href="http://insoshi.com/">Insoshi open-source social networking platform</a> - </p> - </div> </div> - <%- if development? -%> - <div><%= render :partial => 'shared/debug' %></div> - <%- end -%> + <%= render :partial => 'shared/footer' %> + <%= render :partial => 'shared/debug' if development? %> </div> - <%= global_prefs.analytics %> + <%= global_prefs.analytics %> </body> -</html> +</html> \ No newline at end of file app/views/layouts/application.html.erb @@ -17,5 +17,4 @@ <%- column_div :type => :secondary do -%> <%= render :partial => 'searches/box' %> - <%= render :partial => 'shared/minifeed' %> <%- end -%> \ No newline at end of file app/views/messages/index.html.erb @@ -29,5 +29,5 @@ <%- end -%> <%- column_div :type => :secondary do -%> - <%= render :partial => 'shared/minifeed' %> + <%= render :partial => 'searches/box' %> <%- end -%> app/views/messages/show.html.erb @@ -1,18 +1,13 @@ -<%- if logged_in? -%> - <%- unless @common_connections.empty? -%> +<%- if logged_in? && !@common_connections.empty? -%> <h2>Common Contacts</h2> - <ul class="grid contacts small"> - <%- @common_connections.each do |connection| -%> - <li class="vcard"> - <%= image_link(connection.contact, - :image_options => { :class => "photo fn" }, - :link_options => { :class => "url" }) %> - </li> + <ul class="grid contacts medium"> + <%- @some_common_connections.each do |connection| -%> + <%= render :partial => 'shared/contact_medium', :locals => {:contact => connection.contact} %> <%- end -%> - <li class="more"> - <%= link_to "See all »", - common_contacts_person_path(@person) %> - </li> + <%- if @common_connections.length > Person::MAX_DEFAULT_CONTACTS -%> + <li class="more"> + <%= link_to "See all »", common_contacts_person_path(@person) %> + </li> + <%- end -%> </ul> - <%- end -%> <%- end -%> \ No newline at end of file app/views/people/_common_contacts.html.erb @@ -4,4 +4,5 @@ </div> <p><%= person_link person, :class => "url fn" %></p> <%= display(truncate(person.description, 150), :class => "note") %> + <div class="clear"></div> </li> app/views/people/_person.html.erb @@ -1,10 +1,8 @@ <%- column_div :type => :primary do -%> - <h2>Edit profile</h2> + <h2>Edit Your Profile</h2> <div id="profile_edit"> - <h3>Personal details</h3> - <%= error_messages_for :person %> <% form_for @person do |f| %> @@ -15,33 +13,15 @@ </div> <div class="form_row"> - <label for="person_description">Description - </label> - - <%- unless @preview.nil? -%> - <%= display @preview %> - <%- end -%> - - <p><%= formatting_note %></p> - <%= f.text_area :description %> - </div> - - <div class="form_row"> <label for="person_email">Email</label> <%= f.text_field :email, :maxlength => Person::MAX_EMAIL %> </div> <%- if global_prefs.email_notifications? -%> - <br /> - <h3>Email notification preferences</h3> - <p> - You will receive email notifications - for each event type whose box is checked. - </p> - + <p>Receive email notifications for each activated event type.</p> <div class="form_row"> <p> @@ -67,6 +47,18 @@ </div> <%- end -%> + <h3>Public Description</h3> + <div class="form_row"> + <label for="person_description"> (<%= formatting_note %>) + </label> + + <%- unless @preview.nil? -%> + <%= display @preview %> + <%- end -%> + + <%= f.text_area :description %> + </div> + <br /> <div class="form_row"> @@ -78,7 +70,7 @@ <br /> - <h3>Photos</h3> + <h3 id="photos">Photos</h3> <% if @person.photos.empty? %> <%= image_tag @person.thumbnail %> @@ -113,38 +105,37 @@ <br /> <%= button_to "Add a photo", new_photo_path, :class => "button" %> </div> +<%- end -%> - <br /> - - <% form_for @person, :html => { :id => "change_password" } do |f| %> +<%- column_div :type => :secondary do -%> + <% form_for @person, :html => { :id => "change_password" } do |f| %> - <h3>Change Password</h3> + <h3>Change Your Password</h3> - <div class="form_row"> - <label for="password">Current Password</label> - <%= f.password_field :verify_password, - :maxlength => Person::MAX_PASSWORD %> - </div> + <div class="form_row"> + <label for="password">Current Password</label> + <%= f.password_field :verify_password, + :size => 34, + :maxlength => Person::MAX_PASSWORD %> + </div> - <div class="form_row"> - <label for="password">New Password</label> - <%= f.password_field :new_password, - :maxlength => Person::MAX_PASSWORD %> - </div> + <div class="form_row"> + <label for="password">New Password</label> + <%= f.password_field :new_password, + :size => 34, + :maxlength => Person::MAX_PASSWORD %> + </div> - <div class="form_row"> - <label for="password_confirmation">Confirm Password</label> - <%= f.password_field :password_confirmation, - :maxlength => Person::MAX_PASSWORD, - :value => "" %> - </div> - <div class="form_row"> - <%= submit_tag 'Change password', :class => "button" %> - </div> - <input type="hidden" name="type" value="password_edit" /> - <% end %> -<%- end -%> - -<%- column_div :type => :secondary do -%> - <%= render :partial => 'searches/box' %> + <div class="form_row"> + <label for="password_confirmation">Confirm Password</label> + <%= f.password_field :password_confirmation, + :size => 34, + :maxlength => Person::MAX_PASSWORD, + :value => "" %> + </div> + <div class="form_row"> + <%= submit_tag 'Change password', :class => "button" %> + </div> + <input type="hidden" name="type" value="password_edit" /> + <% end %> <%- end -%> \ No newline at end of file app/views/people/edit.html.erb @@ -1,6 +1,17 @@ -<%- column_div :type => :primary do -%> - <div class="profile vcard"> - <h2>Profile: <span class="fn n"><%= h @person.name %></span></h2> +<div id="tabCol"> + <ul>  + <li><a href="#tProfile"><span>Profile</span></a></li> + <li><a href="#tRecentActivity"><span>Recent Activity</span></a></li> + <li><a href="#tContacts"><span>Contacts</span></a></li> + <li><a href="#tWall"><span>Wall</span></a></li> + </ul> + <div id="tProfile" class="profile vcard"> + <h2> + Profile: <span class="fn n"><%= h @person.name %></span> + <%- if current_person?(@person) -%> + <div class="profileEditLink"><%= link_to "Edit", edit_person_path(@person) %></div> + <%- end -%> + </h2> <%- if admin? and not @person.active? -%> <p class="error">This person is not active</p> <%- end -%> @@ -11,11 +22,6 @@ <%= link_to "Click here to add a description", edit_person_path(@person) %> </div> - <%- else -%> - <div class="notice"> - You are viewing your own profile. - <%= link_to "Click here to edit it", edit_person_path(@person) %> - </div> <%- end -%> <%- end -%> <div class="toolbox"> @@ -33,17 +39,15 @@ <%- end -%> <%- if Connection.connected?(@person, current_person) -%> <li> - <%= h @person.name %> is one of your contacts - <br /> - (<%= link_to "end connection", - connection_path(Connection.conn(current_person, @person)), - :method => :delete, - :confirm => -"Are you sure you want to end connection with #{h @person.name}?" %>) - + <%= h @person.name %> is one of your contacts + <%= link_to image_tag("icons/close.gif", :class => 'actioner'), + connection_path(Connection.conn(current_person, @person)), + :method => :delete, + :confirm => "Are you sure you want to remove this connection?", + :title => "Are you sure you want to remove this connection?" %> </li> <%- end -%> - <li><%= email_link @person %></li> + <li><%= email_link(@person, :use_image => false) %></li> <%- end -%> <li><%= link_to "#{h @person.name}'s blog", blog_path(@person.blog) %></li> @@ -65,18 +69,30 @@ <%- end -%> </div> <%= display @person.description %> + <div class="clear"></div> </div> - <%= render :partial => 'recent_activity' %> - <%= render :partial => 'wall' %> -<%- end -%> + <div id="tRecentActivity"> + <%= render :partial => 'recent_activity' %> + </div> + <div id="tWall"> + <%= render :partial => 'wall' %> + </div> -<%- column_div :type => :secondary do -%> - <%= render :partial => 'shared/minifeed' %> - <%- if logged_in? -%> - <%= render :partial => 'shared/contacts_preview', - :locals => { :person => @person } %> - <%= render :partial => 'common_contacts' %> - <%- end -%> -<%- end -%> + <div id="tContacts"> + <div class="innerTabLeft"> + <h2>Contacts for <%= @person.name %></h2> + <div id="contacts_grid"> + <%= render :partial => 'shared/contacts_grid', + :locals => { :contacts => @contacts } %> + </div> + <%= render :partial => 'common_contacts' %> + </div> + <div class="innerTabRight"> + <%= render :partial => 'searches/box' %> + </div> + <div class="clear"> + </div> + </div> +</div> app/views/people/show.html.erb @@ -2,10 +2,12 @@ :id => "blogpost" } do |f| %> <div class="form_row"> - <%= f.text_field :title, :size => 30 %> + <%= f.label :title %> + <%= f.text_field :title, :size => 20 %> </div> <div class="form_row"> + <%= f.label :body, "Post" %> <%= f.text_area :body, :rows => 20 %> </div> app/views/posts/_blog_form.html.erb @@ -1,16 +1,12 @@ <li> - <div class="profile-image"> - <%= image_link comment.commenter, :image => :thumbnail %> - <%= image_tag "icons/comment.gif", :class => "icon", :alt => "Comment" %> - </div> <p class="meta"> + <%= image_tag "icons/comment.gif", :class => "icon", :alt => "Comment" %> <%= person_link comment.commenter %> posted a comment <%= time_ago_in_words(comment.created_at) %> ago: </p> <%= display comment.body %> <%- if current_person?(comment.commentable.blog.person) -%> <div> - <br /> <%= link_to "delete", blog_post_comment_path(@blog, @post, comment), :method => :delete %> </div> app/views/posts/_comment.html.erb @@ -1,20 +1,18 @@ <%# The activity shouldn't be nil, but we're wearing a belt and suspenders. %> <%- unless activity.item.nil? -%> <li> - <div class="profile-image"> - <%= image_link activity.person, :image => :thumbnail %> + <p class="activity_detail"> <%= feed_icon activity %> - </div> - <p> <%= feed_message activity %> - <%- if current_person?(activity.person) -%> - <%= link_to(image_tag("icons/close.gif"), - activity_path(activity), - :method => :delete, - :confirm => %(Are you sure you want to delete this activity from your profile?)) %> - <%- end -%> - </p> - <p class="meta published"> + <%- if current_person?(activity.person) -%> + <%= link_to(image_tag("icons/close.gif", :class => 'actioner'), + activity_path(activity), + :method => :delete, + :confirm => %(Are you sure you want to delete this activity from your profile?), + :title => "Are you sure you want to delete this activity?") %> + <%- end -%> + </p> + <p class="meta published clear"> <%= time_ago_in_words(activity.created_at).capitalize %> ago </p> app/views/shared/_activity.html.erb @@ -2,10 +2,7 @@ <h2>Contacts</h2> <ul class="grid contacts small"> <%- @some_contacts.each do |contact| -%> - <li class="vcard"> - <%= image_link(contact, :image_options => { :class => "photo fn" }, - :link_options => { :class => "url" }) %> - </li> + <%= render :partial => 'shared/contact', :locals => {:contact => contact} %> <%- end -%> <li class="more"> <%= link_to "All contacts »", person_connections_path(person) %> app/views/shared/_contacts_preview.html.erb @@ -1,3 +1,4 @@ +<div> <div id="debug"> <a href="#" onclick="Element.toggle('env_debug_info');return false"> env</a> | @@ -12,4 +13,5 @@ <legend>request</legend> <%= debug(request) %> </fieldset> - </div> \ No newline at end of file + </div> +</div> \ No newline at end of file app/views/shared/_debug.html.erb @@ -1,3 +1,4 @@ +<div class="minifeed"> <h2>Minifeed</h2> <ul class="list activity small"> <%- if logged_in? -%> @@ -7,4 +8,5 @@ <%= render :partial => 'shared/minifeed_item', :collection => Activity.global_feed %> <%- end -%> -</ul> \ No newline at end of file +</ul> +</div> \ No newline at end of file app/views/shared/_minifeed.html.erb @@ -1,4 +1,8 @@ ActionController::Routing::Routes.draw do |map| + map.resources :categories + + map.resources :links + map.resources :preferences map.resources :searches map.resources :activities config/routes.rb @@ -1,2 +1,41 @@ // Place your application-specific JavaScript functions and classes here // This file is automatically included by javascript_include_tag :defaults + +$(document).ready(function() { + // sets up the Profile page tabs + $("#tabCol > ul").tabs(); + + // sets up the hover image for activity feed items + $(".imgHoverMarker").tooltip({ + showURL: false, + bodyHandler: function() { + var i = $(this).children()[0] + var imgsrc = $(i).attr('src'); + return $('<img src="'+imgsrc+'" />'); + } + }); + + // + $('#tContacts div.pagination a').livequery('click', function() { + $('#contacts_grid').load(this.href); + return false; + }); + + // Setup Rails so ajax requests trigger the wants.js block in respond_to + // http://ozmm.org/posts/$_and_respond_to.html + $.ajaxSetup({ + 'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript")} + }); +}); + +/*document.observe("dom:loaded", function() { + var container = $(document.body) + + container.observe('click', function(e) { + var el = e.element() + if (el.match('.pagination a')) { + new Ajax.Request(el.href, { method: 'get' }) + e.stop() + } + }) +})*/ \ No newline at end of file public/javascripts/application.js @@ -6,8 +6,8 @@ body { #header-wrap { /* background: #069; */ background: #069 url('/images/header_background.png'); - float: left; - width: 100%; + /* width: 764px;*/ + margin: 0px auto; } #header, #wrap, #footer { margin: 0 auto; @@ -108,9 +108,7 @@ p.welcome { .list li { border-bottom: 1px solid #eee; background: none; - clear: both; display: inline; - float: left; list-style: none; margin: 0 0 12px 6px; padding: 0 0 6px 0; @@ -124,7 +122,7 @@ p.welcome { .list.full .profile-image { float: left; width: 72px; - overflow: hidden; + /* overflow: hidden; this hides the activity icon when no member thumbnail */ position: relative; width: 102px; } @@ -137,7 +135,7 @@ p.welcome { } .list p { margin-bottom: 0; - margin-left: 102px; +/* margin-left: 102px;*/ } .list .forum p { margin-bottom: 1em; @@ -246,7 +244,7 @@ p.welcome { padding: 0; } form#blogpost #post_title, form#blogpost #post_body { - width: 312px; + width: 212px; /* width reduced by Bill L */ } @@ -321,3 +319,101 @@ form, div, h2, ul, li {zoom: 1;} margin: 0 105px; width: 324px; } + +/* Bill's additions */ +h2 { + padding-left: 0px; +} +.profile { + position: relative; +} +#tabCol h2 { + border-bottom: none; + margin-top: 0px; + margin-bottom: 20px; +} +.profileEditLink { + display: inline; + background: #e5e5e5; + border: 1px solid #cccccc; + padding: 3px; + width: 30px; + margin-left: 25px; + margin-bottom: 5px; +} +.profileEditLink a { + font-size: 80%; +} +.minifeed, #change_password { + margin-top: 20px; + padding: 5px; +} +.minifeed h2 { + margin-top: 0px; + border-bottom: none; +} +#profile_edit h3, #change_password h3 { + color: #006699; +} +#profile_edit form, form#blogpost { + border-bottom: none; + margin-bottom: auto; +} +#change_password { +} +#change_password h3 { + margin-top: 6px; +} +#tabCol { + margin-top: 5px; + width: 100%; +} +ul.ui-tabs-nav li { + background: none; + padding-left: 0px; +} +.ui-tabs-panel { + min-height: 400px; +} +.innerTabRight { + float: left; + width: 35%; + margin-left: 20px; +} +.innerTabLeft { + float: left; + width: 60%; + padding-right: 10px; +} +.innerTabLeft h2 { + margin-bottom: 0px; +} +.comments li div {border-bottom: 1px solid #ccc;} +.imgHoverMarker {display: inline;} +.imgHoverMarker img {display: none;} +ul.activity {margin-bottom: 0px;} +ul.activity li p.activity_detail {font-size: 126%;} +img.actioner {vertical-align: text-bottom;} +.contacts.grid li.vcard { + margin-right: 10px; + line-height: 2em; +} +.prefItem { + clear: both; + padding-bottom: 30px; +} +.prefLabel { + float: left; + font-weight: bold; + width: 200px; +} +.prefValue { + float: left; + margin-left: 10px; + width: 300px; +} +.prefAbout { + margin-top: 5px; + border: 1px solid #ccc; + padding: 5px; +} \ No newline at end of file public/stylesheets/skin.css @@ -193,11 +193,11 @@ a.show-follow:visited { padding: 0; } .pagination { - border-bottom: 1px solid #eee; + /*border-bottom: 1px solid #eee;*/ font-size: 12px; padding-bottom: 12px; - text-align: center; - margin-bottom: 12px; + /* text-align: center; + too much whitespace margin-bottom: 12px; */ } @@ -288,7 +288,8 @@ form a.add-recipient { /* Styles for when the site is (nearly) blank, as for new users. */ h3.blankslate { - text-align: center; +/* Align with title instead - Bill L +text-align: center; */ } @@ -316,4 +317,8 @@ strong { font-weight: bold; } .loud { color: #000; } .highlight { background:#ff0; } .added { background:#060; color: #fff; } -.removed { background:#900; color: #fff; } \ No newline at end of file +.removed { background:#900; color: #fff; } + +/* Bill's additions */ +.clear {clear: both;} +.disabled {color: #c0c0c0;} /* greyed out to emphasize unavailability */ \ No newline at end of file public/stylesheets/typography.css 0b6a9c0728693d0a265147d543ff69d4fb0c9e36 William Lazar williamlazar@Miami-Steve.local http://github.com/insoshi/insoshi/commit/ebda9a1f406de604ded08f25aeb6736d4442be24 ebda9a1f406de604ded08f25aeb6736d4442be24

2008-06-03T16:55:25-07:00

2008-06-03T16:34:05-07:00

First big check-in, with jRails, jQuery, tabbed profile, etc. 27ca8b21ca36679d0bc748c66a3d5b3bf1cdb8cc William Lazar williamlazar@Miami-Steve.local