app/models/tell_friend.rb app/views/layouts/_social_media.html.erb app/views/pages/_tell_friend_form.html.haml app/views/pages/_tell_friend_preview.html.haml app/views/projects/upcoming.atom.builder app/views/user_mailer/tell_friend.erb db/migrate/20080826081134_add_requirements_to_project.rb db/migrate/20080826114524_add_user_fields.rb doc/Gallery.rtfd/1__#$!@%!#__Pasted Graphic.pict doc/Gallery.rtfd/Pasted Graphic 1.pict doc/Gallery.rtfd/Pasted Graphic 10.pict doc/Gallery.rtfd/Pasted Graphic 11.pict doc/Gallery.rtfd/Pasted Graphic 12.pict doc/Gallery.rtfd/Pasted Graphic 13.pict doc/Gallery.rtfd/Pasted Graphic 14.pict doc/Gallery.rtfd/Pasted Graphic 15.pict doc/Gallery.rtfd/Pasted Graphic 16.pict doc/Gallery.rtfd/Pasted Graphic 17.pict doc/Gallery.rtfd/Pasted Graphic 18.pict doc/Gallery.rtfd/Pasted Graphic 19.pict doc/Gallery.rtfd/Pasted Graphic 2.pict doc/Gallery.rtfd/Pasted Graphic 3.pict doc/Gallery.rtfd/Pasted Graphic 4.pict doc/Gallery.rtfd/Pasted Graphic 5.pict doc/Gallery.rtfd/Pasted Graphic 6.pict doc/Gallery.rtfd/Pasted Graphic 7.pict doc/Gallery.rtfd/Pasted Graphic 8.pict doc/Gallery.rtfd/Pasted Graphic 9.pict doc/Gallery.rtfd/Pasted Graphic.pict doc/Gallery.rtfd/TXT.rtf doc/Slogan.psd doc/logo.psd doc/search_box.psd doc/top.psd public/images/right_tab_bg.gif public/images/right_tab_bg.png public/images/slogan.png public/images/tab-blank-bg.png public/images/template/search_box_bg.png public/stylesheets/sass/v2/components/about.sass script/merge_assets @@ -27,4 +27,8 @@ class ApplicationController < ActionController::Base return false end end + + def helpers + self.class.helpers + end end app/controllers/application.rb @@ -1,6 +1,20 @@ class PagesController < ApplicationController def about + if request.post? + @tell_friend = TellFriend.new(params[:tell_friend]) + @tell_friend.valid? + if button_pressed?(:send) + if @tell_friend.send_msg(current_or_anon_user) + flash[:success] = "Sent Message. Thanks for helping to promote #{AppConfig.site_name}!" + redirect_to about_url + end + elsif button_pressed?(:preview) + @preview = true + end + else + @tell_friend = TellFriend.new(:from => current_or_anon_user.email) + end end def blog @@ -11,4 +25,9 @@ class PagesController < ApplicationController redirect_to root_url end end + + protected + def button_pressed?(id) + !params[id].blank? + end end app/controllers/pages_controller.rb @@ -1,32 +1,39 @@ class ProjectsController < ApplicationController def index - @projects = find_projects + build_gallery(gallery_projects) @upcoming = Project.upcoming - @my_projects = current_or_anon_user.projects - - @latest_activities = Activity.latest - - @top_downloaded = Project.top_downloaded - @top_bookmarked = Project.top_bookmarked - - if AppConfig.enable_throttler and throttled? - @tags = [] - else - @tags = Project.tag_counts(:conditions => Project.in_gallery_conditions, :order => "name") - end - - if params[:ajax] - render :partial => "projects/parts/grid", :locals => {:projects => @projects}, :layout => false - else - render + respond_to do |format| + format.html do + if params[:ajax] + render :partial => "projects/parts/grid", :locals => {:projects => @projects}, :layout => false + else + render + end + end + format.atom + end + end + + def upcoming + build_gallery(upcoming_projects) + respond_to do |format| + format.html do + @grid_title = "Upcoming Projects" + @grid_rss = formatted_upcoming_projects_url(:atom) + + @hide_upcoming = true + if params[:ajax] + render :partial => "projects/parts/grid", :locals => {:projects => @projects}, :layout => false + else + render :action => "index" + end + end + format.atom end - - session[:page] = params[:page] end def feed @projects = Project.latest - respond_to do |format| format.atom do render :action => "index.atom.builder" @@ -226,6 +233,26 @@ class ProjectsController < ApplicationController end protected + def build_gallery(projects) + @projects = projects + @my_projects = current_or_anon_user.projects + + @latest_activities = Activity.latest + + @top_downloaded = Project.top_downloaded + @top_bookmarked = Project.top_bookmarked + + if throttled? + @tags = [] + else + @tags = Project.tag_counts(:conditions => Project.in_gallery_conditions, :order => "name") + end + + if params[:q].blank? and params[:tag].blank? + session[:page] = params[:page] + end + end + # retrieves the current project from params[:id] def get_project @current_project ||= Project.find(params[:id]) @@ -237,7 +264,7 @@ class ProjectsController < ApplicationController end # find the projects to display based on the querystring - def find_projects + def gallery_projects # try to find an associated tag @tag = get_tag @search_term = params[:q].strip unless params[:q].blank? @@ -249,7 +276,11 @@ class ProjectsController < ApplicationController else @projects = Project.paginate(:conditions => Project.in_gallery_conditions, :order => "promoted_at DESC", :page => params[:page], :per_page => AppConfig.projects_per_page) end + end + # list the upcoming projects + def upcoming_projects + @projects = Project.paginate(:conditions => Project.upcoming_conditions, :order => "updated_at DESC", :page => params[:page], :per_page => AppConfig.projects_per_page) end # verify that the current user owns a project app/controllers/projects_controller.rb @@ -35,13 +35,20 @@ class UsersController < ApplicationController def show @user = find_user - @bookmarked_projects = @user.projects + @bookmarked_projects = @user.projects.paginate(:page => params[:page], :per_page => AppConfig.bookmarks_per_page) @submitted_projects = @user.submitted @activities = @user.activities.all(:limit => 101, :order => "created_at DESC") @rated_projects = @user.rated_projects respond_to do |format| - format.html + format.html do + @grid_title = helpers.pluralize(@user.projects.count, "Bookmarked Project") + if params[:ajax] + render :partial => "projects/parts/grid", :locals => {:projects => @bookmarked_projects}, :layout => false + else + render + end + end format.js do render :partial => "users/parts/about_user", :locals => {:user => @user}, :layout => false end @@ -154,7 +161,7 @@ class UsersController < ApplicationController def forgot_password if request.post? User.forgot_password(params[:email]) - flash[:notice] = "An email has been sent to you that will allow you to reset your password. If you have any problems email us at opensourcerails@gmail.com" + flash[:notice] = "An email has been sent to you that will allow you to reset your password. If you have any problems email us at #{AppConfig.admin_email_address}" end redirect_to new_session_url end @@ -165,7 +172,7 @@ class UsersController < ApplicationController # find user from auth code @user = User.find_by_forgot_password_hash(params[:auth]) unless @user - flash[:error] = "Reset Password URL was invalid. It may have expired. Please email us at opensourcerails@gmail.com if you are still unable to log in." + flash[:error] = "Reset Password URL was invalid. It may have expired. Please email us at #{AppConfig.admin_email_address} if you are still unable to log in." redirect_to new_session_url return end @@ -189,7 +196,12 @@ class UsersController < ApplicationController protected def find_user - @user = User.find(params[:id]) + if(params[:id].to_s.include? "anon_") + user_id = params[:id].gsub("anon_","").to_i + @user = User.find_by_id(user_id) + else + @user = User.find_by_login(params[:id]) + end end # verify that the current user can edit this profile app/controllers/users_controller.rb @@ -114,7 +114,7 @@ module ApplicationHelper def paging(page_data, style = :sabros) return unless page_data.class == WillPaginate::Collection - will_paginate(page_data, :class => "pagination #{style}", :inner_window => 3) + will_paginate(page_data, :class => "pagination #{style}", :outer_window => 1, :inner_window => 1) end def error_messages_for(name, options = {}) @@ -132,12 +132,36 @@ module ApplicationHelper def name_display(user) if current_or_anon_user == user return "Your" - elsif user + elsif !user.name.blank? return "#{user.name}'s" + elsif !user.login.blank? + return "#{user.login}'s" + else + return "User's" end end def paging?(list) list.is_a? WillPaginate::Collection end + + def hide_login_panel? + @hide_login_panel + end + + def hide_login_panel + @hide_login_panel = true + end + + def projects_rss + AppConfig.rss_url || formatted_projects_url(:atom) + end + + def upcoming_rss + AppConfig.upcoming_rss_url || formatted_upcoming_projects_url(:atom) + end + + def activity_rss + AppConfig.upcoming_activity_url || formatted_activity_projects_url(:atom) + end end app/helpers/application_helper.rb @@ -1,5 +1,13 @@ module ProjectsHelper + def gallery_url + if session[:page].blank? + root_url + else + root_url :page => session[:page] + end + end + def activity_display(activity, options = {}) partial "activities/activity", options.merge(:activity => activity) end @@ -121,6 +129,19 @@ module ProjectsHelper end end + # Display an approve button for a project (if permissions allow) + def delete_button(project) + if admin? + haml_tag :div, :class => "actions text-center" do + puts br + puts link_to("Delete Project", + project_url(@project), + :method => :delete, + :confirm => "This delete this project and all related information. There is no UNDO. Continue?") + end + end + end + def deploy_now(project) content_tag(:div, :class => "deploy-now") do app/helpers/projects_helper.rb @@ -33,7 +33,7 @@ module TabsHelper # Give the tab a name and unique id def tab(name, tab_id , options={}, &block) # append an element to our nav_html - @__tabs_navhtml << content_tag(:li, link_to(name, "##{tab_id}", :title => name)) + @__tabs_navhtml << content_tag(:li, link_to(name, "##{tab_id}", :title => name), :class => options[:tab_class]) # build our tab haml_tag :div, options.merge(:id => tab_id) do @@ -41,4 +41,9 @@ module TabsHelper puts content_tag(:div, "", :style => "clear: both") end end + + def blank_tab + @__tabs_navhtml << content_tag(:li, "&nbsp;", :class => "blank") + return "" + end end \ No newline at end of file app/helpers/tabs_helper.rb @@ -5,6 +5,9 @@ class Comment < ActiveRecord::Base validates_presence_of :author_name, :author_email validates_as_email_address :author_email, :allow_blank => true + + belongs_to :user, :class_name => "User", :foreign_key => "owner_id" + def self.initialize_from_user(user) comment = Comment.new if user.is_a? User app/models/comment.rb @@ -12,10 +12,11 @@ class Project < ActiveRecord::Base has_many :instructions, :order => "updated_at DESC", :dependent => :delete_all has_many :bookmarks, :dependent => :destroy + has_many :activities, :order => "updated_at DESC", :dependent => :delete_all validates_uniqueness_of :title, :on => :create, :message => "must be unique" - attr_accessible :title, :description, :author_name, :author_contact, + attr_accessible :title, :description, :author_name, :author_contact, :requirements, :homepage_url, :source_url, :license, :short_description, :tag_list # checkbox used to auto assign author from current_user @@ -102,6 +103,10 @@ class Project < ActiveRecord::Base find(:all, :conditions => {:in_gallery => false, :is_submitted => true}, :limit => limit, :order => "last_changed DESC") end + def self.gallery(limit = 25) + find(:all, :conditions => {:in_gallery => true, :is_submitted => true}, :limit => limit, :order => "last_changed DESC") + end + # Search projects with a given search string def self.search(search_term, options = {}) @@ -134,6 +139,11 @@ class Project < ActiveRecord::Base {:in_gallery => true, :is_submitted => true} end + # I'll convert this to named_scope when Rails 2.1 comes out + def self.upcoming_conditions + {:in_gallery => false, :is_submitted => true} + end + # Top Downloaded def self.top_downloaded(limit = 5) find(:all, :limit => limit, :conditions => {:is_submitted => true}, :order => "downloads DESC") app/models/project.rb @@ -18,7 +18,7 @@ class User < ActiveRecord::Base has_many :rated, :class_name => "ProjectRating", :foreign_key => "rater_id" def rated_projects project_list = [] - rated.all(:include => [:project]).each do |r| + rated.all(:order => "created_at DESC", :include => [:project]).each do |r| p = r.project p.user_rating = r project_list << p @@ -51,7 +51,7 @@ class User < ActiveRecord::Base # prevents a user from submitting a crafted form that bypasses activation # anything else you want your user to change should be added here. - attr_accessible :login, :email, :password, :password_confirmation, :signup + attr_accessible :login, :email, :password, :password_confirmation, :signup, :homepage, :name, :about acts_as_state_machine :initial => :anonymous state :anonymous @@ -122,6 +122,14 @@ class User < ActiveRecord::Base UserMailer.deliver_send_password_reset(self) end + def login + if self[:login].blank? + "anon_#{self.id}" + else + self[:login] + end + end + # finds an email and initiate the forgot password flow def self.forgot_password(email) @@ -181,6 +189,10 @@ class User < ActiveRecord::Base return "Anonymous" end + def to_param + return self.login + end + def update_from_comment(comment) unless self.signed_up? self.name = comment.author_name if self.name.blank? app/models/user.rb @@ -1,6 +1,6 @@ class UserMailer < ActionMailer::Base def signup_notification(user) - setup_email(user) + setup_email(user.email) subject "#{AppConfig.site_name} - Please activate your new account" body :user => user, @@ -8,23 +8,32 @@ class UserMailer < ActionMailer::Base end def activation_success(user) - setup_email(user) + setup_email(user.email) subject "#{AppConfig.site_name} - Your account has been activated!" body :user => user, :url => "#{AppConfig.site_url}" end def send_password_reset(user) - setup_email(user) + setup_email(user.email) subject "#{AppConfig.site_name} Password Recovery" body :user => user end + def tell_friend(user, friend) + setup_email(friend.to) + reply_to friend.from + + subject AppConfig.tellafriend_subject + body :tell_friend => friend, :current_user => user + + end + protected - def setup_email(user) - recipients "#{user.email}" - from "Admin" + def setup_email(to) + recipients "#{to}" + from "#{AppConfig.admin_email_name} <#{AppConfig.admin_email_address}>" sent_on Time.now end end app/models/user_mailer.rb @@ -1,5 +1,5 @@ - if local_assigns[:activity] - %span.activity{:class => activity.target_type.downcase} + %span.activity{:class => activity.target_type.to_s.downcase} = activity.user_name = activity.action_name @@ -8,7 +8,8 @@ = activity.endconnector - if activity.project_id - = activity.endconnector+link_to(activity.project_name.to_s+".", project_url(:id => activity.project_id)) + = activity.endconnector + = link_to("#{activity.project_name}.", project_url(:id => activity.project_id)) - else == #{activity.endconnector}. app/views/activities/_activity.html.haml @@ -4,5 +4,5 @@ %p You haven't bookmarked any applications. - else -# list my projects - = partial "projects/parts/list", :projects => @my_projects + = partial "projects/parts/list", :projects => @my_projects, :action => local_assigns[:action] \ No newline at end of file app/views/bookmarks/_bookmark_list.html.haml @@ -16,7 +16,10 @@ %p.comment-meta %span.comment-num = link_to "##{index+1}", project_comment_url(comment.project, comment) - %strong= comment.author_name + - if comment.user and comment.user.active? + %strong= link_to comment.author_name, comment.user + - else + %strong= comment.author_name %span.comment-time{:title => comment.created_at.to_s(:comment)} == posted #{time_ago_in_words(comment.created_at)} ago. app/views/comments/_comments.html.haml @@ -28,7 +28,8 @@ = f.text_field :author_email, :label => "Email (not displayed)" %li= f.text_area :body, :label => "Comment" - %li= f.text_field :antispam, :label => AppConfig.spam_question, :separator => "" + - if comment.new_record? + %li= f.text_field :antispam, :label => AppConfig.spam_question, :separator => "" %li.app_form_sub - if is_edit? .right app/views/comments/_form.html.haml @@ -4,7 +4,8 @@ = f.text_field :title, :label => "Link Name" = f.text_field :url, :label => "Link URL" = f.text_area :description, :label => "Notes, demo logins, etc.. (optional)", :separator => "" - = f.text_field :antispam, :label => AppConfig.spam_question, :separator => "" + - if hosted_instance.new_record? + = f.text_field :antispam, :label => AppConfig.spam_question, :separator => "" .actions - if hosted_instance.new_record? app/views/hosted_instances/_form.html.haml @@ -1,13 +1,11 @@ - force_show = false unless local_assigns[:force_show] #about_us{hide_unless(current_or_anon_user.show_welcome! || force_show)} - right_box "about" do - %h3.about About Open Source Rails + %h3.about== About #{AppConfig.site_name} %p - Open Source Rails is a community site dedicated to tracking the best open source Ruby on Rails applications. + = AppConfig.site_description - unless force_show = link_to "Read More...", about_url, :class => "readmore" | - = link_to "Close", "#", :class => "hide-click", :rel => ".right-box-top.about" - - \ No newline at end of file + = link_to "Hide About", "#", :class => "hide-click", :rel => ".right-box-top.about" \ No newline at end of file app/views/layouts/_about_us.html.haml @@ -2,29 +2,26 @@ .links %strong LINKS: = link_to "Gallery", root_url - - if logged_in? - | - = link_to "Profile", user_url(current_user) + | + = link_to "Profile", user_url(current_or_anon_user) | = link_to "About", about_url | = link_to "Blog", blog_url + - if AppConfig.feedback_link + | + = link_to "Feedback", AppConfig.feedback_link - unless logged_in? | = link_to "Login", new_session_url | = link_to "Sign Up", new_user_url - .about .credits - &copy; Open Source Rails - | - Developed by - = link_to "RailsJedi", "http://www.railsjedi.com" - .credits - Logo by - = link_to("VivaLogo", "http://www.vivalogo.com")+"," - Source Code - = link_to "Available", "http://www.github.com/jcnetdev/opensourcerails" + == &copy; #{AppConfig.site_name} + + .about + = partial("layouts/social_media") if AppConfig.show_social_media - = clear \ No newline at end of file + = clear + app/views/layouts/_footer.html.haml @@ -1,18 +1,21 @@ #header - = partial "sessions/login_panel" %h1 %a.replace#logo{:href => root_url, :name => "logo", :title => AppConfig.site_name} %span &nbsp; = AppConfig.site_name + .address + = link_to image_tag("slogan.png"), AppConfig.site_url + #menu %ul - if active_tab.is_a? String %li= menu_item(active_tab, url_for, true) - %li= menu_item("Gallery", root_url, active_tab == :gallery) + %li= menu_item("Gallery", gallery_url, active_tab == :gallery) %li= menu_item("About", about_url, active_tab == :about) %li= menu_item("Blog", blog_url, active_tab == :blog) - if logged_in? %li= link_to menu_tag("Log Out"), session_url, :method => :delete, :confirm => "Are you sure you want to log out?" = clear + = partial "sessions/login_panel" app/views/layouts/_header.html.haml @@ -8,9 +8,10 @@ = stylesheets = javascripts - = yield :head - - = auto_discovery_link_tag(:atom, AppConfig.rss_url || formatted_projects_url(:atom), :title => "Latest Projects") + = auto_discovery_link_tag(:atom, projects_rss, :title => "Latest Apps") + = auto_discovery_link_tag(:atom, upcoming_rss, :title => "Upcoming Apps") + - if AppConfig.blog_rss + = auto_discovery_link_tag(:atom, AppConfig.blog_rss, :title => "Latest Blog Posts") %body .body-main app/views/layouts/application.html.haml @@ -1,28 +1,49 @@ - active_tab :about -#body +#body.about #body_left #left_pad - .details.main - %h2.right== Latest #{AppConfig.version} - %h2.left About OpenSourceRails.com - = clear - .entry{:style => "font-size: 20px;color:#666"} - %p Open Source Rails is dedicated to keeping track of the latest and greatest Ruby on Rails open source applications. - %p - If you are the author of one of the projects listed on the site and want admin access over your project, - register a user and then email us - = mail_to "opensourcerails@gmail.com", "here", :encode => "javascript" - and we'll grant you project ownership access. - %p - Feature request and bug can be - sent - = mail_to "opensourcerails@gmail.com", "here.", :encode => "javascript" + - if @preview + = partial "pages/tell_friend_preview" + - else + .details.main + %h2.right== Latest #{AppConfig.version} + %h2.left== About #{AppConfig.site_name} + = clear + .entry{:style => "color:#666"} + %p + = br + Open Source Rails features an easy to browse gallery of the best open source / freely available rails projects. + + %p + Each project features screenshots plus community driven comments, ratings, and bookmarking. + + %p + If you have a Rails project that you're considering to release to the community, please let us know + and we'll help you get featured, and hopefully build up a community to help build and extend your project. + + %p{:style => "margin-bottom: 0"} + Keep up to date with OpenSourceRails.com: + + %ul{:style => "margin-bottom: 20px"} + %li= link_to "Featured Projects RSS Feed", projects_rss + %li= link_to "Upcoming Projects RSS Feed", upcoming_rss + - if AppConfig.blog_rss + %li= link_to "Latest Blog RSS Feed", AppConfig.blog_rss + + %p + Got a feature idea? Find a bug? + = mail_to AppConfig.admin_email_address, "Email", :encode => "javascript" + us. #body_right = partial "layouts/about_us", :force_show => true #about_tabs - - tabs do + - tabs(:class => "size-3") do + - tab "Promote", "spread_tab" do + %p{:style => "margin-top: 0px;margin-bottom: 10px"} Let a friend know about Open Source Rails! + = partial "pages/tell_friend_form" + - tab "Credits", "credits_tab" do %p{:style => "margin-bottom: 0px"} Open Source Rails uses the following freely available design components. %ul @@ -33,10 +54,6 @@ Crystal Icons by = link_to "Everaldo", "http://www.everaldo.com/crystal/" %li - Initial Theme Template - = br+"by" - = link_to "Shabu Anower", "http://www.osdesigner.net/about/" - %li Javascript Lightbox Effect = br+"by" = link_to "Nick Stakenburg", "http://www.nickstakenburg.com" app/views/pages/about.html.haml @@ -1,7 +1,7 @@ - if local_assigns[:project] - div_for(project, :class => cycle("start-row", "")) do %h2= link_to h(project.title), project_url(project), :rel => "bookmark", :title => h(project.short_description) - %p= project.short_description + %p.tagline= project.short_description -# show default screenshot .screen= link_to image_tag(project.screenshot_url), project_url(project) app/views/projects/_project.html.haml @@ -1,5 +1,5 @@ atom_feed do |feed| - feed.title "Open Source Rails" + feed.title AppConfig.site_name feed.updated((@projects.first.promoted_at)) unless @projects.empty? app/views/projects/index.atom.builder @@ -7,17 +7,16 @@ = partial "projects/parts/grid", :projects => @projects #body_right - = partial "layouts/searchbox" + = partial "layouts/about_us" #submit_app = link_to_image "template/submit_app.gif", "#", | :label => "Submit a New Application", | :class => "submit toggle", :rel => "#new_project_tab_form" | = render :partial => "projects/parts/mini_form" + = partial "layouts/searchbox" - = partial "layouts/about_us" = partial "projects/parts/tabs" - = clear app/views/projects/index.html.haml @@ -16,6 +16,7 @@ %p - unless project.license.blank? + = br %strong License: =h project.license app/views/projects/parts/_about_project.html.haml @@ -1,8 +1,11 @@ #project_grid - if local_assigns[:projects] - - unless local_assigns[:grid_title].blank? - %h3= local_assigns[:grid_title] + - if !@grid_title.blank? + %h3 + - if @grid_rss + .rss= link_to image_tag("rss-reflection-sm.png", :size => "20x20"), @grid_rss + = @grid_title - else = search_or_tag_title app/views/projects/parts/_grid.html.haml @@ -19,4 +19,7 @@ = time_ago_in_words(project.last_changed) ago. - = clear \ No newline at end of file + = clear + - if local_assigns[:action] + %li.action + = link_to action.first, action.last \ No newline at end of file app/views/projects/parts/_list.html.haml @@ -1,14 +1,23 @@ -- if @upcoming and @my_projects - - tabs(:class => "size-2") do +- tabs(:class => "size-2") do + - if @hide_upcoming + - tab "Gallery", "gallery_apps", :class => "scroll-250" do + - if Project.gallery.size > 0 + = partial "projects/parts/list", :projects => Project.gallery, :action => ["View All Gallery Projects", projects_url] + - else + %p No gallery applications. Submit one now! + + - else - tab "Upcoming", "upcoming_apps", :class => "scroll-250" do - - if @upcoming.size > 0 - = partial "projects/parts/list", :projects => @upcoming + - if Project.upcoming.size > 0 + = partial "projects/parts/list", :projects => Project.upcoming, :action => ["View All Upcoming Projects", upcoming_projects_url] - else %p No upcoming applications. Submit one now! + - if @my_projects - tab "Bookmarked", "projects_add", :class => "scroll-250" do - #my_bookmarks= partial "bookmarks/bookmark_list", :projects => @my_projects - + #my_bookmarks= partial "bookmarks/bookmark_list", :projects => @my_projects, :action => ["View All Bookmarks", user_url(current_or_anon_user)] + - else + - blank_tab - if @latest_activities and @tags and @top_downloaded - tabs(:class => "size-3") do app/views/projects/parts/_tabs.html.haml @@ -21,7 +21,7 @@ #body_right #go_back - = link_to_image "back-arrow-sm.png", projects_url(:page => session[:page]), :label => "Back to Gallery..." + = link_to_image "back-arrow-sm.png", gallery_url, :label => "Back to Gallery..." #project_info - right_box do = partial "projects/parts/about_project", :project => @project @@ -32,5 +32,6 @@ - if @project.is_submitted? = partial "projects/tabs/project_activity", :activities => @latest_activities = approve_button(@project) + = delete_button(@project) = clear \ No newline at end of file app/views/projects/show.html.haml @@ -1,9 +1,11 @@ -.login +- unless @hide_login_panel - if logged_in? - Logged in as: - %strong= link_to current_user.login, user_url(current_user) + .login.current + Logged in as: + %strong= link_to current_user.login, user_url(current_user) - else - .links - = link_to "Login", new_session_url - | - = link_to "Sign Up", new_user_url + .login + .links + = link_to "Login", new_session_url + | + = link_to "Sign Up", new_user_url app/views/sessions/_login_panel.html.haml @@ -3,6 +3,8 @@ - @login ||= Login.new +- hide_login_panel + #body #body_left #left_pad app/views/sessions/new.html.haml @@ -1,6 +1,8 @@ - title "Sign Up" - active_tab "Sign Up" +- hide_login_panel + #body #body_left #left_pad app/views/users/new.html.haml @@ -12,8 +12,29 @@ #body_right - if current_or_anon_user == @user + - if @user.active? + - right_box do + = partial "users/parts/about_user", :user => @user + - else + - right_box do + = br + %h2= link_to "Make an Account!", new_user_url + - else - right_box do - = partial "users/parts/about_user", :user => @user + %h3== #{name_display(@user)} Profile + .display + %p + %strong Name: + =h default(@user.name, "[Not Entered]") + - unless @user.homepage.blank? + = br + %strong Homepage: + = link_to h(@user.homepage), h(@user.homepage) + + - unless @user.profile.blank? + = br + %strong About: + =h(@user.profile) - right_box do %h3== #{name_display(@user)} Activities (#{@activities.size}) app/views/users/show.html.haml @@ -2,16 +2,18 @@ - build_form_for [@project, version], :html => {:multipart => true} do |f| - .attach-download - - f.file_field :download, :label => "Upload Tarball", :size => "25" do - .text-right= link_to "Set Download Link", "#", :class => "set-link" - .attach-link{hidden} + .attach-link - f.text_field :link, :label => "Download Link" do .text-right= link_to "Upload Version", "#", :class => "set-upload" + + .attach-download{hidden} + - f.file_field :download, :label => "Upload Tarball", :size => "25" do + .text-right= link_to "Set Download Link", "#", :class => "set-link" = f.text_field :title, :label => "Version Name" = f.text_area :notes, :label => "Update Notes (optional)" - = f.text_field :antispam, :label => AppConfig.spam_question, :separator => "" + - if version.new_record? + = f.text_field :antispam, :label => AppConfig.spam_question, :separator => "" .actions - if version.new_record? app/views/versions/_form.html.haml @@ -1,20 +1,32 @@ # Set Site Details site_name: "Open Source Rails" site_url: "http://www.opensourcerails.com" +blog_url: "http://blog.opensourcerails.com" +admin_email_name: "OpenSourceRails" +admin_email_address: "opensourcerails@gmail.com" version: "v1.0" + +# Options +show_social_media: true require_email_activation: true enable_throttler: false +show_morph: true -blog_url: http://blog.opensourcerails.com - -file_storage: s3 +# About Page +site_description: "Open Source Rails is a community site dedicated to tracking the best open source Ruby on Rails applications." # SEO Stuff default_meta_keywords: "open source ruby on rails" default_meta_description: "Open Source Rails is a community site dedicated to tracking the best open source Ruby on Rails applications." +# Tell a Friend +tellafriend_subject: "Check out OpenSourceRails.com" +tellafriend_body_intro: "OpenSourceRails.com is features the latest and greatest open source Ruby on Rails projects. Check it out: http://www.opensourcerails.com" +tellafriend_body_message: "It features an easy to use browse gallery with screenshots plus community driven comments, ratings, and bookmarking." + # Paging Sizes projects_per_page: 6 +bookmarks_per_page: 8 # Set Avatar Sizes screenshot_sizes: @@ -24,9 +36,9 @@ screenshot_sizes: # Set default avatar screenshot_default: "/images/default_screenshots/:style.png" +# Retarded Spam Question spam_question: What is 3 plus 2? spam_answer: - "5" - "five" -show_morph: false \ No newline at end of file config/app_config.yml @@ -9,6 +9,12 @@ set :scm, "git" set :checkout, "export" set :deploy_via, :remote_cache +# set the list of config files to symlink on deployment +set :config_files, %w[database.yml app_config.yml environments/production.yml] + +# set the list of folders to symlink on deployment +set :upload_folders, %w[screenshots downloads] + set :base_path, "/var/www" set :deploy_to, "/var/www/production/#{application}" set :apache_site_folder, "/etc/apache2/sites-enabled" @@ -83,6 +89,7 @@ after "deploy:setup", "init:set_permissions" after "deploy:setup", "init:database_yml" after "deploy:setup", "init:create_database" after "deploy:setup", "init:create_vhost" +after "deploy:setup", "init:create_app_config" after "deploy:setup", "init:enable_site" namespace :init do @@ -140,34 +147,59 @@ production: end + desc "create app config" + task :create_app_config do + app_config_yml = File.open(File.join(File.dirname(__FILE__), "app_config.yml"), "r").read + put app_config_yml, "#{shared_path}/config/app_config.yml" + + run "mkdir -p #{shared_path}/config/environments/" + + production_yml = File.open(File.join(File.dirname(__FILE__), "environments", "production.yml"), "r").read + put production_yml, "#{shared_path}/config/environments/production.yml" + end + end after "deploy:update_code", "localize:install_gems" after "deploy:update_code", "localize:copy_shared_configurations" -after "deploy:update_code", "localize:upload_folders" +after "deploy:update_code", "localize:link_upload_folders" +after "deploy:update_code", "localize:merge_assets" namespace :localize do desc "copy shared configurations to current" task :copy_shared_configurations, :roles => [:app] do - %w[database.yml].each do |f| - run "ln -nsf #{shared_path}/config/#{f} #{release_path}/config/#{f}" + if defined? :config_files + config_files.each do |f| + run "ln -nsf #{shared_path}/config/#{f} #{release_path}/config/#{f}" + end end end desc "installs / upgrades gem dependencies " task :install_gems, :roles => [:app] do - sudo "date" # fuck you capistrano + sudo "date" run "cd #{release_path} && sudo rake RAILS_ENV=production gems:install" end - task :upload_folders, :roles => [:app] do - # create symlink for screenshots - run "mkdir -p #{deploy_to}/shared/screenshots" - run "ln -s #{deploy_to}/shared/screenshots #{release_path}/public/screenshots" - - # create symlink for downloads - run "mkdir -p #{deploy_to}/shared/downloads" - run "ln -s #{deploy_to}/shared/downloads #{release_path}/public/downloads" + desc "linking upload folders" + task :link_upload_folders, :roles => [:app] do + if defined? :upload_folders + upload_folders.each do |f| + run "mkdir -p #{shared_path}/uploads/#{f}" + run "ln -nsf #{shared_path}/uploads/#{f} #{release_path}/public/#{f}" + end + end + end + + desc "merge asset files" + task :merge_assets, :roles => [:app] do + sudo "date" + run "cd #{release_path} && sudo script/merge_assets" + end + + task :merge_current_assets, :roles => [:app] do + sudo "date" + run "cd #{current_path} && sudo script/merge_assets" end end config/deploy.rb @@ -10,6 +10,10 @@ ActionController::Routing::Routes.draw do |map| :details => :get, :rate => :post, :download => :get + }, + :collection => { + :upcoming => :get, + :activity => :get } do |project| project.resources :comments config/routes.rb @@ -9,24 +9,24 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20080728120230) do +ActiveRecord::Schema.define(:version => 20080826114524) do create_table "activities", :force => true do |t| - t.datetime "created_at" - t.datetime "updated_at" - t.integer "project_id", :limit => 11 - t.integer "target_id", :limit => 11 + t.string "user_name" + t.integer "user_id", :limit => 11 t.string "action_name" - t.string "target_name" t.string "midsentence" - t.string "project_name" - t.string "endconnector" - t.string "source_action" + t.string "target_name" + t.integer "target_id", :limit => 11 t.string "target_type" - t.integer "user_id", :limit => 11 - t.string "source_model" - t.string "user_name" + t.string "endconnector" + t.string "project_name" + t.integer "project_id", :limit => 11 t.datetime "happened_at" + t.string "source_model" + t.string "source_action" + t.datetime "created_at" + t.datetime "updated_at" end create_table "bookmarks", :force => true do |t| @@ -74,9 +74,9 @@ ActiveRecord::Schema.define(:version => 20080728120230) do t.string "license" t.datetime "created_at" t.datetime "updated_at" - t.string "thumb_url", :default => "/images/default_screenshots/thumb.png" - t.string "preview_url", :default => "/images/default_screenshots/medium.png" - t.string "screenshot_url", :default => "/images/default_screenshots/original.png" + t.string "thumb_url", :default => "/images/default_thumb.png" + t.string "preview_url", :default => "/images/default_preview.png" + t.string "screenshot_url", :default => "/images/default_screenshot.png" t.string "download_url" t.boolean "in_gallery", :default => false t.boolean "is_submitted", :default => false @@ -85,7 +85,7 @@ ActiveRecord::Schema.define(:version => 20080728120230) do t.integer "author_id", :limit => 11 t.string "short_description" t.integer "rating_count", :limit => 11 - t.integer "rating_total", :limit => 10 + t.integer "rating_total", :limit => 10, :precision => 10, :scale => 0 t.decimal "rating_avg", :precision => 10, :scale => 2 t.text "cached_tag_list" t.integer "downloads", :limit => 11, :default => 0 @@ -96,30 +96,35 @@ ActiveRecord::Schema.define(:version => 20080728120230) do t.integer "screenshots_count", :limit => 11, :default => 0 t.integer "instructions_count", :limit => 11, :default => 0 t.datetime "last_changed" + t.string "requirements" end create_table "ratings", :force => true do |t| t.integer "rater_id", :limit => 11 t.integer "rated_id", :limit => 11 t.string "rated_type" - t.integer "rating", :limit => 10 + t.integer "rating", :limit => 10, :precision => 10, :scale => 0 t.datetime "created_at" end add_index "ratings", ["rater_id"], :name => "index_ratings_on_rater_id" add_index "ratings", ["rated_type", "rated_id"], :name => "index_ratings_on_rated_type_and_rated_id" + create_table "schema_info", :id => false, :force => true do |t| + t.integer "version", :limit => 11 + end + create_table "screenshots", :force => true do |t| t.integer "project_id", :limit => 11 - t.integer "owner_id", :limit => 11 - t.string "screenshot_file_name" - t.string "screenshot_content_type" - t.integer "screenshot_file_size", :limit => 11 - t.string "filename" t.string "content_type" + t.string "filename" t.integer "size", :limit => 11 t.datetime "created_at" t.datetime "updated_at" + t.integer "owner_id", :limit => 11 + t.string "screenshot_content_type" + t.string "screenshot_file_name" + t.integer "screenshot_file_size", :limit => 11 end create_table "taggings", :force => true do |t| @@ -152,15 +157,17 @@ ActiveRecord::Schema.define(:version => 20080728120230) do t.boolean "admin", :default => false t.string "ip_address" t.string "name" - t.string "homepage" t.text "profile" t.boolean "signed_up", :default => false t.text "bookmark_blob" t.boolean "show_alert", :default => false t.boolean "show_welcome", :default => true t.boolean "spammer", :default => false - t.string "forgot_password_hash" t.datetime "forgot_password_expire" + t.string "forgot_password_hash" + t.string "homepage" + t.integer "tell_friend_count", :limit => 11, :default => 0 + t.datetime "tell_friend_last_sent" end add_index "users", ["ip_address"], :name => "index_users_on_ip_address" @@ -169,18 +176,18 @@ ActiveRecord::Schema.define(:version => 20080728120230) do create_table "versions", :force => true do |t| t.integer "project_id", :limit => 11 t.integer "uploader_id", :limit => 11 - t.string "title" t.text "notes" - t.string "link" - t.string "download_file_name" - t.string "download_content_type" - t.integer "download_file_size", :limit => 11 - t.string "filename" t.string "content_type" + t.string "filename" t.integer "size", :limit => 11 t.datetime "created_at" t.datetime "updated_at" + t.string "title" t.integer "owner_id", :limit => 11 + t.string "download_content_type" + t.string "download_file_name" + t.integer "download_file_size", :limit => 11 + t.string "link" end end db/schema.rb public/images/right-box/bg.png public/images/right-box/end_bg.png public/images/right-box/top.png public/images/right-box/top_about.png public/images/right-box/top_add.png public/images/tab-bottom.png public/images/tab-half-highlighted.png public/images/tab-half.png public/images/tab-third-highlighted.png public/images/tab-third.png @@ -5,7 +5,7 @@ $j(document).ready(function() { shortcut.add("ESC",function() { $j(".container.debug").toggleClass("showgrid"); $j(".debug-info.container").toggle(); - }, {disable_in_input: true}); + }); }); \ No newline at end of file public/javascripts/common/shortcuts.js @@ -1,5 +1,6 @@ $j(document).ready(function() { if($j("#project_grid").notOnPage()){return;} + if($j("#disable_ajax_paging").onPage()){return;} // hook up ajax paging $j("#project_grid .pagination a").livequery('click', function() { public/javascripts/components/project_grid.js @@ -2,8 +2,8 @@ // Returns whether or not a result set has results in it jQuery.fn.onPage = function() { return this.size() > 0; -} +}; jQuery.fn.notOnPage = function() { return !this.onPage(); -} +}; public/javascripts/jquery.ext/jquery.onPage.js @@ -1,7 +1,7 @@ // App item #app_item width: 538px - border: 1px solid #E9E9E9 + border: 1px solid #b3c4ed padding: 1px #app_item_top public/stylesheets/sass/v2/components/app_item.sass @@ -49,6 +49,8 @@ padding-left: 20px padding-bottom: 10px + min-height: 500px + h2 color: #474848 .image-loading @@ -60,6 +62,11 @@ vertical-align: middle margin: 0 + + a + font-weight: bold + text-decoration: underline + h2.form color: #0066cb margin-bottom: 10px public/stylesheets/sass/v2/components/details.sass @@ -20,7 +20,7 @@ margin-left: 10px padding-top: 3px color: #fff - p + p.tagline margin: 0 padding: 3px text-align: center @@ -28,6 +28,7 @@ overflow: hidden background: #f6f6f6 color: #595959 + text-transform: lowercase .screen padding: 3px 0 public/stylesheets/sass/v2/components/project.sass @@ -9,6 +9,11 @@ padding-top: 2px font-size: .7em color: #00AEEF + .rss + float: right + a + padding: 0 + margin: 0 .grid-paging position: relative public/stylesheets/sass/v2/components/project_grid.sass @@ -14,7 +14,7 @@ padding-bottom: 10px label font-size: 12px - color: #919191 + color: #555 display: block padding-bottom: 0px li.app_form_left @@ -34,7 +34,7 @@ color: #666 font-size: 12px font-family: Verdana, Arial, Helvetica, sans-serif - border: 1px solid #d9d9d9 + border: 1px solid #aaa padding: 6px 8px 6px 8px @@ -45,7 +45,7 @@ color: #666 font-size: 12px font-family: Verdana, Arial, Helvetica, sans-serif - border: 1px solid #d9d9d9 + border: 1px solid #aaa padding: 6px 8px 6px 8px public/stylesheets/sass/v2/forms/app_form.sass @@ -6,7 +6,7 @@ a padding: 4px 8px 4px 8px background: #fff - border: 1px solid #e5e5e5 + border: 1px solid #aaa color: #838383 font-size: 10px margin: 0 5px 0 0 @@ -28,6 +28,6 @@ span padding: 4px 8px 4px 8px - border: 1px solid #e5e5e5 + border: 1px solid #aaa font-size: 10px margin: 0 5px 0 0 \ No newline at end of file public/stylesheets/sass/v2/paging.sass @@ -28,4 +28,13 @@ ul.project-list li.first padding-top: 0px background: none !important - \ No newline at end of file + + li.action + padding-top: 10px !important + text-align: center + text-decoration: underline + a + color: #313062 !important + font-size: 12px !important + text-transform: uppercase + \ No newline at end of file public/stylesheets/sass/v2/panels/project-list.sass @@ -22,18 +22,35 @@ a color: #00aeef + .credits + padding-top: 5px + color: #aaa + font-size: 12px + .about float: right - padding-right: 24px - padding-top: 10px + padding-right: 17px + padding-top: 17px text-align: right + + iframe + margin-right: -19px + .copyrights a font-weight: bold color: #00aeef font-size: .6em - .credits - a - color: #00aeef - + + .empty-message + display: none + + .delicious-blogbadge-line .url-link + padding-right: 0px + + .delicious-blogbadge-line .top-tags-container + display: none + + .delicious-blogbadge-line .save-to-link + background-color: #fff public/stylesheets/sass/v2/parts/footer.sass @@ -3,8 +3,11 @@ width: : 100% height: 105px position: relative + overflow: hidden h1 - float: left + position: absolute + left: 0 + top: 0 #logo width: 235px @@ -24,11 +27,20 @@ height: 100% cursor: pointer - .login + .address position: absolute - right: -5px + right: 0px + text-align: right + top: 23px + + .login.current + padding-right: 10px + + .login + padding-top: 79px + padding-right: 8px text-align: right - top: 10px + float: right font-size: 1.2em a color: #eee public/stylesheets/sass/v2/parts/header.sass @@ -74,7 +74,8 @@ body #search_box width: 303px height: 34px - background: url(/images/template/search_box_bg.gif) no-repeat + margin-bottom: 10px + background: url(/images/template/search_box_bg.png) no-repeat fieldset padding-left: 8px @@ -88,7 +89,7 @@ body width: 262px float: left position: relative - top: 6px + top: 5px margin-right: 5px .search_input.hint color: #666 !important @@ -104,7 +105,7 @@ body position: relative overflow: hidden display: block - margin: 8px 0 7px 0 + margin: 0px 0 8px 0 span background: url(/images/template/submit_app.gif) no-repeat position: absolute public/stylesheets/sass/v2/styles.sass @@ -2,7 +2,7 @@ padding: 0 width: 303px margin-bottom: 10px - background: url(/images/template/right_tab_bg.gif) repeat-y + background: url(/images/right_tab_bg.png) repeat-y .ui-tabs-hide display: none @@ -96,6 +96,14 @@ a:focus, a:active outline: none + li.ui-tabs-selected.last + background-position: right + + li.blank + background: + image: url(/images/tab-blank-bg.png) !important + repeat: repeat-x !important + // tab navigation overrides .tabs.size-2 ul.ui-tabs-nav public/stylesheets/sass/v2/tabs.sass @@ -1,5 +1,29 @@ -.pagination { margin: 0 0 20px 0; padding: 10px 0 0 0; color: #838383; } -.pagination a { padding: 4px 8px 4px 8px; background: #fff; border: 1px solid #e5e5e5; color: #838383; font-size: 10px; margin: 0 5px 0 0; } -.pagination a:hover { padding: 4px 8px 4px 8px; border: 1px solid #0066cb; color: #0066cb; text-decoration: none; font-size: 10px; margin: 0 5px 0 0; } -.pagination .current { padding: 4px 8px 4px 8px; border: 1px solid #0066cb; color: #0066cb; font-size: 10px; margin: 0 5px 0 0; } -.pagination span { padding: 4px 8px 4px 8px; border: 1px solid #e5e5e5; font-size: 10px; margin: 0 5px 0 0; } +.pagination { + margin: 0 0 20px 0; + padding: 10px 0 0 0; + color: #838383; } +.pagination a { + padding: 4px 8px 4px 8px; + background: #fff; + border: 1px solid #aaa; + color: #838383; + font-size: 10px; + margin: 0 5px 0 0; } +.pagination a:hover { + padding: 4px 8px 4px 8px; + border: 1px solid #0066cb; + color: #0066cb; + text-decoration: none; + font-size: 10px; + margin: 0 5px 0 0; } +.pagination .current { + padding: 4px 8px 4px 8px; + border: 1px solid #0066cb; + color: #0066cb; + font-size: 10px; + margin: 0 5px 0 0; } +.pagination span { + padding: 4px 8px 4px 8px; + border: 1px solid #aaa; + font-size: 10px; + margin: 0 5px 0 0; } public/stylesheets/v2/paging.css @@ -1,41 +1,114 @@ -ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, body, html, p, blockquote, fieldset, input { margin: 0; padding: 0; } - -ul { list-style: none; } - -h1, h2, h3, h4, h5, h6 { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; } - -a { color: #626262; text-decoration: none; } - -a:hover { text-decoration: underline; } - -a img, fieldset { border: 0; } - -.clear { clear: both; } - -.replace { position: relative; margin: 0; padding: 0; overflow: hidden; } - -.replace span { display: block; position: absolute; top: 0; left: 0; z-index: 1; } - -body { margin: 0; padding: 0; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; background-color: #131313; color: #626262; } - -.body-main { background: #ffffff url(/images/template/bg.png) repeat-x; min-height: 500px; } - -.body-bottom { background: url(/images/body-bottom-bg.png) repeat-x; padding-top: 51px; } - -.page-content { width: 900px; margin: 0 auto; } - -#body #body_left { width: 584px; float: left; } -#body #body_left #left_pad { width: 541px; margin-left: 21px; padding-top: 17px; } -#body #body_left.swap { float: right; } -#body #body_right { width: 316px; padding-top: 17px; float: right; } - -#search_box { width: 303px; height: 34px; background: url(/images/template/search_box_bg.gif) no-repeat; } -#search_box fieldset { padding-left: 8px; padding-top: 5px; } -#search_box .search_input { font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; border: 0; background: none; width: 262px; float: left; position: relative; top: 6px; margin-right: 5px; } -#search_box .search_input.hint { color: #666 !important; } -#search_box .search_sub { float: left; margin-top: 3px; } - -#submit_app { width: 303px; height: 54px; font-size: 0.2em; position: relative; overflow: hidden; display: block; margin: 8px 0 7px 0; } -#submit_app span { background: url(/images/template/submit_app.gif) no-repeat; position: absolute; width: 100%; height: 100%; cursor: pointer; } - -#go_back { width: 303px; margin: 0px 0px 10px 0px; vertical-align: middle; font-size: 1.5em; } +ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, body, html, p, blockquote, fieldset, input { + margin: 0; + padding: 0; } + +ul { + list-style: none; } + +h1, h2, h3, h4, h5, h6 { + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; } + +a { + color: #626262; + text-decoration: none; } + +a:hover { + text-decoration: underline; } + +a img, fieldset { + border: 0; } + +.clear { + clear: both; } + +.replace { + position: relative; + margin: 0; + padding: 0; + overflow: hidden; } + +.replace span { + display: block; + position: absolute; + top: 0; + left: 0; + z-index: 1; } + +body { + margin: 0; + padding: 0; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + background-color: #131313; + color: #626262; } + +.body-main { + background: #ffffff url(/images/template/bg.png) repeat-x; + min-height: 500px; } + +.body-bottom { + background: url(/images/body-bottom-bg.png) repeat-x; + padding-top: 51px; } + +.page-content { + width: 900px; + margin: 0 auto; } + +#body #body_left { + width: 584px; + float: left; } +#body #body_left #left_pad { + width: 541px; + margin-left: 21px; + padding-top: 17px; } +#body #body_left.swap { + float: right; } +#body #body_right { + width: 316px; + padding-top: 17px; + float: right; } + +#search_box { + width: 303px; + height: 34px; + margin-bottom: 10px; + background: url(/images/template/search_box_bg.png) no-repeat; } +#search_box fieldset { + padding-left: 8px; + padding-top: 5px; } +#search_box .search_input { + font-size: 11px; + font-family: Verdana, Arial, Helvetica, sans-serif; + border: 0; + background: none; + width: 262px; + float: left; + position: relative; + top: 5px; + margin-right: 5px; } +#search_box .search_input.hint { + color: #666 !important; } +#search_box .search_sub { + float: left; + margin-top: 3px; } + +#submit_app { + width: 303px; + height: 54px; + font-size: 0.2em; + position: relative; + overflow: hidden; + display: block; + margin: 0px 0 8px 0; } +#submit_app span { + background: url(/images/template/submit_app.gif) no-repeat; + position: absolute; + width: 100%; + height: 100%; + cursor: pointer; } + +#go_back { + width: 303px; + margin: 0px 0px 10px 0px; + vertical-align: middle; + font-size: 1.5em; } public/stylesheets/v2/styles.css @@ -8,8 +8,8 @@ module ExceptionNotifiable ActionController::UnknownAction, ActionController::RoutingError, ActionController::MethodNotAllowed, - WillPaginate::InvalidPage - ] + defined?(WillPaginate) ? WillPaginate::InvalidPage : nil + ].compact def self.included(base) base.extend ClassMethods vendor/plugins/exception_notification/lib/exception_notifiable.rb app/controllers/comps_controller.rb app/views/comps/detail.html.erb app/views/comps/form.html.erb app/views/comps/index.html.haml app/views/comps/list.html.erb script/merge_javascript_css test/functional/blog_controller_test.rb test/functional/pages_controller_test.rb vendor/plugins/use_db 014376228643a97f830eda2b47a2f40288f91795 Jacques Crocker jcnetdev@gmail.com http://github.com/jcnetdev/opensourcerails/commit/1c619ea838a194341fba78aa2593c8c431b4994e 1c619ea838a194341fba78aa2593c8c431b4994e 2008-08-30T07:34:31-07:00 2008-08-30T07:34:31-07:00 Localizing site for different technologies. Updating design elements 6ae66c8d116ac9b8125c4379e79cd076e66c99f2 Jacques Crocker jcnetdev@gmail.com