@@ -35,16 +35,15 @@ class AccountController < ApplicationController def authenticate - # reset the agent session in case there are any content partners logged in to avoid any funny things + # reset the session in case there are any content partners logged in to avoid any funny things session[:agent_id] = nil user_params=params[:user] - remember_me=EOLConvert.to_boolean(params[:remember_me]) - + if using_open_id? - open_id_authentication(params[:openid_url],remember_me) + open_id_authentication(params[:openid_url]) else - password_authentication(user_params[:username],user_params[:password],remember_me) + password_authentication(user_params[:username],user_params[:password]) end end @@ -105,7 +104,7 @@ class AccountController < ApplicationController def logout params[:return_to] = nil unless params[:return_to] =~ /\A[%2F\/]/ # Whitelisting redirection to our own site, relative paths. - cookies.delete :user_auth_token + reset_session store_location(params[:return_to]) flash[:notice] = "You have been logged out."[:you_have_been_logged_out] @@ -227,17 +226,17 @@ class AccountController < ApplicationController end protected - def password_authentication(username, password, remember_me) + def password_authentication(username, password) user = User.authenticate(username,password) if user[0] - successful_login(user[1],remember_me) + successful_login(user[1]) else failed_login(user[1]) end end - def open_id_authentication(identity_url,remember_me) - open_id_return_to = "#{realm}/account/authenticate?remember_me=#{remember_me}" + def open_id_authentication(identity_url) + open_id_return_to = "#{realm}/account/authenticate" authenticate_with_open_id(identity_url, :return_to => open_id_return_to, :optional => [ :fullname, :nickname, :email ]) do |result, identity_url, registration| @@ -256,25 +255,17 @@ class AccountController < ApplicationController user.save! new_username = "openid_user_#{user.id.to_s}" user.update_attributes(:username=>new_username,:given_name=>registration['nickname'] || new_username) - new_openid_user=true end - successful_login(user, remember_me, new_openid_user) + successful_login(user, new_openid_user) else failed_login result.message end end end - def successful_login(user, remember_me, new_openid_user = false) + def successful_login(user, new_openid_user = false) set_current_user(user) - notice_message="Logged in successfully."[:logged_in] - if remember_me && !user.is_admin? - user.remember_me - cookies[:user_auth_token] = { :value => user.remember_token , :expires => user.remember_token_expires_at } - elsif remember_me && user.is_admin? - notice_message+=" NOTE: for security reasons, administrators cannot use the remember me feature."[:admin_remind_me_message] - end - flash[:notice] = notice_message + flash[:notice] = "Logged in successfully"[:logged_in] # could catch the fact that they are a new openid user here and redirect somewhere else if you wanted if user.is_admin? && ( session[:return_to].nil? || session[:return_to].empty?) # if we're an admin we STILL would love a return, thank you very much! redirect_to :controller => 'admin', :action => 'index', :protocol => "http://" app/controllers/account_controller.rb @@ -3,10 +3,16 @@ class AdminController < ApplicationController layout 'main' before_filter :check_authentication + before_filter :set_no_cache + access_control :DEFAULT => 'administrator' def index end - + + def set_no_cache + @no_cache=true + end + end app/controllers/admin_controller.rb @@ -31,11 +31,10 @@ class ApplicationController < ActionController::Base prepend_before_filter :set_session before_filter :clear_any_logged_in_session unless $ALLOW_USER_LOGINS - before_filter :set_user_settings helper :all - helper_method :logged_in?, :current_url, :current_user, :return_to_url, :current_agent, :agent_logged_in?, :allow_page_to_be_cached? + helper_method :logged_in?, :current_user, :return_to_url, :current_agent, :agent_logged_in?, :allow_page_to_be_cached? around_filter :set_current_language def view_helper_methods @@ -90,42 +89,37 @@ class ApplicationController < ActionController::Base session[:return_to] || root_url end - # Set the page expertise and vetted defaults, get from querystring, update the session with this value if found - def set_user_settings - expertise = params[:expertise] if ['novice','middle','expert'].include?(params[:expertise]) - alter_current_user do |user| - user.expertise=expertise unless expertise.nil? - end - vetted = params[:vetted] - alter_current_user do |user| - user.vetted=EOLConvert.to_boolean(vetted) unless vetted.blank? - end + def valid_return_to_url + return_to_url != nil && return_to_url != login_url && return_to_url != register_url && return_to_url != logout_url && !url_for(:controller=>'content_partner',:action=>'login',:only_path=>true).include?(return_to_url) end + def referred_url request.referer end - def current_url(remove_querystring=true) - if remove_querystring - current_url=URI.parse(request.url).path - else - request.url - end - end - # Redirect to the URL stored by the most recent store_location call or to the passed default. def redirect_back_or_default(default=root_url) - # be sure we aren't returning the login, register or logout page - if return_to_url != nil && return_to_url != login_url && return_to_url != register_url && return_to_url != logout_url && !url_for(:controller=>'content_partner',:action=>'login',:only_path=>true).include?(return_to_url) - redirect_to(CGI.unescape(return_to_url),:protocol => "http://") + if valid_return_to_url + redirect_to(CGI.unescape(return_to_url), :protocol => "http://") else - redirect_to(default,:protocol => "http://") + redirect_to(default, :protocol => "http://") end store_location(nil) return false - + end + + # send user to the SSL version of the page (used in the account controller, can be used elsewhere) + def redirect_to_ssl + url_to_return = params[:return_to] ? CGI.unescape(params[:return_to]).strip : nil + unless request.ssl? || local_request? + if url_to_return && url_to_return[0...1] == '/' #return to local url + redirect_to :protocol => "https://", :return_to => url_to_return + else + redirect_to :protocol => "https://" + end + end end def collected_errors(model_object) @@ -282,17 +276,6 @@ class ApplicationController < ActionController::Base !((request.remote_ip =~ /127.0.0.1/).nil? && (request.remote_ip =~ /128.128./).nil? && (request.remote_ip =~ /10.19./).nil?) end - # send user to the SSL version of the page (used in the account controller, can be used elsewhere) - def redirect_to_ssl - params[:return_to] = nil unless params[:return_to] =~ /\A[%2F\/]/ # Whitelisting redirection to our own site, relative paths. - - if params[:return_to] - redirect_to :protocol => "https://", :return_to => params[:return_to] unless (request.ssl? or local_request?) - else - redirect_to :protocol => "https://" unless (request.ssl? or local_request?) - end - end - # send user back to the non-SSL version of the page def redirect_back_to_http @@ -317,10 +300,7 @@ class ApplicationController < ActionController::Base return temporary_logged_in_user ? temporary_logged_in_user : set_temporary_logged_in_user(cached_user) else - session[:user] ||= create_new_user # if there wasn't one - session[:user] = create_new_user unless session[:user].respond_to?(:stale?) - session[:user] = create_new_user if session[:user].stale? - return session[:user] + session[:user] ||= create_new_user end end @@ -356,22 +336,7 @@ class ApplicationController < ActionController::Base # check to see if we have a logged in user def logged_in? - return(logged_in_from_session? || logged_in_from_cookie?) - end - - def logged_in_from_session? - not session[:user_id].nil? - end - - def logged_in_from_cookie? - user = cookies[:user_auth_token] && User.find_by_remember_token(cookies[:user_auth_token]) - if user && user.remember_token? - cookies[:user_auth_token] = { :value => user.remember_token, :expires => user.remember_token_expires_at } - set_logged_in_user(user) - return true - else - return false - end + return(not session[:user_id].nil?) end def check_authentication @@ -394,7 +359,7 @@ class ApplicationController < ActionController::Base alias is_curator is_curator? def permission_denied - flash[:warning] = "You are not authorized to perform this action."[] + flash[:notice] = "You don't have privileges to access this action" return redirect_to(root_url) end @@ -420,7 +385,7 @@ class ApplicationController < ActionController::Base # A user is not authorized for the particular controller based on the rights for the roles they are in def access_denied - flash.now[:warning]="You are not authorized to perform this action."[] + flash.now[:warning]='You are not authorized to perform this action.' request.env["HTTP_REFERER"] ? (redirect_to :back) : (redirect_to root_url) end @@ -505,8 +470,7 @@ private # NOTE: if you want to change a user's settings, you need to use alter_current_user def set_logged_in_user(user) set_temporary_logged_in_user(user) - #TODO: Remove old session flushing code - session[:user] = nil # This was the "new user", before we updated the code -- this is here to ensure we flush all old sessions and can probably safely be removed now. + session[:user] = nil # This was the "new user", before. session[:user_id] = user.id set_unlogged_in_user(nil) Rails.cache.delete("users/#{session[:user_id]}") @@ -527,17 +491,14 @@ private %w{novice middle expert}.each do |expertise| %w{true false}.each do |vetted| %w{text flash}.each do |default_taxonomic_browser| - [nil.to_s, Hierarchy.browsable_by_label.map {|h| h.id.to_s }].flatten.each do |default_hierarchy_id| - %w{true false}.each do |can_curate| - part_name = 'page_' + taxon_concept_id.to_s + - '_' + language.iso_639_1 + - '_' + expertise + - '_' + vetted + - '_' + default_taxonomic_browser + - '_' + default_hierarchy_id + - '_' + can_curate - expire_fragment(:controller => '/taxa', :part => part_name) - end + %w{true false}.each do |can_curate| + part_name = 'page_' + taxon_concept_id.to_s + + '_' + language.iso_639_1 + + '_' + expertise + + '_' + vetted + + '_' + default_taxonomic_browser + + '_' + can_curate + expire_fragment(:controller => '/taxa', :part => part_name) end end end @@ -557,11 +518,6 @@ private else expire_fragment(:controller => '/content', :part => "#{page}_#{language.iso_639_1}") end - if page.class == ContentPage && page.page_url == 'home' - Hierarchy.all.each do |h| - expire_fragment(:controller => '/content', :part=>"home_#{language.iso_639_1}_#{h.id.to_s}") # this is because the home page fragment is dependent on the user's selected hierarchy entry ID, unlike the other content pages - end - end end end end app/controllers/application.rb @@ -14,11 +14,11 @@ class ContentController < ApplicationController @home_page=true - unless @cached_fragment = read_fragment(:controller=>'content',:part=>'home_' + current_user.content_page_cache_str) + unless @cached_fragment = read_fragment(:controller=>'content',:part=>'home_' + current_user.language_abbr) @content=ContentPage.get_by_page_name_and_language_abbr('Home',current_user.language_abbr) raise "static page content not found" if @content.nil? @explore_taxa = RandomHierarchyImage.random_set(6, @session_hierarchy) - @featured_taxa = TaxonConcept.exemplars # comment this out to make featured taxa go away on home page! + @featured_taxa = TaxonConcept.exemplars # get top news items less then a predetermined number of weeks old @news_items = NewsItem.find_all_by_active(true,:limit=>$NEWS_ITEMS_HOMEPAGE_MAX_DISPLAY,:order=>'display_date desc',:conditions=>'display_date >= "' + $NEWS_ITEMS_TIMEOUT_HOMEPAGE_WEEKS.weeks.ago.to_s(:db) + '"') end app/controllers/content_controller.rb @@ -2,6 +2,7 @@ class TaxaController < ApplicationController layout 'main' prepend_before_filter :redirect_back_to_http if $USE_SSL_FOR_LOGIN # if we happen to be on an SSL page, go back to http + before_filter :set_user_settings, :only=>[:show,:search,:settings] before_filter :set_session_hierarchy_variable, :only => [:show, :classification_attribution] if $SHOW_SURVEYS @@ -353,12 +354,26 @@ class TaxaController < ApplicationController ############################################### private + # reset the content level if it is in the querystring NOTE the expertise level is set by pre filter # TODO: Get rid of the content level, it is depracated and no longer needed # set_user_settings() def update_user_content_level current_user.content_level = params[:content_level] if ['1','2','3','4'].include?(params[:content_level]) end + # Set the page expertise and vetted defaults, get from querystring, update the session with this value if found + def set_user_settings + expertise = params[:expertise] if ['novice','middle','expert'].include?(params[:expertise]) + alter_current_user do |user| + user.expertise=expertise unless expertise.nil? + end + + vetted = params[:vetted] + alter_current_user do |user| + user.vetted=EOLConvert.to_boolean(vetted) unless vetted.blank? + end + end + def get_new_text_tocitem_id(category_id) if category_id && TocItem.find(category_id).allow_user_text? category_id @@ -452,7 +467,7 @@ private def taxa_page_html_fragment_name current_user = @taxon_concept.current_user - return "page_#{params[:id]}_#{current_user.taxa_page_cache_str}_#{@taxon_concept.show_curator_controls?}" + 'page_' + params[:id].to_s + '_' + current_user.language_abbr + '_' + current_user.expertise.to_s + '_' + current_user.vetted.to_s + '_' + current_user.default_taxonomic_browser.to_s + '_' + @taxon_concept.show_curator_controls?.to_s end helper_method(:taxa_page_html_fragment_name) app/controllers/taxa_controller.rb @@ -718,18 +718,19 @@ class DataObject < SpeciesSchemaModel def self.cached_images_for_taxon(taxon, options = {}) options[:user] = User.create_new if options[:user].nil? add_cp = join_agents = join_hierarchy = '' - + if options[:from].nil? options[:from] ||= 'top_images' else nested = true end - + if !options[:filter_by_hierarchy].nil? && !options[:hierarchy].nil? join_hierarchy = "JOIN hierarchy_entries he_filter ON (ti.hierarchy_entry_id=he_filter.id AND he_filter.hierarchy_id=#{options[:hierarchy].id})" options[:from] = 'top_species_images' if options[:from].nil? end - + + # Unpublished images require a few extra bits to the query: if nested and not options[:agent].nil? add_cp = ', ar.agent_id agent_id' app/models/data_object.rb @@ -326,28 +326,23 @@ class Search data_objects = [] end results = [] - taxon_concept_ids = [] + taxon_concept_ids = [] user = options[:user_id] ? User.find(options[:user_id]) : nil vetted_only = user && user.vetted - data_objects.each do |data_object| if !vetted_only || data_object.vetted_id == Vetted.trusted.id data_object.taxon_concepts.each do |taxon_concept| unless taxon_concept_ids.include?(taxon_concept.id) - taxon_concept_ids << taxon_concept.id + taxon_concept_ids << taxon_concept.id results << [taxon_concept, data_object] if (!vetted_only || taxon_concept.vetted_id == Vetted.trusted.id) && taxon_concept.published == 1 && taxon_concept.supercedure_id == 0 end end end end - - # sorting by scientific_name without <i> - results_sort = results.sort_by {|a| a[0].scientific_name.gsub(/<\/?[^>]*>/, "")} - # that commented out, because not allows more than 10 tags to show up - # results = page_range(results) + results = page_range(results) @maximum = results.length - @search_results = {:common => [], :scientific => [], :errors => [], :tags => results_sort} + @search_results = {:common => [], :scientific => [], :errors => [], :tags => results} end def text_search(current_user, current_agent) app/models/search.rb @@ -30,16 +30,13 @@ class TaxonConcept < SpeciesSchemaModel has_one :taxon_concept_content - #searchable :auto_index => false, :auto_remove => false do - #end - attr_accessor :includes_unvetted # true or false indicating if this taxon concept has any unvetted/unknown data objects attr_reader :has_media, :length_of_images def show_curator_controls?(user = nil) return @show_curator_controls if !@show_curator_controls.nil? - user = @current_user if user.nil? # This needs to check the actual instance variable, please keep it here. + user = @current_user if user.nil? if user.nil? raise "a user must be specified" end @@ -168,18 +165,16 @@ class TaxonConcept < SpeciesSchemaModel def table_of_contents(options = {}) if @table_of_contents.nil? tb = TocBuilder.new - @table_of_contents = tb.toc_for(self, :agent => @current_agent, :user => self.current_user, :agent_logged_in => options[:agent_logged_in]) + @table_of_contents = tb.toc_for(self, :agent => @current_agent, :user => current_user, :agent_logged_in => options[:agent_logged_in]) end @table_of_contents end alias :toc :table_of_contents - # If you just call "comments", you are actually getting comments that should really be invisible. This method gets - # around this, and didn't see appropriate to do with a named_scope. - # Note that the argument is simply to match the interface of the same method on other classes that can be parents - # of comments. - def visible_comments(ignore_user = nil) - return comments if self.current_user.is_moderator? + # If you just call "comments", you are actually getting comments that should really be invisible. This method gets around this, + # and didn't see appropriate to do with a named_scpope: + def visible_comments(user = @current_user) + return comments if user and user.is_moderator? comments.find_all {|comment| comment.visible? } end @@ -238,12 +233,8 @@ class TaxonConcept < SpeciesSchemaModel # Set the current user, so that methods will have defaults (language, etc) appropriate to that user. def current_user=(who) - expire_cached_images - @current_user = who - end - - def expire_cached_images @images = nil + @current_user = who end def canonical_form_object @@ -301,7 +292,7 @@ class TaxonConcept < SpeciesSchemaModel end def videos - videos = DataObject.for_taxon(self, :video, :agent => @current_agent, :user => self.current_user) + videos = DataObject.for_taxon(self, :video, :agent => @current_agent, :user => current_user) @length_of_videos = videos.length # cached, so we don't have to query this again. return videos end @@ -414,7 +405,7 @@ class TaxonConcept < SpeciesSchemaModel end def quick_common_name(language = nil, hierarchy = nil) - language ||= self.current_user.language + language ||= current_user.language hierarchy ||= Hierarchy.default common_name_results = SpeciesSchemaModel.connection.execute("SELECT n.string name, he.hierarchy_id source_hierarchy_id FROM taxon_concept_names tcn JOIN names n ON (tcn.name_id = n.id) LEFT JOIN hierarchy_entries he ON (tcn.source_hierarchy_entry_id = he.id) WHERE tcn.taxon_concept_id=#{id} AND language_id=#{language.id} AND preferred=1").all_hashes @@ -658,7 +649,7 @@ EOIUCNSQL # handled by TaxonConcept#get_default_content ccb = CategoryContentBuilder.new - options[:vetted] = self.current_user.vetted + options[:vetted] = current_user.vetted options[:taxon_concept_id] = id content = ccb.content_for(toc_item, options) content = get_default_content(toc_item) if content.nil? @@ -667,40 +658,17 @@ EOIUCNSQL # This used to be singleton, but now we're changing the views (based on permissions) a lot, so I removed it. def images(options = {}) - - # TODO - dump this. Forces a check to see if the current user is valid: - unless self.current_user.attributes.keys.include?('filter_content_by_hierarchy') - self.current_user = User.create_new - end - + # set hierarchy to filter images by - if self.current_user.filter_content_by_hierarchy && self.current_user.default_hierarchy_valid? - filter_hierarchy = Hierarchy.find(self.current_user.default_hierarchy_id) + if current_user.filter_content_by_hierarchy && current_user.default_hierarchy_valid? + filter_hierarchy = Hierarchy.find(current_user.default_hierarchy_id) else filter_hierarchy = nil end perform_filter = !filter_hierarchy.nil? - @images ||= DataObject.for_taxon(self, :image, :user => self.current_user, :agent => @current_agent, :filter_by_hierarchy => perform_filter, :hierarchy => filter_hierarchy) + @images ||= DataObject.for_taxon(self, :image, :user => current_user, :agent => @current_agent, :filter_by_hierarchy => perform_filter, :hierarchy => filter_hierarchy) @length_of_images = @images.length # Caching this because the call to #images is expensive and we don't want to do it twice. - - @images = @images.sort do |a,b| - if a.vetted_id == b.vetted_id - # TODO - this should probably also sort on visibility. - if a.data_rating == b.data_rating - b.id <=> a.id # Note this is reversed; ends up being roughly by date. - else - b.data_rating <=> a.data_rating # Note this is reversed; higher ratings are better. - end - else - # Account for the rare (read: nigh impossible) cases that Vetted is something else or missing: - return 0 if a.vetted.nil? and b.vetted.nil? - return 1 if a.vetted.nil? - return -1 if b.vetted.nil? - a.vetted.sort_weight <=> b.vetted.sort_weight - end - end - return @images end @@ -753,12 +721,14 @@ EOIUCNSQL then o.id else o.to_i end } return [] if ids.nil? or ids.empty? # Fix for EOLINFRASTRUCTURE-808 - sql = "select taxon_concepts.* from taxon_concepts - join taxon_concept_names on taxon_concept_names.taxon_concept_id = taxon_concepts.id - join taxa on taxa.name_id = taxon_concept_names.name_id - join data_objects_taxa on data_objects_taxa.taxon_id = taxa.id - join data_objects on data_objects.id = data_objects_taxa.data_object_id - where data_objects.id IN (#{ ids.join(', ') })" + sql = "SELECT taxon_concepts.* FROM taxon_concepts + JOIN taxon_concept_names ON taxon_concept_names.taxon_concept_id = taxon_concepts.id + JOIN taxa ON taxa.name_id = taxon_concept_names.name_id + JOIN data_objects_taxa ON data_objects_taxa.taxon_id = taxa.id + JOIN data_objects ON data_objects.id = data_objects_taxa.data_object_id + WHERE data_objects.id IN (#{ ids.join(', ') }) + AND taxon_concepts.supercedure_id = 0 + AND taxon_concepts.published = 1" TaxonConcept.find_by_sql(sql).uniq end @@ -866,7 +836,7 @@ private result = { :content_type => 'text', :category_name => TocItem.find(category_id).label, - :data_objects => DataObject.for_taxon(self, :text, :toc_id => category_id, :agent => @current_agent, :user => self.current_user) + :data_objects => DataObject.for_taxon(self, :text, :toc_id => category_id, :agent => @current_agent, :user => current_user) } # TODO = this should not be hard-coded! IDEA = use partials. Then we have variables and they can be dynamically changed. # NOTE: I tried to dynamically alter data_objects directly, below, but they didn't app/models/taxon_concept.rb @@ -15,7 +15,7 @@ class TaxonConceptName < SpeciesSchemaModel # Returns the number of rows affected. (Should always be either 1 or 0 because of PKs.) def set_preferred(val) raise "Cannot set the Preferred value to anything other than 1 or 0)" unless val == 0 or val == 1 # detaint - connection.execute(%Q{ + connection.update_sql(%Q{ UPDATE taxon_concept_names SET preferred = #{val} WHERE name_id = #{name_id.to_i} AND taxon_concept_id = #{taxon_concept_id.to_i} app/models/taxon_concept_name.rb @@ -1,7 +1,7 @@ -# This class shouldn't be used. :) It's really just here so that fixtures load into the right database. Meaning, -# this *class* doesn't perform any special function. The top_images table, however, is used for denormalized -# searches on (normal, vetted, visible, published) images. That table is referenced by -# DataObject#cached_images_for_taxon(). That table is *built* using PHP, so you will not see any other ref to it. +# This class shouldn't be used. :) It's really just here so that fixtures load into the right database. Meaning, this *class* +# doesn't perform any special function. The top_images table, however, is used for denormalized searches on (normal, vetted, visible, +# published) images. That table is referenced by DataObject#cached_images_for_taxon(). That table is *built* using PHP, so you will +# not see any other ref to it. class TopImage < SpeciesSchemaModel set_primary_keys :hierarchy_entry_id, :data_object_id belongs_to :hierarchy_entry app/models/top_image.rb @@ -1,7 +1,7 @@ -# This class shouldn't be used. :) It's really just here so that fixtures load into the right database. Meaning, -# this *class* doesn't perform any special function. The top_iages table, however, is used for denormalized searches -# on (normal, vetted, visible, published) images. That table is referenced by DataObject#cached_images_for_taxon(). -# That table is *built* using PHP, so you will not see any other ref to it. +# This class shouldn't be used. :) It's really just here so that fixtures load into the right database. Meaning, this *class* +# doesn't perform any special function. The top_iages table, however, is used for denormalized searches on (normal, vetted, visible, +# published) images. That table is referenced by DataObject#cached_images_for_taxon(). That table is *built* using PHP, so you will +# not see any other ref to it. class TopUnpublishedImage < SpeciesSchemaModel set_primary_keys :hierarchy_entry_id, :data_object_id belongs_to :hierarchy_entry app/models/top_unpublished_image.rb @@ -1,8 +1,5 @@ require "digest" -# NOTE - there is a method called #stale? (toward the bottom) which needs to be kept up-to-date with any changes made -# to the user model. We *could* achieve a similar result with method_missing, but I worry that it would cause other -# problems. class User < ActiveRecord::Base belongs_to :language @@ -74,8 +71,15 @@ class User < ActiveRecord::Base end def total_objects_curated - CuratorDataObjectLog.count :conditions => ['user_id = ?', id] + # CuratorDataObjectLog.count :conditions => ['user_id = ?', id] + # CuratorDataObjectLog.count :conditions => ['user_id = 35200'] + # => 316 + # CuratorDataObjectLog.find_all_by_user_id(35200).map(&:data_object_id).uniq.size + # => 302 + + CuratorDataObjectLog.find_all_by_user_id(id).map(&:data_object_id).uniq.size end + def total_comments_curated CuratorCommentLog.count :conditions => ['user_id = ?', id] end @@ -338,11 +342,6 @@ class User < ActiveRecord::Base return (has_curator_role? && !self.curator_hierarchy_entry.blank?) end - def selected_default_hierarchy - hierarchy=Hierarchy.find_by_id(self.default_hierarchy_id) - hierarchy.blank? ? '' : hierarchy.label - end - def last_curator_activity lcd = LastCuratedDate.find_by_user_id(self.id, :order => 'last_curated DESC', :limit => 1) return nil if lcd.nil? @@ -402,46 +401,7 @@ class User < ActiveRecord::Base def default_hierarchy_valid? return(self[:default_hierarchy_id] and Hierarchy.exists?(self[:default_hierarchy_id])) end - - # These create and unset the fields required for remembering users between browser closes - def remember_me - remember_me_for 2.weeks - end - - def remember_me_for(time) - remember_me_until time.from_now.utc - end - - def remember_me_until(time) - self.remember_token_expires_at = time - self.remember_token = User.hash_password("#{email}--#{remember_token_expires_at}") - save(false) - end - - def forget_me - self.remember_token_expires_at = nil - self.remember_token = nil - save(false) - end - - def content_page_cache_str - return_string="#{language_abbr}" - return_string+="_#{default_hierarchy_id.to_s}" unless default_hierarchy_id.to_s.blank? - return_string - end - - def taxa_page_cache_str - return "#{language_abbr}_#{expertise}_#{vetted}_#{default_taxonomic_browser}_#{default_hierarchy_id}" - end - - # This is a method that checks if the user model pulled from a session is actually up-to-date: - # - # YOU SHOULD ADD NEW USER ATTRIBUTES TO THIS METHOD WHEN YOU TWEAK THE USER TABLE. - def stale? - # if you add to this, use 'and'; KEEP ALL OLD METHOD CHECKS. - return true unless self.attributes.keys.include?('filter_content_by_hierarchy') - end - + # -=-=-=-=-=-=- PROTECTED -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- protected def password_required? @@ -449,3 +409,33 @@ protected end end +# == Schema Info +# Schema version: 20081020144900 +# +# Table name: users +# +# id :integer(4) not null, primary key +# curator_hierarchy_entry_id :integer(4) +# curator_verdict_by_id :integer(4) +# language_id :integer(4) +# active :boolean(1) +# content_level :integer(4) +# credentials :text not null +# curator_approved :boolean(1) not null +# default_taxonomic_browser :string(24) +# email :string(255) +# expertise :string(24) +# family_name :string(255) +# flash_enabled :boolean(1) +# given_name :string(255) +# hashed_password :string(32) +# identity_url :string(255) +# mailing_list :boolean(1) +# notes :text +# remote_ip :string(24) +# username :string(32) +# vetted :boolean(1) +# created_at :datetime +# curator_verdict_at :datetime +# updated_at :datetime + app/models/user.rb @@ -35,11 +35,6 @@ class Vetted < SpeciesSchemaModel def self.untrusted_ids [self.untrusted.id,self.unknown.id].join(',') end - - def sort_weight - @@vetted_weight ||= {Vetted.trusted.id => 1, Vetted.unknown.id => 2, Vetted.untrusted.id => 3} - return @@vetted_weight.has_key?(id) ? @@vetted_weight[id] : 4 - end end app/models/vetted.rb @@ -13,4 +13,8 @@ <div id="full-page-content"> A confirmation email was sent to the email address you registered with. Please check your email and follow the confirmation link to activate your account. </div> + + + </div> + </div> app/views/account/confirmation_sent.html.erb @@ -45,7 +45,7 @@ <tr><td class="odd"><a href="http://www.livejournal.com"><img class="favicon" src="http://www.livejournal.com/favicon.ico" alt="" /></a> LiveJournal </td><td class="odd"> <strong>username</strong>.livejournal.com</td></tr> <tr><td class="even"><a class="favicon" href="http://www.smugmug.com"><img class="favicon" src="http://openid.net/wp-content/uploads/smugmug.png" alt="" /></a> SmugMug </td><td class="even"> <strong>username</strong>.smugmug.com</td></tr> <tr><td class="odd"><a href="http://www.technorati.com"><img class="favicon" src="http://www.technorati.com/favicon.ico" alt="" /></a> Technorati </td><td class="odd"> technorati.com/people/technorati/<strong>username</strong></td></tr> - <tr><td class="even"><a href="http://www.vox.com"><img src="http://openid.net/wp-content/uploads/vox.png" alt="" /></a> Vox </td><td class="even"> <strong>member</strong>.vox.com</td></tr> + <tr><td class="even"><img src="http://openid.net/wp-content/uploads/vox.png" alt="" /></a> Vox </td><td class="even"> <strong>member</strong>.vox.com</td></tr> <tr><td class="odd"><a href="http://www.wordpress.com"><img class="favicon" src="http://openid.net/wp-content/uploads/wordpress.png" alt="" /></a> WordPress.com </td><td class="odd"> <strong>username</strong>.wordpress.com</td></tr> </table> <br /> @@ -58,9 +58,6 @@ <%= link_to 'What is OpenID?', 'http://openid.net/',:target=>'_blank' %> | <a href="#" onclick="Element.toggle('open_id_instructions');return false;">How do I log in with OpenID?</a> </div> <br /> - <label for="remember_me"><%= "Remember Me"[]%></label> - <%= check_box_tag 'remember_me'%> <%="check to stay logged in automatically for up to two weeks (do NOT use on public computers)"[:remember_me_message]%> - <br /><br /> <table border="0" width="500" cellpadding="20"> <tr> <td valign="top"><%= submit_tag 'Login Now'[:login_now] + ' &#187;' %></td> app/views/account/login.html.erb @@ -69,7 +69,7 @@ <%= f.check_box :mailing_list %> <%= "Yes"[:yes_answer] %> <br /><br /> - </td><td valign='top'> + </td><td> <%= render(:partial=>'taxa/set_content_settings',:locals=>{:f=>f}) %> </td> </tr> app/views/account/profile.html.erb @@ -43,15 +43,14 @@ %br/ = link_to_remote(content_partner_check_box_image(@agent.auto_publish?, :id => 'auto_publish_img'), :url => { :action => 'auto_publish', :id => @agent }, :confirm => "Are you sure you want to #{@agent.auto_publish? ? 'disable' : 'enable'} auto-publish for this partner? If enabled, all data objects are immediately published when imported (i.e. no preview and further approval is required).") = "#{@agent.auto_publish? ? 'Disable' : 'Enable'} auto-publish for " + @agent.project_name + "." + %br/ + Content partner status: + = collection_select(:agent,:agent_status_id,@agent_status,:id,:label,{},{:onChange=>'JavaScript:update_partner_status(' + @agent.id.to_s + ',this);'}) - else = @agent.project_name is not ready for their agreement. %br/ -Content partner status: -= collection_select(:agent,:agent_status_id,@agent_status,:id,:label,{},{:onChange=>'JavaScript:update_partner_status(' + @agent.id.to_s + ',this);'}) -%br/ - - if !@agent.content_partner.last_action.blank? This partner's last action was = format_date_time(@agent.content_partner.last_action) app/views/administrator/content_partner_report/show.html.haml @@ -102,7 +102,7 @@ <%- if @cached_fragment %> <%= @cached_fragment %> <%- else %> - <%- cache({:controller=>"content", :part => 'home_' + current_user.content_page_cache_str}) do %> + <%- cache({:controller=>"content", :part => 'home_' + current_user.language_abbr}) do %> <div id="page-separator-general"></div> @@ -132,7 +132,7 @@ <div id="sidebar-b"> <%- unless @news_items.empty? %> - <h1><%="What's New?"[]%></h1> + <h1>What's New?</h1> <ul class="helplist"> <%- @news_items.each do |news_item| if news_item.visible? %> @@ -154,32 +154,44 @@ <li>To subscribe via RSS, click <%=link_to image_tag('rss.png'), {:action=>'news',:format=>'rss'}%>, or add this URL to your RSS reader: http://<%=request.host + url_for(:action=>'news',:format=>'rss')%></li> </ul><%# .helplist %> <%- end %><%# unless news_items empty %> - + + <%= @content.main_content %> + </div><%# sidebar-b %> - <div id="home-center-content"> + <div id="home-content-species"> <%- unless @featured_taxa.nil? %> - - <%- featured_taxon = @featured_taxa.sort_by{rand}[0] %> - - <h1><%="Featured"[]%></h1> - - <table id="featured-species-table" cellspacing="0" summary="featured table"> - <tr> - <td class="image"> - <%= medium_thumb_partial(featured_taxon) %> - </td> - </tr> - <tr> - <td><%= linked_name(featured_taxon) %></td> - </tr> - </table><%# featured-species-table %> - - <%- end %><%# unless featured_taxa nil %> - - <%= @content.main_content %> - - </div><%# home-center-content %> + + <%- featured_taxon = @featured_taxa.sort_by{rand}[0] %> + + <h1><%="Featured"[]%></h1> + + <table id="featured-species-table" cellspacing="0" summary="featured table"> + <tr> + <td class="image"> + <%= medium_thumb_partial(featured_taxon) %> + </td> + </tr> + <tr> + <td><%= linked_name(featured_taxon) %></td> + </tr> + </table><%# featured-species-table %> + + <%- end %><%# unless featured_taxa nil %> + + <br /><%# TODO - this is useless. What we really want is a div of a given height... %> + <br /> + <br /> + <br /> + <br /> + <br /> + <br /> + <br /> + <br /> + <br /> + <br /> + <br /> + </div><%# home-content-species %> </div><%# home-content-wrap %> app/views/content/index.html.erb @@ -27,9 +27,6 @@ <label for="password"><%= "Password"[] %></label> <%= form.password_field 'password', :size=>16,:maxlength=>30 %> - <label for="remember_me"><%= "Remember Me"[]%></label> - <%= check_box_tag 'remember_me'%> <%="check to stay logged in automatically for up to two weeks (do NOT use on public computers)"[:remember_me_message]%> - <br /><br /> <table border="0" width="500" cellpadding="20"> <tr> app/views/content_partner/login.html.erb @@ -39,7 +39,7 @@ <% if data_object.text? || data_object.image? %> <div class="credit permalink"> <div class="credit-caption"><%="Permalink"[]%></div> - <div class="credit-value"><%="Copy and paste in email or document"[]%>:<br /><form><input onclick="this.select();" size="<%= data_object.text? ? '45' : '35'%>" type="text" value="<%="http://#{request.domain}/pages/#{data_object.taxon_concepts[0].id}?#{data_object.data_type.label.downcase}_id=#{data_object.id}"%>"/></form></div> + <div class="credit-value"><form><input onclick="this.select();" size="35" type="text" value="<%="http://#{request.domain}/pages/#{data_object.taxon_concepts[0].id}?#{data_object.data_type.label.downcase}_id=#{data_object.id}"%>"/></form></div> <div class="footer"></div> </div> <% end %> app/views/data_objects/_attribution.html.erb @@ -26,6 +26,10 @@ <meta name="description" content="Encyclopedia of Life" /> <meta name="keywords" content="Encyclopedia of Life,Biodiversity,Biology,Bioinformatics" /> <%- end -%> + <%- if @no_cache -%> + <meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE" /> + <meta HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE" /> + <%- end -%> <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> <link rel="search" type="application/opensearchdescription+xml" title="Encyclopedia of Life" href="/opensearch.xml"/> @@ -245,20 +249,11 @@ </div> <!-- /search --> - <div class="page-mode"> - <% - case current_user.vetted - when true: current_mode="authoritative information"[];change_mode="all information"[];set_vetted="false" - when false: current_mode="all information"[];change_mode="authoritative information"[];set_vetted="true" - end - %> - Showing: <a title="click to show <%=change_mode%>" href="<%=current_url%>?vetted=<%=set_vetted%>"><%=current_mode%></a><br /> - <%- if (current_user.default_hierarchy_id.to_s != Hierarchy.default.id.to_s && !current_user.default_hierarchy_id.blank?) -%> - <a title="using <%=current_user.selected_default_hierarchy%>, click to change" href="<%=url_for(settings_url)%>"><%="Alternate classification"[]%></a> <br /> - <%- end -%> - <%- if current_user.filter_content_by_hierarchy -%> - <a title="click to change settings" href="<%=url_for(settings_url)%>"><%="Filtered information"[]%></a><br /> - <%- end -%> + + <div class="page-mode"><%="Showing"[]%> <%= case current_user.vetted + when true: "authoritative information"[] + when false: "all information"[] + end %> </div> app/views/layouts/main.html.erb @@ -16,13 +16,13 @@ <% if showing_unknown_image %> <div id="unknown-thumbnail-warning-box"> - <span><%="Items in yellow are not reviewed."[]%></span> + <span><%="Images in yellow are not reviewed."[]%></span> </div> <% end %> <% if showing_untrusted_image %> <div id="untrusted-thumbnail-warning-box"> - <span><%="Items in red are not trusted."[]%></span> + <span><%="Images in red are not trusted."[]%></span> </div> <% end %> app/views/taxa/_image_collection.html.erb @@ -97,6 +97,6 @@ <%- end %> <%- if @search.searching %> - <%= paginate_results(@search) if @search.total_pages > 1 %> + <%= paginate_results(@search) %> <%- end %> app/views/taxa/_names_search_results.html.erb @@ -1,30 +1,28 @@ <h3 class="preference-header"><%= "Content Settings"[] %></h3> - <a href="#" onclick="new Effect.Appear('filtering_help');return false;"><%="Learn more about browse classification and filtering"[]%></a> + <a href="#" onclick="new Effect.Appear('filtering_help');return false;"><%="Learn more about browse hierarchies and filtering"[]%></a> <div style="display:none;" id="filtering_help"> - <p>EOL has the ability to filter its content by a classification (or hierarchy). This allows you to change the - list of taxa shown in the classification browser on the right side of a species page and, optionally, - create a filter for EOL based on this classification. - <br /><br /> - For instance, if you choose a classification containing only marine taxa and select the filtering option, then - your view of EOL will only show those taxa and images recognized by the marine classification - an - Encyclopedia of Marine Life! You can still search for any taxa using the search page. - <!-- <br /><br /> - You can also choose two classifications if you wish, which will be seamlessly merged together as you browse this website - this feature may be useful for biologists and taxonomists. --></p> + <p>EOL has the ability to filter its content by a hierarchy (or classification). This allows you to change the list of taxa shown in the classification + browser on the right side of a species page and, optionally, create a filter for EOL based on this hierarchy. + <br /><br /> + For instance, if you choose a hierarchy containing only marine taxa and select the filtering option, then your view of EOL will only show those taxa and images recognized by the marine hierarchy - an Encyclopedia of Marine Life! You can still + search for any taxa using the search page. + <br /><br /> + You can also choose two hierarchies if you wish, which will be seamlessly merged together as you browse this website - this feature may be useful for biologists and taxonomists.</p> </div> <br/> - <label for="user_default_hierarchy_id" title="<%= "Which default browse classification would you prefer?"[:classification_preference] %>"><%= "Which default browse classification would you prefer?"[:classification_preference] %></label> + <label for="user_default_hierarchy_id" title="<%= "Which default browse hierarchy would you prefer?"[:hierarchy_preference] %>"><%= "Which default browse hierarchy would you prefer?"[:hierarchy_preference] %></label> <%= f.select :default_hierarchy_id, [['-- always use default --', nil]] + Hierarchy.find_all_by_browsable(1).sort_by{|h| h.label}.collect {|h| [h.label, h.id]} %><br/> <br /> - <!-- <label for="user_secondary_hierarchy_id" title="<%= "Which secondary browse classification would you prefer?"[:secondary_hierarchy_preference] %>"><%= "Which secondary browse classification would you prefer?"[:classification_preference] %></label> + <!-- <label for="user_secondary_hierarchy_id" title="<%= "Which secondary browse hierarchy would you prefer?"[:secondary_hierarchy_preference] %>"><%= "Which secondary browse hierarchy would you prefer?"[:hierarchy_preference] %></label> <%= f.select :secondary_hierarchy_id, [['-- none --', nil]] + Hierarchy.browsable_by_label.collect {|h| [h.label, h.id]} %><br/> <br /> --> <table> <tr> - <td style="padding-right:1em;"><%= f.check_box :filter_content_by_hierarchy %></td><td><%= f.label :filter_content_by_hierarchy, 'Filter EOL based on your primary browse classification?'[:filter_content_by_classification_preference] %></td> + <td style="padding-right:1em;"><%= f.check_box :filter_content_by_hierarchy %></td><td><%= f.label :filter_content_by_hierarchy, 'Filter EOL based on your primary browse hierarchy?'[:filter_content_by_hierarchy_preference] %></td> </tr> </table> @@ -32,14 +30,13 @@ <label for="user_language_abbr" title="<%= "Which language do you prefer?"[:language_preference] %>"><%= "Which language do you prefer?"[:language_preference] %></label> <%= f.select :language_abbr, Language.find_active.collect {|l| [l.name, l.iso_639_1]} %><br/> - <!-- <br/> + <br/> <label title="<%= "Do you want to include?"[:detail_level] %>"><%= "Do you want to include?"[:detail_level] %></label> <%= f.radio_button :expertise, "novice"%> <%="Information intended for beginners"[]%> <br /> <%= f.radio_button :expertise, "middle"%> <%="Information for any audience"[]%> <br /> <%= f.radio_button :expertise, "expert"%> <%="Information intended for experts"[]%> <br /> - --> - <br /> + <% if $ALLOW_USER_TO_CHANGE_CONTENT_LEVEL%> <label for="user_content_level" title="<%= "Do you want to see?"[:content_level] %>"><%= "Do you want to see?"[:content_level] %></label> <% ContentLevel.find.each do |content_level| %> @@ -49,5 +46,5 @@ <% end %> <label title="<%= "Do you want to see?"[:content_level] %>"><%= "Do you want to see?"[:content_level] %></label> - <%= f.radio_button :vetted, "true"%> <%="Only authoritative information"[:view_only_vetted_content]%> <br /> + <%= f.radio_button :vetted, "true"%> <%="Only information that comes from authoritative sources"[:view_only_vetted_content]%> <br /> <%= f.radio_button :vetted, "false"%> <%="All information"[]%> app/views/taxa/_set_content_settings.html.erb @@ -39,7 +39,7 @@ <% end %> </span> <span class="page-status"> - Showing: <%= current_user.expertise.to_s == 'expert' ? link_to('scientific names', taxon_url(:id=>@taxon_concept.id) + '?expertise=middle',{:title=>'click to show common names'}) : link_to('common names', taxon_url(:id=>@taxon_concept.id) + '?expertise=expert',{:title=>'click to show scientific names'}) %> + <%= current_user.expertise.to_s == 'expert' ? link_to('Switch to common names', taxon_url(:id=>@taxon_concept.id) + '?expertise=middle') : link_to('Switch to scientific names', taxon_url(:id=>@taxon_concept.id) + '?expertise=expert') %> </span> <hr /> </div> @@ -59,8 +59,7 @@ <input id="current_taxon_concept_id" type="hidden" name="current_taxon_concept_id" value="<%= @taxon_concept.id %>" /> <input id="current_content" type="hidden" name="current_content" value="<%= @category_id %>" /> <input id="canonical_form" type="hidden" name="canonical_form" value="<%= strip_tags(@taxon_concept.canonical_form) %>" /> - &nbsp;&nbsp;<a class="smalltext" href="#" onclick="JavaScript:eol_show_pop_up('slider-help','slider-help');return false;"><%="What happened to the slider?"[]%></a> - <div style="display:none;" id="slider-help" class="popup"></div> + <h4 id="toc-header" class="margin-header left-margin-header"><%= "Table of Contents"[] %></h4> <ul id="toc"> <% @@ -77,7 +76,7 @@ </li> <li class="multi_new_text_error" style="display:none;"> - <%="Only one text object can be edited at a time."[]%> + Only one text object can be edited at a time. </li> </ul> <hr /> app/views/taxa/_show.html.erb @@ -32,12 +32,12 @@ <br/> <% if showing_unknown_video %> <div id="unknown-video-warning-box"> - <span><%="Items in yellow are not trusted."[]%></span> + Images in yellow are not reviewed. </div> <% end %> <% if showing_untrusted_video %> <div id="untrusted-video-warning-box"> - <span><%="Items in red are not trusted."[]%></span> + Videos in red are not trusted. </div> <% end %> app/views/taxa/mediacenter/_tab_videos.html.erb @@ -140,7 +140,7 @@ <td class="<%= column_class %>"><% unless result[0].images.empty? %><a href="<%=url_for(:action=>'search_clicked',:id=>taxon_concept_id.to_s,:search_id=> @search.logged_search_id)%>"><img alt="<%=strip_tags(namestring)%>" title="<%=strip_tags(namestring)%>" src="<%= result[1].smart_medium_thumb %>"/></a><%end%></td></tr> <% end %> </table> - <%#= paginate_results(@search) if @search.total_pages > 1 %> + <%= paginate_results(@search) if @search.total_pages > 1 %> </div> <% elsif @search.search_type == 'tag' && @search.tag_results.length == 0 %> <h3>No tagged results were found</h3><br /> app/views/taxa/search.html.erb @@ -52,8 +52,6 @@ Rails::Initializer.run do |config| config.gem "ruby-yadis", :version => "0.3.4", :lib => "yadis" config.gem 'ezcrypto' config.gem 'ratom', :lib => 'atom' - #config.gem 'outoftime-sunspot', :lib => 'sunspot' - #config.gem 'outoftime-sunspot_rails', :lib => 'sunspot/rails' # Use SQL instead of Active Record's schema dumper when creating the test database. # This is necessary if your schema can't be completely dumped by the schema dumper, @@ -150,7 +148,7 @@ Rails::Initializer.run do |config| # CACHE CONFIGURATION $CACHE_CLEARED_LAST = Time.now() # This variable will record the last time the home page cache was cleared - $CACHE_CLEAR_IN_HOURS = 1 # automatically expire home page cached fragment at this time interval (in hours) + $CACHE_CLEAR_IN_HOURS = 1 # automatically expire home page cached fragment at this time interval # CONTENT PARTNER REGISTRY CONFIGURATION $LOGO_UPLOAD_PATH = "/uploads/images/collection_icons/" # directory to place uploaded content partner logos from CP registry, content server needs SFTP access to this folder (logos are not served out of this area) config/environment.rb @@ -102,13 +102,11 @@ class EOL def build_top_image if @dato.published @taxon.hierarchy_entry.ancestors.each do |he| - TopSpeciesImage.gen :data_object => @dato, :hierarchy_entry => he - TopImage.gen :data_object => @dato, :hierarchy_entry => he + TopImage.gen :data_object => @dato, :hierarchy_entry => he end else @taxon.hierarchy_entry.ancestors.each do |he| - TopUnpublishedSpeciesImage.gen :data_object => @dato, :hierarchy_entry => he - TopUnpublishedImage.gen :data_object => @dato, :hierarchy_entry => he + TopUnpublishedImage.gen :data_object => @dato, :hierarchy_entry => he end end end lib/eol/data_object_builder.rb @@ -4,13 +4,12 @@ class EOL attr_reader :tc - include EOL::Spec::Helpers # gbif_hierarchy iucn_hierarchy default_harvest_event gbif_harvest_event - # iucn_harvest_event (and others, but I think those we want) + include EOL::Spec::Helpers # == Options: # - # These all have intelligent(ish) default values, so just specify those values that you feel are really salient. - # Note that a TC will NOT have a map or an IUCN status unless you specify options that create them. + # These all have intelligent(ish) default values, so just specify those values that you feel are really salient. Note that a TC will + # NOT have a map or an IUCN status unless you specify options that create them. # # +attribution+:: # String to be used in scientific name as attribution @@ -31,11 +30,6 @@ class EOL # +:description+ and +:object_cache_url+. # +gbif_map_id+:: # The ID to use for the Map Data Object. - # +hierarchy+:: - # Put all generated hierarchy_entries in this hierarhcy. - # +hierarchies+:: - # If you want multiple hierarchy entries, supply a list of hierarchies and they will all be created. The last - # one will be considered the "main" entry, under which all data objects are attached. # +id+:: # Forces the ID of the TaxonConcept to be what you specify, useful for exemplars. # +images+:: @@ -64,8 +58,8 @@ class EOL # +youtube+:: # Array of YouTube videos, each member is a hash for the video options. The keys you will want are # +:description+ and +:object_cache_url+. - # TODO - Create a harvest event and a resource (status should be published) (and the resource needs a hierarchy, - # which we use for the HEs) + # TODO - Create a harvest event and a resource (status should be published) (and the resource needs a hierarchy, which we use for + # the HEs) # TODO - Normalize names ... when harvesting is done, this is done on-the-fly, so we should do it here. # NOTE: when we denormalize the taxon_concept_names table, we should be looking at Synonyms as well as Names. def initialize(options) @@ -140,17 +134,7 @@ class EOL end def gen_he - parent_he = HierarchyEntry.find(@parent_hierarchy_entry_id) rescue nil # Ick, but... - @entries = [] - @hierarchies.each do |hierarchy| - this_is_the_primary = parent_he ? (parent_he.hierarchy_id == hierarchy.id) : false - options = {:hierarchy => hierarchy} - options.merge(:parent_hierarchy_entry_id => @parent_hierarchy_entry_id) if this_is_the_primary - entry = build_entry_in_hierarchy(options) - @entries << entry - @he = entry if this_is_the_primary - end - @he = @entries.last unless @he + @he = build_entry_in_hierarchy(:parent_id => @parent_hierarchy_entry_id) end # TODO - add some alternate names, including at least one in another language. @@ -204,11 +188,9 @@ class EOL def gen_taxon puts "** Enter: gen_taxon" if @debugging - @entries.each do |entry| - @taxon = Taxon.gen(:name => @sname, :hierarchy_entry => entry, :scientific_name => @complete) # Okay that we don't set kingdom, phylum, etc - HarvestEventsTaxon.gen(:taxon => @taxon, :harvest_event => @event) - # TODO - Create some references here ... just a string and an associated identifier (like a URL) - end + @taxon = Taxon.gen(:name => @sname, :hierarchy_entry => @he, :scientific_name => @complete) # Okay that we don't set kingdom, phylum, etc + HarvestEventsTaxon.gen(:taxon => @taxon, :harvest_event => @event) + # TODO - Create some references here ... just a string and an associated identifier (like a URL) end def add_images @@ -250,6 +232,7 @@ class EOL def add_map puts "** Enter: add_map" if @debugging if @gbif_map_id + #gbif_he = build_hierarchy_entry(@depth, @tc, @sname, :hierarchy => gbif_hierarchy, :map => true, puts "++ Add map!" if @debugging puts "GBIF hierarchy:" if @debugging pp gbif_hierarchy if @debugging @@ -343,7 +326,6 @@ class EOL def set_default_options(options) puts "** Enter: set_default_options" if @debugging - set_hierarchy_options(options) @attri = options[:attribution] || Factory.next(:attribution) @bhl = options[:bhl] || [{:publication => 'Great Big Journal of Fun', :page => 42}, {:publication => 'Great Big Journal of Fun', :page => 44}, @@ -356,6 +338,7 @@ class EOL @event = options[:event] || default_harvest_event # Note this method is in eol_spec_helper @flash = options[:flash] @gbif_map_id = options[:gbif_map_id] + @hierarchy = options[:hierarchy] @id = options[:id] @images = options[:images] || [{}, {}] @images = testing_images if @images == :testing @@ -369,17 +352,6 @@ class EOL @youtube = options[:youtube] end - # "Intelligently" figures out which hierarchy or hierarchies the caller wants to create entries (and taxa, and - # harvest events) in. - def set_hierarchy_options(options) - puts "** Enter: set_hierarchy_options" if @debugging - @hierarchy = options[:hierarchy] - @hierarchies = options[:hierarchies] - @hierarchy = options[:hierarchies].last if @hierarchies and not @hierarchy - @hierarchy = Hierarchy.default unless @hierarchy - @hierarchies = [@hierarchy] unless @hierarchies - end - def default_toc_option toc = [{:toc_item => TocItem.overview, :description => "This is an overview of the <b>#{@canon}</b> hierarchy entry."}, {:toc_item => TocItem.find_by_label('Description'), :description => "This is an description of the <b>#{@canon}</b> hierarchy entry."}] lib/eol/taxon_concept_builder.rb @@ -378,14 +378,12 @@ ul#global-navigation { float:right; text-transform: uppercase; font-weight: 700; - text-align: right; - height: 200px; font-size: 10px; color: #666666; margin-right: 10px; - margin-top: 5px; + margin-top: 10px; } - + .popup { z-index: 105; font-size: 12px; @@ -480,7 +478,7 @@ ul#global-navigation { text-decoration: none; } - #post-info .page-status { + #post-info .page-status a{ float: right; padding-right: 20px; width: 471px; @@ -489,6 +487,7 @@ ul#global-navigation { text-decoration: none; } + #page-cite { font-size: 12px; color: #333; @@ -2111,10 +2110,8 @@ input.warn, textarea.warn { } -#home-center-content { +#home-content-species { padding: 10px; - height: 100%; - min-height: 100px; } public/stylesheets/main.css @@ -9,7 +9,13 @@ # --- # dependencies: [ :foundation ] # arbitrary_variable: arbitrary value + +require 'spec/eol_spec_helpers' require 'spec/scenario_helpers' +# This gives us the ability to recalculate some DB values: +include EOL::Data +# This gives us the ability to build taxon concepts: +include EOL::Spec::Helpers # A singleton that creates some users: def bootstrap_users @@ -151,17 +157,14 @@ tc30 = build_taxon_concept(:id => 30, :event => event) tc30.add_common_name(Factory.next(:common_name)) +curator = build_curator(tc30, :username => 'test_curator', :password => 'password', :given_name => 'test', :family_name => 'curator') #31 has unvetted and vetted videos, please don't change this one, needed for selenum test: tc31 = build_taxon_concept(:parent_hierarchy_entry_id => fifth_entry_id, :common_names => [Factory.next(:common_name)], :id => 31, :depth => depth_now, :flash => [{}, {:vetted => Vetted.unknown}], :youtube => [{:vetted => Vetted.unknown}, {:vetted => Vetted.untrusted}], :comments => [], :bhl => [], :event => event) -#(:username => 'curator_for_tc', :password => 'password') -curator_for_tc31 = create_curator(tc31) -# curator = build_curator(HierarchyEntry.gen, :username => 'test_curator', :password => 'test_password') -# curator_for_tc = build_curator(HierarchyEntry.find(fifth_entry_id, :username => 'curator_for_tc', :password => 'password') -# RAILS_DEFAULT_LOGGER.debug "URA, curator_for_tc = "+curator_for_tc.inspect.to_s +curator_for_tc31 = build_curator(tc31, :username => 'curator_for_tc', :password => 'password') text_dato = tc31.overview.first # TODO - this doesn't seem to ACTAULLY be the overview. Fix it? image_dato = tc31.images.first @@ -224,10 +227,6 @@ admin.save test_user2 = User.gen(:username => 'test_user2', :password => 'password', :given_name => 'test', :family_name => 'user2') test_user2.save -#curator for selenium tests (NB: page #30) -curator = User.gen(:username => 'test_curator', :password => 'password', 'given_name' => 'test', :family_name => 'curator', :curator_hierarchy_entry_id => 20, :curator_approved => true) -curator.save - #moderator for selenium test moderator = User.gen :username => 'moderator', :password => 'moderator', :given_name => 'Moderator', :family_name => 'User' moderator.roles = Role.find(:all, :conditions => 'title LIKE "Moderator"') @@ -242,13 +241,9 @@ exemplar = build_taxon_concept(:id => 910093, # That ID is one of the (hard-code ContentPage.gen(:page_name => "curator_central", :title => "Curator central", :left_content => "") - - col_collection = Collection.gen(:agent => Agent.catalogue_of_life, :title => "Catalogue of Life Collection", :uri => "http://www.catalogueoflife.org/browse_taxa.php?selected_taxon=FOREIGNKEY", :logo_cache_url => 4130) col_mapping = Mapping.gen(:collection => col_collection, :name => kingdom.entry.name_object) - - # TODO - we need to build TopImages such that ancestors contain the images of their descendants # creating collection / mapping data @@ -355,8 +350,7 @@ bacteria.add_common_name("le grimme", :language => french, :preferred => false) bacteria.add_common_name("ler petit bugge", :language => french, :preferred => false) # Another Selenium curator -curator2 = User.gen(:username => 'curator_two', :password => 'iliketocurate') -curator2.approve_to_curate! bacteria.entry +curator2 = build_curator(bacteria, :username => 'curator_two', :password => 'iliketocurate') 4.times do parent_id = ncbi_hierarchy.hierarchy_entries.last.id @@ -373,12 +367,6 @@ curator2.approve_to_curate! bacteria.entry :depth => depth) end - - - - - - TaxonConcept.all.each do |tc| if tc.hierarchy_entries.empty? TaxonConcept.delete(tc.id) @@ -393,6 +381,7 @@ RandomHierarchyImage.all.each do |rhi| d.destroy rhi.destroy end + HierarchyEntry.all.each do |he| RandomHierarchyImage.gen(:hierarchy => he.hierarchy, :taxon_concept => he.taxon_concept, :hierarchy_entry => he, :data_object => he.taxon_concept.images[0]) if !he.taxon_concept.images[0].nil? end scenarios/bootstrap.rb @@ -32,7 +32,7 @@ describe 'Login' do it 'should tell us if we logged in incorrectly' do # first, we fail a login attempt - login_as( :username => 'snoopy', :password => 'secret',:remember_me=>'1' ).should be_redirect + login_as( :username => 'snoopy', :password => 'secret' ).should be_redirect # ^ it'll redirect us back to login ... when we get there, we should have a flash message request('/login').body.should include('Invalid login') @@ -42,11 +42,6 @@ describe 'Login' do user = create_user 'charliebrown', 'testing' login_as(user).should redirect_to('/') end - - it 'should set a remember token for us if we asked to be remembered' do - user = create_user 'charliebrown', 'testing' - login_as(:username => 'charliebrown', :password => 'testing',:remember_me=>'1' ).should(User.find_by_username('charliebrown').remember_token.empty? == false && redirect_to('/')) - end it 'should say hello to the user after logging in' do user = create_user 'charliebrown', 'testing' spec/blackbox/login_spec.rb @@ -33,22 +33,6 @@ def assert_results(options) end end -def assert_tag_results(options) - res = request("/search?search_type=tag&q=value#{options[:page] ? "&page=#{options[:page]}" : ''}").body - res.should have_tag('div[class=serp_pagination]') - res.should have_tag('table[class=results_table]') do |table| - header_index = 1 - result_index = header_index + 1 - table.should have_tag("tr:nth-child(#{header_index})") - options[:num_results_on_this_page].times do - table.should have_tag("tr:nth-child(#{result_index})") - result_index += 1 - end - table.should_not have_tag("tr:nth-child(#{result_index})") - end -end - - describe 'Search' do def create_taxon(namestring) @@ -122,42 +106,5 @@ describe 'Search' do res = request('/search?q=value-old&search_type=tag') res.body.should include(taxon_concept.name) end - -# remove after pagination implementing - it 'should show > 10 tags' do - user = User.gen :username => 'username', :password => 'password' - all_tc = [] - amount_of_taxa = 15 - - amount_of_taxa.times do - taxon_concept = build_taxon_concept(:images => [{}]) - image_dato = taxon_concept.images.last - image_dato.tag("key", "value", user) - all_tc << taxon_concept.name - end - - res = request('/search?search_type=tag&q=value') - for tc_name in all_tc - res.body.should include(tc_name) - end - end - -# # open after pagination implementing -# it 'should show pagination if there are > 10 tags' do -# user = User.gen :username => 'username', :password => 'password' -# all_tc = [] -# results_per_page = 10 -# extra_results = 3 -# amount_of_taxa = results_per_page + extra_results -# -# amount_of_taxa.times do -# taxon_concept = build_taxon_concept(:images => [{}]) -# image_dato = taxon_concept.images.last -# image_dato.tag("key", "value", user) -# end -# -# assert_tag_results(:num_results_on_this_page => results_per_page) -# assert_tag_results(:num_results_on_this_page => extra_results, :page => 2) -# end end spec/blackbox/search_spec.rb @@ -1,15 +1,6 @@ require File.dirname(__FILE__) + '/../spec_helper' require 'nokogiri' -def create_hierarchy_and_event(name) - agent = Agent.gen - resource = Resource.gen - AgentsResource.gen(:agent => agent, :resource => resource) - event = HarvestEvent.gen(:resource => resource) - hierarchy = Hierarchy.gen(:label => name, :agent => agent) - return [hierarchy, event] -end - def find_unique_tc(options) options[:in].hierarchy_entries.each do |entry| return entry.taxon_concept unless entry.taxon_concept.in_hierarchy(options[:not_in]) @@ -321,32 +312,5 @@ describe 'Taxa page (HTML)' do new_result.body.should_not include(info_item_title.label) end - it 'should filter content by hierarchy if preferences dictate' do - # 1a) given hierarchies _a and _b, - hierarchy_a, event_a = create_hierarchy_and_event('hierarchy a') - hierarchy_b, event_b = create_hierarchy_and_event('hierarchy b') - # 1b) genus_a exists in both (no images) - genus_a = build_taxon_concept(:hierarchies => [hierarchy_a, hierarchy_b], :rank => 'genus', :images => []) - # 2) species_a is a child of genus_a in hierarchy_a, but not hierarchy_b, and has an image. - species_a_description = 'species a description' - species_a = build_taxon_concept(:parent_hierarchy_entry_id => genus_a.entry(hierarchy_a).id, - :images => [{:description => species_a_description}]) - image = species_a.images.first - # 3) the user selects hierarchy_b. - user = User.gen(:filter_content_by_hierarchy => true, :default_hierarchy_id => hierarchy_b.id, :password => 'foob') - # 4) when browsing to genus_a, the user should NOT see images in species_a. - login_as user - result = RackBox.request("/pages/#{genus_a.id}").body - result.should_not have_tag("a.thumbnail_#{image.id}") - # 4) the user switches to hierarchy_a. - user.default_hierarchy_id = hierarchy_a.id - user.save! - # 6) when browsing to genus_a, the user should now actually see the images from species_a. - new_result = RackBox.request("/pages/#{genus_a.id}").body - #TODO - I can't get this to work! Not sure what's missing. I think I built the right entry in - #top_species_images, but perhaps I'm missing something. Sigh. - #new_result.should have_tag("a.thumbnail_#{image.id}") - end - end spec/blackbox/taxa_page_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' -def create_user username, password, args = {} - User.gen({:username => username, :password => password}.merge(args)) +def create_user username, password + User.gen :username => username, :password => password end # NOTE !!!!!!! @@ -10,32 +10,26 @@ end describe 'User Profile' do - Scenario.load :foundation + #Scenario.load :foundation before(:all) do - @username = 'bobbafett' - @password = 'ihatesolo' - @filter = false - @switch_to = true - @tag = 'input#user_filter_content_by_hierarchy' - @user = create_user(@username, @password, :filter_content_by_hierarchy => @filter) - @settings_body = request('/settings').body - login_as(@user).should redirect_to('/') - @profile_body = request('/settings').body + #@username = 'bobbafett' + #@password = 'ihatesolo' + #@user = create_user(@username, @password) + #@settings_body = request('/settings').body + #login_as @user + #pp request('/account/authenticate', + #:params => {'user[username]' => @username, + #'user[password]' => @password }) + #@profile_body = request('/profile').body # first try is a redirect (why?) + #@profile_body = request('/profile').body end - it 'should allow change of filter content hierarchy' do - @settings_body.should include('browse classification') - @settings_body.should have_tag(@tag) - @profile_body.should include('browse classification') - @profile_body.should have_tag(@tag) - end - - it 'should keep a change of value for filter content hierarchy' do - request('/settings', - :params => { - 'user[filter_content_by_hierarchy]' => @switch_to }) - request('/settings').body.should have_tag("#{@tag}[checked=?]", 'checked') - end + #it 'should allow change of filter content hierarchy' do + #@settings_body.should include('Filter images') + #@settings_body.should have_tag('input#user_filter_content_by_hierarchy') + #@profile_body.should include('Filter images') + #@profile_body.should have_tag('input#user_filter_content_by_hierarchy') + #end end spec/blackbox/user_profile_spec.rb @@ -27,8 +27,7 @@ module EOL::Spec def login_content_partner(options = {}) f = request('/content_partner/login', :params => { 'agent[username]' => options[:username], - 'agent[password]' => options[:password], - 'remember_me' => options[:remember_me] || '' }) + 'agent[password]' => options[:password] }) end def login_as(options = {}) @@ -37,8 +36,7 @@ module EOL::Spec end request('/account/authenticate', :params => { 'user[username]' => options[:username], - 'user[password]' => options[:password], - 'remember_me' => options[:remember_me] || '' }) + 'user[password]' => options[:password] }) end # returns a connection for each of our databases, eg: 1 for Data, 1 for Logging ... spec/eol_spec_helpers.rb @@ -873,24 +873,12 @@ Factory.define :top_image do |ti| ti.view_order 1 # Perhaps this should be in a sequence, but I don't want to figure out how to persist the same HE end -Factory.define :top_species_image do |ti| - ti.association :hierarchy_entry - ti.association :data_object - ti.view_order 1 # Again, this should be sequential, but... -end - Factory.define :top_unpublished_image do |tui| tui.association :hierarchy_entry tui.association :data_object tui.view_order 1 # Again, this should be sequential, but... end -Factory.define :top_unpublished_species_image do |tui| - tui.association :hierarchy_entry - tui.association :data_object - tui.view_order 1 # Again, this should be sequential, but... -end - Factory.define :untrust_reason do |ur| ur.updated_at Time.now ur.created_at Time.now @@ -923,7 +911,6 @@ Factory.define :user do |u| u.curator_verdict_by_id 0 u.curator_verdict_at nil u.curator_scope '' - u.filter_content_by_hierarchy false end Factory.define :users_data_object do |u| spec/factories.rb @@ -34,18 +34,13 @@ describe TaxonConcept do @image_2 = Factory.next(:image) @image_3 = Factory.next(:image) @image_unknown_trust = Factory.next(:image) - @image_untrusted = Factory.next(:image) @video_1_text = 'First Test Video' @video_2_text = 'Second Test Video' @video_3_text = 'YouTube Test Video' @comment_1 = 'This is totally awesome' @comment_bad = 'This is totally inappropriate' @comment_2 = 'And I can comment multiple times' - @kingdom = build_taxon_concept(:rank => 'kingdom', :depth => 0) - @phylum = build_taxon_concept(:rank => 'phylum', :depth => 1, :parent_hierarchy_entry_id => @kingdom.entry.id) - @order = build_taxon_concept(:rank => 'order', :depth => 2, :parent_hierarchy_entry_id => @phylum.entry.id) tc = build_taxon_concept( - :parent_hierarchy_entry_id => @order.entry.id, :rank => 'species', :canonical_form => @canonical_form, :attribution => @attribution, @@ -55,10 +50,9 @@ describe TaxonConcept do :flash => [{:description => @video_1_text}, {:description => @video_2_text}], :youtube => [{:description => @video_3_text}], :comments => [{:body => @comment_1}, {:body => @comment_bad}, {:body => @comment_2}], - :images => [{:object_cache_url => @image_1, :data_rating => 2}, - {:object_cache_url => @image_2, :data_rating => 3}, - {:object_cache_url => @image_untrusted, :vetted => Vetted.untrusted}, - {:object_cache_url => @image_3, :data_rating => 4}, + :images => [{:object_cache_url => @image_1}, + {:object_cache_url => @image_2}, + {:object_cache_url => @image_3}, {:object_cache_url => @image_unknown_trust, :vetted => Vetted.unknown}], :toc => [{:toc_item => @overview, :description => @overview_text}, {:toc_item => @toc_item_2}, {:toc_item => @toc_item_3}] @@ -73,16 +67,7 @@ describe TaxonConcept do LastCuratedDate.gen(:user => @curator, :taxon_concept => @taxon_concept) # And we want one comment that the world cannot see: Comment.find_by_body(@comment_bad).hide! User.last - @user = User.gen recreate_normalized_names_and_links - @subspecies1 = build_taxon_concept(:rank => 'subspecies', :depth => 4, - :parent_hierarchy_entry_id => @taxon_concept.entry.id) - @subspecies2 = build_taxon_concept(:rank => 'subspecies', :depth => 4, - :parent_hierarchy_entry_id => @taxon_concept.entry.id) - @subspecies3 = build_taxon_concept(:rank => 'subspecies', :depth => 4, - :parent_hierarchy_entry_id => @taxon_concept.entry.id) - @infraspecies = build_taxon_concept(:rank => 'infraspecies', :depth => 4, - :parent_hierarchy_entry_id => @subspecies1.entry.id) end after :all do truncate_all_tables @@ -197,10 +182,25 @@ describe TaxonConcept do end it 'should be able to list its ancestors (by convention, ending with itself)' do + @kingdom = build_taxon_concept(:rank => 'kingdom', :depth => 0) + @phylum = build_taxon_concept(:rank => 'phylum', :depth => 1, :parent_hierarchy_entry_id => @kingdom.entry.id) + @order = build_taxon_concept(:rank => 'order', :depth => 2, :parent_hierarchy_entry_id => @phylum.entry.id) + # Now we attach our TC to those: + he = @taxon_concept.entry + he.parent_id = @order.entry.id + he.save @taxon_concept.ancestors.map(&:id).should == [@kingdom.id, @phylum.id, @order.id, @taxon_concept.id] end it 'should be able to list its children (NOT descendants, JUST children--animalia would be a disaster!)' do + @subspecies1 = build_taxon_concept(:rank => 'subspecies', :depth => 4, + :parent_hierarchy_entry_id => @taxon_concept.entry.id) + @subspecies2 = build_taxon_concept(:rank => 'subspecies', :depth => 4, + :parent_hierarchy_entry_id => @taxon_concept.entry.id) + @subspecies3 = build_taxon_concept(:rank => 'subspecies', :depth => 4, + :parent_hierarchy_entry_id => @taxon_concept.entry.id) + @infraspecies = build_taxon_concept(:rank => 'infraspecies', :depth => 4, + :parent_hierarchy_entry_id => @subspecies1.entry.id) @taxon_concept.children.map(&:id).should only_include @subspecies1.id, @subspecies2.id, @subspecies3.id end @@ -248,16 +248,14 @@ describe TaxonConcept do #end it 'should show its untrusted images images, by default' do - old_user = @taxon_concept.current_user - @taxon_concept.current_user = User.create_new + @taxon_concept.current_user = User.create_new # It's okay if this one "sticks", so no cleanup code @taxon_concept.images.map(&:object_cache_url).should include(@image_unknown_trust) - @taxon_concept.current_user = old_user # Cleaning up so as not to affect other tests end it 'should show only trusted images if the user prefers' do old_user = @taxon_concept.current_user @taxon_concept.current_user = User.gen(:vetted => true) - @taxon_concept.images.map(&:object_cache_url).should only_include(@image_1, @image_2, @image_3) + @taxon_concept.images.map(&:object_cache_url).should == [@image_1, @image_2, @image_3] @taxon_concept.current_user = old_user # Cleaning up so as not to affect other tests end @@ -286,7 +284,7 @@ describe TaxonConcept do # ... And remove it from top images: TopImage.delete_all(:hierarchy_entry_id => @taxon_concept.entry.id, :data_object_id => @taxon_concept.images.last.id) - @taxon_concept.expire_cached_images + @taxon_concept.current_user = @taxon_concept.current_user #hack to expire cached images @taxon_concept.images.length.should == how_many - 1 # Ensuring that we removed it... dato.visibility = Visibility.preview @@ -316,21 +314,6 @@ describe TaxonConcept do TaxonConcept.common_names_for?(tc.id).should == false end - it 'should return images sorted by trusted, unknown, untrusted' do - old_user = @taxon_concept.current_user - @taxon_concept.current_user = @user - @taxon_concept.images.map {|i| i.vetted.label }.should == - [Vetted.trusted.label, Vetted.trusted.label, Vetted.trusted.label, Vetted.unknown.label, Vetted.untrusted.label] - @taxon_concept.current_user = old_user # Cleaning up so as not to affect other tests - end - - it 'should sort the vetted images by data rating' do - old_user = @taxon_concept.current_user - @taxon_concept.current_user = @user - @taxon_concept.images[0..2].map(&:object_cache_url).should == [@image_3, @image_2, @image_1] - @taxon_concept.current_user = old_user # Cleaning up so as not to affect other tests - end - # # I'm all for pending tests, but in this case, they run SLOWLY, so it's best to comment them out: # spec/models/taxon_concept_spec.rb @@ -6,7 +6,7 @@ require 'spec/rails' load 'composite_primary_keys/fixtures.rb' require File.expand_path(File.dirname(__FILE__) + "/factories") -require File.expand_path(File.dirname(__FILE__) + "/scenario_helpers") +require File.expand_path(File.dirname(__FILE__) + "/eol_spec_helpers") require File.expand_path(File.dirname(__FILE__) + "/custom_matchers") require 'scenarios' spec/spec_helper.rb app/models/top_species_image.rb app/models/top_unpublished_species_image.rb app/views/popups/slider-help.html.erb db/migrate/20091015210148_add_remember_token_for_users.rb f556441a9733aa0c72b9cd2a70c7ab3f0c16e314 dima dima@78829999-583a-0410-bd01-8a9b849fd409 http://github.com/eol/eol/commit/98ce0aa3b6accdd8d47f7077b4289100c46006ed 98ce0aa3b6accdd8d47f7077b4289100c46006ed 2009-11-03T10:24:27-08:00 2009-11-03T10:24:27-08:00 merged trunk back: svn merge -r1310:1305 git-svn-id: file:///data/subversion/eol/trunk@1317 78829999-583a-0410-bd01-8a9b849fd409 c297e595d4d86f2ee8dbd64dd7315785015ca7d6 dima dima@78829999-583a-0410-bd01-8a9b849fd409