You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(20) |
Sep
(26) |
Oct
|
Nov
(3) |
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(7) |
Oct
|
Nov
(5) |
Dec
|
2010 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
(1) |
May
|
Jun
(5) |
Jul
(2) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <th...@us...> - 2012-01-25 15:45:57
|
Revision: 675 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=675&view=rev Author: thabing Date: 2012-01-25 15:45:50 +0000 (Wed, 25 Jan 2012) Log Message: ----------- changed contact email address Modified Paths: -------------- ruby/trunk/aquifer/app/views/home/contact_us.rhtml ruby/trunk/aquifer/app/views/home/message_sent.rhtml Modified: ruby/trunk/aquifer/app/views/home/contact_us.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/contact_us.rhtml 2011-05-27 16:59:26 UTC (rev 674) +++ ruby/trunk/aquifer/app/views/home/contact_us.rhtml 2012-01-25 15:45:50 UTC (rev 675) @@ -3,5 +3,5 @@ <p>1301 West Springfield Avenue<br /> Urbana, IL 61801 </p> - <p>in...@am...</p> -</div> \ No newline at end of file + <p><a href='mailto:eng...@ui...'>eng...@ui...</a></p> +</div> Modified: ruby/trunk/aquifer/app/views/home/message_sent.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/message_sent.rhtml 2011-05-27 16:59:26 UTC (rev 674) +++ ruby/trunk/aquifer/app/views/home/message_sent.rhtml 2012-01-25 15:45:50 UTC (rev 675) @@ -24,7 +24,7 @@ <tr> <td valign="top" class="submenu">1301 West Springfield Avenue<br /> Urbana, IL 61801 - <p>e: in...@am...</p></td> + <p><a href='mailto:eng...@ui...'>eng...@ui...</a></p></td> <td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2011-05-27 16:59:32
|
Revision: 674 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=674&view=rev Author: paulnsorensen Date: 2011-05-27 16:59:26 +0000 (Fri, 27 May 2011) Log Message: ----------- Cleaned up rake tasks Modified Paths: -------------- ruby/trunk/aquifer/app/models/ingest_job.rb ruby/trunk/aquifer/lib/ingest_automator.rb ruby/trunk/aquifer/lib/ingest_manager.rb ruby/trunk/aquifer/lib/tasks/aquifer.rake Modified: ruby/trunk/aquifer/app/models/ingest_job.rb =================================================================== --- ruby/trunk/aquifer/app/models/ingest_job.rb 2011-05-13 15:36:40 UTC (rev 673) +++ ruby/trunk/aquifer/app/models/ingest_job.rb 2011-05-27 16:59:26 UTC (rev 674) @@ -1,5 +1,3 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. class IngestJob < ActiveRecord::Base @@ingest_map = { @@ -22,16 +20,7 @@ 'end' ] - def test_job(str) - if 1+rand(6) > 4 - # puts str - else - puts "error" - raise "Error" - end - end - def run # get current step # while current step ! = end or fail count < 2 on current step Modified: ruby/trunk/aquifer/lib/ingest_automator.rb =================================================================== --- ruby/trunk/aquifer/lib/ingest_automator.rb 2011-05-13 15:36:40 UTC (rev 673) +++ ruby/trunk/aquifer/lib/ingest_automator.rb 2011-05-27 16:59:26 UTC (rev 674) @@ -1,5 +1,3 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. class IngestAutomator def initialize(options = {}) Modified: ruby/trunk/aquifer/lib/ingest_manager.rb =================================================================== --- ruby/trunk/aquifer/lib/ingest_manager.rb 2011-05-13 15:36:40 UTC (rev 673) +++ ruby/trunk/aquifer/lib/ingest_manager.rb 2011-05-27 16:59:26 UTC (rev 674) @@ -36,13 +36,7 @@ end - def self.full_harvest - manager = IngestManager.new - manager.harvest_collections - - end - def harvest_collections if @incremental puts "Harvesting collection descriptions..." @@ -54,6 +48,7 @@ puts "Done!" end + def harvest_metadata RawXml.harvest_items_from_aggregation(@incremental, @max, @resume, @set_spec) end @@ -68,17 +63,11 @@ end - def self.harvest_and_index_all_collections - cols = Collection.find(:all, :select=>"set_spec") - cols.each do |c| - IngestManager.harvest_and_index_collection(c.set_spec) - end - end def update_collection_count if !@set_spec - #raise error + raise "set_spec not defined" else puts "Updating cached counters for '#{@set_spec}'..." c = Collection.find(:first, :conditions=>["set_spec=?",@set_spec]) @@ -94,7 +83,7 @@ def harvest_and_index_collection if !@set_spec - #raise error + raise "set_spec not defined" else harvest_metadata update_collection_count @@ -102,47 +91,10 @@ geo_resolver update_collection_headings index_collection - end - # count = RawXml.harvest_items_by_collection(set_spec, resume) - # - # # rescue http 500 error here? -- maybe one level up? - # - # if count <= 0 - # puts "No records found. Quitting..." - # return -1 - # end - # - # - # #init the cached counts - # puts "Updating cached counters for '#{set_spec}'..." - # c = Collection.find(:first, :conditions=>["set_spec=?",set_spec]) - # puts "#{c.set_spec} #{c.title_sort}..." - # cnt = RawXml.count(["collection_id=?",c.id]) - # puts " raw_xmls_count=#{cnt}" - # Collection.connection.execute "UPDATE collections SET raw_xmls_count=#{cnt} WHERE ID=#{c.id}" - # - # if cnt <=0 - # return -1 - # end - # - # # can't we just do the RawXml count? - # # cnt = RawXml.count(["set_spec rlike ?", "^#{c.set_spec}$|^#{c.set_spec}:|^#{c.set_spec},|,#{c.set_spec}$|,#{c.set_spec},|^#{c.collection_code}$|^#{c.collection_code}:|^#{c.collection_code},|,#{c.collection_code}$|,#{c.collection_code},"]) - # # puts " count_set_spec=#{cnt}" - # # Collection.connection.execute "UPDATE collections SET count_set_spec=#{cnt} WHERE ID=#{c.id}" - # - # #add incr - # options = Hash.new - # # options['start_id'] = RawXml.connection.select_value( "select min(id) from raw_xmls where collection_id = #{c.id}" ) - # # options['end_id'] = RawXml.connection.select_value( "select max(id) from raw_xmls where collection_id = #{c.id}" ) - # - # options['collection_id'] = c.id - # - # raw_xml_to_item = RawXmlToItem.new(options) - # raw_xml_to_item.process - # - # IngestManager.index_collection(c.id) + end end + def update_collection_headings MetadataStats.heading_stat_build(0,0,500,@collection_id) # HeadingStat.update_grand_total @@ -151,7 +103,7 @@ def index_collection if !@set_spec - #raise error + raise "set_spec not defined" else indexer = ItemIndexer.new(@options) puts "Processing and optimizing index..." Modified: ruby/trunk/aquifer/lib/tasks/aquifer.rake =================================================================== --- ruby/trunk/aquifer/lib/tasks/aquifer.rake 2011-05-13 15:36:40 UTC (rev 673) +++ ruby/trunk/aquifer/lib/tasks/aquifer.rake 2011-05-27 16:59:26 UTC (rev 674) @@ -32,32 +32,13 @@ end - - desc "Runs all the reharvesting tasks with one command" - task :reharvest => [:reharvest_collection_descriptions, :reharvest_metadata, :update_collection_count, :transform_raw_xml, :fix_orphaned_items, :delete_orphaned_items] - - desc "Runs all the reharvesting and reindexing tasks. If resume=[token] is passed, the reharvest_collection_descriptions will be skipped" - task :reindex => :environment do - if !ENV.include?("resume") - Rake::Task["aquifer:reharvest_collection_descriptions"].execute - end - Rake::Task["aquifer:reharvest_metadata"].execute - Rake::Task["aquifer:update_collection_count"].execute - Rake::Task["aquifer:transform_raw_xml"].execute - Rake::Task["aquifer:fix_orphaned_items"].execute - Rake::Task["aquifer:delete_orphaned_items"].execute - Rake::Task["aquifer:geo_resolver"].execute - Rake::Task["aquifer:rebuild_all_stats"].execute - Rake::Task["aquifer:index_items"].execute - - - end - + desc "Removes SOLR indexes for passed argument: set_spec=[set]" task :clear_solr_set => :environment do indexer = ItemIndexer.new( ENV ) indexer.clear_set end + desc "Optimizes SOLR" task :optimize_solr => :environment do indexer = ItemIndexer.new( ENV ) indexer.optimize @@ -65,7 +46,7 @@ - #orphaned items can occur if the harvest and/or is interupted before completing + #orphaned items can occur if the harvest and/or is interrupted before completing desc "Delete orphaned items (those without a corresponding raw_xml)" task :delete_orphaned_items => :environment do puts "Deleting orphaned items..." @@ -274,11 +255,9 @@ desc "Transform and Index, combined" task :transform_and_index => [:transform_raw_xml, :index_items] - task :harvest_all_by_collection => :environment do - IngestManager.harvest_and_index_all_collections - end - task :harvest_by_collection => :environment do + "Ingests singular collection. Options: set_spec='foo'" + task :ingest_collection => :environment do if ENV.include?("set_spec") manager = IngestManager.new( ENV ) manager.harvest_and_index_collection @@ -287,15 +266,18 @@ end end + desc "Updates collection headings specified by coll_id=n" task :update_collection_headings => :environment do IngestManager.update_collection_headings(ENV['coll_id']) end + desc "Indexes collection specified by set_spec='foo'" task :index_collection => :environment do h = Collection.get_all_set_specs_hash IngestManager.index_collection(h[ENV['set_spec']]) end + desc "Harvest metadata. Options: incr, max=n, resume='token', set_spec='foo'" task :harvest_metadata => :environment do incr = (true if ENV['incr']) || false max = (ENV['max'] if ENV['max']) || 0 @@ -304,11 +286,13 @@ IngestManager.harvest_metadata(incr, max, resumption_token, set_spec) end + desc "Ingests all collections. Options: incremental=true, resume=true (resumes ingest from any jobs in database)" task :ingest_collections => :environment do automator = IngestAutomator.new(ENV) automator.ingest_all end + desc "Clears jobs from the ingest job table" task :clear_jobs => :environment do IngestJob.delete_all end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2011-05-13 15:36:46
|
Revision: 673 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=673&view=rev Author: thabing Date: 2011-05-13 15:36:40 +0000 (Fri, 13 May 2011) Log Message: ----------- Made the data dir a config param Modified Paths: -------------- ruby/trunk/aquifer/vendor/plugins/acts_as_solr/lib/tasks/solr.rake Modified: ruby/trunk/aquifer/vendor/plugins/acts_as_solr/lib/tasks/solr.rake =================================================================== --- ruby/trunk/aquifer/vendor/plugins/acts_as_solr/lib/tasks/solr.rake 2011-05-13 15:35:59 UTC (rev 672) +++ ruby/trunk/aquifer/vendor/plugins/acts_as_solr/lib/tasks/solr.rake 2011-05-13 15:36:40 UTC (rev 673) @@ -19,11 +19,26 @@ port end +def get_data_dir + data = nil + if ENV[ 'DATA' ] + data = ENV[ 'DATA' ] + elsif File.exists?(RAILS_ROOT+'/config/solr.yml') + config = YAML::load_file(RAILS_ROOT+'/config/solr.yml') + data = "#{config[RAILS_ENV]['data']}" if config[RAILS_ENV]['data'] + end + unless data + data = "solr/data/#{ENV['RAILS_ENV']}" + end + data +end + namespace :solr do desc 'Starts Solr. Options accepted: RAILS_ENV=your_env, PORT=XX. Defaults to development if none.' task :start do SOLR_PORT = get_port + SOLR_DATA_DIR = get_data_dir begin n = Net::HTTP.new('localhost', SOLR_PORT) n.request_head('/').value @@ -34,18 +49,18 @@ rescue Errno::ECONNREFUSED, Errno::EBADF #not responding if RUBY_PLATFORM.include?('mswin32') Dir.chdir(SOLR_PATH) do - exec "start #{'"'}solr_#{ENV['RAILS_ENV']}_#{SOLR_PORT}#{'"'} /min java -Xms512m -Xmx768m -Dsolr.data.dir=solr/data/#{ENV['RAILS_ENV']} -Djetty.port=#{SOLR_PORT} -jar start.jar" - puts "#{ENV['RAILS_ENV']} Solr started sucessfuly on #{SOLR_PORT}." + exec "start #{'"'}solr_#{ENV['RAILS_ENV']}_#{SOLR_PORT}#{'"'} /min java -Xms512m -Xmx768m -Dsolr.data.dir=#{SOLR_DATA_DIR} -Djetty.port=#{SOLR_PORT} -jar start.jar" + puts "#{ENV['RAILS_ENV']} Solr started successfuly on #{SOLR_PORT} in dir #{SOLR_DATA_DIR}." end else Dir.chdir(SOLR_PATH) do pid = fork do #STDERR.close - exec "java -Xms512m -Xmx1g -Dsolr.data.dir=solr/data/#{ENV['RAILS_ENV']} -Djetty.port=#{SOLR_PORT} -jar start.jar" + exec "java -Xms512m -Xmx1g -Dsolr.data.dir=#{SOLR_DATA_DIR} -Djetty.port=#{SOLR_PORT} -jar start.jar" end sleep(5) File.open("#{SOLR_PATH}/tmp/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} - puts "#{ENV['RAILS_ENV']} Solr started sucessfuly on #{SOLR_PORT}, pid: #{pid}." + puts "#{ENV['RAILS_ENV']} Solr started sucessfuly on #{SOLR_PORT}, pid: #{pid} in dir #{SOLR_DATA_DIR}." end end rescue @@ -80,6 +95,7 @@ desc 'Remove Solr index' task :destroy_index do + #TODO: This needs to be updated to accomodate the SOLR_DATA_DIR from the solr.yml file raise "In production mode. I'm not going to delete the index, sorry." if ENV['RAILS_ENV'] == "production" if File.exists?("#{SOLR_PATH}/solr/data/#{ENV['RAILS_ENV']}") Dir[ SOLR_PATH + "/solr/data/#{ENV['RAILS_ENV']}/index/*"].each{|f| File.unlink(f)} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2011-05-13 15:36:05
|
Revision: 672 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=672&view=rev Author: thabing Date: 2011-05-13 15:35:59 +0000 (Fri, 13 May 2011) Log Message: ----------- Made the data dir a config param Modified Paths: -------------- ruby/trunk/aquifer/config/solr.yml Modified: ruby/trunk/aquifer/config/solr.yml =================================================================== --- ruby/trunk/aquifer/config/solr.yml 2011-05-13 14:07:43 UTC (rev 671) +++ ruby/trunk/aquifer/config/solr.yml 2011-05-13 15:35:59 UTC (rev 672) @@ -10,7 +10,8 @@ production: solr_port: 8983 url: http://localhost:8983/solr + data: /aquifer/webapp/shared/solr/data/production test: solr_port: 8981 - url: http://localhost:8981/solr \ No newline at end of file + url: http://localhost:8981/solr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2011-05-13 14:07:49
|
Revision: 671 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=671&view=rev Author: thabing Date: 2011-05-13 14:07:43 +0000 (Fri, 13 May 2011) Log Message: ----------- Changimg heap size back Modified Paths: -------------- ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start Modified: ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start =================================================================== --- ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start 2011-05-12 19:17:41 UTC (rev 670) +++ ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start 2011-05-13 14:07:43 UTC (rev 671) @@ -1,3 +1,3 @@ #!/bin/bash cd $AQUIFER_HOME/vendor/plugins/acts_as_solr/solr -java -Xms64m -Xmx500m -Dsolr.data.dir=$AQUIFER_SHARED/solr/data/production -Djetty.port=8983 -DSTOP.PORT=8079 -DSTOP.KEY=ftasolrstop -jar start.jar > $AQUIFER_SHARED/log/solr.log 2>&1 & +java -Xms512m -Xmx1g -Dsolr.data.dir=$AQUIFER_SHARED/solr/data/production -Djetty.port=8983 -DSTOP.PORT=8079 -DSTOP.KEY=ftasolrstop -jar start.jar > $AQUIFER_SHARED/log/solr.log 2>&1 & This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2011-05-12 19:17:47
|
Revision: 670 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=670&view=rev Author: thabing Date: 2011-05-12 19:17:41 +0000 (Thu, 12 May 2011) Log Message: ----------- reduced heap size Modified Paths: -------------- ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start Modified: ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start =================================================================== --- ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start 2011-05-12 19:14:16 UTC (rev 669) +++ ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start 2011-05-12 19:17:41 UTC (rev 670) @@ -1,3 +1,3 @@ #!/bin/bash cd $AQUIFER_HOME/vendor/plugins/acts_as_solr/solr -java -Xms64m -Xmx512m -Dsolr.data.dir=$AQUIFER_SHARED/solr/data/production -Djetty.port=8983 -DSTOP.PORT=8079 -DSTOP.KEY=ftasolrstop -jar start.jar > $AQUIFER_SHARED/log/solr.log 2>&1 & +java -Xms64m -Xmx500m -Dsolr.data.dir=$AQUIFER_SHARED/solr/data/production -Djetty.port=8983 -DSTOP.PORT=8079 -DSTOP.KEY=ftasolrstop -jar start.jar > $AQUIFER_SHARED/log/solr.log 2>&1 & This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2011-05-12 19:14:22
|
Revision: 669 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=669&view=rev Author: thabing Date: 2011-05-12 19:14:16 +0000 (Thu, 12 May 2011) Log Message: ----------- reduced heap size Modified Paths: -------------- ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start Modified: ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start =================================================================== --- ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start 2011-02-07 22:06:38 UTC (rev 668) +++ ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/solr.start 2011-05-12 19:14:16 UTC (rev 669) @@ -1,3 +1,3 @@ #!/bin/bash cd $AQUIFER_HOME/vendor/plugins/acts_as_solr/solr -java -Xms512m -Xmx1g -Dsolr.data.dir=$AQUIFER_SHARED/solr/data/production -Djetty.port=8983 -DSTOP.PORT=8079 -DSTOP.KEY=ftasolrstop -jar start.jar > $AQUIFER_SHARED/log/solr.log 2>&1 & \ No newline at end of file +java -Xms64m -Xmx512m -Dsolr.data.dir=$AQUIFER_SHARED/solr/data/production -Djetty.port=8983 -DSTOP.PORT=8079 -DSTOP.KEY=ftasolrstop -jar start.jar > $AQUIFER_SHARED/log/solr.log 2>&1 & This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2011-02-07 22:06:44
|
Revision: 668 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=668&view=rev Author: paulnsorensen Date: 2011-02-07 22:06:38 +0000 (Mon, 07 Feb 2011) Log Message: ----------- Added ingest automator and ingest jobs to aid harvesting Modified Paths: -------------- ruby/trunk/aquifer/config/environment.rb ruby/trunk/aquifer/lib/ingest_manager.rb ruby/trunk/aquifer/lib/tasks/aquifer.rake Added Paths: ----------- ruby/trunk/aquifer/app/models/ingest_job.rb ruby/trunk/aquifer/db/migrate/027_create_ingest_job_table.rb ruby/trunk/aquifer/lib/ingest_automator.rb ruby/trunk/aquifer/test/fixtures/ingest_jobs.yml ruby/trunk/aquifer/test/unit/ingest_job_test.rb Added: ruby/trunk/aquifer/app/models/ingest_job.rb =================================================================== --- ruby/trunk/aquifer/app/models/ingest_job.rb (rev 0) +++ ruby/trunk/aquifer/app/models/ingest_job.rb 2011-02-07 22:06:38 UTC (rev 668) @@ -0,0 +1,91 @@ +# To change this template, choose Tools | Templates +# and open the template in the editor. + +class IngestJob < ActiveRecord::Base + @@ingest_map = { + 'hmd' => 'harvest_metadata', + 'ucc' => 'update_collection_count', + 'trx' => 'transform_raw_xml', + 'geo' => 'geo_resolver', + 'uch' => 'update_collection_headings', + 'idx' => 'index_collection', + 'end' => '' + } + + @@ingest_order = [ + 'hmd', + 'ucc', + 'trx', + 'geo', + 'uch', + 'idx', + 'end' + ] + + def test_job(str) + if 1+rand(6) > 4 + # puts str + else + puts "error" + raise "Error" + end + end + + + def run + # get current step + # while current step ! = end or fail count < 2 on current step + + ingest_stack = Array.new + ingest_stack.replace(@@ingest_order) + command_ptr = 'beg' + + if self.command == 'beg' or self.command.nil? + command_ptr = ingest_stack.shift + self.command = command_ptr + else + while self.command != command_ptr + command_ptr = ingest_stack.shift + end + end + + self.save! + + while self.command != 'end' and (self.fail_count == 0 or self.fail_count % 2 != 0) do + manager = IngestManager.new('coll_id' => self.collection_id, 'incremental' => self.incremental) + + begin + manager.send "#{@@ingest_map[command_ptr]}" + rescue + self.fail_count = self.fail_count + 1 + if self.fail_count % 2 == 0 + retry + else + get_new_queue_number + self.save! + break + end + end + + self.fail_count = 0 + command_ptr = ingest_stack.shift + self.command = command_ptr + self.save! + end + + if self.command == 'end' + self.destroy + end + end + + private + def get_new_queue_number + i = IngestJob.maximum('queue_number') + if i == nil + i = 1 + else + i = i + 1 + end + self.queue_number = i + end +end Property changes on: ruby/trunk/aquifer/app/models/ingest_job.rb ___________________________________________________________________ Added: svn:executable + * Modified: ruby/trunk/aquifer/config/environment.rb =================================================================== --- ruby/trunk/aquifer/config/environment.rb 2010-11-03 20:33:37 UTC (rev 667) +++ ruby/trunk/aquifer/config/environment.rb 2011-02-07 22:06:38 UTC (rev 668) @@ -127,4 +127,7 @@ # Collection Image Placeholder (used when no collection thumbnail exists) # The path in which this file should reside is Public/themes/#{THEME}/images/ -NOIMAGEFILE = 'image_unavailable.png' \ No newline at end of file +NOIMAGEFILE = 'image_unavailable.png' + +# Maximum number of failures +MAX_INGEST_FAILURES = 10 \ No newline at end of file Added: ruby/trunk/aquifer/db/migrate/027_create_ingest_job_table.rb =================================================================== --- ruby/trunk/aquifer/db/migrate/027_create_ingest_job_table.rb (rev 0) +++ ruby/trunk/aquifer/db/migrate/027_create_ingest_job_table.rb 2011-02-07 22:06:38 UTC (rev 668) @@ -0,0 +1,18 @@ +class CreateIngestJobTable < ActiveRecord::Migration + def self.up + create_table "ingest_jobs", :force => true do |t| + t.column "collection_id", :integer + t.column "fail_count", :integer + t.column "queue_number", :integer + t.column "command", :string, :limit=>3 + t.column "incremental", :boolean + end + + add_index "ingest_jobs", ["collection_id"], :name => "collection_id_idx" + add_index "ingest_jobs", ["queue_number"], :name => "queue_number_idx" + end + + def self.down + drop_table "ingest_jobs" + end +end Property changes on: ruby/trunk/aquifer/db/migrate/027_create_ingest_job_table.rb ___________________________________________________________________ Added: svn:executable + * Added: ruby/trunk/aquifer/lib/ingest_automator.rb =================================================================== --- ruby/trunk/aquifer/lib/ingest_automator.rb (rev 0) +++ ruby/trunk/aquifer/lib/ingest_automator.rb 2011-02-07 22:06:38 UTC (rev 668) @@ -0,0 +1,74 @@ +# To change this template, choose Tools | Templates +# and open the template in the editor. + +class IngestAutomator + def initialize(options = {}) + @incremental = false + @incremental = true if options['incremental'] + @set_spec = options['set_spec'] if options['set_spec'] + @collection_id = options['coll_id'] if options['coll_id'] + @resume = false + @resume = true if options['resume'] + + if @set_spec && !@collection_id + @collection_id = Collection.get_id_from_set_spec(@set_spec) + @options['collection_id'] = @collection_id.to_s + elsif @collection_id + set_spec = Collection.get_set_spec_from_id(@collection_id) + if(@set_spec != set_spec) + puts "Warning: set_spec and collection_id do not match! Using collection_id..." + @set_spec = set_spec + @options['set_spec'] = @set_spec + end + end + end + + def ingest_all + + if @resume == false + clear_jobs + manager = IngestManager.new({'incremental' => @incremental}) + manager.harvest_collections + else + puts "Resuming ingest..." + end + + # turn each collection into job + i = IngestJob.maximum('queue_number') + if i == nil + i = 1 + else + i = i + 1 + end + + cols = Collection.find(:all, :select=>"id") + cols.each do |c| + job = IngestJob.new + job.collection_id = c.id + job.fail_count = 0 + job.command = 'beg' + job.queue_number = i + job.incremental = @incremental + job.save! + i = i+1 + end + + run_jobs + end + + + def clear_jobs + IngestJob.delete_all + end + + + private + def run_jobs + while IngestJob.count('id', :conditions => ['fail_count < ?', MAX_INGEST_FAILURES]) > 0 + jobs = IngestJob.find(:all, :order=>"queue_number", :conditions => ['fail_count < ?', MAX_INGEST_FAILURES]) + jobs.each do |j| + j.run + end + end + end +end Property changes on: ruby/trunk/aquifer/lib/ingest_automator.rb ___________________________________________________________________ Added: svn:executable + * Modified: ruby/trunk/aquifer/lib/ingest_manager.rb =================================================================== --- ruby/trunk/aquifer/lib/ingest_manager.rb 2010-11-03 20:33:37 UTC (rev 667) +++ ruby/trunk/aquifer/lib/ingest_manager.rb 2011-02-07 22:06:38 UTC (rev 668) @@ -27,7 +27,7 @@ elsif @collection_id set_spec = Collection.get_set_spec_from_id(@collection_id) if(@set_spec != set_spec) - puts "Warning: set_spec and collection_id do not match! Using collection_id..." + #puts "Warning: set_spec and collection_id do not match! Using collection_id..." @set_spec = set_spec @options['set_spec'] = @set_spec end Modified: ruby/trunk/aquifer/lib/tasks/aquifer.rake =================================================================== --- ruby/trunk/aquifer/lib/tasks/aquifer.rake 2010-11-03 20:33:37 UTC (rev 667) +++ ruby/trunk/aquifer/lib/tasks/aquifer.rake 2011-02-07 22:06:38 UTC (rev 668) @@ -303,5 +303,14 @@ set_spec = (ENV['set_spec'] if ENV['set_spec']) || nil IngestManager.harvest_metadata(incr, max, resumption_token, set_spec) end - + + task :ingest_collections => :environment do + automator = IngestAutomator.new(ENV) + automator.ingest_all + end + + task :clear_jobs => :environment do + IngestJob.delete_all + end + end Added: ruby/trunk/aquifer/test/fixtures/ingest_jobs.yml =================================================================== --- ruby/trunk/aquifer/test/fixtures/ingest_jobs.yml (rev 0) +++ ruby/trunk/aquifer/test/fixtures/ingest_jobs.yml 2011-02-07 22:06:38 UTC (rev 668) @@ -0,0 +1,5 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html +one: + id: 1 +two: + id: 2 Added: ruby/trunk/aquifer/test/unit/ingest_job_test.rb =================================================================== --- ruby/trunk/aquifer/test/unit/ingest_job_test.rb (rev 0) +++ ruby/trunk/aquifer/test/unit/ingest_job_test.rb 2011-02-07 22:06:38 UTC (rev 668) @@ -0,0 +1,10 @@ +require File.dirname(__FILE__) + '/../test_helper' + +class IngestJobTest < Test::Unit::TestCase + fixtures :ingest_jobs + + # Replace this with your real tests. + def test_truth + assert true + end +end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2010-11-03 20:33:46
|
Revision: 667 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=667&view=rev Author: paulnsorensen Date: 2010-11-03 20:33:37 +0000 (Wed, 03 Nov 2010) Log Message: ----------- Added ability to harvest and index items for a single collection, further features and cleanup for ingest are work in progress Modified Paths: -------------- ruby/trunk/aquifer/app/controllers/home_controller.rb ruby/trunk/aquifer/app/models/collection.rb ruby/trunk/aquifer/app/models/raw_xml.rb ruby/trunk/aquifer/config/environment.rb ruby/trunk/aquifer/lib/geo_resolver.rb ruby/trunk/aquifer/lib/item_indexer.rb ruby/trunk/aquifer/lib/raw_xml_to_item.rb ruby/trunk/aquifer/lib/stat_builder.rb ruby/trunk/aquifer/lib/tasks/aquifer.rake Added Paths: ----------- ruby/trunk/aquifer/db/migrate/025_add_raw_xmls_status_index.rb ruby/trunk/aquifer/db/migrate/026_add_collections_status_index.rb ruby/trunk/aquifer/lib/ingest_manager.rb Modified: ruby/trunk/aquifer/app/controllers/home_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-09-01 21:19:07 UTC (rev 666) +++ ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-11-03 20:33:37 UTC (rev 667) @@ -154,7 +154,8 @@ begin danger = danger + 1 next_coll = rand(colls.length) - if !old_ids.include?(next_coll) && !new_ids.include?(next_coll) && colls[next_coll].get_image_url != "" + iurl = colls[next_coll].get_image_url + if !old_ids.include?(next_coll) && !new_ids.include?(next_coll) && !iurl.include?("#{NOIMAGEFILE}") @@featured_collections.push(colls[next_coll]) new_ids.push(next_coll) end Modified: ruby/trunk/aquifer/app/models/collection.rb =================================================================== --- ruby/trunk/aquifer/app/models/collection.rb 2010-09-01 21:19:07 UTC (rev 666) +++ ruby/trunk/aquifer/app/models/collection.rb 2010-11-03 20:33:37 UTC (rev 667) @@ -20,15 +20,15 @@ @@titles=Hash.new -def primary_display_location - ret='' - mods.location.each do |loc| - loc.url({'@usage'=>'primary display','@access'=>'object in context'}).each do |u| - ret = u.to_s + def primary_display_location + ret='' + mods.location.each do |loc| + loc.url({'@usage'=>'primary display','@access'=>'object in context'}).each do |u| + ret = u.to_s + end end + return ret end - return ret -end =begin Return the title of the collection, given a set_spec @@ -42,8 +42,8 @@ coll = Collection.find_by_set_spec(set_spec) if coll and coll.mods and coll.mods.titleInfo({'@type'=>nil}) coll.mods.titleInfo({'@type'=>nil}).each do |t| - @@titles[set_spec]=t.to_s - break + @@titles[set_spec]=t.to_s + break end else @@titles[set_spec]='[title unavailable]' @@ -250,14 +250,14 @@ #This needs to be a db-driven lookup, but for now do a quick conversion if src_set_specs.blank? src_set_specs = case src_base_url - when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Northwestern_Static_OAI/wwiiposters_static.xml" then ['northwestern-wwii'] - when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/MOA_static.xml" then ['Cornell_MOA'] - when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/CHLA_static.xml" then ['Cornell_CHLA'] - when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/Home_static.xml" then ['Cornell_Home'] - when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/NYLit_static.xml" then ['Cornell_NYLit'] - when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/digital.lib.umn.edu/postersmods.xml" then ['umn-ww-posters'] - when "http://digital.library.upenn.edu/webbin/OAI-celebration" then ['aquifer:americana'] - else [] + when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Northwestern_Static_OAI/wwiiposters_static.xml" then ['northwestern-wwii'] + when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/MOA_static.xml" then ['Cornell_MOA'] + when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/CHLA_static.xml" then ['Cornell_CHLA'] + when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/Home_static.xml" then ['Cornell_Home'] + when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/NYLit_static.xml" then ['Cornell_NYLit'] + when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/digital.lib.umn.edu/postersmods.xml" then ['umn-ww-posters'] + when "http://digital.library.upenn.edu/webbin/OAI-celebration" then ['aquifer:americana'] + else [] end end @@ -388,6 +388,9 @@ if $!.code=='noRecordsMatch' return count else + if !incr && !resumption_token + Collection.update_all("status=''") + end raise end end @@ -434,9 +437,9 @@ #if there is no set_spec, set the set_spec to the collection ID if (set_spec_str.blank? and coll_id_str.blank?) - col.set_spec = '' - puts "Collection '#{oai_id}' does not have a set spec or collection id" - #logger.warn "Collection '#{oai_id}' does not have a set spec or collection id" + col.set_spec = '' + puts "Collection '#{oai_id}' does not have a set spec or collection id" + #logger.warn "Collection '#{oai_id}' does not have a set spec or collection id" elsif (set_spec_str.blank?) col.set_spec = coll_id_str else @@ -537,8 +540,8 @@ elsif File.exists?("#{coll_image_base}.gif") ret = "/themes/#{THEME}/images/collection/#{file_base}.gif" else -# ret = "/images/logo.gif" - ret = "/images/noimage.gif" + # ret = "/images/logo.gif" + ret = "/themes/#{THEME}/images/#{NOIMAGEFILE}" end return ret @@ -602,6 +605,18 @@ end return ret end + + + def Collection.get_all_set_specs_hash + cols=Collection.find(:all,:select=>"id,set_spec") + ret = Hash.new + cols.each do |c| + ret[c.set_spec]=c.id + end + return ret + end + + #for each raw_xml that does not have an associated collection #create a stub collection record for the it @@ -620,4 +635,16 @@ coll.save end end - end + + + def self.get_set_spec_from_id(coll_id) + c = Collection.find_by_id(coll_id) + return c.set_spec + end + + def self.get_id_from_set_spec(set_spec) + c = Collection.find_by_set_spec(set_spec) + return c.id + end + +end Modified: ruby/trunk/aquifer/app/models/raw_xml.rb =================================================================== --- ruby/trunk/aquifer/app/models/raw_xml.rb 2010-09-01 21:19:07 UTC (rev 666) +++ ruby/trunk/aquifer/app/models/raw_xml.rb 2010-11-03 20:33:37 UTC (rev 667) @@ -17,6 +17,7 @@ belongs_to :collection, :counter_cache=>true has_one :item has_many :set_values + def mods m = data_as_xml(true) @@ -71,11 +72,11 @@ #if self.item.has_asset_action? #TODO: The has_asset_action is too slow for real use, need to cache these data, for #time being just add link to all records - elem=xml.root.add(REXML::Element.new("extension")) - elem=elem.add(REXML::Element.new("location")) - elem=elem.add(REXML::Element.new("url")) - elem.add_attribute('access', 'asset action package') - elem.text=self.item.get_asset_action_link + elem=xml.root.add(REXML::Element.new("extension")) + elem=elem.add(REXML::Element.new("location")) + elem=elem.add(REXML::Element.new("url")) + elem.add_attribute('access', 'asset action package') + elem.text=self.item.get_asset_action_link #end @@ -143,7 +144,7 @@ # check for the existence of thumbnails for all records and update the def self.check_thumbnails(incr=true) if incr - self.find(:all,:conditions=>'thumbnail IS NULL').each do |x| + self.find(:all,:conditions=>'thumbnail IS NULL').each do |x| x.check_thumbnail end else @@ -218,7 +219,7 @@ end - def self.get_items(user_query) + def self.get_items(user_query) print "user_query=#{user_query}\n" num_found, ids = SearchHelper.solr_search( user_query ) print "search complete\n" @@ -229,11 +230,11 @@ print "\nids=#{ids.join(',')}\n" recs = find(:all, - :conditions => "id in (" + ids.join(',') + ")" , -# :conditions => ["id in (?)", ids.join(',') ], - :limit => 1000, - :order => 'id' ) - puts "recs=#{recs.length}\n" + :conditions => "id in (" + ids.join(',') + ")" , + # :conditions => ["id in (?)", ids.join(',') ], + :limit => 1000, + :order => 'id' ) + puts "recs=#{recs.length}\n" recs end @@ -244,10 +245,10 @@ print "\nids=#{id_list.join(',')}\n" recs = find(:all, - :conditions => "id in (" + id_list.join(',') + ")" , -# :conditions => ["id in (?)", ids.join(',') ], - :limit => 1000, - :order => 'id' ) + :conditions => "id in (" + id_list.join(',') + ")" , + # :conditions => ["id in (?)", ids.join(',') ], + :limit => 1000, + :order => 'id' ) recs end @@ -276,9 +277,237 @@ def set_array return RawXml.set_array(self.set_spec) end + + def self.harvest_all_items_by_collection + cols = Collection.find(:all, :select=>"set_spec") + cols.each do |c| + RawXml.harvest_items_by_collection(c.set_spec) + end + end + + def self.harvest_items_by_collection(set_spec, incr = true, max = 0, resumption_token = nil) + puts set_spec + + count = 0 + + if @h.nil? + @h = Collection.get_all_set_specs_hash + end + + coll_id = @h[set_spec] + + url = AGGREGATION_OAI_BASE_URL + prefix = AGGREGATION_OAI_METADATA_PREFIX + - def self.harvest_items_from_aggregation (incr=true, max=0, resumption_token=nil) + #turn off debug logging for this even in development + old_log_lev=logger.level + logger.level = Logger::INFO + + + repo = OAI::Client.new url, :parser => 'rexml' #libxml' + + begin + if resumption_token + puts("Starting to harvest items from #{url}?verb=ListRecords&resumptionToken=#{resumption_token}") + logger.info("Starting to harvest items from #{url}?verb=ListRecords&resumptionToken=#{resumption_token}") + res = repo.list_records( :resumption_token => resumption_token ) + else + puts("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}&set=#{set_spec}") + logger.info("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}&set=#{set_spec}") + res = repo.list_records( :metadata_prefix=>prefix, :set=>set_spec ) + end + + rescue OAI::Exception + if $!.code=='noRecordsMatch' + puts "No Records Match" + return count + else + raise + end + + #Todo see if we can rescue the 500 error and move on to the next collection + + # rescue Exception + # + # puts $! + # if $! == "Net::HTTPInternalServerError [500]" + # puts "Network Error" + # return count + # else + # raise + # end + end + # assuming this is not incremental (after that is added) + cnt = RawXml.count(["collection_id=?",coll_id]) + puts(res.entries.count) + puts(cnt) + + # if(res.entries.count == cnt) + # puts("Skipping harvest: The number of entries and items already in database is the same (#{cnt}). View log for more details.") + # logger.info("Skipping harvest: The number of entries and items already in database is the same (#{cnt})") + # + # #restore the previous logging level + # logger.level = old_log_lev + # return cnt; + # end + + + + if !resumption_token + puts "Settings status to 'pending'..." + x = Time.now + RawXml.update_all("status='pending'","collection_id=#{coll_id}") + puts (Time.now-x).to_s + puts "Done setting status!" + end + + + + + while true do + entries = res.entries + + # coll = Collection.find(:first,:conditions=>"id=#{coll_id}", :select=>"count_set_spec") + + + entries.each do |entry| + count +=1 + + a = Time.now + + src_identifier = entry.provenance_identifier + src_base_url = entry.provenance_base_url + src_set_specs = entry.provenance_set_specs + + header = entry.header + + b = Time.now + raw_xml = RawXml.find_or_initialize_by_oai_id(src_identifier) + puts "find time: "+(Time.now-b).to_s + raw_xml.status=header.status + raw_xml.collection_id = coll_id + raw_xml.date_stamp = entry.provenance_datestamp + raw_xml.harvest_date=Time.new + x = entry.metadata_child.to_s + raw_xml.data=x + raw_xml.set_spec = src_set_specs.join(',') + + c = Time.now + begin + raw_xml.json=CobraVsMongooseNs.xml_to_json(x,true) + rescue JSON::JSONError + puts "JSONError: Unable to generate JSON for record '#{raw_xml.oai_id}'; " + $! + logger.error "JSONError: Unable to generate JSON for record '#{raw_xml.oai_id}'; " + $! + rescue Exception + puts "Exception: Unable to generate JSON for record '#{raw_xml.oai_id}'; " + $! + logger.error "Exception: Unable to generate JSON for record '#{raw_xml.oai_id}'; " + $! + end + puts "json time:" + (Time.now-c).to_s + raw_xml.aggregation_oai_id = header.identifier + raw_xml.aggregation_date_stamp = header.datestamp + raw_xml.aggregation_set_spec = entry.all_set_specs.join(',') + raw_xml.aggregation_harvest_date=entry.provenance_harvest_date + raw_xml.aggregation_altered=entry.provenance_altered + logger.info("#{count} Harvested OAI record, ID: #{raw_xml.oai_id} AggID: #{raw_xml.aggregation_oai_id} Src Base URL: #{src_base_url} Set: #{src_set_specs.join(',')}") + raw_xml.save! + raw_xml.set_array.each do |sa| + raw_xml.set_values.create('set_spec'=>sa) + end + puts "record time: " + (Time.now-a).to_s + end + token = res.resumption_token + + break if not token + logger.info("ResumptionToken: #{token}") + + retries=0 + puts "Resuming harvest: #{token}" + begin + retries += 1 + res = repo.list_records( :resumption_token => token ) + rescue Timeout::Error + if retries<=HARVEST_MAX_RETRIES + puts("Retrying in #{10 * Math.exp(retries)} seconds") + logger.info("Retrying in #{10 * Math.exp(retries)} seconds") + sleep(10 * Math.exp(retries)) + retry + else + raise + end + end + break if res == nil + + end + + + #TODO: In the event of an abnormal exit we should switch all the pending + #statuses back to normal + + #cleanup anything with a status of deleted or pending + puts "cleaning up..." + x = Time.now + # xs = RawXml.find(:all,:conditions=>"collection_id = #{coll_id} and status='deleted' or status='pending'") + + + del_cnt=0 + # xs.each do |x| + # x.destroy + # del_cnt+=1 + # end + + + # if set_spec + minid = RawXml.minimum('id', :conditions=>['collection_id = ? and status=? or status=?', coll_id, 'pending', 'deleted']) + maxid = RawXml.maximum('id', :conditions=>['collection_id = ? and status=? or status=?', coll_id, 'pending', 'deleted']) + y = Time.now + puts (y-x).to_s + if minid and maxid + minid.step(maxid,1000) do |sid| + del_cnt += RawXml.delete_all(["collection_id = ? and id >= ? and id < ? and status=? or status=?",coll_id, sid, sid+1000, 'pending','deleted']) + end + end + puts (Time.now-y).to_s + + # else + # minid = RawXml.minimum('id') + # maxid = RawXml.maximum('id') + # if minid and maxid + # minid.step(maxid,1000) do |sid| + # RawXml.update_all("status='pending'","id>=#{sid} and id<#{sid+1000}") + # end + # end + # end + + + #NOTE: The above is rather inefficient, but it works around a innodb limitation + #We are looking to tweak the innodb settings to overcome this. The following is + #better way to do this in one statement + # del_cnt=RawXml.delete_all(["collection_id = ? and status=? or status=?",coll_id,"deleted","pending"]) + + logger.info("Deleted #{del_cnt} items") + + #any records with blank set_spec will get the collection_code,set_spec from their parent collection + # items = RawXml.find(:all,:conditions=>"set_spec='' and collection_id!=0") + # items.each do |item| + # item.set_spec="#{item.collection.collection_code},#{item.collection.set_spec}" + # item.save! + # end + + puts("Finished the harvest: #{count} items. View log for more details.") + logger.info("Finished the harvest: #{count} items") + + + + #restore the previous logging level + logger.level = old_log_lev + + return count + end + + def self.harvest_items_from_aggregation_old (incr=true, max=0, resumption_token=nil) + #cache all the collection ids for quick retrieval col_hash = Collection.get_all_colls_hash @@ -286,24 +515,24 @@ url = AGGREGATION_OAI_BASE_URL setstr = AGGREGATION_OAI_SET_SPEC prefix = AGGREGATION_OAI_METADATA_PREFIX - + begin from = incr ? RawXml.maximum(:date_stamp) - 1.day : Time.local(1980,1,1) rescue from = Time.local(1980,1,1) if !from end - + if !incr && !resumption_token puts "Settings status to 'pending'..." minid = RawXml.minimum('id') maxid = RawXml.maximum('id') if minid and maxid minid.step(maxid,1000) do |sid| - RawXml.update_all("status='pending'","id>=#{sid} and id<#{sid+1000}") + RawXml.update_all("status='pending'","id>=#{sid} and id<#{sid+1000}") end end #NOTE: The above is rather inefficient, but it works around a innodb limitation - #We are looking to tweak the innodb settings to overcome this. The following is + #We are looking to tweak the innodb settings to overcome this. The following is #better way to do this in one statement #RawXml.update_all("status='pending'") puts "Done setting status!" @@ -312,8 +541,8 @@ #turn off debug logging for this even in development old_log_lev=logger.level logger.level = Logger::INFO - - + + repo = OAI::Client.new url, :parser => 'rexml' #libxml' sets = setstr.split(';') @@ -354,24 +583,24 @@ src_set_specs = entry.provenance_set_specs coll_oai_id = entry.aquifer_collection_oai_id -# #Assign set_specs for collections without sets -# #TODO: This needs to be a db-driven lookup, but for now do a quick conversion -# if src_set_specs.blank? -# src_set_specs = case src_base_url.downcase -# when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/digital.library.northwestern.edu/oai/oai-static/WWIICollection-static-oai.xml".downcase then ['northwestern-wwii'] -# when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/MOA_static.xml".downcase then ['Cornell_MOA'] -# when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/CHLA_static.xml".downcase then ['Cornell_CHLA'] -# when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/Home_static.xml".downcase then ['Cornell_Home'] -# when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/NYLit_static.xml".downcase then ['Cornell_NYLit'] -# when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/digital.lib.umn.edu/postersmods.xml".downcase then ['umn-ww-posters'] -# when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/cosimo.stanford.edu/oai/aquImmigrationCommission/ICStatic.xml".downcase then ['stanford'] -# when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/FCLA_Static_OAI/frontline.mods_static.xml".downcase then ['frontline'] -# when "http://digital.library.upenn.edu/webbin/OAI-celebration".downcase then ['aquifer:americana'] -# when "http://oai.library.emory.edu/sspaces".downcase then ['sspaces'] -# #TODO: Add lookups for all the CDL collections -# else [] -# end -# end + # #Assign set_specs for collections without sets + # #TODO: This needs to be a db-driven lookup, but for now do a quick conversion + # if src_set_specs.blank? + # src_set_specs = case src_base_url.downcase + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/digital.library.northwestern.edu/oai/oai-static/WWIICollection-static-oai.xml".downcase then ['northwestern-wwii'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/MOA_static.xml".downcase then ['Cornell_MOA'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/CHLA_static.xml".downcase then ['Cornell_CHLA'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/Home_static.xml".downcase then ['Cornell_Home'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/NYLit_static.xml".downcase then ['Cornell_NYLit'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/digital.lib.umn.edu/postersmods.xml".downcase then ['umn-ww-posters'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/cosimo.stanford.edu/oai/aquImmigrationCommission/ICStatic.xml".downcase then ['stanford'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/FCLA_Static_OAI/frontline.mods_static.xml".downcase then ['frontline'] + # when "http://digital.library.upenn.edu/webbin/OAI-celebration".downcase then ['aquifer:americana'] + # when "http://oai.library.emory.edu/sspaces".downcase then ['sspaces'] + # #TODO: Add lookups for all the CDL collections + # else [] + # end + # end header = entry.header @@ -387,35 +616,35 @@ puts "Possible missing collection: #{src_base_url} #{coll_oai_id}" end -# raw_xml.collection_id=0 -# src_set_specs.each do |ss| -# if raw_xml.collection_id.blank? or raw_xml.collection_id=0 -# col_id = col_hash["#{src_base_url.downcase}#{ss}"] -# if col_id -# raw_xml.collection_id=col_id -# elsif ss.include?(":") -# #look for the base setSpec -# col_id = col_hash["#{src_base_url}#{ss.slice(/^[^:]+:/).chop}"] -# if col_id -# raw_xml.collection_id=col_id -# else -# raw_xml.collection_id=0 -# logger.warn "Possible missing collection: #{src_base_url} #{ss}" -# puts "Possible missing collection: #{src_base_url} #{ss}" -# end -# else -# raw_xml.collection_id=0 -# logger.warn "Possible missing collection: #{src_base_url} #{ss}" -# puts "Possible missing collection: #{src_base_url} #{ss}" -# end -# end -# end + # raw_xml.collection_id=0 + # src_set_specs.each do |ss| + # if raw_xml.collection_id.blank? or raw_xml.collection_id=0 + # col_id = col_hash["#{src_base_url.downcase}#{ss}"] + # if col_id + # raw_xml.collection_id=col_id + # elsif ss.include?(":") + # #look for the base setSpec + # col_id = col_hash["#{src_base_url}#{ss.slice(/^[^:]+:/).chop}"] + # if col_id + # raw_xml.collection_id=col_id + # else + # raw_xml.collection_id=0 + # logger.warn "Possible missing collection: #{src_base_url} #{ss}" + # puts "Possible missing collection: #{src_base_url} #{ss}" + # end + # else + # raw_xml.collection_id=0 + # logger.warn "Possible missing collection: #{src_base_url} #{ss}" + # puts "Possible missing collection: #{src_base_url} #{ss}" + # end + # end + # end raw_xml.date_stamp = entry.provenance_datestamp raw_xml.harvest_date=Time.new x = entry.metadata_child.to_s raw_xml.data=x raw_xml.set_spec = src_set_specs.join(',') - + begin raw_xml.json=CobraVsMongooseNs.xml_to_json(x,true) rescue JSON::JSONError @@ -435,7 +664,7 @@ raw_xml.set_array.each do |sa| raw_xml.set_values.create('set_spec'=>sa) end - end + end token = res.resumption_token #set max to do quick testing @@ -463,31 +692,301 @@ end end - + #TODO: In the event of an abnormal exit we should switch all the pending #statuses back to normal #cleanup anything with a status of deleted or pending - xs = RawXml.find(:all,:conditions=>"status='deleted' or status='pending'") - del_cnt=0 - xs.each do |x| - x.destroy - del_cnt+=1 - end + Collection.connection.execute "UPDATE collections SET raw_xmls_count=#{cnt} count_set_spec=#{cnt} WHERE ID=#{c.id}" + #NOTE: The above is rather inefficient, but it works around a innodb limitation - #We are looking to tweak the innodb settings to overcome this. The following is + #We are looking to tweak the innodb settings to overcome this. The following is #better way to do this in one statement #del_cnt=RawXml.delete_all(["status=? or status=?","deleted","pending"]) - + logger.info("Deleted #{del_cnt} items") - + #any records with blank set_spec will get the collection_code,set_spec from their parent collection items = RawXml.find(:all,:conditions=>"set_spec='' and collection_id!=0") items.each do |item| item.set_spec="#{item.collection.collection_code},#{item.collection.set_spec}" item.save! end + + puts("Finished the harvest: #{count} items. View log for more details.") + logger.info("Finished the harvest: #{count} items") + + #restore the previous logging level + logger.level = old_log_lev + + return count + end + + + def self.harvest_items_from_aggregation (incr=true, max=0, resumption_token=nil, set_spec=nil) + + if incr + puts "Incremental harvest..." + else + puts "Harvesting all..." + end + + count=0 + url = AGGREGATION_OAI_BASE_URL + setstr = AGGREGATION_OAI_SET_SPEC + prefix = AGGREGATION_OAI_METADATA_PREFIX + + #cache all the collection ids for quick retrieval + if @h.nil? + @h = Collection.get_all_set_specs_hash + end + + if set_spec + coll_id = @h[set_spec] + if coll_id.nil? + #raise an exception here + return -1 + end + end + + begin + if set_spec + from = incr ? RawXml.maximum(:date_stamp,:conditions=>['collection_id = ?', coll_id]) - 1.day : Time.local(1980,1,1) + else + from = incr ? RawXml.maximum(:date_stamp) - 1.day : Time.local(1980,1,1) + end + rescue + from = Time.local(1980,1,1) if !from + end + + if !incr && !resumption_token + puts "Settings status to 'pending'..." + if set_spec + items = RawXml.find(:all,:conditions=>['collection_id = ?', coll_id]) + items.each do |item| + item.status = 'pending' + item.save! + end + else + minid = RawXml.minimum('id') + maxid = RawXml.maximum('id') + if minid and maxid + minid.step(maxid,1000) do |sid| + RawXml.update_all("status='pending'","id>=#{sid} and id<#{sid+1000}") + end + end + end + #NOTE: The above is rather inefficient, but it works around a innodb limitation + #We are looking to tweak the innodb settings to overcome this. The following is + #better way to do this in one statement + #RawXml.update_all("status='pending'") + puts "Done setting status!" + end + + #turn off debug logging for this even in development + old_log_lev=logger.level + logger.level = Logger::INFO + + + repo = OAI::Client.new url, :parser => 'rexml' #libxml' + + sets = setstr.split(';') + + #if a resumption_token was given then ignore sets -- just set it to a dummy value since it will be ignored + sets=['--no--set--'] if resumption_token or setstr=='' + sets=[set_spec] if set_spec + sets.each do |set| + begin + if resumption_token + puts("Starting to harvest items from #{url}?verb=ListRecords&resumptionToken=#{resumption_token}") + logger.info("Starting to harvest items from #{url}?verb=ListRecords&resumptionToken=#{resumption_token}") + res = repo.list_records( :resumption_token => resumption_token ) + elsif set=='--no--set--' + if incr + puts("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}&from=#{from.strftime("%Y-%m-%d")}") + logger.info("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}&from=#{from.strftime("%Y-%m-%d")}") + res = repo.list_records( :metadata_prefix=>prefix, :from=>from.strftime("%Y-%m-%d")) + else + puts("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}") + logger.info("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}") + res = repo.list_records( :metadata_prefix=>prefix) + end + else + if incr + puts("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}&set=#{set}&from=#{from.strftime("%Y-%m-%d")}") + logger.info("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}&set=#{set}&from=#{from.strftime("%Y-%m-%d")}") + res = repo.list_records( :metadata_prefix=>prefix, :set=>set, :from=>from.strftime("%Y-%m-%d")) + else + puts("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}&set=#{set}") + logger.info("Starting to harvest items from #{url}?verb=ListRecords&metadataPrefix=#{prefix}&set=#{set}") + res = repo.list_records( :metadata_prefix=>prefix, :set=>set) + end + end + rescue OAI::Exception + if $!.code=='noRecordsMatch' + return count + else + raise + end + end + + while true do + entries = res.entries + + entries.each do |entry| + count +=1 + + src_identifier = entry.provenance_identifier + src_base_url = entry.provenance_base_url + src_set_specs = entry.provenance_set_specs + + # #Assign set_specs for collections without sets + # #TODO: This needs to be a db-driven lookup, but for now do a quick conversion + # if src_set_specs.blank? + # src_set_specs = case src_base_url.downcase + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/digital.library.northwestern.edu/oai/oai-static/WWIICollection-static-oai.xml".downcase then ['northwestern-wwii'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/MOA_static.xml".downcase then ['Cornell_MOA'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/CHLA_static.xml".downcase then ['Cornell_CHLA'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/Home_static.xml".downcase then ['Cornell_Home'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/Cornell_Static_OAI/NYLit_static.xml".downcase then ['Cornell_NYLit'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/digital.lib.umn.edu/postersmods.xml".downcase then ['umn-ww-posters'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/cosimo.stanford.edu/oai/aquImmigrationCommission/ICStatic.xml".downcase then ['stanford'] + # when "http://imlsdcc.grainger.uiuc.edu/gateway.net/oai.aspx/gita.grainger.uiuc.edu/FCLA_Static_OAI/frontline.mods_static.xml".downcase then ['frontline'] + # when "http://digital.library.upenn.edu/webbin/OAI-celebration".downcase then ['aquifer:americana'] + # when "http://oai.library.emory.edu/sspaces".downcase then ['sspaces'] + # #TODO: Add lookups for all the CDL collections + # else [] + # end + # end + + header = entry.header + + raw_xml = RawXml.find_or_initialize_by_oai_id(src_identifier) + raw_xml.status=header.status + coll_oai_id = entry.aquifer_collection_oai_id + + if set_spec + raw_xml.collection_id = coll_id + else + coll = Collection.find(:first,:conditions=>["oai_id=?",coll_oai_id],:select=>"id") + if coll + raw_xml.collection_id = coll.id + else + raw_xml.collection_id = 0 + logger.warn "Possible missing collection: #{src_base_url} #{coll_oai_id}" + puts "Possible missing collection: #{src_base_url} #{coll_oai_id}" + end + end + # raw_xml.collection_id=0 + # src_set_specs.each do |ss| + # if raw_xml.collection_id.blank? or raw_xml.collection_id=0 + # col_id = col_hash["#{src_base_url.downcase}#{ss}"] + # if col_id + # raw_xml.collection_id=col_id + # elsif ss.include?(":") + # #look for the base setSpec + # col_id = col_hash["#{src_base_url}#{ss.slice(/^[^:]+:/).chop}"] + # if col_id + # raw_xml.collection_id=col_id + # else + # raw_xml.collection_id=0 + # logger.warn "Possible missing collection: #{src_base_url} #{ss}" + # puts "Possible missing collection: #{src_base_url} #{ss}" + # end + # else + # raw_xml.collection_id=0 + # logger.warn "Possible missing collection: #{src_base_url} #{ss}" + # puts "Possible missing collection: #{src_base_url} #{ss}" + # end + # end + # end + raw_xml.date_stamp = entry.provenance_datestamp + raw_xml.harvest_date=Time.new + x = entry.metadata_child.to_s + raw_xml.data=x + raw_xml.set_spec = src_set_specs.join(',') + + begin + raw_xml.json=CobraVsMongooseNs.xml_to_json(x,true) + rescue JSON::JSONError + puts "JSONError: Unable to generate JSON for record '#{raw_xml.oai_id}'; " + $! + logger.error "JSONError: Unable to generate JSON for record '#{raw_xml.oai_id}'; " + $! + rescue Exception + puts "Exception: Unable to generate JSON for record '#{raw_xml.oai_id}'; " + $! + logger.error "Exception: Unable to generate JSON for record '#{raw_xml.oai_id}'; " + $! + end + raw_xml.aggregation_oai_id = header.identifier + raw_xml.aggregation_date_stamp = header.datestamp + raw_xml.aggregation_set_spec = entry.all_set_specs.join(',') + raw_xml.aggregation_harvest_date=entry.provenance_harvest_date + raw_xml.aggregation_altered=entry.provenance_altered + logger.info("#{count} Harvested OAI record, ID: #{raw_xml.oai_id} AggID: #{raw_xml.aggregation_oai_id} Src Base URL: #{src_base_url} Set: #{src_set_specs.join(',')}") + raw_xml.save! + raw_xml.set_array.each do |sa| + raw_xml.set_values.create('set_spec'=>sa) + end + end + token = res.resumption_token + + #set max to do quick testing + break if max>0 and count>max + + break if not token + logger.info("ResumptionToken: #{token}") + + retries=0 + puts "Resuming harvest: #{token}" + begin + retries += 1 + res = repo.list_records( :resumption_token => token ) + rescue Timeout::Error + if retries<=HARVEST_MAX_RETRIES + puts("Retrying in #{10 * Math.exp(retries)} seconds") + logger.info("Retrying in #{10 * Math.exp(retries)} seconds") + sleep(10 * Math.exp(retries)) + retry + else + raise + end + end + break if res == nil + + end + end + + #TODO: In the event of an abnormal exit we should switch all the pending + #statuses back to normal + + #cleanup anything with a status of deleted or pending + if !incr && !resumption_token + if set_spec + xs = RawXml.find(:all,:conditions=>"collection_id = #{coll_id} and status='deleted' or status='pending'") + else + xs = RawXml.find(:all,:conditions=>"status='deleted' or status='pending'") + end + del_cnt=0 + xs.each do |x| + x.destroy + del_cnt+=1 + end + logger.info("Deleted #{del_cnt} items") + end + #NOTE: The above is rather inefficient, but it works around a innodb limitation + #We are looking to tweak the innodb settings to overcome this. The following is + #better way to do this in one statement + #del_cnt=RawXml.delete_all(["status=? or status=?","deleted","pending"]) + + + if not set_spec + #any records with blank set_spec will get the collection_code,set_spec from their parent collection + items = RawXml.find(:all,:conditions=>"set_spec='' and collection_id!=0") + items.each do |item| + item.set_spec="#{item.collection.collection_code},#{item.collection.set_spec}" + item.save! + end + end + puts("Finished the harvest: #{count} items. View log for more details.") logger.info("Finished the harvest: #{count} items") @@ -497,4 +996,4 @@ return count end -end +end \ No newline at end of file Modified: ruby/trunk/aquifer/config/environment.rb =================================================================== --- ruby/trunk/aquifer/config/environment.rb 2010-09-01 21:19:07 UTC (rev 666) +++ ruby/trunk/aquifer/config/environment.rb 2010-11-03 20:33:37 UTC (rev 667) @@ -124,3 +124,7 @@ #THEME = 'gma' #META_TITLE = 'Global Middle Ages History Online' #META_DESCRIPTION = 'Global Middle Ages History Online is a research project of the University of Illinois and is focused on finding, gathering, and collecting distributed scholarly content in Global Middle Ages History. Global Middle Ages History Online allows researchers to find and use collections in 9 formats, including images (photographs and cultural materials), books and pamphlets, journal articles, maps, sheet music, videos, data sets, political cartoons and posters, and oral histories. ' + +# Collection Image Placeholder (used when no collection thumbnail exists) +# The path in which this file should reside is Public/themes/#{THEME}/images/ +NOIMAGEFILE = 'image_unavailable.png' \ No newline at end of file Added: ruby/trunk/aquifer/db/migrate/025_add_raw_xmls_status_index.rb =================================================================== --- ruby/trunk/aquifer/db/migrate/025_add_raw_xmls_status_index.rb (rev 0) +++ ruby/trunk/aquifer/db/migrate/025_add_raw_xmls_status_index.rb 2010-11-03 20:33:37 UTC (rev 667) @@ -0,0 +1,42 @@ +class AddRawXmlsStatusIndex < ActiveRecord::Migration + + def self.up + add_index "raw_xmls", ["status"], {:name => "raw_xmls_status", :size => 1} + end + + def self.down + remove_index "raw_xmls", :name => "raw_xmls_status" + end + +# def self.up +# create_table "new_raw_xmls", :force => true do |t| +# t.column "status", :string, :limit => 8, :default => "" +# t.column "collection_id", :integer, :null => false +# t.column "oai_id", :string, :limit => 200, :default => "", :null => false +# t.column "date_stamp", :datetime, :null => false +# t.column "harvest_date", :datetime, :null => false +# t.column "data", :text, :null => false +# t.column "set_spec", :string, :limit => 200, :default => "", :null => false +# t.column "json", :text +# t.column "aggregation_oai_id", :string, :limit => 200 +# t.column "aggregation_date_stamp", :datetime +# t.column "aggregation_set_spec", :string, :limit => 200 +# t.column "aggregation_harvest_date", :datetime +# t.column "aggregation_altered", :boolean +# t.column "thumbnail", :string, :limit => 200 +# end +# +# add_index "new_raw_xmls", ["oai_id"], :name => "oai_id" +# add_index "new_raw_xmls", ["collection_id"], :name => "raw_xmls_coll_id" +# add_index "new_raw_xmls", ["status"], {:name => "raw_xmls_status", :size => 1} +# +# execute "INSERT INTO new_raw_xmls +# ('id','status','collection_id','oai_id','date_stamp','harvest_date', +# 'data','set_spec','json','aggregation_oai_id','aggregation_set_spec', +# 'aggregation_harvest_date','aggregation_altered','thumbnail')" +# +# drop_table("raw_xmls") +# rename_table("new_raw_xmls", "raw_xmls") + + +end Property changes on: ruby/trunk/aquifer/db/migrate/025_add_raw_xmls_status_index.rb ___________________________________________________________________ Added: svn:executable + * Added: ruby/trunk/aquifer/db/migrate/026_add_collections_status_index.rb =================================================================== --- ruby/trunk/aquifer/db/migrate/026_add_collections_status_index.rb (rev 0) +++ ruby/trunk/aquifer/db/migrate/026_add_collections_status_index.rb 2010-11-03 20:33:37 UTC (rev 667) @@ -0,0 +1,11 @@ +class AddCollectionsStatusIndex < ActiveRecord::Migration + + def self.up + add_index "collections", ["status"], {:name => "collections_status", :size => 1} + end + + def self.down + remove_index "collections", :name => "collections_status" + end + +end Property changes on: ruby/trunk/aquifer/db/migrate/026_add_collections_status_index.rb ___________________________________________________________________ Added: svn:executable + * Modified: ruby/trunk/aquifer/lib/geo_resolver.rb =================================================================== --- ruby/trunk/aquifer/lib/geo_resolver.rb 2010-09-01 21:19:07 UTC (rev 666) +++ ruby/trunk/aquifer/lib/geo_resolver.rb 2010-11-03 20:33:37 UTC (rev 667) @@ -2,87 +2,97 @@ require 'pp' class GeoResolver -@@state_aliases = { - 'AL'=>['AL', 'ALA', 'ALA.', 'ALABAMA'], - 'AK'=>['AK', 'ALASKA'], - 'AS'=>['AS', 'AMERICAN SAMOA'], - 'AZ'=>['AZ', 'ARIZ', 'ARIZ.', 'ARIZONA'], - 'AR'=>['AR', 'ARK', 'ARK.', 'ARKANSAS'], - 'CA'=>['CA', 'CALIF', 'CALIF.', 'CALIFORNIA'], - 'CO'=>['CO', 'COLO','COLO.', 'COLORADO'], - 'CT'=>['CT', 'CONN', 'CONN.', 'CONNECTICUT'], - 'DE'=>['DE', 'DEL','DEL.', 'DELAWARE'], - 'DC'=>['DC', 'D.C.', 'DISTRICT OF COLUMBIA'], - 'FM'=>['FM', 'FEDERATED STATES OF MICRONESIA'], - 'FL'=>['FL', 'FLA' ,'FLA.', 'FLORIDA'], - 'GA'=>['GA', 'GEORGIA'], - 'GU'=>['GU', 'GUAM'], - 'HI'=>['HI', 'HAWAII'], - 'ID'=>['ID', 'IDAHO'], - 'IL'=>['IL', 'ILL', 'ILL.', 'ILLINOIS'], - 'IN'=>['IN', 'IND', 'IND.', 'INDIANA'], - 'IA'=>['IA', 'IOWA'], - 'KS'=>['KS', 'KAN','KAN.', 'KANSAS'], - 'KY'=>['KY', 'KENTUCKY'], - 'LA'=>['LA', 'LOUISIANA'], - 'ME'=>['ME', 'MAINE'], - 'MH'=>['MH', 'MARSHALL ISLANDS'], - 'MD'=>['MD', 'MARYLAND'], - 'MA'=>['MA', 'MASS','MASS.', 'MASSACHUSETTS'], - 'MI'=>['MI', 'MICH','MICH.', 'MICHIGAN'], - 'MN'=>['MN', 'MINN','MINN.', 'MINNESOTA'], - 'MS'=>['MS', 'MISS', 'MISS.', 'MISSISSIPPI'], - 'MO'=>['MO', 'MISSOURI'], - 'MT'=>['MT', 'MONT','MONT.', 'MONTANA'], - 'NE'=>['NE', 'NEB','NEB.', 'NEBRASKA'], - 'NV'=>['NV', 'NEV','NEV.', 'NEVADA'], - 'NH'=>['NH', 'N.H.', 'NEW HAMPSHIRE'], - 'NJ'=>['NJ', 'N.J.', 'NEW JERSEY'], - 'NM'=>['NM', 'N.M.', 'NEW MEXICO'], - 'NY'=>['NY', 'N.Y.', 'NEW YORK'], - 'NC'=>['NC', 'N.C.', 'NORTH CAROLINA'], - 'ND'=>['ND', 'N.D', 'NORTH DAKOTA'], - 'MP'=>['MP', 'NORTHERN MARIANA ISLANDS'], - 'OH'=>['OH', 'OHIO'], - 'OK'=>['OK', 'OKLA','OKLA.', 'OKLAHOMA'], - 'OR'=>['OR', 'ORE','ORE.', 'OREGON'], - 'PW'=>['PW', 'PALAU'], - 'PA'=>['PA', 'PENNSYLVANIA'], - 'PR'=>['PR', 'PUERTO RICO'], - 'RI'=>['RI', 'R.I.', 'RHODE ISLAND'], - 'SC'=>['SC', 'S.C.', 'SOUTH CAROLINA'], - 'SD'=>['SD', 'S.D.', 'SOUTH DAKOTA'], - 'TN'=>['TN', 'TENN','TENN.', 'TENNESSEE'], - 'TX'=>['TX', 'TEX', 'TEX.', 'TEXAS'], - 'UT'=>['UT', 'UTAH'], - 'VT'=>['VT', 'VERMONT'], - 'VI'=>['VI', 'VIRGIN ISLANDS'], - 'VA'=>['VA', 'VIRGINIA'], - 'WA'=>['WA', 'WASH', 'WASH.', 'WASHINGTON'], - 'WV'=>['WV', 'WVA' ,'W.VA.', 'W. VA.', 'WEST VIRGINIA'], - 'WI'=>['WI', 'WIS', 'WIS.', 'WISCONSIN'], - 'WY'=>['WY', 'WYO', 'WYO.', 'WYOMING'] - } - @@client = nil + @@state_aliases = { + 'AL'=>['AL', 'ALA', 'ALA.', 'ALABAMA'], + 'AK'=>['AK', 'ALASKA'], + 'AS'=>['AS', 'AMERICAN SAMOA'], + 'AZ'=>['AZ', 'ARIZ', 'ARIZ.', 'ARIZONA'], + 'AR'=>['AR', 'ARK', 'ARK.', 'ARKANSAS'], + 'CA'=>['CA', 'CALIF', 'CALIF.', 'CALIFORNIA'], + 'CO'=>['CO', 'COLO','COLO.', 'COLORADO'], + 'CT'=>['CT', 'CONN', 'CONN.', 'CONNECTICUT'], + 'DE'=>['DE', 'DEL','DEL.', 'DELAWARE'], + 'DC'=>['DC', 'D.C.', 'DISTRICT OF COLUMBIA'], + 'FM'=>['FM', 'FEDERATED STATES OF MICRONESIA'], + 'FL'=>['FL', 'FLA' ,'FLA.', 'FLORIDA'], + 'GA'=>['GA', 'GEORGIA'], + 'GU'=>['GU', 'GUAM'], + 'HI'=>['HI', 'HAWAII'], + 'ID'=>['ID', 'IDAHO'], + 'IL'=>['IL', 'ILL', 'ILL.', 'ILLINOIS'], + 'IN'=>['IN', 'IND', 'IND.', 'INDIANA'], + 'IA'=>['IA', 'IOWA'], + 'KS'=>['KS', 'KAN','KAN.', 'KANSAS'], + 'KY'=>['KY', 'KENTUCKY'], + 'LA'=>['LA', 'LOUISIANA'], + 'ME'=>['ME', 'MAINE'], + 'MH'=>['MH', 'MARSHALL ISLANDS'], + 'MD'=>['MD', 'MARYLAND'], + 'MA'=>['MA', 'MASS','MASS.', 'MASSACHUSETTS'], + 'MI'=>['MI', 'MICH','MICH.', 'MICHIGAN'], + 'MN'=>['MN', 'MINN','MINN.', 'MINNESOTA'], + 'MS'=>['MS', 'MISS', 'MISS.', 'MISSISSIPPI'], + 'MO'=>['MO', 'MISSOURI'], + 'MT'=>['MT', 'MONT','MONT.', 'MONTANA'], + 'NE'=>['NE', 'NEB','NEB.', 'NEBRASKA'], + 'NV'=>['NV', 'NEV','NEV.', 'NEVADA'], + 'NH'=>['NH', 'N.H.', 'NEW HAMPSHIRE'], + 'NJ'=>['NJ', 'N.J.', 'NEW JERSEY'], + 'NM'=>['NM', 'N.M.', 'NEW MEXICO'], + 'NY'=>['NY', 'N.Y.', 'NEW YORK'], + 'NC'=>['NC', 'N.C.', 'NORTH CAROLINA'], + 'ND'=>['ND', 'N.D', 'NORTH DAKOTA'], + 'MP'=>['MP', 'NORTHERN MARIANA ISLANDS'], + 'OH'=>['OH', 'OHIO'], + 'OK'=>['OK', 'OKLA','OKLA.', 'OKLAHOMA'], + 'OR'=>['OR', 'ORE','ORE.', 'OREGON'], + 'PW'=>['PW', 'PALAU'], + 'PA'=>['PA', 'PENNSYLVANIA'], + 'PR'=>['PR', 'PUERTO RICO'], + 'RI'=>['RI', 'R.I.', 'RHODE ISLAND'], + 'SC'=>['SC', 'S.C.', 'SOUTH CAROLINA'], + 'SD'=>['SD', 'S.D.', 'SOUTH DAKOTA'], + 'TN'=>['TN', 'TENN','TENN.', 'TENNESSEE'], + 'TX'=>['TX', 'TEX', 'TEX.', 'TEXAS'], + 'UT'=>['UT', 'UTAH'], + 'VT'=>['VT', 'VERMONT'], + 'VI'=>['VI', 'VIRGIN ISLANDS'], + 'VA'=>['VA', 'VIRGINIA'], + 'WA'=>['WA', 'WASH', 'WASH.', 'WASHINGTON'], + 'WV'=>['WV', 'WVA' ,'W.VA.', 'W. VA.', 'WEST VIRGINIA'], + 'WI'=>['WI', 'WIS', 'WIS.', 'WISCONSIN'], + 'WY'=>['WY', 'WYO', 'WYO.', 'WYOMING'] + } + @@client = nil - # Cache the most recent hits: - # @@lastmatches is a hash of {field=>result,...} pairs - # @@lastfields is a priority queue where the most recently - # used fields are at the top of the queue. - # @@lastmax is the size of the queue - @@lastmatches = Hash.new - @@lastfields = Array.new - @@lastmax = 20 + # Cache the most recent hits: + # @@lastmatches is a hash of {field=>result,...} pairs + # @@lastfields is a priority queue where the most recently + # used fields are at the top of the queue. + # @@lastmax is the size of the queue + @@lastmatches = Hash.new + @@lastfields = Array.new + @@lastmax = 20 def GeoResolver.get_best( target ) unless @@client @@client = XMLRPC::Client.new2( 'http://localhost:3005/geo_gazer/api',nil,300 ) end # puts "target='#{target.inspect}''" + retry_count = 0 begin @@client.call( 'FindBest', target ) rescue XMLRPC::FaultException puts "GeoGazer exception input='#{target}' exception=#{$!}" + rescue Exception # if this is a broken pipe, this probably will need a new client? + #catch all + if retry_count == 0 + puts "Error: #{$!}. Retrying..." + retry_count = 1 + retry + else + raise + end end end @@ -97,7 +107,7 @@ # started this way, join seems better item.mods_fields[ 'subject_geographic_facet' ].each do |field| fields = [item.mods_fields[ 'subject_geographic_facet' ], - item.mods_fields[ 'subject' ] ] + item.mods_fields[ 'subject' ] ] fields.flatten.each do |field| next if field.blank? @@ -170,6 +180,7 @@ start_id = options[ 'start_id' ].to_i || 1 total = options[ 'limit' ].to_i || 0 incr = ( Time.parse(options[ 'incr' ]) if options[ 'incr' ] ) || nil + coll_id = options['collection_id'].to_i || nil items_processed = 0 found_count = 0 @@ -178,9 +189,17 @@ while( true ) if incr - items = Item.find(:all,:conditions=>["id >= ? and process_date >= ?", start_id, incr],:limit=>100,:order=>'id' ) + if coll_id + items = Item.find(:all,:conditions=>["collection_id = ? and id >= ? and process_date >= ?", coll_id, start_id, incr],:limit=>100,:order=>'id' ) + else + items = Item.find(:all,:conditions=>["id >= ? and process_date >= ?", start_id, incr],:limit=>100,:order=>'id' ) + end else - items = Item.find(:all,:conditions=>["id >= ?", start_id],:limit=>100,:order=>'id' ) + if coll_id + items = Item.find(:all,:conditions=>["collection_id = ? and id >= ?", coll_id, start_id],:limit=>100,:order=>'id' ) + else + items = Item.find(:all,:conditions=>["id >= ?", start_id],:limit=>100,:order=>'id' ) + end end break if items.blank? items.each do |item| Added: ruby/trunk/aquifer/lib/ingest_manager.rb =================================================================== --- ruby/trunk/aquifer/lib/ingest_manager.rb (rev 0) +++ ruby/trunk/aquifer/lib/ingest_manager.rb 2010-11-03 20:33:37 UTC (rev 667) @@ -0,0 +1,165 @@ +# This class is for easily managing harvesting and indexing classes for the +# rake tasks + +class IngestManager + def initialize(options = {}) + @options = options #to pass to other objects if needed + @collection_id = nil + @set_spec = nil + @incremental = false + @incr = nil + @do_geo = true + @limit = nil + @max = 0 + @resume = nil + + @incremental = true if options['incremental'] + @set_spec = options['set_spec'] if options['set_spec'] + @collection_id = options['coll_id'] if options['coll_id'] + @resume = options['resume'] if options['resume'] + @limit = options['limit'].to_i if options.include?('limit') + @max = options['limit'].to_i if options.include?('limit') + @incr = ( Time.parse(options[ 'incr' ]) if options[ 'incr' ] ) || nil + + if @set_spec && !@collection_id + @collection_id = Collection.get_id_from_set_spec(@set_spec) + @options['collection_id'] = @collection_id.to_s + elsif @collection_id + set_spec = Collection.get_set_spec_from_id(@collection_id) + if(@set_spec != set_spec) + puts "Warning: set_spec and collection_id do not match! Using collection_id..." + @set_spec = set_spec + @options['set_spec'] = @set_spec + end + end + + end + + + def self.full_harvest + manager = IngestManager.new + manager.harvest_collections + + end + + + def harvest_collections + if @incremental + puts "Harvesting collection descriptions..." + else + puts "Reharvesting collection descriptions..." + end + + Collection.harvest_collections(@incremental) + puts "Done!" + end + + def harvest_metadata + RawXml.harvest_items_from_aggregation(@incremental, @max, @resume, @set_spec) + end + + def transform_raw_xml + raw_xml_to_item = RawXmlToItem.new(@options) + raw_xml_to_item.process + end + + def geo_resolver + GeoResolver.finder(@options) + end + + + def self.harvest_and_index_all_collections + cols = Collection.find(:all, :select=>"set_spec") + cols.each do |c| + IngestManager.harvest_and_index_collection(c.set_spec) + end + end + + + def update_collection_count + if !@set_spec + #raise error + else + puts "Updating cached counters for '#{@set_spec}'..." + c = Collection.find(:first, :conditions=>["set_spec=?",@set_spec]) + puts "#{c.set_spec} #{c.title_sort}..." + cnt = RawXml.count(["collection_id=?",c.id]) + puts " raw_xmls_count=#{cnt}" + c.raw_xmls_count = cnt + c.count_set_spec = cnt + c.save! + end + end + + + def harvest_and_index_collection + if !@set_spec + #raise error + else + harvest_metadata + update_collection_count + transform_raw_xml + geo_resolver + update_collection_headings + index_collection + end + # count = RawXml.harvest_items_by_collection(set_spec, resume) + # + # # rescue http 500 error here? -- maybe one level up? + # + # if count <= 0 + # puts "No records found. Quitting..." + # return -1 + # end + # + # + # #init the cached counts + # puts "Updating cached counters for '#{set_spec}'..." + # c = Collection.find(:first, :conditions=>["set_spec=?",set_spec]) + # puts "#{c.set_spec} #{c.title_sort}..." + # cnt = RawXml.count(["collection_id=?",c.id]) + # puts " raw_xmls_count=#{cnt}" + # Collection.connection.execute "UPDATE collections SET raw_xmls_count=#{cnt} WHERE ID=#{c.id}" + # + # if cnt <=0 + # return -1 + # end + # + # # can't we just do the RawXml count? + # # cnt = RawXml.count(["set_spec rlike ?", "^#{c.set_spec}$|^#{c.set_spec}:|^#{c.set_spec},|,#{c.set_spec}$|,#{c.set_spec},|^#{c.collection_code}$|^#{c.collection_code}:|^#{c.collection_code},|,#{c.collection_code}$|,#{c.collection_code},"]) + # # puts " count_set_spec=#{cnt}" + # # Collection.connection.execute "UPDATE collections SET count_set_spec=#{cnt} WHERE ID=#{c.id}" + # + # #add incr + # options = Hash.new + # # options['start_id'] = RawXml.connection.select_value( "select min(id) from raw_xmls where collection_id = #{c.id}" ) + # # options['end_id'] = RawXml.connection.select_value( "select max(id) from raw_xmls where collection_id = #{c.id}" ) + # + # options['collection_id'] = c.id + # + # raw_xml_to_item = RawXmlToItem.new(options) + # raw_xml_to_item.process + # + # IngestManager.index_collection(c.id) + end + + def update_collection_headings + MetadataStats.heading_stat_build(0,0,500,@collection_id) + # HeadingStat.update_grand_total + end + + + def index_collection + if !@set_spec + #raise error + else + indexer = ItemIndexer.new(@options) + puts "Processing and optimizing index..." + indexer.clear_set + indexer.process + indexer.optimize + end + end + + +end Property changes on: ruby/trunk/aquifer/lib/ingest_manager.rb ___________________________________________________________________ Added: svn:executable + * Modified: ruby/trunk/aquifer/lib/item_indexer.rb =================================================================== --- ruby/trunk/aquifer/lib/item_indexer.rb 2010-09-01 21:19:07 UTC (rev 666) +++ ruby/trunk/aquifer/lib/item_indexer.rb 2010-11-03 20:33:37 UTC (rev 667) @@ -24,11 +24,34 @@ def initialize( options={} ) - @set_like = ( options[ 'set_like' ] if options[ 'set_like' ] ) || '%' - @start_id = ( options[ 'start_id' ] if options[ 'start_id' ] ) || RawXml.connection.select_value( "select min(id) from raw_xmls where set_spec like '#{@set_like}'" ) - @end_id = ( options[ 'end_id' ] if options[ 'end_id' ] ) || RawXml.connection.select_value( "select max(id) from raw_xmls where set_spec like '#{@set_like}'" ) + @set_like = ( options[ 'set_like' ] if options[ 'set_like' ] ) || nil + @collection_id = (options['collection_id'] if options['collection_id']) || nil + @set_spec = (options['set_spec'] if options['set_spec']) || nil + + if @set_spec && !@collection_id + @collection_id = Collection.get_id_from_set_spec(@set_spec) + elsif @collection_id + set_spec = Collection.get_set_spec_... [truncated message content] |
From: <pau...@us...> - 2010-09-01 21:19:14
|
Revision: 666 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=666&view=rev Author: paulnsorensen Date: 2010-09-01 21:19:07 +0000 (Wed, 01 Sep 2010) Log Message: ----------- Added ability to set meta title and descriptions in environment.rb, removed meta keywords, added share button Modified Paths: -------------- ruby/trunk/aquifer/app/views/collection/show.rhtml ruby/trunk/aquifer/app/views/layouts/default.rhtml ruby/trunk/aquifer/app/views/search/_record.rhtml ruby/trunk/aquifer/app/views/search/search_collections.rhtml ruby/trunk/aquifer/config/environment.rb ruby/trunk/aquifer/public/javascripts/application.js Modified: ruby/trunk/aquifer/app/views/collection/show.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/show.rhtml 2010-08-26 21:02:51 UTC (rev 665) +++ ruby/trunk/aquifer/app/views/collection/show.rhtml 2010-09-01 21:19:07 UTC (rev 666) @@ -3,8 +3,6 @@ <div class="leftposition"> <div class="main_wrapper"> <div id="main_content"> - - <table class="details"> <%= render(:partial=>'mods_element',:object=>@collection.mods.titleInfo({'@type'=>nil}),:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> <%= render(:partial=>'mods_element',:object=>@collection.mods.titleInfo({'@type'=>'alternative'}),:locals=>{:pre_label=>'Alternative ',:label=>nil,:post_label=>''})%> @@ -29,7 +27,6 @@ <%= render(:partial=>'mods_element',:object=>@collection.mods.recordInfo,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> </table> </div> - </div> <div id="aux_content"> <div style='text-align: center'> @@ -39,16 +36,23 @@ <ul style> <li> <%= link_to('Go to Collection',@collection.primary_display_location,:class=>'external') %> - </li> <li> <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec', :facet_browse => @collection.set_spec}) %> (<%= @collection.count_set_spec %>)    </li> + <li> + <!-- AddToAny BEGIN --> + <a class="a2a_dd" href="http://www.addtoany.com/share_save"><img src="http://static.addtoany.com/buttons/share_save_106_16.gif" width="106" height="16" border="0" alt="Share/Bookmark"/></a> + <script type="text/javascript"> + var a2a_config = a2a_config || {}; + a2a_config.num_services = 6; + </script> + <script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script> + <!-- AddToAny END --> + </li> </ul> <%#= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(@collection.set_spec)}) %> </div> - </div> - </div> </div> Modified: ruby/trunk/aquifer/app/views/layouts/default.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/layouts/default.rhtml 2010-08-26 21:02:51 UTC (rev 665) +++ ruby/trunk/aquifer/app/views/layouts/default.rhtml 2010-09-01 21:19:07 UTC (rev 666) @@ -3,29 +3,17 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title><%= truncate(@page_title,45,"...") || "American History Online" %></title> + <title><%= truncate(@page_title,45,"...") || META_TITLE %></title> <% if @page_description %> <meta name="description" content="<%=h(@page_description)%>" /> <% else %> - <meta name="description" content="American History Online is a research project of the University of Illinois and is focused on finding, gathering, and collecting distributed scholarly content in American History. AmericanHistory Online allows researchers to find and use collections in 9 formats, including images (photographs and cultural materials), books and pamphlets, journal articles, maps, sheet music, videos, data sets, political cartoons and posters, and oral histories." /> + <meta name="description" content="<%=META_DESCRIPTION%>" /> <% end %> <% if @page_keywords %> <meta name="keywords" content="<%=h(@page_keywords)%>" /> - <% else %> - <meta name="keywords" content="Aquifer, dlfaquifer.com, Social History, Digital Library Federation, United States, - U.S., American, history, historical, full text, digital, images, imprints, newspapers, government, publications, - documents, broadsides, ephemera, pamphlets, 20th century, 19th century, college, university, library, sheet music, - political cartoons, posters, video, oral histories, maps, cultural materials, data sets, negatives, civil - war photographs, african american photographs, great depression, world war II, abraham lincoln, - charles cushman photographs, edison motion pictures, Edward S. Curtis collection, Frances Benjamin Johnston Collection, - the Emancipator, Lawrence & Houseworth Collection, Making of America, George Grantham Bain Collection, - John C. H. Grabill Collection, National Child Labor Committee Collection, Panoramic Photographs, - National Photo Company Collection, Sam DeVincent Collection, Stereograph Cards, Starr Sheet Music Collection, - Southern Spaces, Photographs by Theodor Horydczak, Transportation History Collection: Railroad, Wright Brothers - Negatives, Public Papers of the Presidents of the United States." /> - <% end %> - <%= stylesheet_link_tag "/themes/#{THEME}/stylesheets/style.css", :media => "all" %> - <%= stylesheet_link_tag "/themes/#{THEME}/stylesheets/jquery-ui.css", :media => "all" %> + <% end %> + <%= stylesheet_link_tag "/themes/#{THEME}/stylesheets/style.css", :media => "all" %> + <%= stylesheet_link_tag "/themes/#{THEME}/stylesheets/jquery-ui.css", :media => "all" %> <link rel="icon" href="/themes/<%=THEME%>/images/favicon.ico" type="image/ico" /> <link rel="shortcut icon" href="/themes/<%=THEME%>/images/favicon.ico" /> <link rel="unapi-server" type="application/xml" title="unAPI" href="<%=url_for :controller => 'unapi', :only_path=>false %>" /> Modified: ruby/trunk/aquifer/app/views/search/_record.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/_record.rhtml 2010-08-26 21:02:51 UTC (rev 665) +++ ruby/trunk/aquifer/app/views/search/_record.rhtml 2010-09-01 21:19:07 UTC (rev 666) @@ -1,7 +1,7 @@ <div style='position:relative;float:left'> <%= render :partial => 'thumbnail', :locals => { :item => item, :mode => mode } %> </div> -<div> +<div style='position:relative;float:left'> <span class='Z3988' title='<%=item.get_openurl_contextobject%>'></span> <abbr class='unapi-id' title='<%=item.id%>'></abbr> <table class="details"> @@ -23,4 +23,14 @@ <% end %> <% end %> </table> +</div> +<div class='share' style='position:relative;float:left'> + <!-- AddToAny BEGIN --> + <a class="a2a_dd" href="http://www.addtoany.com/share_save"><img src="http://static.addtoany.com/buttons/share_save_106_16.gif" width="106" height="16" border="0" alt="Share/Bookmark"/></a> + <script type="text/javascript"> + var a2a_config = a2a_config || {}; + a2a_config.num_services = 6; + </script> + <script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script> + <!-- AddToAny END --> </div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/search/search_collections.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/search_collections.rhtml 2010-08-26 21:02:51 UTC (rev 665) +++ ruby/trunk/aquifer/app/views/search/search_collections.rhtml 2010-09-01 21:19:07 UTC (rev 666) @@ -6,7 +6,7 @@ <% odd = cnt % 2 == 1 ? "odd" : "" %> <div class="smalllistitem clearfix <%=odd%>"> <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> - <h5><%= link_to(t, :action => 'full_record', :id => collection.id, :q => params[:q], :page => params[:page]) %></h5> + <h5><%= link_to(t,{:controller => 'collection', :action=>'show',:id=>collection.id}) %></h5> <h6> <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> <%=orig.publisher[0].to_s.gsub(/\[\]/,'')%> Modified: ruby/trunk/aquifer/config/environment.rb =================================================================== --- ruby/trunk/aquifer/config/environment.rb 2010-08-26 21:02:51 UTC (rev 665) +++ ruby/trunk/aquifer/config/environment.rb 2010-09-01 21:19:07 UTC (rev 666) @@ -119,4 +119,8 @@ # Theme settings THEME = 'aho' +META_TITLE = 'American History Online' +META_DESCRIPTION = 'American History Online is a research project of the University of Illinois and is focused on finding, gathering, and collecting distributed scholarly content in American History. American History Online allows researchers to find and use collections in 9 formats, including images (photographs and cultural materials), books and pamphlets, journal articles, maps, sheet music, videos, data sets, political cartoons and posters, and oral histories.' #THEME = 'gma' +#META_TITLE = 'Global Middle Ages History Online' +#META_DESCRIPTION = 'Global Middle Ages History Online is a research project of the University of Illinois and is focused on finding, gathering, and collecting distributed scholarly content in Global Middle Ages History. Global Middle Ages History Online allows researchers to find and use collections in 9 formats, including images (photographs and cultural materials), books and pamphlets, journal articles, maps, sheet music, videos, data sets, political cartoons and posters, and oral histories. ' Modified: ruby/trunk/aquifer/public/javascripts/application.js =================================================================== --- ruby/trunk/aquifer/public/javascripts/application.js 2010-08-26 21:02:51 UTC (rev 665) +++ ruby/trunk/aquifer/public/javascripts/application.js 2010-09-01 21:19:07 UTC (rev 666) @@ -297,11 +297,12 @@ d.load(href+ ' #main >*', function(){ + $('#dialog .share').hide(); var prev = $('#dialog .prev a'); var next = $('#dialog .next a'); var buttons = {}; - + if(next.is('a')){ buttons['Next'] = function() { show_full_record(next); @@ -312,6 +313,10 @@ show_full_record(prev); }; } + buttons['Full Page'] = function() { + location.href = href; + } + d.dialog('option', 'buttons', buttons); d.dialog('option', 'title', 'Item Details'); }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2010-08-26 21:02:59
|
Revision: 665 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=665&view=rev Author: paulnsorensen Date: 2010-08-26 21:02:51 +0000 (Thu, 26 Aug 2010) Log Message: ----------- Several small interface adjustments, added a consolidated rake task Modified Paths: -------------- ruby/trunk/aquifer/app/controllers/home_controller.rb ruby/trunk/aquifer/app/models/search.rb ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml ruby/trunk/aquifer/app/views/collection/shortlist.rhtml ruby/trunk/aquifer/app/views/home/index.rhtml ruby/trunk/aquifer/app/views/search/_brief_field.rhtml ruby/trunk/aquifer/app/views/search/_collection_box.rhtml ruby/trunk/aquifer/app/views/search/index.rhtml ruby/trunk/aquifer/app/views/search/search_collections.rhtml ruby/trunk/aquifer/lib/tasks/aquifer.rake ruby/trunk/aquifer/public/javascripts/application.js ruby/trunk/aquifer/public/themes/aho/stylesheets/style.css ruby/trunk/aquifer/public/themes/gma/stylesheets/style.css Added Paths: ----------- ruby/trunk/aquifer/public/themes/aho/images/highlighted_collectionbg.png ruby/trunk/aquifer/public/themes/gma/images/highlighted_collectionbg.png Modified: ruby/trunk/aquifer/app/controllers/home_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-08-26 21:02:51 UTC (rev 665) @@ -27,16 +27,12 @@ # end def index - @item_cnt = Item.count('id',:conditions => nil).to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,") @coll_cnt = Collection.count('id',:conditions => nil) @fmt_cnt = 9 featured_collections - - - + tag_cloud - end @@ -138,16 +134,21 @@ def featured_collections cache_age = Time.now - @@last_featured_collections_update unless read_fragment({}) and cache_age < 1.day + count = @coll_cnt + if count > 11 + count = 11 + end + colls=Collection.find(:all) - old_ids = Array.new(11) + old_ids = Array.new(count) @@featured_collections.each do |collection| old_ids.push(collection.object_id) end @@featured_collections.clear - new_ids = Array(11) + new_ids = Array(count) danger=0 begin @@ -158,7 +159,7 @@ new_ids.push(next_coll) end break if (@@featured_collections.size >= @coll_cnt) || (danger > 1000) - end while @@featured_collections.size < 11 + end while @@featured_collections.size < count #make featured collections always update at about the same time regardless of when the page is browsed @@last_featured_collections_update = Time.mktime(Time.now.year, Time.now.month, Time.now.day, 1, 0, 0) @@ -184,6 +185,7 @@ puts "conditions=#{conditions.inspect}" @headings = Heading.paginate( :page => params[:page], :joins => joins, :conditions => conditions, :order => order, :per_page => per_page ) +# @headings.sort {|a,b| a.original_text <=> b.original_text } end Modified: ruby/trunk/aquifer/app/models/search.rb =================================================================== --- ruby/trunk/aquifer/app/models/search.rb 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/app/models/search.rb 2010-08-26 21:02:51 UTC (rev 665) @@ -23,8 +23,8 @@ @@facet_types = [ - Facet.new( "subject", "subject", "count",5000 ), - Facet.new( "subject_topic", "topic", "count",5000 ), +# Facet.new( "subject", "subject", "count",5000 ), + Facet.new( "subject_topic", "subject", "count",5000 ), Facet.new( "subject_geographic", "place", "count",5000 ), Facet.new( "subject_name", "name", "count",5000 ), Facet.new( "city_state", "city", "label" ), Modified: ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml 2010-08-26 21:02:51 UTC (rev 665) @@ -1,33 +1,28 @@ <% if collections %> - <% collections.each do |collection| %> - <% if collection %> - - <div class="collection"> - - <div class="thumbnailarea"> - <ul class="actions"> - <li><%= link_to('Go to Collection',url_encode(collection.primary_display_location), :class => 'external') %></li> - - <li><%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)</li> - <li><%= link_to('View Details',{:controller => 'collection', :action=>'show',:id=>collection.id}) %></li> - <%#*<li><%= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(collection.set_spec)}) % ></li>%> - </ul> - <% if collection.get_image_url != "" %> - <%= link_to(image_tag(collection.get_image_url),collection.primary_display_location, :class=>'thumbnail') %> - <% else %> - <%= link_to(image_tag('image_unavailable.png'),collection.primary_display_location, :class => "thumbnail") %> - <% end %> - - </div> - <div class="collectioninfo"> - <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> - <b><%=truncate(t.to_s, 30)%></b><br/> - <% end %> - <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> - <%=truncate(orig.publisher[0].to_s.gsub(/\[\]/,''), 35)%> - <% end %> - </div> - </div> + <% collections.each do |collection| %> + <% if collection %> + <div class="collection"> + <div class="thumbnailarea"> + <ul class="actions"> + <li><%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)</li> + <li><%= link_to('View Details',{:controller => 'collection', :action=>'show',:id=>collection.id}) %></li> + <li><%= link_to('View Original Items',collection.primary_display_location, :class => 'external') %></li> + </ul> + <% if collection.get_image_url != "" %> + <%= link_to(image_tag(collection.get_image_url),collection.primary_display_location, :class=>'thumbnail') %> + <% else %> + <%= link_to(image_tag('image_unavailable.png'),collection.primary_display_location, :class => "thumbnail") %> <% end %> - <% end %> - <% end %> + </div> + <div class="collectioninfo"> + <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> + <b><%=truncate(t.to_s, 30)%></b><br/> + <% end %> + <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> + <%=truncate(orig.publisher[0].to_s.gsub(/\[\]/,''), 35)%> + <% end %> + </div> + </div> + <% end %> + <% end %> +<% end %> Modified: ruby/trunk/aquifer/app/views/collection/shortlist.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/shortlist.rhtml 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/app/views/collection/shortlist.rhtml 2010-08-26 21:02:51 UTC (rev 665) @@ -3,39 +3,38 @@ <div class="menutext">Collections Pages:</div> <div class="pagination"> <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></div> <div class="menubuttons"> - <%= link_to('Grid View',{:action=>'list',:page=>@collections2.current_page,:q=>params[:q]}) %> + <%= link_to('Grid View',{:action=>'list',:page=>@collections2.current_page,:q=>params[:q]}) %> </div> </div> </div> - - + + <div id="main_content" class="clearfix"> - <% cnt =0 %> - <% @collections2.each do |collection| %> - <% if collection %> - <% cnt = cnt + 1%> - <% odd = cnt % 2 == 1 ? "odd" : "" %> - <div class="listitem clearfix <%=odd%>"> - <div style="float:left"> -<%= link_to(image_tag(collection.get_image_url,:border=>'0',:width=>'144'),collection.primary_display_location) %> - </div> - <div style="float:left; max-width: 70%; margin: 0 18px"> - <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> - <h3><%=t%></h3> - <% end %> - <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> - <%=orig.publisher[0].to_s.gsub(/\[\]/,'')%><br/> - <% end %> - <p><%=collection.mods.abstract[0].to_s%></p> - <%= link_to('Go to Collection',collection.primary_display_location, :class=>'external') %>   - <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)   - <%= link_to('View Details',{:action=>'show',:id=>collection.id}) %>   - <%#= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(collection.set_spec)}) %> - </div> - </div> - <% end %> - <% end %> + <% cnt =0 %> + <% @collections2.each do |collection| %> + <% if collection %> + <% cnt = cnt + 1%> + <% odd = cnt % 2 == 1 ? "odd" : "" %> + <div class="listitem clearfix <%=odd%>"> + <div style="float:left"> + <%= link_to(image_tag(collection.get_image_url,:border=>'0',:width=>'144'),collection.primary_display_location) %> + </div> + <div style="float:left; max-width: 70%; margin: 0 18px"> + <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> + <h3><%=t%></h3> + <% end %> + <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> + <%=orig.publisher[0].to_s.gsub(/\[\]/,'')%><br/> + <% end %> + <p><%=collection.mods.abstract[0].to_s%></p> + <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)   + <%= link_to('View Details',{:action=>'show',:id=>collection.id}) %>   + <%= link_to('View Original Items',collection.primary_display_location, :class=>'external') %>   + </div> + </div> + <% end %> + <% end %> </div> <div class="pagemenu bottom clearfix"> - <div class="pagination bottom"> <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></div> + <div class="pagination bottom"> <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></div> </div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/index.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/index.rhtml 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/app/views/home/index.rhtml 2010-08-26 21:02:51 UTC (rev 665) @@ -2,74 +2,51 @@ <div class="leftposition"> <div class="main_wrapper"> <div id="main_content"> - - + <h3 class="page_title">Featured Collections</h3> <div id="collectionlist" class="clearfix featured"> - - <%= render :partial=>'collection/collection_list', :locals => {:collections => @featured_colls}%> - - - - - <div class="collection"> - - <h2 id="browse_collections"><%= link_to("Browse all <span>#@coll_cnt</span> collections" , {:controller=>'collection'}) %></h2> - - </div> + <div class="collection highlighted"> + <%= link_to("<h2 id='browse_collections'>Browse all <span>#@coll_cnt</span> collections</h2>" , {:controller=>'collection'}) %> </div> - - - + <%= render :partial=>'collection/collection_list', :locals => {:collections => @featured_colls}%> </div> - </div> - <div id="aux_content"> - <h4>Browsing Shortcuts</h4> - <div style="float:right"> - <div id="accordion"> - - <h3><a href="#">Subjects</a></h3> - <div id="subjects" class="tree_widget"> - <div style="margin:0 auto; text-align:center; height:350px; color:#ccc; font-weight:bold;"><div style="height:153px;"></div><%= image_tag("/images/ajax-loader.gif") %> loading...</div> - </div> - - <h3><a href="#">Places</a></h3> - - <div id="places" class="tree_widget"> - <div style="margin:0 auto; text-align:center; height:300px; color:#ccc; font-weight:bold;"><div style="height:138px;"></div><%= image_tag("/images/ajax-loader.gif") %> loading...</div> </div> - - <h3><a href="#">Times</a></h3> - - <div id="times" class="tree_widget"> - <div style="margin:0 auto; text-align:center; height:300px; color:#ccc; font-weight:bold;"><div style="height:138px;"></div><%= image_tag("/images/ajax-loader.gif") %> loading...</div> </div> - + </div> + <div id="aux_content"> + <h4>Browsing Shortcuts</h4> + <div style="float:right"> + <div id="accordion"> + <h3><a href="#">Subjects</a></h3> + <div id="subjects" class="tree_widget"> + <div style="margin:0 auto; text-align:center; height:350px; color:#ccc; font-weight:bold;"><div style="height:153px;"></div><%= image_tag("/images/ajax-loader.gif") %> loading...</div> </div> - <script type="text/javascript"> - /* <![CDATA[ */ - $(function(){ - load_front_widget_data(); - <%#*load_front_widget_data('subjects');%> - <%#*load_front_widget_data('places');%> - <%#*load_front_widget_data('times');%> - }); - /* ]]> */ - </script> - -<%#= render :partial => "front_widget", :locals => { :div_base => "place_tree", :tree_nodes => @place_tree, :depth=>0 } %> + <h3><a href="#">Places</a></h3> + <div id="places" class="tree_widget"> + <div style="margin:0 auto; text-align:center; height:300px; color:#ccc; font-weight:bold;"><div style="height:138px;"></div><%= image_tag("/images/ajax-loader.gif") %> loading...</div> + </div> + <h3><a href="#">Times</a></h3> + <div id="times" class="tree_widget"> + <div style="margin:0 auto; text-align:center; height:300px; color:#ccc; font-weight:bold;"><div style="height:138px;"></div><%= image_tag("/images/ajax-loader.gif") %> loading...</div> + </div> </div> - - - <div id='tag_cloud' > - <% for heading in @headings.sort {|a,b| a.original_text <=> b.original_text } %> - <%= link_to( heading.original_text, - { :controller => :search, :q => "#{heading.original_text}" }, - { :style => "#{font_size_for_tag_cloud( heading.grand_total, - @headings.last.grand_total, - @headings.first.grand_total, { :max_font_size => 40, :min_font_size => 14 } )}" } ) %> - - <% end %> - </div> + <script type="text/javascript"> + /* <![CDATA[ */ + $(function(){ + load_front_widget_data(); + }); + /* ]]> */ + </script> </div> - + <div id='tag_cloud' > + <% for heading in @headings.sort {|a,b| a.original_text <=> b.original_text} %> + <%= link_to( heading.original_text, + { :controller => :search, :q => "#{heading.original_text}" }, + { :style => "#{font_size_for_tag_cloud( heading.grand_total, + @headings.last.grand_total, + @headings.first.grand_total, { :max_font_size => 40, :min_font_size => 14 } )}" } ) %> + + <% end %> + </div> </div> + </div> +</div> Modified: ruby/trunk/aquifer/app/views/search/_brief_field.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/_brief_field.rhtml 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/app/views/search/_brief_field.rhtml 2010-08-26 21:02:51 UTC (rev 665) @@ -1,11 +1,11 @@ -<% if field.tag == 'title' and item.get_external_link %> - <h3><%= render( :partial => "link_to_source", :locals => { :item => item, :link_text => @search.to_html_with_query_words_highlighted( field.display_data ) } ) %></h3> +<% if field.tag == 'title' %> + <h3><span class="full_record"><%= link_to @search.to_html_with_query_words_highlighted( field.display_data ), :action => 'item', :unused => item.title_url_form, :id => item, :q => params[:q], :page => params[:page] %></span></h3> <% elsif field.tag=='set_spec' %> - <%= link_to @search.to_html_with_query_words_highlighted( Collection.get_title_by_set_spec(field.display_data)), {:controller=>:collection, :action=>:show, :id=>item.collection.id} %> + <%= link_to @search.to_html_with_query_words_highlighted( Collection.get_title_by_set_spec(field.display_data)), {:controller=>:collection, :action=>:show, :id=>item.collection.id} %> <% elsif field.external_link? %> - <%= "<a class='' href=\"#{field.data}\" target=\"_blank\">#{@search.to_html_with_query_words_highlighted( field.display_data )}</a>" %> + <%= "<a class='' href=\"#{field.data}\" target=\"_blank\">#{@search.to_html_with_query_words_highlighted( field.display_data )}</a>" %> <% elsif field.search_link? %> - <%= link_to @search.to_html_with_query_words_highlighted( field.display_data ), { :action => :index, :q => field.search_data }, { :rel => 'nofollow' } %> + <%= link_to @search.to_html_with_query_words_highlighted( field.display_data ), { :action => :index, :q => field.search_data }, { :rel => 'nofollow' } %> <% else %> - <%= @search.to_html_with_query_words_highlighted( field.display_data ) %> + <%= @search.to_html_with_query_words_highlighted( field.display_data ) %> <% end %> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/search/_collection_box.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/_collection_box.rhtml 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/app/views/search/_collection_box.rhtml 2010-08-26 21:02:51 UTC (rev 665) @@ -1,4 +1,3 @@ - <% if params['q'] %> <div id="collectionbox" class="clearfix"> <h4>Relevant Collections</h4> @@ -8,7 +7,11 @@ <script type="text/javascript"> /* <![CDATA[ */ $(function(){ - $('#relcollections').load('search/search_collections #relcollections >*', {q:'<%=params[:q]%>'}); + $('#relcollections').load('search/search_collections #relcollections >*', {q:'<%=params[:q]%>'}, function(){ + $('a.external').attr({ + target: "_blank" + }); + }); }); /* ]]> */ </script> Modified: ruby/trunk/aquifer/app/views/search/index.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/index.rhtml 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/app/views/search/index.rhtml 2010-08-26 21:02:51 UTC (rev 665) @@ -24,10 +24,10 @@ <div id="main_content" class="clearfix"> <% for item in @items %> <div class ="searchitem clearfix"> - <%= render :partial => "brief_record", :locals => { :item => item, :mode => 'index', :display_fields => SearchOptions.brief_tags } %> - <span class="full_record"> - <%= link_to 'full record', :action => 'item', :unused => item.title_url_form, :id => item, :q => params[:q], :page => params[:page] %> - </span> + <%= render :partial => "brief_record", :locals => { :item => item, :mode => 'index', :display_fields => SearchOptions.brief_tags } %> + <% if item.get_external_link %> + <%= render( :partial => "link_to_source", :locals => { :item => item, :link_text => 'View Original Item'} ) %> + <% end %> <% if true==false and @has_xslt %> | <%= link_nofollow 'xsl info', { :action => 'transform_record', :id => item.id }, { :target => '_blank' } %> Modified: ruby/trunk/aquifer/app/views/search/search_collections.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/search_collections.rhtml 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/app/views/search/search_collections.rhtml 2010-08-26 21:02:51 UTC (rev 665) @@ -5,16 +5,16 @@ <% cnt = cnt + 1%> <% odd = cnt % 2 == 1 ? "odd" : "" %> <div class="smalllistitem clearfix <%=odd%>"> - <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> - <h5><%= link_to(t,collection.primary_display_location, {:class => 'external'}) %></h5> - <%# end %> + <h5><%= link_to(t, :action => 'full_record', :id => collection.id, :q => params[:q], :page => params[:page]) %></h5> <h6> <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> <%=orig.publisher[0].to_s.gsub(/\[\]/,'')%> <% end %> </h6> <a href="#" onclick="update_facets('/search/index', {facet_tag: 'set_spec', facet_browse: '<%=collection.set_spec%>', new_search: 1}); return false;">Browse Records</a> (<%= commify(collection.count_set_spec) %>) +   + <%= link_to('View Original Item',collection.primary_display_location, {:class => 'external'}) %> </div> <% end %> <% end %> Modified: ruby/trunk/aquifer/lib/tasks/aquifer.rake =================================================================== --- ruby/trunk/aquifer/lib/tasks/aquifer.rake 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/lib/tasks/aquifer.rake 2010-08-26 21:02:51 UTC (rev 665) @@ -2,13 +2,33 @@ include MetadataStats namespace :aquifer do - + + desc "Runs all the reharvesting tasks with one command" + task :reharvest => [:reharvest_collection_descriptions, :reharvest_metadata, :update_collection_count, :transform_raw_xml, :fix_orphaned_items, :delete_orphaned_items] + + desc "Runs all the reharvesting and reindexing tasks. If resume=[token] is passed, the reharvest_collection_descriptions will be skipped" + task :reindex => :environment do + if !ENV.include?("resume") + Rake::Task["aquifer:reharvest_collection_descriptions"].execute + end + Rake::Task["aquifer:reharvest_metadata"].execute + Rake::Task["aquifer:update_collection_count"].execute + Rake::Task["aquifer:transform_raw_xml"].execute + Rake::Task["aquifer:fix_orphaned_items"].execute + Rake::Task["aquifer:delete_orphaned_items"].execute + Rake::Task["aquifer:geo_resolver"].execute + Rake::Task["aquifer:rebuild_all_stats"].execute + Rake::Task["aquifer:index_items"].execute + + + end + desc "Repopulate the set_values table from the set_spec column in the raw_xmls table" task :repopulate_set_values => :environment do - puts "Repopulating set_values table..." - SetValue.init_from_raw_xml - puts "Done!" - end + puts "Repopulating set_values table..." + SetValue.init_from_raw_xml + puts "Done!" + end #orphaned items can occur if the harvest and/or is interupted before completing desc "Delete orphaned items (those without a corresponding raw_xml)" @@ -37,37 +57,37 @@ desc "Update the raw_xmls collection counter for just one collection given by an set_spec=? param" task :update_one_collection_count => :environment do - #init the cached counts - puts "Updating cached counters for '#{ENV['set_spec']}'..." - Collection.find(:first, :condition=>["set_spec=? or collection_code=?",ENV['set_spec'],ENV['set_spec']]).each do |c| - puts "#{c.set_spec} #{c.title_sort}..." - cnt = RawXml.count(["collection_id=?",c.id]) - puts " raw_xmls_count=#{cnt}" - Collection.connection.execute "UPDATE collections SET raw_xmls_count=#{cnt} WHERE ID=#{c.id}" + #init the cached counts + puts "Updating cached counters for '#{ENV['set_spec']}'..." + Collection.find(:first, :condition=>["set_spec=? or collection_code=?",ENV['set_spec'],ENV['set_spec']]).each do |c| + puts "#{c.set_spec} #{c.title_sort}..." + cnt = RawXml.count(["collection_id=?",c.id]) + puts " raw_xmls_count=#{cnt}" + Collection.connection.execute "UPDATE collections SET raw_xmls_count=#{cnt} WHERE ID=#{c.id}" - cnt = RawXml.count(["set_spec rlike ?", "^#{c.set_spec}$|^#{c.set_spec}:|^#{c.set_spec},|,#{c.set_spec}$|,#{c.set_spec},|^#{c.collection_code}$|^#{c.collection_code}:|^#{c.collection_code},|,#{c.collection_code}$|,#{c.collection_code},"]) - puts " count_set_spec=#{cnt}" - Collection.connection.execute "UPDATE collections SET count_set_spec=#{cnt} WHERE ID=#{c.id}" - end - puts "Done!" + cnt = RawXml.count(["set_spec rlike ?", "^#{c.set_spec}$|^#{c.set_spec}:|^#{c.set_spec},|,#{c.set_spec}$|,#{c.set_spec},|^#{c.collection_code}$|^#{c.collection_code}:|^#{c.collection_code},|,#{c.collection_code}$|,#{c.collection_code},"]) + puts " count_set_spec=#{cnt}" + Collection.connection.execute "UPDATE collections SET count_set_spec=#{cnt} WHERE ID=#{c.id}" + end + puts "Done!" end desc "Update the raw_xmls collection counter" task :update_collection_count => :environment do - #init the cached counts - puts 'Updating cached counters...' - Collection.find(:all).each do |c| - puts "#{c.set_spec} #{c.title_sort}..." - cnt = RawXml.count(["collection_id=?",c.id]) - puts " raw_xmls_count=#{cnt}" - Collection.connection.execute "UPDATE collections SET raw_xmls_count=#{cnt} WHERE ID=#{c.id}" + #init the cached counts + puts 'Updating cached counters...' + Collection.find(:all).each do |c| + puts "#{c.set_spec} #{c.title_sort}..." + cnt = RawXml.count(["collection_id=?",c.id]) + puts " raw_xmls_count=#{cnt}" + Collection.connection.execute "UPDATE collections SET raw_xmls_count=#{cnt} WHERE ID=#{c.id}" - cnt = RawXml.count(["set_spec rlike ?", "^#{c.set_spec}$|^#{c.set_spec}:|^#{c.set_spec},|,#{c.set_spec}$|,#{c.set_spec},|^#{c.collection_code}$|^#{c.collection_code}:|^#{c.collection_code},|,#{c.collection_code}$|,#{c.collection_code},"]) - puts " count_set_spec=#{cnt}" - Collection.connection.execute "UPDATE collections SET count_set_spec=#{cnt} WHERE ID=#{c.id}" - end - puts "Done!" + cnt = RawXml.count(["set_spec rlike ?", "^#{c.set_spec}$|^#{c.set_spec}:|^#{c.set_spec},|,#{c.set_spec}$|,#{c.set_spec},|^#{c.collection_code}$|^#{c.collection_code}:|^#{c.collection_code},|,#{c.collection_code}$|,#{c.collection_code},"]) + puts " count_set_spec=#{cnt}" + Collection.connection.execute "UPDATE collections SET count_set_spec=#{cnt} WHERE ID=#{c.id}" + end + puts "Done!" end @@ -87,35 +107,35 @@ desc "eXist updater, options: start_id=n end_id=n limit=n" task :add_to_exist => :environment do - puts "Adding records to eXist DB..." - adder = RawXmlToExist.new( ENV ) - adder.process - puts "Done!" + puts "Adding records to eXist DB..." + adder = RawXmlToExist.new( ENV ) + adder.process + puts "Done!" end desc "Create sitemap and sitemap index files, use force_ping=[0|1] to alter default ping behavior, default is to ping if production" task :make_sitemap => :environment do - puts "Building site map..." - builder = SitemapBuilder.new - builder.create_files - if ENV[ 'force_ping'] == '1' or ( ENV[ 'RAILS_ENV' ] == 'production' and ENV[ 'force_ping' ] != '0' ) - builder.send_pings - end - puts "Done!" + puts "Building site map..." + builder = SitemapBuilder.new + builder.create_files + if ENV[ 'force_ping'] == '1' or ( ENV[ 'RAILS_ENV' ] == 'production' and ENV[ 'force_ping' ] != '0' ) + builder.send_pings + end + puts "Done!" end desc "Populate the search_fields and the heading_items table" task :heading_item_builder => :environment do - puts "Building item headings..." - heading_stat_build_just_heading_items(0,0) - puts "Done!" + puts "Building item headings..." + heading_stat_build_just_heading_items(0,0) + puts "Done!" end desc "Populate the search_fields and heading_stats tables" task :heading_stat_builder => :environment do - puts "Building just headings..." - heading_stat_build_just_headings(0,0) - puts "Done!" + puts "Building just headings..." + heading_stat_build_just_headings(0,0) + puts "Done!" end desc "Populate the search_fields and heading_stats and heading_items tables" Modified: ruby/trunk/aquifer/public/javascripts/application.js =================================================================== --- ruby/trunk/aquifer/public/javascripts/application.js 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/public/javascripts/application.js 2010-08-26 21:02:51 UTC (rev 665) @@ -139,6 +139,10 @@ $('.pagemenu.top').html($(data).find('.pagemenu.top').html()); $('.pagemenu.bottom').html($(data).find('.pagemenu.bottom').html()); + $('a.external').attr({ + target: "_blank" + }); + $('.pagemenu .pagination a').click(function (){ load_pagination($(this)); return false; @@ -245,7 +249,10 @@ $(this).hide(); }); - + $('a.external').attr({ + target: "_blank" + }); + $('#main_content').fadeIn(600); $('.pagemenu.top').html($(data).find('.pagemenu.top').html()); Added: ruby/trunk/aquifer/public/themes/aho/images/highlighted_collectionbg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/highlighted_collectionbg.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: ruby/trunk/aquifer/public/themes/aho/stylesheets/style.css =================================================================== --- ruby/trunk/aquifer/public/themes/aho/stylesheets/style.css 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/public/themes/aho/stylesheets/style.css 2010-08-26 21:02:51 UTC (rev 665) @@ -204,22 +204,26 @@ } .pagemenu .menuwrapper { -max-width:65%; +max-width:70%; margin:0 auto; } .pagemenu .menubuttons { -float:right; +/*float:right;*/ +margin: 0 0 0 12px; +display: inline; } .pagemenu .menubuttons a { -background:#fafafa; -border:1px solid #eee; +background:#487fb4; +border:1px solid #ddd; -webkit-border-radius:4px; -moz-border-radius:4px; border-radius:4px; -margin:0 10px; +/*margin:0 10px 0 0;*/ padding:3px; +font-size: 110%; +color: #fff; } .pagemenu .menutext { @@ -288,6 +292,11 @@ padding:6px; } +.collection.highlighted { + background:#C8E0F4 url('/themes/aho/images/highlighted_collectionbg.png') repeat-x top left; + border: 1px solid #ccc; +} + .collection b { font-size:1.05em; } @@ -454,14 +463,13 @@ border-radius:8px; margin:6px; padding:6px; -} - -#browse_collections a { +background:#F2F8FC; color:#8a1915; } -#browse_collections a:hover { +#browse_collections:hover { text-decoration:none; +background: #fff; } #browse_collections span { @@ -1134,6 +1142,15 @@ list-style-type:decimal; } +#main_content h3.page_title { + color: #ccc; + text-align: center; + font-size:1.2em; + margin: 0 0 6px; + padding: 0; + font-weight: normal; +} + #main_content h4 { font-weight:700; font-size:0.95em; Added: ruby/trunk/aquifer/public/themes/gma/images/highlighted_collectionbg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/gma/images/highlighted_collectionbg.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: ruby/trunk/aquifer/public/themes/gma/stylesheets/style.css =================================================================== --- ruby/trunk/aquifer/public/themes/gma/stylesheets/style.css 2010-07-09 01:32:21 UTC (rev 664) +++ ruby/trunk/aquifer/public/themes/gma/stylesheets/style.css 2010-08-26 21:02:51 UTC (rev 665) @@ -204,22 +204,26 @@ } .pagemenu .menuwrapper { -max-width:65%; +max-width:70%; margin:0 auto; } .pagemenu .menubuttons { -float:right; +/*float:right;*/ +margin: 0 0 0 12px; +display: inline; } .pagemenu .menubuttons a { -background:#fafafa; -border:1px solid #eee; +background:#487fb4; +border:1px solid #ddd; -webkit-border-radius:4px; -moz-border-radius:4px; border-radius:4px; -margin:0 10px; +/*margin:0 10px 0 0;*/ padding:3px; +font-size: 110%; +color: #fff; } .pagemenu .menutext { @@ -288,6 +292,11 @@ padding:6px; } +.collection.highlighted { + background:#C8E0F4 url('/themes/gma/images/highlighted_collectionbg.png') repeat-x top left; + border: 1px solid #ccc; +} + .collection b { font-size:1.05em; } @@ -454,14 +463,13 @@ border-radius:8px; margin:6px; padding:6px; -} - -#browse_collections a { +background:#F2F8FC; color:#8a1915; } -#browse_collections a:hover { +#browse_collections:hover { text-decoration:none; +background: #fff; } #browse_collections span { @@ -1134,6 +1142,15 @@ list-style-type:decimal; } +#main_content h3.page_title { + color: #ccc; + text-align: center; + font-size:1.2em; + margin: 0 0 6px; + padding: 0; + font-weight: normal; +} + #main_content h4 { font-weight:700; font-size:0.95em; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2010-07-09 01:32:28
|
Revision: 664 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=664&view=rev Author: thabing Date: 2010-07-09 01:32:21 +0000 (Fri, 09 Jul 2010) Log Message: ----------- Fixed endless loop when fewer than 11 collections Modified Paths: -------------- ruby/trunk/aquifer/app/controllers/home_controller.rb ruby/trunk/aquifer/app/models/collection.rb Modified: ruby/trunk/aquifer/app/controllers/home_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-07-06 22:55:57 UTC (rev 663) +++ ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-07-09 01:32:21 UTC (rev 664) @@ -149,13 +149,16 @@ @@featured_collections.clear new_ids = Array(11) + danger=0 begin - next_coll = rand(colls.length) + danger = danger + 1 + next_coll = rand(colls.length) if !old_ids.include?(next_coll) && !new_ids.include?(next_coll) && colls[next_coll].get_image_url != "" @@featured_collections.push(colls[next_coll]) new_ids.push(next_coll) end - end while @@featured_collections.size < 11 + break if (@@featured_collections.size >= @coll_cnt) || (danger > 1000) + end while @@featured_collections.size < 11 #make featured collections always update at about the same time regardless of when the page is browsed @@last_featured_collections_update = Time.mktime(Time.now.year, Time.now.month, Time.now.day, 1, 0, 0) Modified: ruby/trunk/aquifer/app/models/collection.rb =================================================================== --- ruby/trunk/aquifer/app/models/collection.rb 2010-07-06 22:55:57 UTC (rev 663) +++ ruby/trunk/aquifer/app/models/collection.rb 2010-07-09 01:32:21 UTC (rev 664) @@ -538,7 +538,7 @@ ret = "/themes/#{THEME}/images/collection/#{file_base}.gif" else # ret = "/images/logo.gif" - ret = "" + ret = "/images/noimage.gif" end return ret This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2010-07-06 22:56:03
|
Revision: 663 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=663&view=rev Author: thabing Date: 2010-07-06 22:55:57 +0000 (Tue, 06 Jul 2010) Log Message: ----------- Fix for harvest failure when raw_xml table is empty Modified Paths: -------------- ruby/trunk/aquifer/app/models/raw_xml.rb Modified: ruby/trunk/aquifer/app/models/raw_xml.rb =================================================================== --- ruby/trunk/aquifer/app/models/raw_xml.rb 2010-06-24 22:08:12 UTC (rev 662) +++ ruby/trunk/aquifer/app/models/raw_xml.rb 2010-07-06 22:55:57 UTC (rev 663) @@ -297,8 +297,10 @@ puts "Settings status to 'pending'..." minid = RawXml.minimum('id') maxid = RawXml.maximum('id') - minid.step(maxid,1000) do |sid| - RawXml.update_all("status='pending'","id>=#{sid} and id<#{sid+1000}") + if minid and maxid + minid.step(maxid,1000) do |sid| + RawXml.update_all("status='pending'","id>=#{sid} and id<#{sid+1000}") + end end #NOTE: The above is rather inefficient, but it works around a innodb limitation #We are looking to tweak the innodb settings to overcome this. The following is This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2010-06-24 22:08:24
|
Revision: 662 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=662&view=rev Author: paulnsorensen Date: 2010-06-24 22:08:12 +0000 (Thu, 24 Jun 2010) Log Message: ----------- Cleaned up SVN mess -- Added full themes folder Added Paths: ----------- ruby/trunk/aquifer/public/themes/ ruby/trunk/aquifer/public/themes/aho/ ruby/trunk/aquifer/public/themes/aho/images/ ruby/trunk/aquifer/public/themes/aho/images/about.gif ruby/trunk/aquifer/public/themes/aho/images/about_banner.jpg ruby/trunk/aquifer/public/themes/aho/images/about_sample.jpg ruby/trunk/aquifer/public/themes/aho/images/ah_logo.png ruby/trunk/aquifer/public/themes/aho/images/aho_logo.png ruby/trunk/aquifer/public/themes/aho/images/aho_logo2.png ruby/trunk/aquifer/public/themes/aho/images/aho_logo_scaled.png ruby/trunk/aquifer/public/themes/aho/images/ajax-loader-small.gif ruby/trunk/aquifer/public/themes/aho/images/ajax-loader.gif ruby/trunk/aquifer/public/themes/aho/images/arrow.gif ruby/trunk/aquifer/public/themes/aho/images/arrow2.gif ruby/trunk/aquifer/public/themes/aho/images/arrow_down.gif ruby/trunk/aquifer/public/themes/aho/images/arrow_up.gif ruby/trunk/aquifer/public/themes/aho/images/blank.gif ruby/trunk/aquifer/public/themes/aho/images/bottomcontentbg.png ruby/trunk/aquifer/public/themes/aho/images/collection/ ruby/trunk/aquifer/public/themes/aho/images/collection/AH.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/AL.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/BMC_Weddings.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/BSUTheatre.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/CC.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/CE.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/CH.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/CK.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/CL.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_CHLA.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_Home.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_MOA.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_NYLit.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/CoveredBridges.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/DHWCour.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/DNYC.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/EdithIrvine.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ElRoos.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/Emery.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/FR.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/GN.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/GeorgeBeard.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/HC_QuakSlav.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/HC_hisphoto.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/Helburn.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/HungBag.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/IA.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ICEO.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/IE.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/IH.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/IM.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/INArtsDesk.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/INwright.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/Jay.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/LSTACivWar.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/Lehman.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/MH.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/MMD.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/MU.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/MidOrHis.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/MinFur.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/NI.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/NR.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/OX_2.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/OX_2455.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/OX_2617.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/RFKen.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/RH.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/RL.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/SC_Ephemera.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/SC_Truman.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/SC_WILPF.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/SC_photo.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/SR.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/Stamps.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/TV.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/UI.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/UTMods_armods.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/UTMods_arrmods.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/UTMods_emnmods.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/UTMods_famods.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/WWIIHistFilm.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/WWIPosters.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/acsc.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/afro.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ahfgold.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ahfmur.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ahfrein.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ahfreloc.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ahfsaints.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ahstuc.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ahswwf.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ajhjnp.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/alajournals.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/allen_leigh.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/amjewess.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ammbush.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ammgen.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ammimg.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/anedub.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/app.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/aquifer_americana.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/archgov.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/archives.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ascbrbib.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ascfrbib.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/aslsilver.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/asmteiwes.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/asufras.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/asujrc.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/asupwow.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/asusci.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/awkbbib.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/baseball.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/beaver_murdock_academy.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/berea.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/bh12ic.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/bhl.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/bhlpoetry.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/bplic.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/branch_agricultural_college.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/branch_normal_school.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/brhc.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/buttons.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/byu.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/byuihistpho.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/calbkbib.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cartoons.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cca.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ccmearly.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ccobisb.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ccpl.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl1.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl10.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl11.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl12.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl13.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl14.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl15.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl16.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl17.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl18.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl19.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl2.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl20.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl21.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl22.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl23.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl24.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl25.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl26.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl27.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl28.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl29.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl3.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl30.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl31.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl32.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl33.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl34.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl35.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl36.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl37.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl38.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl39.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl40.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl41.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl42.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl43.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl44.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl45.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl46.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl47.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl48.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl49.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl4a.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl5.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl50.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl51.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl52.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl53.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl54.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl55.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl56.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl57.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl58.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl59.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl6.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl60.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl61.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl62.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl63.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl64.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl65.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl66.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl67.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl68.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl69.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl7.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl70.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl71.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl72.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl73.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl74.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl75.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl76.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl77.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl78.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl79.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl8.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cdl9.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/chinese.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/chs.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/clamor.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/clarivision.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/clevehts.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cogprs.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/coll.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/colorado.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/crawford_family.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/csu.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cultural.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cushman.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cut.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cwmars.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/cwp.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dag.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dencos.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/devincent.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/digitalpast.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dixie_national_forest.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dlps_lincoln.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dlps_micounty.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dlps_moa.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dlps_ppotpus.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dlps_railroad.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/docsouth.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dpalic.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/drama.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/dunbar.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/earhart.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/earthquake.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ecur.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/epurdue.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/esbib.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ethnomuseum.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/examiner.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/faw.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/fbj.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/fenn.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ffcarp.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/fm.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/folkstreams.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/freedomh.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/frontline.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/fsac.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gardens.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gccarc.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gcrmaps.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gea.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/germans.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gg.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ggbain.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ghssfp.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/glenallen.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gmd.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gottscho.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gplhis.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gr.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/grabill.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/gwinter.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/har.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/hdl_2333.1_17964.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/herrick.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/historical_photographs.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/histphotos.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/hohenberger.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/horyd.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/humphrey.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/hungarians.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ilair.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/immigration.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/indiana.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/irish.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/iron_mining_district.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/jarda.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/jermmm.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/kada.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/lakewood.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/lastar.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/lawhou.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/lb.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/lhbcbbib.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/lhbtnbib.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/linchigh.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/lomaxpp.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/manz.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/metroparks.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/misc.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/miscwwii.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/mmhtrnhist.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/mnadfc.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/mnhtrs.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/moaa.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/mussm.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/nclc.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ncmch.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ncosw.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/nickel.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/northwestern-wwii.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/npco.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/oregon.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/othermiddle.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/otmch.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/otmhar.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/otmtrade.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/pan.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/papr.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/pbuildings.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/pconow.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/pgmbaskt.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/pgmhohokam.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/pgmpottery.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/phfaps.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/photo.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/poetsvoice.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/polish.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/postcards.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/praying.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/press.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/puhistphot.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/pustudents.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/rbpebib.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/rcdhilites.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/rcdimages.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/savage.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/scarlet.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/scl.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/sdlphotos.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/sdlsvf.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/sellers.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/serials.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/sg.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shaker.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shakespeare.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shmamerind.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shmbuild.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shmcurator.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shmining.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shmland.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shmmaps.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shmmilit.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/shmtrans.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/slhch.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/splimage.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/splrem.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/sspaces.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/stanford.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/starr.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/stereo.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/suffragists.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/svhocdm.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/swift.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/tgmhistcoll.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/thumbs.zip ruby/trunk/aquifer/public/themes/aho/images/collection/traveling.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/tshsettle.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/uclamusic.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/umn-ww-posters.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/urbanfarm.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ussteel.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/van.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/wheeling.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/whsrail.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/wpacards.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/wpamaps.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/wpapos.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/wright.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/wsu.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/ww.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/wwipos.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection/yhsic1.thumb.jpg ruby/trunk/aquifer/public/themes/aho/images/collection_bg.png ruby/trunk/aquifer/public/themes/aho/images/collectionbg.png ruby/trunk/aquifer/public/themes/aho/images/construction.jpg ruby/trunk/aquifer/public/themes/aho/images/contact.gif ruby/trunk/aquifer/public/themes/aho/images/externallink.png ruby/trunk/aquifer/public/themes/aho/images/externallinks.gif ruby/trunk/aquifer/public/themes/aho/images/favicon.ico ruby/trunk/aquifer/public/themes/aho/images/favicon.jpg ruby/trunk/aquifer/public/themes/aho/images/favicon.png ruby/trunk/aquifer/public/themes/aho/images/featured.jpg ruby/trunk/aquifer/public/themes/aho/images/feedback.gif ruby/trunk/aquifer/public/themes/aho/images/gma_logo.png ruby/trunk/aquifer/public/themes/aho/images/gma_logo.xcf ruby/trunk/aquifer/public/themes/aho/images/gma_logo2.png ruby/trunk/aquifer/public/themes/aho/images/highlight.png ruby/trunk/aquifer/public/themes/aho/images/icon_su.gif ruby/trunk/aquifer/public/themes/aho/images/image_unavailable.png ruby/trunk/aquifer/public/themes/aho/images/leaf.gif ruby/trunk/aquifer/public/themes/aho/images/logo.gif ruby/trunk/aquifer/public/themes/aho/images/mapview.jpg ruby/trunk/aquifer/public/themes/aho/images/menubg.png ruby/trunk/aquifer/public/themes/aho/images/minus.gif ruby/trunk/aquifer/public/themes/aho/images/plus.gif ruby/trunk/aquifer/public/themes/aho/images/rails.png ruby/trunk/aquifer/public/themes/aho/images/sample1.jpg ruby/trunk/aquifer/public/themes/aho/images/sample2.jpg ruby/trunk/aquifer/public/themes/aho/images/search.png ruby/trunk/aquifer/public/themes/aho/images/searchbg.png ruby/trunk/aquifer/public/themes/aho/images/searchbuttonbg.png ruby/trunk/aquifer/public/themes/aho/images/searchbuttonbg_hover.png ruby/trunk/aquifer/public/themes/aho/images/searchfieldbg.png ruby/trunk/aquifer/public/themes/aho/images/send.gif ruby/trunk/aquifer/public/themes/aho/images/tagtodelicious.gif ruby/trunk/aquifer/public/themes/aho/images/takeatour_banner.jpg ruby/trunk/aquifer/public/themes/aho/images/thumbnail_shadow.png ruby/trunk/aquifer/public/themes/aho/images/toggle_arrows.gif ruby/trunk/aquifer/public/themes/aho/images/topcontentbg.png ruby/trunk/aquifer/public/themes/aho/images/ui-bg_flat_0_aaaaaa_40x100.png ruby/trunk/aquifer/public/themes/aho/images/ui-bg_flat_75_ffffff_40x100.png ruby/trunk/aquifer/public/themes/aho/images/ui-bg_glass_55_F9F2E4_1x400.png ruby/trunk/aquifer/public/themes/aho/images/ui-bg_glass_65_92B6DA_1x400.png ruby/trunk/aquifer/public/themes/aho/images/ui-bg_glass_75_B2D0ED_1x400.png ruby/trunk/aquifer/public/themes/aho/images/ui-bg_highlight-soft_20_153f69_1x100.png ruby/trunk/aquifer/public/themes/aho/images/ui-bg_highlight-soft_20_441615_1x100.png ruby/trunk/aquifer/public/themes/aho/images/ui-bg_inset-soft_95_fef1ec_1x100.png ruby/trunk/aquifer/public/themes/aho/images/ui-icons_222222_256x240.png ruby/trunk/aquifer/public/themes/aho/images/ui-icons_2e83ff_256x240.png ruby/trunk/aquifer/public/themes/aho/images/ui-icons_5e7c98_256x240.png ruby/trunk/aquifer/public/themes/aho/images/ui-icons_cccccc_256x240.png ruby/trunk/aquifer/public/themes/aho/images/ui-icons_cd0a0a_256x240.png ruby/trunk/aquifer/public/themes/aho/images/welcome.gif ruby/trunk/aquifer/public/themes/aho/stylesheets/ ruby/trunk/aquifer/public/themes/aho/stylesheets/SpryAccordion.css ruby/trunk/aquifer/public/themes/aho/stylesheets/aquifer.css ruby/trunk/aquifer/public/themes/aho/stylesheets/asho.css ruby/trunk/aquifer/public/themes/aho/stylesheets/jquery-ui.css ruby/trunk/aquifer/public/themes/aho/stylesheets/scaffold.css ruby/trunk/aquifer/public/themes/aho/stylesheets/style.css ruby/trunk/aquifer/public/themes/aho/stylesheets/tablesorter/ ruby/trunk/aquifer/public/themes/aho/stylesheets/tablesorter/style.css ruby/trunk/aquifer/public/themes/gma/ ruby/trunk/aquifer/public/themes/gma/images/ ruby/trunk/aquifer/public/themes/gma/images/about.gif ruby/trunk/aquifer/public/themes/gma/images/about_banner.jpg ruby/trunk/aquifer/public/themes/gma/images/about_sample.jpg ruby/trunk/aquifer/public/themes/gma/images/ah_logo.png ruby/trunk/aquifer/public/themes/gma/images/aho_logo.png ruby/trunk/aquifer/public/themes/gma/images/aho_logo2.png ruby/trunk/aquifer/public/themes/gma/images/aho_logo_scaled.png ruby/trunk/aquifer/public/themes/gma/images/ajax-loader-small.gif ruby/trunk/aquifer/public/themes/gma/images/ajax-loader.gif ruby/trunk/aquifer/public/themes/gma/images/arrow.gif ruby/trunk/aquifer/public/themes/gma/images/arrow2.gif ruby/trunk/aquifer/public/themes/gma/images/arrow_down.gif ruby/trunk/aquifer/public/themes/gma/images/arrow_up.gif ruby/trunk/aquifer/public/themes/gma/images/blank.gif ruby/trunk/aquifer/public/themes/gma/images/bottomcontentbg.png ruby/trunk/aquifer/public/themes/gma/images/collection/ ruby/trunk/aquifer/public/themes/gma/images/collection/bayerische.thumb.jpg ruby/trunk/aquifer/public/themes/gma/images/collection/bnf.thumb.jpg ruby/trunk/aquifer/public/themes/gma/images/collection/brithist.thumb.jpg ruby/trunk/aquifer/public/themes/gma/images/collection/derecho.thumb.jpg ruby/trunk/aquifer/public/themes/gma/images/collection/jewish.thumb.jpg ruby/trunk/aquifer/public/themes/gma/images/collection/larioja.thumb.jpg ruby/trunk/aquifer/public/themes/gma/images/collection/madrid.thumb.jpg ruby/trunk/aquifer/public/themes/gma/images/collection/mancha.thumb.jpg ruby/trunk/aquifer/public/themes/gma/images/collection/valenciana.thumb.jpg ruby/trunk/aquifer/public/themes/gma/images/collection_bg.png ruby/trunk/aquifer/public/themes/gma/images/collectionbg.png ruby/trunk/aquifer/public/themes/gma/images/construction.jpg ruby/trunk/aquifer/public/themes/gma/images/contact.gif ruby/trunk/aquifer/public/themes/gma/images/externallink.png ruby/trunk/aquifer/public/themes/gma/images/externallinks.gif ruby/trunk/aquifer/public/themes/gma/images/favicon.ico ruby/trunk/aquifer/public/themes/gma/images/favicon.jpg ruby/trunk/aquifer/public/themes/gma/images/favicon.png ruby/trunk/aquifer/public/themes/gma/images/featured.jpg ruby/trunk/aquifer/public/themes/gma/images/feedback.gif ruby/trunk/aquifer/public/themes/gma/images/gma_logo.png ruby/trunk/aquifer/public/themes/gma/images/gma_logo.xcf ruby/trunk/aquifer/public/themes/gma/images/gma_logo2.png ruby/trunk/aquifer/public/themes/gma/images/highlight.png ruby/trunk/aquifer/public/themes/gma/images/icon_su.gif ruby/trunk/aquifer/public/themes/gma/images/image_unavailable.png ruby/trunk/aquifer/public/themes/gma/images/leaf.gif ruby/trunk/aquifer/public/themes/gma/images/logo.gif ruby/trunk/aquifer/public/themes/gma/images/mapview.jpg ruby/trunk/aquifer/public/themes/gma/images/menubg.png ruby/trunk/aquifer/public/themes/gma/images/minus.gif ruby/trunk/aquifer/public/themes/gma/images/plus.gif ruby/trunk/aquifer/public/themes/gma/images/rails.png ruby/trunk/aquifer/public/themes/gma/images/sample1.jpg ruby/trunk/aquifer/public/themes/gma/images/sample2.jpg ruby/trunk/aquifer/public/themes/gma/images/search.png ruby/trunk/aquifer/public/themes/gma/images/searchbg.png ruby/trunk/aquifer/public/themes/gma/images/searchbuttonbg.png ruby/trunk/aquifer/public/themes/gma/images/searchbuttonbg_hover.png ruby/trunk/aquifer/public/themes/gma/images/searchfieldbg.png ruby/trunk/aquifer/public/themes/gma/images/send.gif ruby/trunk/aquifer/public/themes/gma/images/tagtodelicious.gif ruby/trunk/aquifer/public/themes/gma/images/takeatour_banner.jpg ruby/trunk/aquifer/public/themes/gma/images/thumbnail_shadow.png ruby/trunk/aquifer/public/themes/gma/images/toggle_arrows.gif ruby/trunk/aquifer/public/themes/gma/images/topcontentbg.png ruby/trunk/aquifer/public/themes/gma/images/ui-bg_flat_0_aaaaaa_40x100.png ruby/trunk/aquifer/public/themes/gma/images/ui-bg_flat_75_ffffff_40x100.png ruby/trunk/aquifer/public/themes/gma/images/ui-bg_glass_55_F9F2E4_1x400.png ruby/trunk/aquifer/public/themes/gma/images/ui-bg_glass_65_92B6DA_1x400.png ruby/trunk/aquifer/public/themes/gma/images/ui-bg_glass_75_B2D0ED_1x400.png ruby/trunk/aquifer/public/themes/gma/images/ui-bg_highlight-soft_20_153f69_1x100.png ruby/trunk/aquifer/public/themes/gma/images/ui-bg_highlight-soft_20_441615_1x100.png ruby/trunk/aquifer/public/themes/gma/images/ui-bg_inset-soft_95_fef1ec_1x100.png ruby/trunk/aquifer/public/themes/gma/images/ui-icons_222222_256x240.png ruby/trunk/aquifer/public/themes/gma/images/ui-icons_2e83ff_256x240.png ruby/trunk/aquifer/public/themes/gma/images/ui-icons_5e7c98_256x240.png ruby/trunk/aquifer/public/themes/gma/images/ui-icons_cccccc_256x240.png ruby/trunk/aquifer/public/themes/gma/images/ui-icons_cd0a0a_256x240.png ruby/trunk/aquifer/public/themes/gma/images/welcome.gif ruby/trunk/aquifer/public/themes/gma/stylesheets/ ruby/trunk/aquifer/public/themes/gma/stylesheets/SpryAccordion.css ruby/trunk/aquifer/public/themes/gma/stylesheets/aquifer.css ruby/trunk/aquifer/public/themes/gma/stylesheets/asho.css ruby/trunk/aquifer/public/themes/gma/stylesheets/globalmiddleages.css ruby/trunk/aquifer/public/themes/gma/stylesheets/jquery-ui.css ruby/trunk/aquifer/public/themes/gma/stylesheets/scaffold.css ruby/trunk/aquifer/public/themes/gma/stylesheets/style.css ruby/trunk/aquifer/public/themes/gma/stylesheets/tablesorter/ ruby/trunk/aquifer/public/themes/gma/stylesheets/tablesorter/style.css Added: ruby/trunk/aquifer/public/themes/aho/images/about.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/about.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/about_banner.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/about_banner.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/about_sample.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/about_sample.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/ah_logo.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/ah_logo.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/aho_logo.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/aho_logo.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/aho_logo2.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/aho_logo2.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/aho_logo_scaled.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/aho_logo_scaled.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/ajax-loader-small.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/ajax-loader-small.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/ajax-loader.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/ajax-loader.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/arrow.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/arrow.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/arrow2.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/arrow2.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/arrow_down.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/arrow_down.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/arrow_up.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/arrow_up.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/blank.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/blank.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/bottomcontentbg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/bottomcontentbg.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/AH.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/AH.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/AL.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/AL.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/BMC_Weddings.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/BMC_Weddings.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/BSUTheatre.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/BSUTheatre.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/CC.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/CC.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/CE.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/CE.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/CH.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/CH.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/CK.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/CK.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/CL.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/CL.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_CHLA.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_CHLA.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_Home.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_Home.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_MOA.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_MOA.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_NYLit.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/Cornell_NYLit.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/CoveredBridges.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/CoveredBridges.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/DHWCour.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/DHWCour.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/DNYC.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/DNYC.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/EdithIrvine.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/EdithIrvine.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/ElRoos.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/ElRoos.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/Emery.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/Emery.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/FR.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/FR.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/GN.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/GN.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/GeorgeBeard.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/GeorgeBeard.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/HC_QuakSlav.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/HC_QuakSlav.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/HC_hisphoto.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/HC_hisphoto.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/Helburn.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/Helburn.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/HungBag.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/HungBag.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/IA.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/IA.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/ICEO.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/ICEO.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/IE.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/IE.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/IH.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/IH.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/IM.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/IM.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/INArtsDesk.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/INArtsDesk.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/INwright.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/INwright.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/Jay.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/Jay.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/LSTACivWar.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/LSTACivWar.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/Lehman.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/Lehman.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/MH.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/MH.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/MMD.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/themes/aho/images/collection/MMD.thumb.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/themes/aho/images/collection/MU.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/t... [truncated message content] |
From: <pau...@us...> - 2010-06-24 22:05:34
|
Revision: 661 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=661&view=rev Author: paulnsorensen Date: 2010-06-24 22:05:28 +0000 (Thu, 24 Jun 2010) Log Message: ----------- Attempt at cleaning up SVN mess #2 Removed Paths: ------------- ruby/trunk/aquifer/public/themes/ ruby/trunk/aquifer/public/themestmp/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2010-06-24 21:59:06
|
Revision: 660 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=660&view=rev Author: paulnsorensen Date: 2010-06-24 21:59:00 +0000 (Thu, 24 Jun 2010) Log Message: ----------- Attempt at cleaning up SVN mess #1 Added Paths: ----------- ruby/trunk/aquifer/public/themestmp/ Removed Paths: ------------- ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-05.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-12.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-19.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-21.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-27.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-30.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-34.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-37.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-40.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-42.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-52.gif ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnline.jpg ruby/trunk/aquifer/public/images/about.gif ruby/trunk/aquifer/public/images/about_banner.jpg ruby/trunk/aquifer/public/images/about_sample.jpg ruby/trunk/aquifer/public/images/ah_logo.png ruby/trunk/aquifer/public/images/aho_logo.png ruby/trunk/aquifer/public/images/aho_logo2.png ruby/trunk/aquifer/public/images/aho_logo_scaled.png ruby/trunk/aquifer/public/images/arrow.gif ruby/trunk/aquifer/public/images/arrow2.gif ruby/trunk/aquifer/public/images/arrow_down.gif ruby/trunk/aquifer/public/images/arrow_up.gif ruby/trunk/aquifer/public/images/bottomcontentbg.png ruby/trunk/aquifer/public/images/collection_bg.png ruby/trunk/aquifer/public/images/collectionbg.png ruby/trunk/aquifer/public/images/construction.jpg ruby/trunk/aquifer/public/images/contact.gif ruby/trunk/aquifer/public/images/externallinks.gif ruby/trunk/aquifer/public/images/favicon.ico ruby/trunk/aquifer/public/images/favicon.jpg ruby/trunk/aquifer/public/images/favicon.png ruby/trunk/aquifer/public/images/featured.jpg ruby/trunk/aquifer/public/images/feedback.gif ruby/trunk/aquifer/public/images/gma_logo.png ruby/trunk/aquifer/public/images/gma_logo.xcf ruby/trunk/aquifer/public/images/gma_logo2.png ruby/trunk/aquifer/public/images/highlight.png ruby/trunk/aquifer/public/images/icon_su.gif ruby/trunk/aquifer/public/images/image_unavailable.png ruby/trunk/aquifer/public/images/leaf.gif ruby/trunk/aquifer/public/images/logo.gif ruby/trunk/aquifer/public/images/mapview.jpg ruby/trunk/aquifer/public/images/menubg.png ruby/trunk/aquifer/public/images/minus.gif ruby/trunk/aquifer/public/images/plus.gif ruby/trunk/aquifer/public/images/rails.png ruby/trunk/aquifer/public/images/sample1.jpg ruby/trunk/aquifer/public/images/sample2.jpg ruby/trunk/aquifer/public/images/search.png ruby/trunk/aquifer/public/images/searchbg.png ruby/trunk/aquifer/public/images/searchbuttonbg.png ruby/trunk/aquifer/public/images/searchbuttonbg_hover.png ruby/trunk/aquifer/public/images/searchfieldbg.png ruby/trunk/aquifer/public/images/send.gif ruby/trunk/aquifer/public/images/tagtodelicious.gif ruby/trunk/aquifer/public/images/takeatour_banner.jpg ruby/trunk/aquifer/public/images/thumbnail_shadow.png ruby/trunk/aquifer/public/images/toggle_arrows.gif ruby/trunk/aquifer/public/images/topcontentbg.png ruby/trunk/aquifer/public/images/ui-bg_flat_0_aaaaaa_40x100.png ruby/trunk/aquifer/public/images/ui-bg_flat_75_ffffff_40x100.png ruby/trunk/aquifer/public/images/ui-bg_glass_55_F9F2E4_1x400.png ruby/trunk/aquifer/public/images/ui-bg_glass_65_92B6DA_1x400.png ruby/trunk/aquifer/public/images/ui-bg_glass_75_B2D0ED_1x400.png ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_153f69_1x100.png ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_441615_1x100.png ruby/trunk/aquifer/public/images/ui-bg_inset-soft_95_fef1ec_1x100.png ruby/trunk/aquifer/public/images/ui-icons_222222_256x240.png ruby/trunk/aquifer/public/images/ui-icons_2e83ff_256x240.png ruby/trunk/aquifer/public/images/ui-icons_5e7c98_256x240.png ruby/trunk/aquifer/public/images/ui-icons_cccccc_256x240.png ruby/trunk/aquifer/public/images/ui-icons_cd0a0a_256x240.png ruby/trunk/aquifer/public/images/welcome.gif Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-05.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-12.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-19.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-21.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-27.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-30.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-34.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-37.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-40.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-42.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnl-52.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/AmericanSocialHistoryOnline.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/about.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/about_banner.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/about_sample.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ah_logo.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/aho_logo.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/aho_logo2.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/aho_logo_scaled.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/arrow.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/arrow2.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/arrow_down.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/arrow_up.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/bottomcontentbg.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/collection_bg.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/collectionbg.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/construction.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/contact.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/externallinks.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/favicon.ico =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/favicon.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/favicon.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/featured.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/feedback.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/gma_logo.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/gma_logo.xcf =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/gma_logo2.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/highlight.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/icon_su.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/image_unavailable.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/leaf.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/logo.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/mapview.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/menubg.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/minus.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/plus.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/rails.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/sample1.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/sample2.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/search.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/searchbg.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/searchbuttonbg.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/searchbuttonbg_hover.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/searchfieldbg.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/send.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/tagtodelicious.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/takeatour_banner.jpg =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/thumbnail_shadow.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/toggle_arrows.gif =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/topcontentbg.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-bg_flat_0_aaaaaa_40x100.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-bg_flat_75_ffffff_40x100.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-bg_glass_55_F9F2E4_1x400.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-bg_glass_65_92B6DA_1x400.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-bg_glass_75_B2D0ED_1x400.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_153f69_1x100.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_441615_1x100.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-bg_inset-soft_95_fef1ec_1x100.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-icons_222222_256x240.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-icons_2e83ff_256x240.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-icons_5e7c98_256x240.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-icons_cccccc_256x240.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/ui-icons_cd0a0a_256x240.png =================================================================== (Binary files differ) Deleted: ruby/trunk/aquifer/public/images/welcome.gif =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2010-06-24 21:36:25
|
Revision: 659 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=659&view=rev Author: paulnsorensen Date: 2010-06-24 21:36:19 +0000 (Thu, 24 Jun 2010) Log Message: ----------- Created a theme system and added gma thumbs Modified Paths: -------------- ruby/trunk/aquifer/app/models/collection.rb ruby/trunk/aquifer/app/views/home/_header.rhtml ruby/trunk/aquifer/app/views/layouts/default.rhtml ruby/trunk/aquifer/config/environment.rb Added Paths: ----------- ruby/trunk/aquifer/public/themes/ ruby/trunk/aquifer/public/themes/aho/ ruby/trunk/aquifer/public/themes/gma/ Removed Paths: ------------- ruby/trunk/aquifer/public/images/collection/ ruby/trunk/aquifer/public/images/featured/ Modified: ruby/trunk/aquifer/app/models/collection.rb =================================================================== --- ruby/trunk/aquifer/app/models/collection.rb 2010-06-16 22:11:37 UTC (rev 658) +++ ruby/trunk/aquifer/app/models/collection.rb 2010-06-24 21:36:19 UTC (rev 659) @@ -521,21 +521,21 @@ end def get_image_url - coll_images_path = File::join(RAILS_ROOT, "public","images","collection") + coll_images_path = File::join(RAILS_ROOT, "public","themes", THEME, "images","collection") #look for files which are variations of the set_spec file_base = self.set_spec.gsub(":","_") coll_image_base = File.join(coll_images_path,file_base) if File.exists?("#{coll_image_base}.thumb.jpg") - ret = "/images/collection/#{file_base}.thumb.jpg" + ret = "/themes/#{THEME}/images/collection/#{file_base}.thumb.jpg" elsif File.exists?("#{coll_image_base}.jpg") - ret = "/images/collection/#{file_base}.jpg" + ret = "/themes/#{THEME}/images/collection/#{file_base}.jpg" elsif File.exists?("#{coll_image_base}.jpeg") - ret = "/images/collection/#{file_base}.jpeg" + ret = "/themes/#{THEME}/images/collection/#{file_base}.jpeg" elsif File.exists?("#{coll_image_base}.png") - ret = "/images/collection/#{file_base}.png" + ret = "/themes/#{THEME}/images/collection/#{file_base}.png" elsif File.exists?("#{coll_image_base}.gif") - ret = "/images/collection/#{file_base}.gif" + ret = "/themes/#{THEME}/images/collection/#{file_base}.gif" else # ret = "/images/logo.gif" ret = "" Modified: ruby/trunk/aquifer/app/views/home/_header.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_header.rhtml 2010-06-16 22:11:37 UTC (rev 658) +++ ruby/trunk/aquifer/app/views/home/_header.rhtml 2010-06-24 21:36:19 UTC (rev 659) @@ -2,7 +2,8 @@ <div id="header_top_container"> <div id="header_top" class="clearfix"> <div id="logo" class=""> - <%= link_to( image_tag( "ah_logo.png", :size=> "403x95", :alt => "Home" ), { :controller => :home, :action => "index" } ) %> +<%#= link_to( image_tag( "ah_logo.png", :size=> "403x95", :alt => "Home" ), { :controller => :home, :action => "index" } ) %> + <%= link_to('<span class="hidden">Home</span>', { :controller => :home, :action => "index" } ) %> </div> <div id="header_controls" class=""> <div id="submenu" class=""> Modified: ruby/trunk/aquifer/app/views/layouts/default.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/layouts/default.rhtml 2010-06-16 22:11:37 UTC (rev 658) +++ ruby/trunk/aquifer/app/views/layouts/default.rhtml 2010-06-24 21:36:19 UTC (rev 659) @@ -24,12 +24,10 @@ Southern Spaces, Photographs by Theodor Horydczak, Transportation History Collection: Railroad, Wright Brothers Negatives, Public Papers of the Presidents of the United States." /> <% end %> - <%= stylesheet_link_tag "style", :media => "all" %> - <%= stylesheet_link_tag "jquery-ui", :media => "all" %> -<%#*uncomment the line below for the global middle ages theme%> -<%#= stylesheet_link_tag "globalmiddleages", :media => "all" %> - <link rel="icon" href="/images/favicon.ico" type="image/ico" /> - <link rel="shortcut icon" href="/images/favicon.ico" /> + <%= stylesheet_link_tag "/themes/#{THEME}/stylesheets/style.css", :media => "all" %> + <%= stylesheet_link_tag "/themes/#{THEME}/stylesheets/jquery-ui.css", :media => "all" %> + <link rel="icon" href="/themes/<%=THEME%>/images/favicon.ico" type="image/ico" /> + <link rel="shortcut icon" href="/themes/<%=THEME%>/images/favicon.ico" /> <link rel="unapi-server" type="application/xml" title="unAPI" href="<%=url_for :controller => 'unapi', :only_path=>false %>" /> <meta name='ZoteroItemType' content='mods'/> <%= javascript_include_tag "jquery-min" %> @@ -47,7 +45,7 @@ </div> <div id="container_bottom" class="contain"></div> <%= render(:partial => 'home/footer') %> - <div id='loading' class="hidden"><div style="margin:0 auto; text-align:center; color:#ccc; font-weight:bold;"><%= image_tag("/images/ajax-loader.gif") %> loading... </div></div> + <div id='loading' class="hidden"><div style="margin:0 auto; text-align:center; color:#ccc; font-weight:bold;"><%= image_tag("/themes/#{THEME}/images/ajax-loader.gif") %> loading... </div></div> <div id="dialog"><div class=".contents"></div></div> </body> </html> \ No newline at end of file Modified: ruby/trunk/aquifer/config/environment.rb =================================================================== --- ruby/trunk/aquifer/config/environment.rb 2010-06-16 22:11:37 UTC (rev 658) +++ ruby/trunk/aquifer/config/environment.rb 2010-06-24 21:36:19 UTC (rev 659) @@ -116,3 +116,7 @@ REPO_NAME="DLF Aquifer American Social History Online" ADMIN_EMAIL="aqu...@di..." REPO_ID="dlfaquifer.org" + +# Theme settings +THEME = 'aho' +#THEME = 'gma' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2010-06-16 22:11:45
|
Revision: 658 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=658&view=rev Author: paulnsorensen Date: 2010-06-16 22:11:37 +0000 (Wed, 16 Jun 2010) Log Message: ----------- Cleaned up CSS, removed references to search layout, added new gma logo Modified Paths: -------------- ruby/trunk/aquifer/app/controllers/collection_controller.rb ruby/trunk/aquifer/app/controllers/heading_controller.rb ruby/trunk/aquifer/app/controllers/item_admin_controller.rb ruby/trunk/aquifer/app/controllers/my_profile_controller.rb ruby/trunk/aquifer/app/controllers/openid_account_controller.rb ruby/trunk/aquifer/app/controllers/search_controller.rb ruby/trunk/aquifer/app/controllers/search_event_admin_controller.rb ruby/trunk/aquifer/app/controllers/tag_admin_controller.rb ruby/trunk/aquifer/app/controllers/user_admin_controller.rb ruby/trunk/aquifer/app/controllers/utility_controller.rb ruby/trunk/aquifer/app/controllers/xml_admin_controller.rb ruby/trunk/aquifer/app/controllers/xsl_transform_admin_controller.rb ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml ruby/trunk/aquifer/app/views/home/_header.rhtml ruby/trunk/aquifer/app/views/home/faq.rhtml ruby/trunk/aquifer/app/views/home/home3.rhtml ruby/trunk/aquifer/app/views/home/message_sent.rhtml ruby/trunk/aquifer/app/views/layouts/default.rhtml ruby/trunk/aquifer/app/views/search/_item_tag_form.rhtml ruby/trunk/aquifer/app/views/search/_search_bar.rhtml ruby/trunk/aquifer/app/views/search/map.rhtml ruby/trunk/aquifer/app/views/search/map_data.rxml ruby/trunk/aquifer/app/views/user_admin/list.rhtml ruby/trunk/aquifer/public/images/gma_logo.png ruby/trunk/aquifer/public/javascripts/application.js ruby/trunk/aquifer/public/stylesheets/globalmiddleages.css ruby/trunk/aquifer/public/stylesheets/style.css Added Paths: ----------- ruby/trunk/aquifer/public/images/gma_logo2.png Removed Paths: ------------- ruby/trunk/aquifer/public/stylesheets/base.css ruby/trunk/aquifer/public/stylesheets/layout.css Modified: ruby/trunk/aquifer/app/controllers/collection_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/collection_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/collection_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,5 @@ class CollectionController < ApplicationController - layout "default" + layout 'default' def index list Modified: ruby/trunk/aquifer/app/controllers/heading_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/heading_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/heading_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,5 @@ class HeadingController < ApplicationController - layout 'search' + layout 'default' def index list Modified: ruby/trunk/aquifer/app/controllers/item_admin_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/item_admin_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/item_admin_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,5 @@ class ItemAdminController < ApplicationController - layout 'search' + layout 'default' def index list Modified: ruby/trunk/aquifer/app/controllers/my_profile_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/my_profile_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/my_profile_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,5 @@ class MyProfileController < ApplicationController - layout 'search' + layout 'default' before_filter :login_required def index Modified: ruby/trunk/aquifer/app/controllers/openid_account_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/openid_account_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/openid_account_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -14,7 +14,7 @@ end class OpenidAccountController < ApplicationController - layout 'search' + layout 'default' # process the login request, disover the openid server, and # then redirect. Modified: ruby/trunk/aquifer/app/controllers/search_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/search_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/search_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,6 +1,5 @@ class SearchController < ApplicationController - # layout "search", :except => [:raw_mods_record,:timeline,:map_data,:add_tags] - layout "default", :except => [:raw_mods_record,:timeline,:map_data,:add_tags,:search_collections] + layout 'default', :except => [:raw_mods_record,:timeline,:map_data,:add_tags,:search_collections] require 'open-uri' require 'cgi' Modified: ruby/trunk/aquifer/app/controllers/search_event_admin_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/search_event_admin_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/search_event_admin_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,5 @@ class SearchEventAdminController < ApplicationController - layout 'search' + layout 'default' def index list Modified: ruby/trunk/aquifer/app/controllers/tag_admin_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/tag_admin_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/tag_admin_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,6 @@ class TagAdminController < ApplicationController - layout "search" + layout 'default' + before_filter :check_user def index Modified: ruby/trunk/aquifer/app/controllers/user_admin_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/user_admin_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/user_admin_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,5 @@ class UserAdminController < ApplicationController - layout 'search' + layout 'default' before_filter :login_required, :check_user def index Modified: ruby/trunk/aquifer/app/controllers/utility_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/utility_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/utility_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,5 @@ class UtilityController < ApplicationController - layout 'search' + layout 'default' def temper render date_norm Modified: ruby/trunk/aquifer/app/controllers/xml_admin_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/xml_admin_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/xml_admin_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,5 @@ class XmlAdminController < ApplicationController - layout 'search' + layout 'default' def index list Modified: ruby/trunk/aquifer/app/controllers/xsl_transform_admin_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/xsl_transform_admin_controller.rb 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/controllers/xsl_transform_admin_controller.rb 2010-06-16 22:11:37 UTC (rev 658) @@ -1,5 +1,5 @@ class XslTransformAdminController < ApplicationController - layout 'search' + layout 'default' def index list Modified: ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -6,7 +6,7 @@ <div class="thumbnailarea"> <ul class="actions"> - <li><%= link_to('Go to Collection',collection.primary_display_location, :class => 'external') %></li> + <li><%= link_to('Go to Collection',url_encode(collection.primary_display_location), :class => 'external') %></li> <li><%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)</li> <li><%= link_to('View Details',{:controller => 'collection', :action=>'show',:id=>collection.id}) %></li> Modified: ruby/trunk/aquifer/app/views/home/_header.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_header.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/home/_header.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -1,47 +1,28 @@ <div id="header" class="clearfix"> - <div id="header_top_container"> - <div id="header_top" class="clearfix"> - - <div id="logo" class=""> - - <%= link_to( image_tag( "ah_logo.png", :size=> "403x95", :alt => "Home" ), { :controller => :home, :action => "index" } ) %> - </div> - - <div id="header_controls" class=""> - - - - <div id="submenu" class=""> - - - <%#= link_to( 'tools', { :controller => :home, :action => :tools }, { :class => 'submenu' } ) %> - <%= link_to( 'contact us', { :controller => :home, :action => :contact_us }, { :class => 'submenu' } ) %> - <%= link_to( 'help', { :controller => :home, :action => :help }, { :class => 'submenu' } ) %> - <%= link_to( 'faq', { :controller => :home, :action => :faq }, { :class => 'submenu' } ) %> - - </div> - </div> - <h2 id="slogan">find and use primary resources from historical digital collections</h2> - - </div> + <div id="header_top_container"> + <div id="header_top" class="clearfix"> + <div id="logo" class=""> + <%= link_to( image_tag( "ah_logo.png", :size=> "403x95", :alt => "Home" ), { :controller => :home, :action => "index" } ) %> </div> - <div id="menubar_container"> - <div id="menubar" class=""> - - <%= render :partial => "search/search_bar", :controller => :search, :new_search => 1, :locals => { :params => params } %> - - - <div id="menuitems"> - <%= link_to( 'home', { :controller => :home, :action => :index }, { :class => 'menubarlink first' } ) %> - <%= link_to( 'about', { :controller => :home, :action => :about }, { :class => 'menubarlink' } ) %> - <%= link_to( 'collections', { :controller => :collection }, { :class => 'menubarlink' } ) %> - <%#= link_to( 'browse', { :controller => :heading }, { :class => 'menubarlink last' } ) %> - - </div> - + <div id="header_controls" class=""> + <div id="submenu" class=""> + <%= link_to( 'contact us', { :controller => :home, :action => :contact_us }, { :class => 'submenu' } ) %> + <%= link_to( 'help', { :controller => :home, :action => :help }, { :class => 'submenu' } ) %> + <%= link_to( 'faq', { :controller => :home, :action => :faq }, { :class => 'submenu' } ) %> </div> - - </div> - <div id="header_bottom" class="clearfix"><div id="header_bottom_container" class="contain clearfix"></div></div> - </div> \ No newline at end of file + <h2 id="slogan">find and use primary resources from historical digital collections</h2> + </div> + </div> + <div id="menubar_container"> + <div id="menubar" class=""> + <%= render :partial => "search/search_bar", :controller => :search, :new_search => 1, :locals => { :params => params } %> + <div id="menuitems"> + <%= link_to( 'home', { :controller => :home, :action => :index }, { :class => 'menubarlink first' } ) %> + <%= link_to( 'about', { :controller => :home, :action => :about }, { :class => 'menubarlink' } ) %> + <%= link_to( 'collections', { :controller => :collection }, { :class => 'menubarlink' } ) %> + </div> + </div> + </div> + <div id="header_bottom" class="clearfix"><div id="header_bottom_container" class="contain clearfix"></div></div> +</div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/faq.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/faq.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/home/faq.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -16,7 +16,7 @@ <p>Users may reproduce (print or download) in accordance with fair use materials or link to materials from this web site on the condition they give proper credit of the collection-owning repository (the institution that owns the collection). The Library of Congress has a guide for understanding <a href="http://memory.loc.gov/ammem/ndlpedu/start/cpyrt/">copyright and fair use</a>. If there is no information in a record about access condition and you would like permission to publish or reproduce an item, please contact the institution that owns the item, since Aquifer does not own these items.</p> </li> <li>What is Zotero? - <p><a href="http://www.zotero.org">Zotero</a> is a free, easy-to-use research tool that helps you gather and organize resources (bibliography or full text of articles), and then lets you to annotate, organize and share the results of your research. You can download the extention at: <a href="http://www.zotero.org">http://www.zotero.org/</a>. Please note that Zotero works only in Firefox.<br> + <p><a href="http://www.zotero.org">Zotero</a> is a free, easy-to-use research tool that helps you gather and organize resources (bibliography or full text of articles), and then lets you to annotate, organize and share the results of your research. You can download the extention at: <a href="http://www.zotero.org">http://www.zotero.org/</a>. Please note that Zotero works only in Firefox.<br /> </p> </li> </ol> Modified: ruby/trunk/aquifer/app/views/home/home3.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/home3.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/home/home3.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -93,8 +93,8 @@ </tr> <tr> <td> </td> - <td height="100" class="smallBlue"><br> - <br> + <td height="100" class="smallBlue"><br /> + <br /> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td width="50%"><select name="select" style="width:125px;"> Modified: ruby/trunk/aquifer/app/views/home/message_sent.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/message_sent.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/home/message_sent.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -22,7 +22,7 @@ <td colspan="2"> </td> </tr> <tr> - <td valign="top" class="submenu">1301 West Springfield Avenue<br> + <td valign="top" class="submenu">1301 West Springfield Avenue<br /> Urbana, IL 61801 <p>e: in...@am...</p></td> <td> Modified: ruby/trunk/aquifer/app/views/layouts/default.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/layouts/default.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/layouts/default.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -1,9 +1,9 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title><%= truncate(@page_title,45,"...") || "American History Online" %></title> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <% if @page_description %> <meta name="description" content="<%=h(@page_description)%>" /> <% else %> @@ -18,65 +18,34 @@ political cartoons, posters, video, oral histories, maps, cultural materials, data sets, negatives, civil war photographs, african american photographs, great depression, world war II, abraham lincoln, charles cushman photographs, edison motion pictures, Edward S. Curtis collection, Frances Benjamin Johnston Collection, - the Emancipator, Lawrence & Houseworth Collection, Making of America, George Grantham Bain Collection, + the Emancipator, Lawrence & Houseworth Collection, Making of America, George Grantham Bain Collection, John C. H. Grabill Collection, National Child Labor Committee Collection, Panoramic Photographs, National Photo Company Collection, Sam DeVincent Collection, Stereograph Cards, Starr Sheet Music Collection, Southern Spaces, Photographs by Theodor Horydczak, Transportation History Collection: Railroad, Wright Brothers Negatives, Public Papers of the Presidents of the United States." /> <% end %> -<%#= stylesheet_link_tag "aquifer", :media => "all" %> -<%#= stylesheet_link_tag "asho", :media => "all" %> - <%= stylesheet_link_tag "base", :media => "all" %> - -<%#= stylesheet_link_tag "SpryAccordion", :media => "all" %> - <%= stylesheet_link_tag "layout", :media => "all" %> - <%= stylesheet_link_tag "style", :media => "all" %> - - <%= stylesheet_link_tag "jquery-ui", :media => "all" %> - - <%#*uncomment the line below for the global middle ages theme%> - <%#= stylesheet_link_tag "globalmiddleages", :media => "all" %> - - + <%= stylesheet_link_tag "style", :media => "all" %> + <%= stylesheet_link_tag "jquery-ui", :media => "all" %> +<%#*uncomment the line below for the global middle ages theme%> +<%#= stylesheet_link_tag "globalmiddleages", :media => "all" %> <link rel="icon" href="/images/favicon.ico" type="image/ico" /> - <link rel="shortcut icon" href="/images/favicon.ico" /> <link rel="unapi-server" type="application/xml" title="unAPI" href="<%=url_for :controller => 'unapi', :only_path=>false %>" /> <meta name='ZoteroItemType' content='mods'/> -<%#= javascript_include_tag "prototype" %> -<%#= javascript_include_tag "effects" %> -<%#= javascript_include_tag "dragdrop" %> -<%#= javascript_include_tag "controls" %> <%= javascript_include_tag "jquery-min" %> <%= javascript_include_tag "jquery-ui-min" %> <%= javascript_include_tag "jquery-hoverintent-min" %> - <%= javascript_include_tag "jquery-tablesorter-min" %> <%= javascript_include_tag "application" %> - - - - - <!--% end %--> </head> - <body> <%= render(:partial => 'home/header') %> - - <div id="container" class="clearfix"> - - - - <div id="main"> <% if flash[:notice]%><p style="color: green"><%= flash[:notice] %><% flash[:notice] = nil %></p><% end %> <%= @content_for_layout %> </div> - </div> - <div id="container_bottom" class="contain"></div> - <%= render(:partial => 'home/footer') %> <div id='loading' class="hidden"><div style="margin:0 auto; text-align:center; color:#ccc; font-weight:bold;"><%= image_tag("/images/ajax-loader.gif") %> loading... </div></div> <div id="dialog"><div class=".contents"></div></div> Modified: ruby/trunk/aquifer/app/views/search/_item_tag_form.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/_item_tag_form.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/search/_item_tag_form.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -1,8 +1,8 @@ <% form_remote_tag( :id => "tag_form_#{item.id}", :url => {:action => 'add_tags'}, :update => "show_tags_#{item.id}", :complete => "Element.hide('tag_div_#{item.id}')" ) do %> <%= hidden_field_tag( 'item_id', item.id ) %> - tags: (separate multiple tags with commas, e.g. civil war, confederate army)<br> + tags: (separate multiple tags with commas, e.g. civil war, confederate army)<br /> <%= text_field_tag( 'tags', last_user_tags, {:size => 50} ) %> - <br> + <br /> <% if User.get_current.id and User.get_current.id > 0 %> private? <%= check_box_tag( "is_private", "yes", User.get_current.tags_default_to_private ) %> Modified: ruby/trunk/aquifer/app/views/search/_search_bar.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/_search_bar.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/search/_search_bar.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -6,7 +6,6 @@ <% new_search = "1" %> <% hide_options = "hidden" %> <% options_toggled = "" %> - <% end %> <% @search = Search.new unless @search %> @@ -14,25 +13,23 @@ <div id="searchbar"> <div id="mag_glass"></div> <% form_tag :controller => 'search' do -%> - <div> - <%= hidden_field_tag 'search_form_type', "simple" %> - <%= hidden_field_tag 'new_search', new_search %> - <%= text_field_tag( 'q', @search.query, :size => 27, :id => 'searchfield' ) %><%= submit_tag 'Search', { :id => 'searchbutton'} %> - - <div id="searchbarmenu" class=""> - <a href="#" id="searchoptions_toggle" class="<%=options_toggled%>" onclick="toggle_searchoptions(); return false"><span></span>options</a> - <div id="searchoptions" class="<%= hide_options %>"> - Sort by: - <%= select_tag "sort", options_for_select( SearchOptions.sort_types, @search.sort ) %> - <span style="margin-left:20px;"> - Years: - </span> - <%= text_field_tag "year_begin", @search.year_begin, :size => 5 %> - to - <%= text_field_tag "year_end", @search.year_end, :size => 5 %> + <div> + <%= hidden_field_tag 'search_form_type', "simple" %> + <%= hidden_field_tag 'new_search', new_search %> + <%= text_field_tag( 'q', @search.query, :size => 27, :id => 'searchfield' ) %><%= submit_tag 'Search', { :id => 'searchbutton'} %> + <div id="searchbarmenu" class=""> + <a href="#" id="searchoptions_toggle" class="<%=options_toggled%>" onclick="toggle_searchoptions(); return false"><span></span>options</a> + <div id="searchoptions" class="<%= hide_options %>"> + Sort by: + <%= select_tag "sort", options_for_select( SearchOptions.sort_types, @search.sort ) %> + <span style="margin-left:20px;"> + Years: + </span> + <%= text_field_tag "year_begin", @search.year_begin, :size => 5 %> + to + <%= text_field_tag "year_end", @search.year_end, :size => 5 %> + </div> </div> - </div> - </div> <% end %> </div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/search/map.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/map.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/search/map.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -26,7 +26,7 @@ // save the info we need to use later for the side_bar gmarkers[i] = marker; // add a line to the side_bar html - side_bar_html += '<a href="javascript:myclick(' + i + ')">' + name + '</a><br>'; + side_bar_html += '<a href="javascript:myclick(' + i + ')">' + name + '</a><br />'; i++; return marker; } Modified: ruby/trunk/aquifer/app/views/search/map_data.rxml =================================================================== --- ruby/trunk/aquifer/app/views/search/map_data.rxml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/search/map_data.rxml 2010-06-16 22:11:37 UTC (rev 658) @@ -18,7 +18,7 @@ ext_link = "<a href=\"#{external_link}\" onclick=\"new Ajax.Updater('', '#{ajax_url}', {asynchronous:true, evalScripts:true}); window.open( '#{item.get_external_link}', 'external_record' ); return false;\">#{link_text}</a>" ext_link.gsub( /"/, "" ) # let's not deal with quote right now - xml.marker( :lat => lat, :lng => long, :html => "#{ext_link}<br>#{full_link} (#{item.id})", :label => item.title.slice(0..20).gsub(/\&/,'and').gsub(/"/,'') ) + xml.marker( :lat => lat, :lng => long, :html => "#{ext_link}<br />#{full_link} (#{item.id})", :label => item.title.slice(0..20).gsub(/\&/,'and').gsub(/"/,'') ) puts "lat=#{lat}, long=#{long}" end count += 1 Modified: ruby/trunk/aquifer/app/views/user_admin/list.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/user_admin/list.rhtml 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/app/views/user_admin/list.rhtml 2010-06-16 22:11:37 UTC (rev 658) @@ -9,7 +9,7 @@ <%= submit_tag 'Limit' %> <%= end_form_tag %> </div> -<br><br> +<br /><br /> <table> <tr style="text-align: left;"> <th>OpenID URL</th> Modified: ruby/trunk/aquifer/public/images/gma_logo.png =================================================================== (Binary files differ) Added: ruby/trunk/aquifer/public/images/gma_logo2.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/gma_logo2.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: ruby/trunk/aquifer/public/javascripts/application.js =================================================================== --- ruby/trunk/aquifer/public/javascripts/application.js 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/public/javascripts/application.js 2010-06-16 22:11:37 UTC (rev 658) @@ -38,8 +38,6 @@ $('#collectionlist.featured').css('margin-left', leftmargin); }); - $('#facet_results').tablesorter(); - $('.pagination a').click(function (){ load_pagination($(this)); return false; @@ -64,7 +62,6 @@ var searchopts = $('#searchoptions'); if(searchopts.hasClass('hidden')){ searchopts.animate({ - display: 'block', height: 'toggle', opacity: 'toggle' }, @@ -75,7 +72,6 @@ }); }else{ searchopts.animate({ - display: 'none', height: 'toggle', opacity: 'toggle' }, Deleted: ruby/trunk/aquifer/public/stylesheets/base.css =================================================================== --- ruby/trunk/aquifer/public/stylesheets/base.css 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/public/stylesheets/base.css 2010-06-16 22:11:37 UTC (rev 658) @@ -1,206 +0,0 @@ -/* - Document : base - Created on : Dec 2, 2009, 4:13:03 PM - Author : psorens2 - Description: - Purpose of the stylesheet follows. -*/ - -/* - TODO customize this sample style - Syntax recommendation http://www.w3.org/TR/REC-CSS2/ -*/ -/* global reset */ -html, body, div, span, -applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -dd, dl, dt, li, ol, ul, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - line-height: 1; - font-family: inherit; - text-align: left; - vertical-align: baseline; -} -a img, :link img, :visited img { - border: 0; -} -table { - border-collapse: collapse; - border-spacing: 0; -} -ol, ul { - list-style: none; -} -q:before, q:after, -blockquote:before, blockquote:after { - content: ""; -} - -:focus { - outline: 0; -} - - -/* end global reset */ - - -root { - display: block; -} - -html,body{ - height:100%; -} - -body { - font-family:Arial, Helvetica, sans-serif; -} - -a:link -{ - color:#487FB4; - /*color:#0066FF;*/ - - text-decoration: none; -} - -a:visited -{ - color:#487FB4; - text-decoration: none; -} - -a:active -{ - color:#487FB4; - text-decoration: none; -} - -a:hover -{ - color:#487FB4; - text-decoration: underline; -} - -a.external -{ - padding-right: 16px; - background: transparent url('/images/externallink.png') right center no-repeat; -} - -a.external.image{ - background: transparent; -} - -p{ - margin:1em 0; -} - -.highlighted{ - background: yellow; - -} -/*h1 { - font: 150% sans-serif; - color: #226; - border-bottom: 3px dotted #77d; -} - -h1.top_border { - font: 150% sans-serif; - color: #226; - border-top: 3px dotted #77d; - border-bottom:hidden; -}*/ - -h1{ - color:#8A1915; - font-size:2.1em; - font-style:italic; - font-family: Cambria, - "Hoefler Text", - Utopia, - "Liberation Serif", - "Nimbus Roman No9 L", - Times, - "Times New Roman", - serif; - - letter-spacing: -0.05em; - /*margin: 2px 2px 6px;*/ -} - -table {font-family:Arial, Helvetica, sans-serif; - color: #41383C; - font-size:12px; -} - -input,select,textarea {font-family:Arial, Helvetica, sans-serif; - color: #41383C; - font-size:10px; -} - -p { - /* font-family: "Segoe UI", - Candara, - "Bitstream Vera Sans", - "DejaVu Sans", - "Trebuchet MS", - Verdana, - sans-serif;*/ - - font-family: 'Trebuchet MS', Arial, Helvetica, sans-serif; - - - /* font-family: Corbel, - "Lucida Grande", - "Lucida Sans Unicode", - "Lucida Sans", - "DejaVu Sans", - "Bitstream Vera Sans", - "Liberation Sans", - Verdana, - sans-serif;*/ - - line-height: 160%; -} - - -ol { - list-style-type:decimal; - list-style-position: inside; -} - -.hidden { - display:none; -} - -.notice{ - background: #F1FAFF; - border: 1px solid #BDE5F8; - color: #7BB4D2; - padding: 4px 8px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - margin: 14px 4px 4px; - font-size: 87%; - -} -.notice span{ - font-weight:bold; -} - -.bold{ - font-weight:bold; -} \ No newline at end of file Modified: ruby/trunk/aquifer/public/stylesheets/globalmiddleages.css =================================================================== --- ruby/trunk/aquifer/public/stylesheets/globalmiddleages.css 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/public/stylesheets/globalmiddleages.css 2010-06-16 22:11:37 UTC (rev 658) @@ -27,7 +27,7 @@ #logo a{ display:block; - width: 415px; + width: 420px; height: 95px; background: transparent url('/images/gma_logo.png') no-repeat top left; } \ No newline at end of file Deleted: ruby/trunk/aquifer/public/stylesheets/layout.css =================================================================== --- ruby/trunk/aquifer/public/stylesheets/layout.css 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/public/stylesheets/layout.css 2010-06-16 22:11:37 UTC (rev 658) @@ -1,990 +0,0 @@ - - - - -#collectionlist{ - /*border-collapse: collapse;*/ - /*border: 1px #ddd solid;*/ - margin:0 4px; - font-size: .7em; - position: relative; -} - -#collectionlist.featured{ - width: 678px; - float: left; - margin: 0 auto; -} - - - -.listitem{ - margin: 10px; - padding: 10px; - border: 1px solid #ddd; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; - background: #f3f3f3; - font-size: 0.8em; -} -.listitem.odd{ - background: #fefefe; -} -.listitem h3{ - font-weight: bolder; - font-size: 1.15em; - margin: 0 0 4px; -} -.listitem p{ - line-height: 1.2em; - color: #555; -} - -#main_content .listitem p{ - margin: 1em 0; -} - -.smalllistitem{ - margin: 12px 0; - padding: 4px 0; - font-size: 0.8em; -} - -.smalllistitem h5{ - font-weight: bolder; - font-size: 1.15em; - color: #8A1915; - margin-bottom:3px; -} - -.smalllistitem h5 a{ - color: #8A1915; -} -.smalllistitem h6{ - /*line-height: 1.2em;*/ - color: #444; - margin:3px 0 6px; -} - -.pagemenu{ - margin: 10px; - padding:16px; - border: 1px solid #F2EAD7; - -webkit-border-top-left-radius: 16px; - -webkit-border-bottom-right-radius: 16px; - -moz-border-radius-topleft: 16px; - -moz-border-radius-bottomright: 16px; - border-top-left-radius: 16px; - border-bottom-right-radius: 16px; - background: #fff; - font-size: 0.95em; - font-weight: bold; - color: #555; -} - -.pagemenu .menuwrapper{ - margin:0 auto; - max-width:65%; -} - -.pagemenu .menubuttons{ - float: right; -} -.pagemenu .menubuttons a{ - background:#fafafa; - border:1px solid #eee; - padding:3px; - margin: 0 10px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.pagemenu .menubuttons a:hover{ - background:#78A9DA; - color: #fff; - text-decoration:none; -} - -.pagemenu .menutext{ - float: left; - font-size:1.1em; - margin-right:2%; - color:#777; -} - -.pagination{ - font-weight: normal; - font-size: 0.8em; - display: inline -} -.bottom .pagination{ - display:block; - margin: 0 auto; - text-align:center; -} - -.pagination a{ - padding:1px 3px; - margin: 0 1px; - background:#efefef; - border: 1px solid #ddd; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; - -} -.pagination a:hover{ - background:#78A9DA; - color: #fff; - text-decoration:none; -} - - -.pagination .disabled{ - padding:1px 3px; - margin: 0 1px; - color: #aaa; - background:#ddd; - border: 1px solid #ccc; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} - -.pagination .current{ - padding:1px 3px; - margin: 0 1px; - background:#487FB4; - color: #fff; - border: 1px solid #aaa; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} - -.collection{ - /*background: #E6EFF8;*/ - /*background: #EEF5FC;*/ - background: #F1F7FC url('/images/collectionbg.png') repeat-x top left; - /*background: #fff url('/images/collection_bg.png') repeat-x top left;*/ - - /*-moz-border-radius: 16px;*/ - float:left; - width: 190px; - height: 200px; - padding:6px; - margin: 6px; - text-align:center; - /*font-size:.95em;*/ - border: 1px solid #eee; - position: relative; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; - -} -.collection b { font-size:1.05em; -} - - -.collection img { - /*border: 1px solid #d6d6d6;*/ - border: 2px solid #eee; - /*margin: 0 auto;*/ - /* max-width:144px; - max-height:144px; - overflow: hidden;*/ - padding:1px; - background:#ddd; -} - -.collection .thumbnailarea -{ - height:150px; - text-align: center; - width: 150px; - margin: 0 auto; - position: relative; -} -.collectioninfo{ - margin-top: 10px; - /*height:70px;*/ - /*vertical-align: bottom;*/ -} - -/*#collectionlist td, #collectionlist tr{ - border: 1px #ddd solid; - -}*/ - -.collection .thumbnail { - display: block; - text-align: center; -} - -.collection .actions { - display: none; - left:0; - right: 0; - top: 0; - bottom: 0; - font-size: 1.1em; - position: absolute; - background: #444; - z-index:10; - opacity:0.75; - filter:alpha(opacity=75); - padding: 4px; -} -.collection .actions li{ - padding: 2px; - list-style-type: square; - list-style-position: inside; - color: #bbb; -} - -.collection .actions li a{ - color: #fff; -} - - - - -#dialog .menu { - background: #eee; - border: 1px #ccc solid; - /*margin: 0 auto;*/ - font-size: 14px; - padding: 10px; - text-align: center; - width: 50%; - float: left; - position: absolute; - bottom: 5%; - right: 5%; -} - - -#footer { - margin: 0 auto; - clear:both; - font-size: 12px; - padding:0 20px 20px; - text-align: center; - border: 1px #9D8446 solid; - border-right: none; - border-left: none; - background: #B5B1A6; - /*color: #F9F2E4;*/ - color:#34416E; - - - /*color: #9D8446;*/ - /* max-width: 1120px; - min-width: 760px;*/ -} - -#footer_menu{ - padding:16px 0; - font-size:14px; - background:#9E998A; - border: 1px solid #85806F; - border-top:none; -} - -#footer a{ - /*text-decoration:underline;*/ - color: #F9F4E9; -} -#footer ul{ - /*margin: 0 auto;*/ - text-align: center; -} -#footer li { - display: inline; -} - -#footer p{ - text-align: center; -} - -div.ui-accordion-content.tree_widget{ - padding: 6px 2px; - margin: 0; - font-size: 12px; -} -.tree_widget ul{ - margin:0; - padding: 0; -} -.ui-accordion-content.tree_widget a{ - color:#487FB4; -} -.ui-accordion-content.tree_widget span{ - font-size: 10px; - color: #888; - margin-left: 2px; -} - -ul.widget_leaf_nodes{ - list-style-position: inside; - list-style-image: url('/images/leaf.gif'); -} -ul.widget_tree_nodes{ - list-style-position: inside; - list-style-image: url('/images/plus.gif'); -} -#aux_content .widget_children ul li{ - margin-left: 20px; -} - -#aux_content .tree_widget li{ - margin-left: 4px; -} - -.widget_leaf_node { - -} -.widget_tree_node { - cursor: pointer -} -.widget_tree_node.expanded{ - list-style-image: url('/images/minus.gif'); -} - -.widget_children{ - display:none; - list-style: none; -} -/*.widget_children ul{ - list-style-image: url('/images/empty.gif'); -} -*/ -#extra_search_content h4{ - text-align: center; - padding: 0 0 12px; - color: #7BB4D2; - font-size: 1.2em; - font-weight: bold; -} - -#aux_content h4{ - text-align: center; - padding: 0 0 12px; - color: #ccc; - font-size: 1.2em; -} -#aux_content p{ - margin-left: 20px; -} - -#aux_content li { - margin: 4px 0 4px 20px; -} - -#browse_collections{ - font-size: 3.2em; - /*background:#441615;*/ - border: 1px solid #ddd; - padding: 6px; - margin:6px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; - -} -#browse_collections a{ - color:#8a1915; -} -#browse_collections a:hover{ - text-decoration:none; -} -#browse_collections span{ - font-size: 2em; - color: #487fb4; -} - - -#tag_cloud -{ - float: right; - margin: 28px 0 0 28px; - padding: 6px; - /*background: #153f69;*/ - background: #FEFBF7; - border: 1px solid #F2EAD7; - -webkit-border-radius: 16px; - -moz-border-radius: 16px; - border-radius: 16px; - -} -#tag_cloud a{ - color:#487FB4; - /*color: #9FB8D0;*/ - -} - -a.noimage{ - /*display:block;*/ - /*margin: 67px 10px;*/ - /*height: 144px;*/ - /*width: 144px;*/ - font-size: 10px; - text-align: center; - /*vertical-align: top;*/ - /*line-height: 144px;*/ - color: #ccc; - text-decoration: none; -} - -#accordion { - width:250px; - /*font-family: Trebuchet MS, Arial, Helvetica, sans-serif;*/ - font-size: 12px; - float: right -} -#accordion h3 { - font-size: 14px; -} -.accordion { - border: 1px solid #1F669B; - width: 220px; - /* height: 310px; */ - font-family: 'Trebuchet MS', Arial, Helvetica, sans-serif; - font-size: 11px; -} -/*.accordion_header { - font-size: 12px; - padding: 4px 6px 4px 6px; - margin: 0; - border-style: solid none solid none; - border-top-color: #BDC7E7; - border-bottom-color: #182052; - border-width: 1px 0px 1px 0px; - color:#fff; - background-color: #63699C; - cursor:pointer; -}*/ -/*#accordion_visible { - color:#CED7EF; - background-color: #63699C; -}*/ -/*#accordion_panel1, #accordion_panel2, #accordion_panel3, #accordion_panel4 { - margin: 0; - padding-bottom: 0; - border: none; -}*/ -.accordion_panel_body { - /* height:199px; */ -} - - -/*div.pagination{ - display:inline; -} -*/ - -.debug { - border: 1px dotted red; -} - -.clearfix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -.contain { - margin: 0 auto; - max-width: 1160px; - min-width: 760px; -} - -body { - background: #f2ead7; -} - -#container_bottom { - margin: 0 auto; - clear:both; - background: #fff url('/images/bottomcontentbg.png') repeat-x top left; - height:50px; - border: solid 1px #C4D9DA; - border-top: none; - border-bottom:none; - /* position:absolute; - bottom:0; - left:0; - right:0;*/ -} - -#container { - padding: 20px; - /* padding-top: 40px; - */ background: #FFF url('/images/topcontentbg.png') repeat-x top left; - border: solid 1px #C4D9DA; - border-top: none; - border-bottom:none; - min-height: 50%; - - margin: 0 auto; - max-width: 1120px; - min-width: 760px; - position:relative; - -} - - - -#header_top_container { - background: #441615; - /*background: #440B09;*/ - border-bottom: 4px #8a1915 solid; -} - -#header_bottom { - background: #f2ead7; - /* - border-bottom: 1px #ccc solid; - padding-bottom: 6px;*/ -} - -#header_bottom_container { - border: solid 1px #C4D9DA; - border-bottom: none; - - background: #f4f4f4; - /*margin-top: 10px;*/ -} -#slogan { - /*color: #C2D7ED;*/ - color:#aaa; - /*color: #F2EAD7;*/ - /*float:left;*/ - /*text-align:right;*/ - /*margin: 50px 0 0;*/ - /*font-style:italic;*/ - /*font-family: Cambria, - "Hoefler Text", - Utopia, - "Liberation Serif", - "Nimbus Roman No9 L", - Times, - "Times New Roman", - serif;*/ - - /*letter-spacing: -0.01em;*/ - /* font-family: Corbel, - "Lucida Grande", - "Lucida Sans Unicode", - "Lucida Sans", - "DejaVu Sans", - "Bitstream Vera Sans", - "Liberation Sans", - Verdana, - sans-serif;*/ - - font-family: 'Trebuchet MS', Arial, Helvetica, sans-serif; - - - /*font-size:1.1em;*/ - position: absolute; - left: 420px; - /*bottom: 16px;*/ - top:22px; - cursor: default; - padding:30px 0 0 20px; - border-left: 1px solid #444; - /*margin: 22px 0 0 20px;*/ - -} - -#slogan span { - font-size:2.2em; - padding-right:6px; - color: #777; - display:none; -} - - -#menubar_container { - border-top: 1px solid #26425C; - border-bottom: 2px solid #1F384F; - - background: #153f69 url('/images/menubg.png') repeat-x top left; -} - -#header { - background: #f2ead7; -} - -#header_top { - margin: 0 auto; - max-width: 1160px; - min-width: 760px; - min-height:70px; - /*height: 97px;*/ - position: relative; -} - -#logo { - float: left; -} - -#header_controls { - /*float: left;*/ -} - -#searchbar { - margin: 0 30px; - /*padding: 25px 10px 0;*/ - padding: 18px 10px 0; - float: left; - background: #487FB4 url('/images/searchbg.png') repeat-x top left; - -webkit-border-bottom-right-radius: 16px; - -webkit-border-bottom-left-radius: 16px; - -moz-border-radius-bottomright: 16px; - -moz-border-radius-bottomleft: 16px; - border-bottom-right-radius: 16px; - border-bottom-left-radius: 16px; - border: 1px solid #5e7c98; - border-top: none; - -} - -#mag_glass { - background: transparent url('/images/search.png') 1px 1px no-repeat; - position: absolute; - z-index:1000; - height: 32px; - width: 32px; -} - -#searchfield { - /* border: 2px solid #658DB4;*/ - border: 1px solid #346A9E; - - font-size: 22px; - height: 30px; - padding:1px 1px 1px 34px; - background: #fff url('/images/searchfieldbg.png') repeat-x top left; - vertical-align: top; - -webkit-border-top-left-radius: 8px; - -webkit-border-bottom-left-radius: 8px; - -moz-border-radius-topleft: 8px; - -moz-border-radius-bottomleft: 8px; - border-top-left-radius: 8px; - border-bottom-left-radius: 8px; - - border-right: none; - - -} - -#searchbutton { - border: 1px solid #5e7c98; - background: #92B6DA url('/images/searchbuttonbg.png') repeat-x top left; - font-size: 18px; - color: #20384F; - /*border: 2px solid #658DB4;*/ - vertical-align: top; - /*font-family: "Verdana","Arial",sans-serif;*/ - height: 34px; - -webkit-border-top-right-radius: 8px; - -webkit-border-bottom-right-radius: 8px; - -moz-border-radius-topright: 8px; - -moz-border-radius-bottomright: 8px; - border-top-right-radius: 8px; - border-bottom-right-radius: 8px; - -} - -#searchbutton:hover { - cursor:pointer; - color:#5e7c98; - background: #B2D0ED url('/images/searchbuttonbg_hover.png') repeat-x top left; - -} - - -#searchoptions{ - padding: 6px; - color: #B2D0ED; -} -#menubar a#searchoptions_toggle{ - float:right; - padding:2px 2px 2px 9px; - margin:2px; - color: #92B6DA; - position: relative; -} -#menubar a#searchoptions_toggle span{ - height:6px; - width: 7px; - display:block; - position:absolute; - left:0; - top:50%; - margin-top: -2px; - background: transparent url('/images/toggle_arrows.gif') 0 0 no-repeat; -} -#menubar a#searchoptions_toggle.toggled span{ - background: transparent url('/images/toggle_arrows.gif') 0 -7px no-repeat; - -} - -#searchoptions_toggle:hover { - color: #fff; - text-decoration: none; -} - -#searchbarmenu{ - /*height: 25px;*/ - min-height: 18px; - text-align: left; - font-size: .75em; - line-height:25px; -} -/*#searchbarmenu a { - color: #92B6DA; - -}*/ - - -#submenu { - float: right; - font-family:Arial, Helvetica, sans-serif; - color:#41383C; - font-weight:normal; - font-size:12px; - background: #2A0706; - padding: 8px 10px 10px; - margin: 0 5px 0 0; - border: 1px solid #111; - border-top: none; - -webkit-border-bottom-right-radius: 8px; - -webkit-border-bottom-left-radius: 8px; - -moz-border-radius-bottomright: 8px; - -moz-border-radius-bottomleft: 8px; - border-bottom-right-radius: 8px; - border-bottom-left-radius: 8px; - -} - -#submenu a { - margin: 0 8px; - color: #aaa; -} - -#submenu a:hover { - color: #fff; - text-decoration: none; -} - - -#menubar { - height: 50px; - margin: 0 auto; - max-width: 1160px; - min-width: 760px; -} - -#menubar a -{ - color: #9FB8D0; -} - -#menubar a:hover { - color: #fff; - text-decoration:none; - background: transparent url('/images/highlight.png') repeat top left; - -} - -#menuitems{ - vertical-align:middle; - padding-top:10px; -} - -.menubarlink { - display: block; - height: 100%; - float:left; - text-align: center; - color: #fff; - line-height:50px; - margin: -10px 0; - border-right: 1px solid #1F384F; - border-left: 1px solid #26425C; - padding:0 22px; -} - -.menubarlink.first { - margin-left: 50px; -} - -.menubarlink.last { - border-right: 1px solid #1F384F; -} - -#extra_search_content{ - font-size:0.8em; -} - - -.twocolumn #main_content{ - /* float: left; - max-width: 70%; - position: relative;*/ - margin:0 0 0 305px; - overflow:hidden; -} - -/*#main_content.threecolumn{ - max-width:40%; -}*/ - -#meta_search{ - float: left; - padding: 5px; - /*background: #153f69;*/ - background: #FEFBF7; - border: 1px solid #F2EAD7; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; - -} -#meta_search a{ - color:#487FB4; - /*color: #9FB8D0;*/ -} - -#meta_search ul{ - list-style-position: inside; - list-style-type: square; - color:#5e7c98; - -} -#meta_search li{ - margin: 14px 0; -} -.twocolumn #aux_content { - float:right; - width:280px; - border-left: 1px dotted #eee; - min-height: 200px; - /*width:170px;*/ - position:relative; - /*left:185px;*/ - left:305px; -} - - - - -.columnmask { - position:relative; /* This fixes the IE7 overflow hidden bug and stops the layout jumping out of place */ - clear:both; - float:left; - width:100%; /* width of whole page */ - overflow:hidden; /* This chops off any overhanging divs */ -} -/* 2 column right menu settings */ -.twocolumn { - /*background:#ff9;*/ -} -.twocolumn .leftposition { - float:left; - width:200%; - margin-left:-305px; - position:relative; - right:100%; - /*background:#fff;*/ -} -.twocolumn .main_wrapper { - float:left; - width:50%; - position:relative; - left:50%; - padding-bottom:1em; -} -.twocolumn .col1 { - margin:0 15px 0 215px; - overflow:hidden; -} -.twocolumn .col2 { - float:right; - width:170px; - position:relative; - left:185px; -} -.threecolumn { - /*background:#ff9; Right column background colour */ -} -.threecolumn .midposition { - float:left; - width:200%; - margin-left:-280px; /* Width of right column */ - position:relative; - right:100%; - /*background:#fff; Centre column background colour */ - border-right: 1px dotted #eee; - -} -.threecolumn .leftposition { - float:left; - width:100%; - margin-left:-50%; - position:relative; - left:490px; /* Left column width + right column width */ - /*background:#FFD8B7; Left column background colour */ border-right: 1px dotted #eee; - -} -.threecolumn .main_wrapper { - float:left; - width:50%; - position:relative; - right:210px; /* Width of left column */ - /*padding-bottom:1em; Centre column bottom padding. Leave it out if it's zero */ -} -.threecolumn #main_content { - margin:0 285px 0 215px; /* Centre column side padding: - Left padding = left column width + centre column left padding width - Right padding = right column width + centre column right padding width */ - position:relative; - left:200%; - overflow:hidden; -} -.threecolumn .col2 { - float:left; - float:right; /* This overrides the float:left above */ - width:190px; /* Width of left column content (left column width minus left and right padding) */ - position:relative; - right:10px; /* Width of the left-had side padding on the left column*/ -} - -.threecolumn #extra_search_content{ - float:left; - float:right; /* This overrides the float:left above */ - width:200px; /* Width of left column content (left column width minus left and right padding) */ - position:relative; - right:10px; - /*width:280px;*/ - min-height: 200px; -} - -.threecolumn #aux_content { - float:left; - float:right; /* This overrides the float:left above */ - width:270px; /* Width of right column content (right column width minus left and right padding) */ - margin-right:10px; /* Width of right column right-hand padding + left column left and right padding */ - position:relative; - left:50%; - -} - Modified: ruby/trunk/aquifer/public/stylesheets/style.css =================================================================== --- ruby/trunk/aquifer/public/stylesheets/style.css 2010-05-05 19:05:12 UTC (rev 657) +++ ruby/trunk/aquifer/public/stylesheets/style.css 2010-06-16 22:11:37 UTC (rev 658) @@ -1,303 +1,1165 @@ -#main_heading{ - margin: 10px 10px 30px; - padding: 24px; - border: 1px solid #F2EAD7; - -webkit-border-top-left-radius: 32px; - -webkit-border-bottom-right-radius: 32px; - -moz-border-radius-topleft: 32px; - -moz-border-radius-bottomright: 32px; - border-top-left-radius: 32px; - border-bottom-right-radius: 32px; - background: #fff; - color:#8A1915; - font-size:2.1em; - font-style:italic; - font-family: Cambria, - "Hoefler Text", - Utopia, - "Liberation Serif", - "Nimbus Roman No9 L", - Times, - "Times New Roman", - serif; +/* global reset */ +html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td { +border:0; +font-weight:inherit; +font-style:inherit; +font-size:100%; +line-height:1; +font-family:inherit; +text-align:left; +vertical-align:baseline; +margin:0; +padding:0; +} - letter-spacing: -0.05em; +a img,:link img,:visited img { +border:0; } +table { +border-collapse:collapse; +border-spacing:0; +font-family:Arial, Helvetica, sans-serif; +color:#41383C; +font-size:12px; +} -#main_content p{ - margin: 0 40px 20px; +ol,ul { +list-style:none; } +q:before,q:after,blockquote:before,blockquote:after { +content:""; +} -#facet_menu{ - background:#eee; - border: 1px solid #ccc; - padding:10px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - font-size: .9em; +:focus { +outline:0; } -#facet_menu a{ - display: block; - color: #fff; - font-weight: bold; - background: #487FB4; - margin: 2px; - padding: 3px 4px; - float: left; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +/* end global reset */ +root { +display:block; } +html,body { +height:100%; +} -#facet_menu a.chosen{ - background: #153F69; - /*border: 2px solid #487FB4;*/ +body { +font-family:Arial, Helvetica, sans-serif; +} +a:hover { +color:#487FB4; +text-decoration:underline; } -#facet_menu .label{ - margin: 0 auto 4px; - font-weight: bold; - color: #333; +a.external { +padding-right:16px; +background:transparent url('/images/externallink.png') right center no-repeat; } -#active_facets{ - border: 1px solid #ccc; - padding:10px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; margin: 0 auto 10px; - background: #fafafa; +a.external.image { +background:transparent; } -#active_facets .label{ - font-size: .9em; - margin: 0 auto 6px; - font-weight: bold; - color: #444; +p { +font-family:'Trebuchet MS', Arial, Helvetica, sans-serif; +line-height:160%; +margin:1em 0; } -#active_facets .facet { +.highlighted { +background:#FF0; +} - background: #8A1915; - color: #fff; - padding:6px; - margin: 6px 2px; - font-size: 12px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; +h1 { +color:#8A1915; +font-size:2.1em; +font-style:italic; +font-family:Cambria, "Hoefler Text", Utopia, "Liberation Serif", "Nimbus Roman No9 L", Times, "Times New Roman", serif; +letter-spacing:-0.05em; } -#active_facets .facet .tag { - color: #fff; - font-weight: bold; - background: #487FB4; - font-size:10px; - margin-right: 7px; - padding: 1px 2px 2px; - float: left; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; + +h3 { +font-weight:700; +color:#555; +margin:30px 20px 10px; } -#active_facets .facet a{ - font-size: 14px; - font-weight: bold; - color: #eee; - text-decoration:none; - float: right; - margin-right: 2px; +input,select,textarea { +font-family:Arial, Helvetica, sans-serif; +color:#41383C; +font-size:10px; } -#facet_list{ - margin: -2px auto 0; - background:#e6e6e6; - border: 1px solid #ccc; - padding:10px; - -webkit-border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; + +ol { +list-style-type:decimal; +list-style-position:inside; } -#facet_results_wrapper{ - max-height: 400px; - min-height: 200px; - overflow: auto; - border: 1px #ccc solid; - background: #fafafa; - padding: 1px 2px; +.hidden { +display:none; } -#facet_list .tag{ - font-size: 12px; - margin:5px; +.notice { +background:#F1FAFF; +border:1px solid #BDE5F8; +color:#7BB4D2; +-webkit-border-radius:4px; +-moz-border-radius:4px; +border-radius:4px; +font-size:87%; +margin:14px 4px 4px; +padding:4px 8px; +} +a:link,a:visited,a:active { +color:#487FB4; +text-decoration:none; } -#facet_list .count { - float: right; - /*float: left;*/ - font-weight: bold; - background: #7495B5; - padding: 2px; - color:#fff; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; - font-size: 10px; - margin-right:15px; - /*margin: 0 3px;*/ + +.notice span,.bold { +font-weight:700; } -#facet_list .tag a{ - /*margin-left: 15px;*/ - /*float:left;*/ +#collectionlist { +font-size:.7em; +position:relative; +margin:0 4px; } -#collectionbox{ - margin-top:20px; - padding:12px; - background:#f8f8f8; - border:1px #ddd solid; - font-size: 0.8em; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; +#collectionlist.featured { +width:678px; +float:left; +margin:0 auto; +} +.listitem { +border:1px solid #ddd; +-webkit-border-radius:8px; +-moz-border-radius:8px; +border-radius:8px; +background:#f3f3f3; +font-size:0.8em; +margin:10px; +padding:10px; } -#collectionbox h4{ - color:#aaa; - font-weight: bold; + +.listitem.odd { +background:#fefefe; } -.searchitem{ - margin: 10px; - padding: 10px; - border: 1px solid #F2EAD7; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background: #fefefe; - font-size: 0.8em; - line-height: 1.2em; - color: #555; +.listitem h3 { +font-weight:bolder; +font-size:1.15em; +margin:0 0 4px; } -/*.listitem.odd{ - background: #fefefe; -}*/ -.searchitem h3{ - font-weight: bolder; - font-size: 1.15em; - color: #8A1915; - margin: 0 0 6px; + +.listitem p { +line-height:1.2em; +color:#555; } -.searchitem h3 a{ - color: #8A1915; - /*text-decoration:underline;*/ + +#main_content .listitem p { +margin:1em 0; } -.searchitem p{ - line-height: 1.2em; - color: #555; +.smalllistitem { +font-size:0.8em; +margin:12px 0; +padding:4px 0; } -.details{ - font-size: 14px; - margin:0 10px; +.smalllistitem h5 { +font-weight:bolder; +font-size:1.15em; +color:#8A1915; +margin-bottom:3px; } -.ui-widget .details a{ - color:#487FB4; + +.smalllistitem h5 a { +color:#8A1915; } -.details td{ - padding:6px 3px; +.smalllistitem h6 { +color:#444; +margin:3px 0 6px; } -.details tr{ - border-bottom: 2px dotted #f6f6f6; + +.pagemenu { +border:1px solid #F2EAD7; +-webkit-border-top-left-radius:16px; +-webkit-border-bottom-right-radius:16px; +-moz-border-radius-topleft:16px; +-moz-border-radius-bottomright:16px; +border-top-left-radius:16px; +border-bottom-right-radius:16px; +background:#fff; +font-size:0.95em; +font-weight:700; +color:#555; +margin:10px; +padding:16px; } -.details .label{ - font-weight: bold; - padding-right:15px; - color: #777; + +.pagemenu .menuwrapper { +max-width:65%; +margin:0 auto; } -.details .field{ - line-height:135%; + +.pagemenu .menubuttons { +float:right; } +.pagemenu .menubuttons a { +background:#fafafa; +border:1px solid #eee; +-webkit-border-radius:4px; +-moz-border-radius:4px; +b... [truncated message content] |
From: <th...@us...> - 2010-04-05 17:54:28
|
Revision: 655 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=655&view=rev Author: thabing Date: 2010-04-05 17:54:20 +0000 (Mon, 05 Apr 2010) Log Message: ----------- thumbnails for new collections Added Paths: ----------- ruby/trunk/aquifer/public/images/collection/BMC_Weddings.thumb.jpg ruby/trunk/aquifer/public/images/collection/BSUTheatre.thumb.jpg ruby/trunk/aquifer/public/images/collection/CoveredBridges.thumb.jpg ruby/trunk/aquifer/public/images/collection/DHWCour.thumb.jpg ruby/trunk/aquifer/public/images/collection/EdithIrvine.thumb.jpg ruby/trunk/aquifer/public/images/collection/ElRoos.thumb.jpg ruby/trunk/aquifer/public/images/collection/Emery.thumb.jpg ruby/trunk/aquifer/public/images/collection/GeorgeBeard.thumb.jpg ruby/trunk/aquifer/public/images/collection/HC_QuakSlav.thumb.jpg ruby/trunk/aquifer/public/images/collection/HC_hisphoto.thumb.jpg ruby/trunk/aquifer/public/images/collection/Helburn.thumb.jpg ruby/trunk/aquifer/public/images/collection/HungBag.thumb.jpg ruby/trunk/aquifer/public/images/collection/ICEO.thumb.jpg ruby/trunk/aquifer/public/images/collection/INArtsDesk.thumb.jpg ruby/trunk/aquifer/public/images/collection/INwright.thumb.jpg ruby/trunk/aquifer/public/images/collection/LSTACivWar.thumb.jpg ruby/trunk/aquifer/public/images/collection/MMD.thumb.jpg ruby/trunk/aquifer/public/images/collection/MidOrHis.thumb.jpg ruby/trunk/aquifer/public/images/collection/MinFur.thumb.jpg ruby/trunk/aquifer/public/images/collection/OX_2.thumb.jpg ruby/trunk/aquifer/public/images/collection/OX_2455.thumb.jpg ruby/trunk/aquifer/public/images/collection/OX_2617.thumb.jpg ruby/trunk/aquifer/public/images/collection/RFKen.thumb.jpg ruby/trunk/aquifer/public/images/collection/SC_Ephemera.thumb.jpg ruby/trunk/aquifer/public/images/collection/SC_Truman.thumb.jpg ruby/trunk/aquifer/public/images/collection/SC_WILPF.thumb.jpg ruby/trunk/aquifer/public/images/collection/SC_photo.thumb.jpg ruby/trunk/aquifer/public/images/collection/Stamps.thumb.jpg ruby/trunk/aquifer/public/images/collection/WWIIHistFilm.thumb.jpg ruby/trunk/aquifer/public/images/collection/WWIPosters.thumb.jpg ruby/trunk/aquifer/public/images/collection/afro.thumb.jpg ruby/trunk/aquifer/public/images/collection/ahfgold.thumb.jpg ruby/trunk/aquifer/public/images/collection/ahfmur.thumb.jpg ruby/trunk/aquifer/public/images/collection/ahfrein.thumb.jpg ruby/trunk/aquifer/public/images/collection/ahfreloc.thumb.jpg ruby/trunk/aquifer/public/images/collection/ahfsaints.thumb.jpg ruby/trunk/aquifer/public/images/collection/ahstuc.thumb.jpg ruby/trunk/aquifer/public/images/collection/ahswwf.thumb.jpg ruby/trunk/aquifer/public/images/collection/ajhjnp.thumb.jpg ruby/trunk/aquifer/public/images/collection/alajournals.thumb.jpg ruby/trunk/aquifer/public/images/collection/allen_leigh.thumb.jpg ruby/trunk/aquifer/public/images/collection/amjewess.thumb.jpg ruby/trunk/aquifer/public/images/collection/ammbush.thumb.jpg ruby/trunk/aquifer/public/images/collection/ammgen.thumb.jpg ruby/trunk/aquifer/public/images/collection/ammimg.thumb.jpg ruby/trunk/aquifer/public/images/collection/archgov.thumb.jpg ruby/trunk/aquifer/public/images/collection/archives.thumb.jpg ruby/trunk/aquifer/public/images/collection/ascbrbib.thumb.jpg ruby/trunk/aquifer/public/images/collection/ascfrbib.thumb.jpg ruby/trunk/aquifer/public/images/collection/aslsilver.thumb.jpg ruby/trunk/aquifer/public/images/collection/asmteiwes.thumb.jpg ruby/trunk/aquifer/public/images/collection/asufras.thumb.jpg ruby/trunk/aquifer/public/images/collection/asujrc.thumb.jpg ruby/trunk/aquifer/public/images/collection/asupwow.thumb.jpg ruby/trunk/aquifer/public/images/collection/asusci.thumb.jpg ruby/trunk/aquifer/public/images/collection/awkbbib.thumb.jpg ruby/trunk/aquifer/public/images/collection/baseball.thumb.jpg ruby/trunk/aquifer/public/images/collection/beaver_murdock_academy.thumb.jpg ruby/trunk/aquifer/public/images/collection/berea.thumb.jpg ruby/trunk/aquifer/public/images/collection/bh12ic.thumb.jpg ruby/trunk/aquifer/public/images/collection/bhl.thumb.jpg ruby/trunk/aquifer/public/images/collection/bhlpoetry.thumb.jpg ruby/trunk/aquifer/public/images/collection/bplic.thumb.jpg ruby/trunk/aquifer/public/images/collection/branch_agricultural_college.thumb.jpg ruby/trunk/aquifer/public/images/collection/branch_normal_school.thumb.jpg ruby/trunk/aquifer/public/images/collection/buttons.thumb.jpg ruby/trunk/aquifer/public/images/collection/byu.thumb.jpg ruby/trunk/aquifer/public/images/collection/byuihistpho.thumb.jpg ruby/trunk/aquifer/public/images/collection/cartoons.thumb.jpg ruby/trunk/aquifer/public/images/collection/cca.thumb.jpg ruby/trunk/aquifer/public/images/collection/ccmearly.thumb.jpg ruby/trunk/aquifer/public/images/collection/ccobisb.thumb.jpg ruby/trunk/aquifer/public/images/collection/ccpl.thumb.jpg ruby/trunk/aquifer/public/images/collection/clarivision.thumb.jpg ruby/trunk/aquifer/public/images/collection/clevehts.thumb.jpg ruby/trunk/aquifer/public/images/collection/cogprs.thumb.jpg ruby/trunk/aquifer/public/images/collection/colorado.thumb.jpg ruby/trunk/aquifer/public/images/collection/crawford_family.thumb.jpg ruby/trunk/aquifer/public/images/collection/csu.thumb.jpg ruby/trunk/aquifer/public/images/collection/cultural.thumb.jpg ruby/trunk/aquifer/public/images/collection/cut.thumb.jpg ruby/trunk/aquifer/public/images/collection/cwmars.thumb.jpg ruby/trunk/aquifer/public/images/collection/dag.thumb.jpg ruby/trunk/aquifer/public/images/collection/dencos.thumb.jpg ruby/trunk/aquifer/public/images/collection/digitalpast.thumb.jpg ruby/trunk/aquifer/public/images/collection/dixie_national_forest.thumb.jpg ruby/trunk/aquifer/public/images/collection/docsouth.thumb.jpg ruby/trunk/aquifer/public/images/collection/dpalic.thumb.jpg ruby/trunk/aquifer/public/images/collection/drama.thumb.jpg ruby/trunk/aquifer/public/images/collection/earhart.thumb.jpg ruby/trunk/aquifer/public/images/collection/earthquake.thumb.jpg ruby/trunk/aquifer/public/images/collection/epurdue.thumb.jpg ruby/trunk/aquifer/public/images/collection/ethnomuseum.thumb.jpg ruby/trunk/aquifer/public/images/collection/fenn.thumb.jpg ruby/trunk/aquifer/public/images/collection/ffcarp.thumb.jpg ruby/trunk/aquifer/public/images/collection/folkstreams.thumb.jpg ruby/trunk/aquifer/public/images/collection/freedomh.thumb.jpg ruby/trunk/aquifer/public/images/collection/gardens.thumb.jpg ruby/trunk/aquifer/public/images/collection/gccarc.thumb.jpg ruby/trunk/aquifer/public/images/collection/gcrmaps.thumb.jpg ruby/trunk/aquifer/public/images/collection/gea.thumb.jpg ruby/trunk/aquifer/public/images/collection/germans.thumb.jpg ruby/trunk/aquifer/public/images/collection/ghssfp.thumb.jpg ruby/trunk/aquifer/public/images/collection/glenallen.thumb.jpg ruby/trunk/aquifer/public/images/collection/gplhis.thumb.jpg ruby/trunk/aquifer/public/images/collection/gwinter.thumb.jpg ruby/trunk/aquifer/public/images/collection/har.thumb.jpg ruby/trunk/aquifer/public/images/collection/herrick.thumb.jpg ruby/trunk/aquifer/public/images/collection/historical_photographs.thumb.jpg ruby/trunk/aquifer/public/images/collection/histphotos.thumb.jpg ruby/trunk/aquifer/public/images/collection/hohenberger.thumb.jpg ruby/trunk/aquifer/public/images/collection/humphrey.thumb.jpg ruby/trunk/aquifer/public/images/collection/hungarians.thumb.jpg ruby/trunk/aquifer/public/images/collection/ilair.thumb.jpg ruby/trunk/aquifer/public/images/collection/indiana.thumb.jpg ruby/trunk/aquifer/public/images/collection/irish.thumb.jpg ruby/trunk/aquifer/public/images/collection/iron_mining_district.thumb.jpg ruby/trunk/aquifer/public/images/collection/jermmm.thumb.jpg ruby/trunk/aquifer/public/images/collection/lakewood.thumb.jpg ruby/trunk/aquifer/public/images/collection/linchigh.thumb.jpg ruby/trunk/aquifer/public/images/collection/metroparks.thumb.jpg ruby/trunk/aquifer/public/images/collection/misc.thumb.jpg ruby/trunk/aquifer/public/images/collection/miscwwii.thumb.jpg ruby/trunk/aquifer/public/images/collection/mmhtrnhist.thumb.jpg ruby/trunk/aquifer/public/images/collection/mnadfc.thumb.jpg ruby/trunk/aquifer/public/images/collection/mnhtrs.thumb.jpg ruby/trunk/aquifer/public/images/collection/moaa.thumb.jpg ruby/trunk/aquifer/public/images/collection/ncmch.thumb.jpg ruby/trunk/aquifer/public/images/collection/ncosw.thumb.jpg ruby/trunk/aquifer/public/images/collection/nickel.thumb.jpg ruby/trunk/aquifer/public/images/collection/oregon.thumb.jpg ruby/trunk/aquifer/public/images/collection/othermiddle.thumb.jpg ruby/trunk/aquifer/public/images/collection/otmch.thumb.jpg ruby/trunk/aquifer/public/images/collection/otmhar.thumb.jpg ruby/trunk/aquifer/public/images/collection/otmtrade.thumb.jpg ruby/trunk/aquifer/public/images/collection/pbuildings.thumb.jpg ruby/trunk/aquifer/public/images/collection/pconow.thumb.jpg ruby/trunk/aquifer/public/images/collection/pgmbaskt.thumb.jpg ruby/trunk/aquifer/public/images/collection/pgmhohokam.thumb.jpg ruby/trunk/aquifer/public/images/collection/pgmpottery.thumb.jpg ruby/trunk/aquifer/public/images/collection/phfaps.thumb.jpg ruby/trunk/aquifer/public/images/collection/photo.thumb.jpg ruby/trunk/aquifer/public/images/collection/polish.thumb.jpg ruby/trunk/aquifer/public/images/collection/postcards.thumb.jpg ruby/trunk/aquifer/public/images/collection/praying.thumb.jpg ruby/trunk/aquifer/public/images/collection/press.thumb.jpg ruby/trunk/aquifer/public/images/collection/puhistphot.thumb.jpg ruby/trunk/aquifer/public/images/collection/pustudents.thumb.jpg ruby/trunk/aquifer/public/images/collection/rcdhilites.thumb.jpg ruby/trunk/aquifer/public/images/collection/rcdimages.thumb.jpg ruby/trunk/aquifer/public/images/collection/savage.thumb.jpg ruby/trunk/aquifer/public/images/collection/scarlet.thumb.jpg ruby/trunk/aquifer/public/images/collection/sdlphotos.thumb.jpg ruby/trunk/aquifer/public/images/collection/sdlsvf.thumb.jpg ruby/trunk/aquifer/public/images/collection/sellers.thumb.jpg ruby/trunk/aquifer/public/images/collection/sg.thumb.jpg ruby/trunk/aquifer/public/images/collection/shaker.thumb.jpg ruby/trunk/aquifer/public/images/collection/shakespeare.thumb.jpg ruby/trunk/aquifer/public/images/collection/shmamerind.thumb.jpg ruby/trunk/aquifer/public/images/collection/shmbuild.thumb.jpg ruby/trunk/aquifer/public/images/collection/shmcurator.thumb.jpg ruby/trunk/aquifer/public/images/collection/shmining.thumb.jpg ruby/trunk/aquifer/public/images/collection/shmland.thumb.jpg ruby/trunk/aquifer/public/images/collection/shmmaps.thumb.jpg ruby/trunk/aquifer/public/images/collection/shmmilit.thumb.jpg ruby/trunk/aquifer/public/images/collection/shmtrans.thumb.jpg ruby/trunk/aquifer/public/images/collection/slhch.thumb.jpg ruby/trunk/aquifer/public/images/collection/splimage.thumb.jpg ruby/trunk/aquifer/public/images/collection/splrem.thumb.jpg ruby/trunk/aquifer/public/images/collection/suffragists.thumb.jpg ruby/trunk/aquifer/public/images/collection/svhocdm.thumb.jpg ruby/trunk/aquifer/public/images/collection/swift.thumb.jpg ruby/trunk/aquifer/public/images/collection/tgmhistcoll.thumb.jpg ruby/trunk/aquifer/public/images/collection/thumbs.zip ruby/trunk/aquifer/public/images/collection/traveling.thumb.jpg ruby/trunk/aquifer/public/images/collection/tshsettle.thumb.jpg ruby/trunk/aquifer/public/images/collection/uclamusic.thumb.jpg ruby/trunk/aquifer/public/images/collection/urbanfarm.thumb.jpg ruby/trunk/aquifer/public/images/collection/ussteel.thumb.jpg ruby/trunk/aquifer/public/images/collection/van.thumb.jpg ruby/trunk/aquifer/public/images/collection/wheeling.thumb.jpg ruby/trunk/aquifer/public/images/collection/whsrail.thumb.jpg ruby/trunk/aquifer/public/images/collection/wsu.thumb.jpg ruby/trunk/aquifer/public/images/collection/yhsic1.thumb.jpg Added: ruby/trunk/aquifer/public/images/collection/BMC_Weddings.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/BMC_Weddings.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/BSUTheatre.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/BSUTheatre.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/CoveredBridges.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/CoveredBridges.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/DHWCour.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/DHWCour.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/EdithIrvine.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/EdithIrvine.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ElRoos.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ElRoos.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/Emery.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/Emery.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/GeorgeBeard.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/GeorgeBeard.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/HC_QuakSlav.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/HC_QuakSlav.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/HC_hisphoto.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/HC_hisphoto.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/Helburn.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/Helburn.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/HungBag.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/HungBag.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ICEO.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ICEO.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/INArtsDesk.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/INArtsDesk.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/INwright.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/INwright.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/LSTACivWar.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/LSTACivWar.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/MMD.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/MMD.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/MidOrHis.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/MidOrHis.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/MinFur.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/MinFur.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/OX_2.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/OX_2.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/OX_2455.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/OX_2455.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/OX_2617.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/OX_2617.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/RFKen.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/RFKen.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/SC_Ephemera.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/SC_Ephemera.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/SC_Truman.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/SC_Truman.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/SC_WILPF.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/SC_WILPF.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/SC_photo.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/SC_photo.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/Stamps.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/Stamps.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/WWIIHistFilm.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/WWIIHistFilm.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/WWIPosters.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/WWIPosters.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/afro.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/afro.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ahfgold.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ahfgold.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ahfmur.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ahfmur.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ahfrein.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ahfrein.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ahfreloc.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ahfreloc.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ahfsaints.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ahfsaints.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ahstuc.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ahstuc.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ahswwf.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ahswwf.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ajhjnp.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ajhjnp.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/alajournals.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/alajournals.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/allen_leigh.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/allen_leigh.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/amjewess.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/amjewess.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ammbush.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ammbush.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ammgen.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ammgen.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ammimg.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ammimg.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/archgov.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/archgov.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/archives.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/archives.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ascbrbib.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ascbrbib.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ascfrbib.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ascfrbib.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/aslsilver.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/aslsilver.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/asmteiwes.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/asmteiwes.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/asufras.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/asufras.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/asujrc.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/asujrc.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/asupwow.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/asupwow.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/asusci.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/asusci.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/awkbbib.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/awkbbib.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/baseball.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/baseball.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/beaver_murdock_academy.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/beaver_murdock_academy.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/berea.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/berea.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/bh12ic.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/bh12ic.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/bhl.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/bhl.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/bhlpoetry.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/bhlpoetry.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/bplic.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/bplic.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/branch_agricultural_college.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/branch_agricultural_college.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/branch_normal_school.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/branch_normal_school.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/buttons.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/buttons.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/byu.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/byu.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/byuihistpho.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/byuihistpho.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/cartoons.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/cartoons.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/cca.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/cca.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ccmearly.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ccmearly.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ccobisb.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ccobisb.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ccpl.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ccpl.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/clarivision.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/clarivision.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/clevehts.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/clevehts.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/cogprs.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/cogprs.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/colorado.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/colorado.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/crawford_family.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/crawford_family.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/csu.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/csu.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/cultural.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/cultural.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/cut.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/cut.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/cwmars.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/cwmars.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/dag.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/dag.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/dencos.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/dencos.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/digitalpast.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/digitalpast.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/dixie_national_forest.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/dixie_national_forest.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/docsouth.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/docsouth.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/dpalic.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/dpalic.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/drama.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/drama.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/earhart.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/earhart.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/earthquake.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/earthquake.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/epurdue.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/epurdue.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ethnomuseum.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ethnomuseum.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/fenn.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/fenn.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ffcarp.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ffcarp.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/folkstreams.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/folkstreams.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/freedomh.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/freedomh.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/gardens.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/gardens.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/gccarc.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/gccarc.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/gcrmaps.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/gcrmaps.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/gea.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/gea.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/germans.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/germans.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ghssfp.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ghssfp.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/glenallen.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/glenallen.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/gplhis.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/gplhis.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/gwinter.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/gwinter.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/har.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/har.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/herrick.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/herrick.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/historical_photographs.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/historical_photographs.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/histphotos.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/histphotos.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/hohenberger.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/hohenberger.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/humphrey.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/humphrey.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/hungarians.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/hungarians.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ilair.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ilair.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/indiana.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/indiana.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/irish.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/irish.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/iron_mining_district.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/iron_mining_district.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/jermmm.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/jermmm.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/lakewood.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/lakewood.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/linchigh.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/linchigh.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/metroparks.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/metroparks.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/misc.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/misc.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/miscwwii.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/miscwwii.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/mmhtrnhist.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/mmhtrnhist.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/mnadfc.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/mnadfc.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/mnhtrs.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/mnhtrs.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/moaa.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/moaa.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ncmch.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ncmch.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/ncosw.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/ncosw.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/nickel.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/nickel.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/oregon.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/oregon.thumb.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection/othermiddle.thumb.jpg =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection/othermid... [truncated message content] |
From: <pau...@us...> - 2010-03-31 18:07:03
|
Revision: 654 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=654&view=rev Author: paulnsorensen Date: 2010-03-31 18:06:53 +0000 (Wed, 31 Mar 2010) Log Message: ----------- Made front widget more efficient Modified Paths: -------------- ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml ruby/trunk/aquifer/app/views/home/load_front_widget_data.rhtml ruby/trunk/aquifer/public/javascripts/application.js Modified: ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml 2010-03-12 23:30:59 UTC (rev 653) +++ ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml 2010-03-31 18:06:53 UTC (rev 654) @@ -1,39 +1,29 @@ -<% node_num = 0 %> -<% tree_nodes.keys.sort.each do |key| %> - <% tree_node = tree_nodes[ key ] %> - <% if tree_node[ :children ] %> - <% ul_class = "widget_tree_nodes" %> - <% li_class = "widget_tree_node" %> - <% else %> - <% ul_class = "widget_leaf_nodes" %> - <% li_class = "widget_leaf_node" %> - <% end %> - <% if depth == 0 %> - <% ul_class += " root" %> - <% end %> +<% node_num = 0 +tree_nodes.keys.sort.each do |key| + tree_node = tree_nodes[ key ] + if tree_node[ :children ] + ul_class = "widget_tree_nodes" + li_class = "widget_tree_node" + else + ul_class = "widget_leaf_nodes" + li_class = "widget_leaf_node" + end + if depth == 0 + ul_class += " root" + end %> <%= "<ul class ='#{ul_class}'>" %> - - <% child_div = "#{div_base}_#{node_num}" %> - <% node_num += 1 %> - + <% child_div = "#{div_base}_#{node_num}" + node_num += 1 %> <%= "<li class ='#{li_class}'>" %> - - <% if tree_node[ :link_options ] %> <%= link_to( tree_node[ :name ], tree_node[ :link_options ] ) %> <% else %> <%= tree_node[ :name ] %> <% end %> - <%#= " (#{tree_node[ :records ]} records)" %> <%= "<span>(#{tree_node[ :records ]})</span>" %> </li> - <% if tree_node[ :children ] %> - <%#= "<div id=\"#{child_div}\" style=\"display:none;\" >" %> - <li class="widget_children"> - <%= render :partial => "tree_widget_node", :locals => { :div_base => child_div, :tree_nodes => tree_node[ :children ], :depth => depth+1 } %> - </li> - <%#*</div>%> + <li class="widget_children"><%= render :partial => "tree_widget_node", :locals => { :div_base => child_div, :tree_nodes => tree_node[ :children ], :depth => depth+1 } %></li> <% end %> </ul> <% end %> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/load_front_widget_data.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/load_front_widget_data.rhtml 2010-03-12 23:30:59 UTC (rev 653) +++ ruby/trunk/aquifer/app/views/home/load_front_widget_data.rhtml 2010-03-31 18:06:53 UTC (rev 654) @@ -1,18 +1,12 @@ <div> <% cache(:action => 'load_front_widget_data', :action_suffix => 'front_widget') do %> -<%#= render :partial => "front_widget", :locals => { :div_base => "place_tree", :tree_nodes => @place_tree, :depth=>0 } %> <div id="subjects" class="tree_widget"> - <%#= @subject_tree.inspect %> <%= render :partial => "tree_widget_node", :locals => { :div_base => "subject_tree", :tree_nodes => @subject_tree, :depth=>0 } %> </div> <div id="places" class="tree_widget"> - <%#= @place_tree.inspect %> - <%= render :partial => "tree_widget_node", :locals => { :div_base => "place_tree", :tree_nodes => @place_tree, :depth=>0 } %> </div> <div id="times" class="tree_widget"> - <%#= @time_tree.inspect %> - <%= render :partial => "tree_widget_node", :locals => { :div_base => "time_tree", :tree_nodes => @time_tree, :depth=>0 } %> </div> <% end %> Modified: ruby/trunk/aquifer/public/javascripts/application.js =================================================================== --- ruby/trunk/aquifer/public/javascripts/application.js 2010-03-12 23:30:59 UTC (rev 653) +++ ruby/trunk/aquifer/public/javascripts/application.js 2010-03-31 18:06:53 UTC (rev 654) @@ -157,38 +157,56 @@ $('#places').html($(data).find('#places').html()); $('#times').html($(data).find('#times').html()); - $('.widget_tree_node').toggle( - function (e){ - var node = $(e.target); + $('.tree_widget').bind('click', function(e){ + var node = $(e.target); - if(node.is('a')){ - location.href = node.attr('href'); - return true; + if(node.hasClass('.widget_tree_node')){ + if(node.hasClass('expanded')){ + node.removeClass('expanded'); + node.next('.widget_children').hide(); + return false; }else{ - if(!node.is('li')){ - node = node.closest('li'); - } node.next('.widget_children').show(); node.addClass('expanded'); return false; } - }, - function (e){ - var node = $(e.target); + }else{ + return true; + } + }); - if(node.is('a')){ - location.href = node.attr('href'); - return true; - }else{ - if(!node.is('li')){ - node = node.closest('li'); - } - node.removeClass('expanded'); - node.next('.widget_children').hide(); - return false; - } - } - ); + // $('.widget_tree_node').toggle( + // function (e){ + // var node = $(e.target); + // + // if(node.is('a')){ + // location.href = node.attr('href'); + // return true; + // }else{ + // if(!node.is('li')){ + // node = node.closest('li'); + // } + // node.next('.widget_children').show(); + // node.addClass('expanded'); + // return false; + // } + // }, + // function (e){ + // var node = $(e.target); + // + // if(node.is('a')){ + // location.href = node.attr('href'); + // return true; + // }else{ + // if(!node.is('li')){ + // node = node.closest('li'); + // } + // node.removeClass('expanded'); + // node.next('.widget_children').hide(); + // return false; + // } + // } + // ); }); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2010-03-12 23:31:14
|
Revision: 653 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=653&view=rev Author: paulnsorensen Date: 2010-03-12 23:30:59 +0000 (Fri, 12 Mar 2010) Log Message: ----------- Added forgotten files Added Paths: ----------- ruby/trunk/aquifer/public/images/ah_logo.png ruby/trunk/aquifer/public/images/ajax-loader-small.gif ruby/trunk/aquifer/public/images/ajax-loader.gif ruby/trunk/aquifer/public/images/arrow_down.gif ruby/trunk/aquifer/public/images/arrow_up.gif ruby/trunk/aquifer/public/images/bottomcontentbg.png ruby/trunk/aquifer/public/images/collection_bg.png ruby/trunk/aquifer/public/images/collectionbg.png ruby/trunk/aquifer/public/images/externallink.png ruby/trunk/aquifer/public/images/image_unavailable.png ruby/trunk/aquifer/public/images/thumbnail_shadow.png ruby/trunk/aquifer/public/images/toggle_arrows.gif ruby/trunk/aquifer/public/javascripts/jquery-hoverintent-min.js ruby/trunk/aquifer/public/javascripts/jquery-tablesorter-min.js ruby/trunk/aquifer/public/stylesheets/style.css ruby/trunk/aquifer/public/stylesheets/tablesorter/ ruby/trunk/aquifer/public/stylesheets/tablesorter/style.css Added: ruby/trunk/aquifer/public/images/ah_logo.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ah_logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ajax-loader-small.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ajax-loader-small.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ajax-loader.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ajax-loader.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/arrow_down.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/arrow_down.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/arrow_up.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/arrow_up.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/bottomcontentbg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/bottomcontentbg.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collection_bg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collection_bg.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/collectionbg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/collectionbg.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/externallink.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/externallink.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/image_unavailable.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/image_unavailable.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/thumbnail_shadow.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/thumbnail_shadow.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/toggle_arrows.gif =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/toggle_arrows.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/javascripts/jquery-hoverintent-min.js =================================================================== --- ruby/trunk/aquifer/public/javascripts/jquery-hoverintent-min.js (rev 0) +++ ruby/trunk/aquifer/public/javascripts/jquery-hoverintent-min.js 2010-03-12 23:30:59 UTC (rev 653) @@ -0,0 +1,9 @@ +/** +* hoverIntent r5 // 2007.03.27 // jQuery 1.1.2+ +* <http://cherne.net/brian/resources/jquery.hoverIntent.html> +* +* @param f onMouseOver function || An object with configuration options +* @param g onMouseOut function || Nothing (use configuration options object) +* @author Brian Cherne <br...@ch...> +*/ +(function($){$.fn.hoverIntent=function(f,g){var cfg={sensitivity:7,interval:100,timeout:0};cfg=$.extend(cfg,g?{over:f,out:g}:f);var cX,cY,pX,pY;var track=function(ev){cX=ev.pageX;cY=ev.pageY;};var compare=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);if((Math.abs(pX-cX)+Math.abs(pY-cY))<cfg.sensitivity){$(ob).unbind("mousemove",track);ob.hoverIntent_s=1;return cfg.over.apply(ob,[ev]);}else{pX=cX;pY=cY;ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}};var delay=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);ob.hoverIntent_s=0;return cfg.out.apply(ob,[ev]);};var handleHover=function(e){var p=(e.type=="mouseover"?e.fromElement:e.toElement)||e.relatedTarget;while(p&&p!=this){try{p=p.parentNode;}catch(e){p=this;}}if(p==this){return false;}var ev=jQuery.extend({},e);var ob=this;if(ob.hoverIntent_t){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);}if(e.type=="mouseover"){pX=ev.pageX;pY=ev.pageY;$(ob).bind("mousemove",track);if(ob.hoverIntent_s!=1){ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}}else{$(ob).unbind("mousemove",track);if(ob.hoverIntent_s==1){ob.hoverIntent_t=setTimeout(function(){delay(ev,ob);},cfg.timeout);}}};return this.mouseover(handleHover).mouseout(handleHover);};})(jQuery); \ No newline at end of file Property changes on: ruby/trunk/aquifer/public/javascripts/jquery-hoverintent-min.js ___________________________________________________________________ Added: svn:executable + * Added: ruby/trunk/aquifer/public/javascripts/jquery-tablesorter-min.js =================================================================== --- ruby/trunk/aquifer/public/javascripts/jquery-tablesorter-min.js (rev 0) +++ ruby/trunk/aquifer/public/javascripts/jquery-tablesorter-min.js 2010-03-12 23:30:59 UTC (rev 653) @@ -0,0 +1,2 @@ + +(function($){$.extend({tablesorter:new function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'.',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}var rows=table.tBodies[0].rows;if(table.tBodies[0].rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i<l;i++){var p=false;if($.metadata&&($($headers[i]).metadata()&&$($headers[i]).metadata().sorter)){p=getParserById($($headers[i]).metadata().sorter);}else if((table.config.headers[i]&&table.config.headers[i].sorter)){p=getParserById(table.config.headers[i].sorter);}if(!p){p=detectParserForColumn(table,cells[i]);}if(table.config.debug){parsersDebug+="column:"+i+" parser:"+p.id+"\n";}list.push(p);}}if(table.config.debug){log(parsersDebug);}return list;};function detectParserForColumn(table,node){var l=parsers.length;for(var i=1;i<l;i++){if(parsers[i].is($.trim(getElementText(table.config,node)),table,node)){return parsers[i];}}return parsers[0];}function getParserById(name){var l=parsers.length;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==name.toLowerCase()){return parsers[i];}}return false;}function buildCache(table){if(table.config.debug){var cacheTime=new Date();}var totalRows=(table.tBodies[0]&&table.tBodies[0].rows.length)||0,totalCells=(table.tBodies[0].rows[0]&&table.tBodies[0].rows[0].cells.length)||0,parsers=table.config.parsers,cache={row:[],normalized:[]};for(var i=0;i<totalRows;++i){var c=table.tBodies[0].rows[i],cols=[];cache.row.push($(c));for(var j=0;j<totalCells;++j){cols.push(parsers[j].format(getElementText(table.config,c.cells[j]),table,c.cells[j]));}cols.push(i);cache.normalized.push(cols);cols=null;};if(table.config.debug){benchmark("Building cache for "+totalRows+" rows:",cacheTime);}return cache;};function getElementText(config,node){if(!node)return"";var t="";if(config.textExtraction=="simple"){if(node.childNodes[0]&&node.childNodes[0].hasChildNodes()){t=node.childNodes[0].innerHTML;}else{t=node.innerHTML;}}else{if(typeof(config.textExtraction)=="function"){t=config.textExtraction(node);}else{t=$(node).text();}}return t;}function appendToTable(table,cache){if(table.config.debug){var appendTime=new Date()}var c=cache,r=c.row,n=c.normalized,totalRows=n.length,checkCell=(n[0].length-1),tableBody=$(table.tBodies[0]),rows=[];for(var i=0;i<totalRows;i++){rows.push(r[n[i][checkCell]]);if(!table.config.appender){var o=r[n[i][checkCell]];var l=o.length;for(var j=0;j<l;j++){tableBody[0].appendChild(o[j]);}}}if(table.config.appender){table.config.appender(table,rows);}rows=null;if(table.config.debug){benchmark("Rebuilt table:",appendTime);}applyWidget(table);setTimeout(function(){$(table).trigger("sortEnd");},0);};function buildHeaders(table){if(table.config.debug){var time=new Date();}var meta=($.metadata)?true:false,tableHeadersRows=[];for(var i=0;i<table.tHead.rows.length;i++){tableHeadersRows[i]=0;};$tableHeaders=$("thead th",table);$tableHeaders.each(function(index){this.count=0;this.column=index;this.order=formatSortingOrder(table.config.sortInitialOrder);if(checkHeaderMetadata(this)||checkHeaderOptions(table,index))this.sortDisabled=true;if(!this.sortDisabled){$(this).addClass(table.config.cssHeader);}table.config.headerList[index]=this;});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders);}return $tableHeaders;};function checkCellColSpan(table,rows,row){var arr=[],r=table.tHead.rows,c=r[row].cells;for(var i=0;i<c.length;i++){var cell=c[i];if(cell.colSpan>1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i<l;i++){getWidgetById(c[i]).format(table);}}function getWidgetById(name){var l=widgets.length;for(var i=0;i<l;i++){if(widgets[i].id.toLowerCase()==name.toLowerCase()){return widgets[i];}}};function formatSortingOrder(v){if(typeof(v)!="Number"){i=(v.toLowerCase()=="desc")?1:0;}else{i=(v==(0||1))?v:0;}return i;}function isValueInArray(v,a){var l=a.length;for(var i=0;i<l;i++){if(a[i][0]==v){return true;}}return false;}function setHeadersCss(table,$headers,list,css){$headers.removeClass(css[0]).removeClass(css[1]);var h=[];$headers.each(function(offset){if(!this.sortDisabled){h[this.column]=$(this);}});var l=list.length;for(var i=0;i<l;i++){h[list[i][0]].addClass(css[list[i][1]]);}}function fixColumnWidth(table,$headers){var c=table.config;if(c.widthFixed){var colgroup=$('<colgroup>');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('<col>').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i<l;i++){var s=sortList[i],o=c.headerList[s[0]];o.count=s[1];o.count++;}}function multisort(table,sortList,cache){if(table.config.debug){var sortTime=new Date();}var dynamicExp="var sortWrapper = function(a,b) {",l=sortList.length;for(var i=0;i<l;i++){var c=sortList[i][0];var order=sortList[i][1];var s=(getCachedSortType(table.config.parsers,c)=="text")?((order==0)?"sortText":"sortTextDesc"):((order==0)?"sortNumeric":"sortNumericDesc");var e="e"+i;dynamicExp+="var "+e+" = "+s+"(a["+c+"],b["+c+"]); ";dynamicExp+="if("+e+") { return "+e+"; } ";dynamicExp+="else { ";}var orgOrderCol=cache.normalized[0].length-1;dynamicExp+="return a["+orgOrderCol+"]-b["+orgOrderCol+"];";for(var i=0;i<l;i++){dynamicExp+="}; ";}dynamicExp+="return 0; ";dynamicExp+="}; ";eval(dynamicExp);cache.normalized.sort(sortWrapper);if(table.config.debug){benchmark("Sorting on "+sortList.toString()+" and dir "+order+" time:",sortTime);}return cache;};function sortText(a,b){return((a<b)?-1:((a>b)?1:0));};function sortTextDesc(a,b){return((b<a)?-1:((b>a)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){$this.trigger("sortStart");var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){var $cell=$(this);var i=this.column;this.order=this.count++%2;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j<a.length;j++){if(a[j][0]!=i){config.sortList.push(a[j]);}}}config.sortList.push([i,this.order]);}else{if(isValueInArray(i,config.sortList)){for(var j=0;j<config.sortList.length;j++){var s=config.sortList[j],o=config.headerList[s[0]];if(s[0]==i){o.count=s[1];o.count++;s[1]=o.count%2;}}}else{config.sortList.push([i,this.order]);}};setTimeout(function(){setHeadersCss($this[0],$headers,config.sortList,sortCSS);appendToTable($this[0],multisort($this[0],config.sortList,cache));},1);return false;}}).mousedown(function(){if(config.cancelSelection){this.onselectstart=function(){return false};return false;}});$this.bind("update",function(){this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);}).bind("sorton",function(e,list){$(this).trigger("sortStart");config.sortList=list;var sortList=config.sortList;updateHeaderSortCount(this,sortList);setHeadersCss(this,$headers,sortList,sortCSS);appendToTable(this,multisort(this,sortList,cache));}).bind("appendCache",function(){appendToTable(this,cache);}).bind("applyWidgetId",function(e,id){getWidgetById(id).format(this);}).bind("applyWidgets",function(){applyWidget(this);});if($.metadata&&($(this).metadata()&&$(this).metadata().sortlist)){config.sortList=$(this).metadata().sortlist;}if(config.sortList.length>0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==parser.id.toLowerCase()){a=false;}}if(a){parsers.push(parser);};};this.addWidget=function(widget){widgets.push(widget);};this.formatFloat=function(s){var i=parseFloat(s);return(isNaN(i))?0:i;};this.formatInt=function(s){var i=parseInt(s);return(isNaN(i))?0:i;};this.isDigit=function(s,config){var DECIMAL='\\'+config.decimal;var exp='/(^[+]?0('+DECIMAL+'0+)?$)|(^([-+]?[1-9][0-9]*)$)|(^([-+]?((0?|[1-9][0-9]*)'+DECIMAL+'(0*[1-9][0-9]*)))$)|(^[-+]?[1-9]+[0-9]*'+DECIMAL+'0+$)/';return RegExp(exp).test($.trim(s));};this.clearTableBody=function(table){if($.browser.msie){function empty(){while(this.firstChild)this.removeChild(this.firstChild);}empty.apply(table.tBodies[0]);}else{table.tBodies[0].innerHTML="";}};}});$.fn.extend({tablesorter:$.tablesorter.construct});var ts=$.tablesorter;ts.addParser({id:"text",is:function(s){return true;},format:function(s){return $.trim(s.toLowerCase());},type:"text"});ts.addParser({id:"digit",is:function(s,table){var c=table.config;return $.tablesorter.isDigit(s,c);},format:function(s){return $.tablesorter.formatFloat(s);},type:"numeric"});ts.addParser({id:"currency",is:function(s){return/^[£$€?.]/.test(s);},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/[^0-9.]/g),""));},type:"numeric"});ts.addParser({id:"ipAddress",is:function(s){return/^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);},format:function(s){var a=s.split("."),r="",l=a.length;for(var i=0;i<l;i++){var item=a[i];if(item.length==2){r+="0"+item;}else{r+=item;}}return $.tablesorter.formatFloat(r);},type:"numeric"});ts.addParser({id:"url",is:function(s){return/^(https?|ftp|file):\/\/$/.test(s);},format:function(s){return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),''));},type:"text"});ts.addParser({id:"isoDate",is:function(s){return/^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);},format:function(s){return $.tablesorter.formatFloat((s!="")?new Date(s.replace(new RegExp(/-/g),"/")).getTime():"0");},type:"numeric"});ts.addParser({id:"percent",is:function(s){return/\%$/.test($.trim(s));},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),""));},type:"numeric"});ts.addParser({id:"usLongDate",is:function(s){return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));},format:function(s){return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"shortDate",is:function(s){return/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);},format:function(s,table){var c=table.config;s=s.replace(/\-/g,"/");if(c.dateFormat=="us"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$1/$2");}else if(c.dateFormat=="uk"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$2/$1");}else if(c.dateFormat=="dd/mm/yy"||c.dateFormat=="dd-mm-yy"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3");}return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"time",is:function(s){return/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);},format:function(s){return $.tablesorter.formatFloat(new Date("2000/01/01 "+s).getTime());},type:"numeric"});ts.addParser({id:"metadata",is:function(s){return false;},format:function(s,table,cell){var c=table.config,p=(!c.parserMetadataName)?'sortValue':c.parserMetadataName;return $(cell).metadata()[p];},type:"numeric"});ts.addWidget({id:"zebra",format:function(table){if(table.config.debug){var time=new Date();}$("tr:visible",table.tBodies[0]).filter(':even').removeClass(table.config.widgetZebra.css[1]).addClass(table.config.widgetZebra.css[0]).end().filter(':odd').removeClass(table.config.widgetZebra.css[0]).addClass(table.config.widgetZebra.css[1]);if(table.config.debug){$.tablesorter.benchmark("Applying Zebra widget",time);}}});})(jQuery); \ No newline at end of file Property changes on: ruby/trunk/aquifer/public/javascripts/jquery-tablesorter-min.js ___________________________________________________________________ Added: svn:executable + * Added: ruby/trunk/aquifer/public/stylesheets/style.css =================================================================== --- ruby/trunk/aquifer/public/stylesheets/style.css (rev 0) +++ ruby/trunk/aquifer/public/stylesheets/style.css 2010-03-12 23:30:59 UTC (rev 653) @@ -0,0 +1,301 @@ +#main_heading{ + margin: 10px 10px 30px; + padding: 24px; + border: 1px solid #F2EAD7; + -webkit-border-top-left-radius: 32px; + -webkit-border-bottom-right-radius: 32px; + -moz-border-radius-topleft: 32px; + -moz-border-radius-bottomright: 32px; + border-top-left-radius: 32px; + border-bottom-right-radius: 32px; + background: #fff; + color:#8A1915; + font-size:2.1em; + font-style:italic; + font-family: Cambria, + "Hoefler Text", + Utopia, + "Liberation Serif", + "Nimbus Roman No9 L", + Times, + "Times New Roman", + serif; + + letter-spacing: -0.05em; +} + + +#main_content p{ + margin: 0 40px 20px; +} + + +#facet_menu{ + background:#eee; + border: 1px solid #ccc; + padding:10px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + font-size: .9em; +} + +#facet_menu a{ + display: block; + color: #fff; + font-weight: bold; + background: #487FB4; + margin: 2px; + padding: 3px 4px; + float: left; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} + + +#facet_menu a.chosen{ + background: #153F69; + /*border: 2px solid #487FB4;*/ + +} + +#facet_menu .label{ + margin: 0 auto 4px; + font-weight: bold; + color: #333; +} + +#active_facets{ + border: 1px solid #ccc; + padding:10px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; margin: 0 auto 10px; + background: #fafafa; +} + +#active_facets .label{ + font-size: .9em; + margin: 0 auto 6px; + font-weight: bold; + color: #444; +} + +#active_facets .facet { + + background: #8A1915; + color: #fff; + padding:6px; + margin: 6px 2px; + font-size: 12px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +#active_facets .facet .tag { + color: #fff; + font-weight: bold; + background: #487FB4; + font-size:10px; + margin-right: 7px; + padding: 1px 2px 2px; + float: left; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} + +#active_facets .facet a{ + font-size: 14px; + font-weight: bold; + color: #eee; + text-decoration:none; + float: right; + margin-right: 2px; +} +#facet_list{ + margin: -2px auto 0; + background:#e6e6e6; + border: 1px solid #ccc; + padding:10px; + -webkit-border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomright: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} + +#facet_results_wrapper{ + max-height: 400px; + min-height: 200px; + overflow: auto; + border: 1px #ccc solid; + background: #fafafa; + padding: 1px 2px; +} + +#facet_list .tag{ + font-size: 12px; + margin:5px; + +} +#facet_list .count { + float: right; + /*float: left;*/ + font-weight: bold; + background: #7495B5; + padding: 2px; + color:#fff; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + font-size: 10px; + margin-right:15px; + /*margin: 0 3px;*/ +} + +#facet_list .tag a{ + /*margin-left: 15px;*/ + /*float:left;*/ +} + +#collectionbox{ + margin-top:20px; + padding:12px; + background:#f8f8f8; + border:1px #ddd solid; + font-size: 0.8em; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + +} +#collectionbox h4{ + color:#aaa; + font-weight: bold; +} + +.searchitem{ + margin: 10px; + padding: 10px; + border: 1px solid #F2EAD7; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + background: #fefefe; + font-size: 0.8em; + line-height: 1.2em; + color: #555; +} +/*.listitem.odd{ + background: #fefefe; +}*/ +.searchitem h3{ + font-weight: bolder; + font-size: 1.15em; + color: #8A1915; + margin: 0 0 6px; +} +.searchitem h3 a{ + color: #8A1915; + /*text-decoration:underline;*/ +} + +.searchitem p{ + line-height: 1.2em; + color: #555; +} + +.details{ + font-size: 14px; + margin:0 10px; +} +.ui-widget .details a{ + color:#487FB4; +} +.details td{ + padding:6px 3px; + +} +.details tr{ + border-bottom: 2px dotted #f6f6f6; +} +.details .label{ + font-weight: bold; + padding-right:15px; + color: #777; +} +.details .field{ + line-height:135%; +} + + +h3{ + font-weight: bold; + color: #555; + margin: 30px 20px 10px; +} + +ul.content{ + font-family: "Segoe UI", + Candara, + "Bitstream Vera Sans", + "DejaVu Sans", + "Trebuchet MS", + Verdana, + sans-serif; + + + line-height: 160%; + + margin: 0 40px 20px; + +} + +ol.content{ + font-family: "Segoe UI", + Candara, + "Bitstream Vera Sans", + "DejaVu Sans", + "Trebuchet MS", + Verdana, + sans-serif; + + + line-height: 160%; + + margin: 0 40px 20px; + +} +ul.content li{ + margin: 6px 0 10px 15px; + list-style-position: outside; + +} +ul.content li{ + list-style-type: disc; +} +ol.content li{ + list-style-type: decimal; +} + + +#main_content h4{ + font-weight: bold; + font-size:0.95em; + color: #555; + margin: 30px 30px 10px; +} + +/*ul.actions{ + margin:0; + line-height: 100%; + +} + +ul.actions li{ + margin:0; + list-style-type: square; +}*/ \ No newline at end of file Property changes on: ruby/trunk/aquifer/public/stylesheets/style.css ___________________________________________________________________ Added: svn:executable + * Added: ruby/trunk/aquifer/public/stylesheets/tablesorter/style.css =================================================================== --- ruby/trunk/aquifer/public/stylesheets/tablesorter/style.css (rev 0) +++ ruby/trunk/aquifer/public/stylesheets/tablesorter/style.css 2010-03-12 23:30:59 UTC (rev 653) @@ -0,0 +1,39 @@ +/* tables */ +table.tablesorter { + font-family:arial; + background-color: #CDCDCD; + margin:10px 0pt 15px; + font-size: 8pt; + width: 100%; + text-align: left; +} +table.tablesorter thead tr th, table.tablesorter tfoot tr th { + background-color: #e6EEEE; + border: 1px solid #FFF; + font-size: 8pt; + padding: 4px; +} +table.tablesorter thead tr .header { + background-image: url(bg.gif); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; +} +table.tablesorter tbody td { + color: #3D3D3D; + padding: 4px; + background-color: #FFF; + vertical-align: top; +} +table.tablesorter tbody tr.odd td { + background-color:#F0F0F6; +} +table.tablesorter thead tr .headerSortUp { + background-image: url(asc.gif); +} +table.tablesorter thead tr .headerSortDown { + background-image: url(desc.gif); +} +table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { +background-color: #8dbdd8; +} Property changes on: ruby/trunk/aquifer/public/stylesheets/tablesorter/style.css ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2010-03-12 23:27:48
|
Revision: 652 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=652&view=rev Author: paulnsorensen Date: 2010-03-12 23:27:41 +0000 (Fri, 12 Mar 2010) Log Message: ----------- Testing version done Modified Paths: -------------- ruby/trunk/aquifer/app/controllers/home_controller.rb ruby/trunk/aquifer/app/views/collection/shortlist.rhtml ruby/trunk/aquifer/app/views/home/_front_widget.rhtml ruby/trunk/aquifer/app/views/home/_header.rhtml ruby/trunk/aquifer/app/views/home/conditions_of_use.rhtml ruby/trunk/aquifer/app/views/home/faq.rhtml ruby/trunk/aquifer/app/views/home/help.rhtml ruby/trunk/aquifer/app/views/home/index.rhtml ruby/trunk/aquifer/app/views/home/load_front_widget_data.rhtml ruby/trunk/aquifer/public/images/collection/CE.thumb.jpg ruby/trunk/aquifer/public/images/collection/Lehman.thumb.jpg ruby/trunk/aquifer/public/images/collection/UTMods_armods.thumb.jpg ruby/trunk/aquifer/public/images/collection/UTMods_famods.thumb.jpg ruby/trunk/aquifer/public/images/collection/cdl69.thumb.jpg ruby/trunk/aquifer/public/images/collection/coll.thumb.jpg ruby/trunk/aquifer/public/images/collection/dlps_moa.thumb.jpg ruby/trunk/aquifer/public/images/collection/fm.thumb.jpg ruby/trunk/aquifer/public/images/collection/gr.thumb.jpg ruby/trunk/aquifer/public/images/collection/lb.thumb.jpg ruby/trunk/aquifer/public/images/collection/northwestern-wwii.thumb.jpg ruby/trunk/aquifer/public/images/favicon.ico ruby/trunk/aquifer/public/javascripts/application.js ruby/trunk/aquifer/public/stylesheets/base.css ruby/trunk/aquifer/public/stylesheets/layout.css ruby/trunk/geo_gazer/config/database.yml ruby/trunk/geo_gazer/data/geo_gazer_dump.sql.gz Modified: ruby/trunk/aquifer/app/controllers/home_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-03-12 23:27:41 UTC (rev 652) @@ -1,5 +1,5 @@ class HomeController < ApplicationController - layout 'default', :except=>[:maintenance,:load_subjects_widget_data,:load_places_widget_data,:load_times_widget_data] + layout 'default', :except=>[:maintenance,:load_front_widget_data] @@last_widget_cache = Time.local(2000,1,1) @@last_featured_collections_update = Time.local(2000,1,1,1,0) @@ -40,239 +40,324 @@ end - def load_subjects_widget_data - cache_age = Time.now - @@last_subject_tree_cache - unless params[:ffw]=='true' or read_fragment({}) and cache_age < 1.days - subject_tree - @@last_subject_tree_cache = Time.now - end - end + # def load_subjects_widget_data + # cache_age = Time.now - @@last_subject_tree_cache + # unless params[:ffw]=='true' or read_fragment({}) and cache_age < 1.days + # subject_tree + # @@last_subject_tree_cache = Time.now + # end + # end - def load_times_widget_data - cache_age = Time.now - @@last_time_tree_cache - unless params[:ffw]=='true' or read_fragment({}) and cache_age < 1.days - time_tree - @@last_time_tree_cache = Time.now - end - end + # def load_times_widget_data + # cache_age = Time.now - @@last_time_tree_cache + # unless params[:ffw]=='true' or read_fragment({}) and cache_age < 1.days + # time_tree + # @@last_time_tree_cache = Time.now + # end + # end - def load_places_widget_data - cache_age = Time.now - @@last_place_tree_cache - unless params[:ffw]=='true' or read_fragment({}) and cache_age < 1.days - place_tree - @@last_place_tree_cache = Time.now - end - end + # def load_places_widget_data + # cache_age = Time.now - @@last_place_tree_cache + # unless params[:ffw]=='true' or read_fragment({}) and cache_age < 1.days + # place_tree + # @@last_place_tree_cache = Time.now + # end + # end def load_front_widget_data - front_widget if params[:ffw]=='true' #force a refresh of the front widget + if params[:ffw]=='true' + expire_fragment(:controller => 'home', :action => 'load_front_widget_data', :action_suffix => 'front_widget') + front_widget + end + ##force a refresh of the front widget # a better expiration should be done, but this is ok # no caching on dev because class level vars, not held there cache_age = Time.now - @@last_widget_cache - unless read_fragment({}) and cache_age < 1.days + unless read_fragment(:controller => 'home', :action => 'load_front_widget_data', :action_suffix => 'front_widget') and cache_age < 1.days front_widget # setup facet widget @@last_widget_cache = Time.now end -end + end + + + + + + + + def layout -def layout - -end + end -def home2 + def home2 -end + end -def maintenance + def maintenance -end + end -def about + def about -end + end -def help + def help -end + end -def contact_us + def contact_us -end + end -def message_sent -UserFeedback.deliver_feedback( params ) -end + def message_sent + UserFeedback.deliver_feedback( params ) + end -def faq + def faq -end + end -def conditions_of_use + def conditions_of_use -end + end -def tools + def tools -end + end -def debug -unless User.get_current.is_super_user? - render(:status=>'403 Forbidden') -end -end + def debug + unless User.get_current.is_super_user? + render(:status=>'403 Forbidden') + end + end -private + private -def featured_collections -cache_age = Time.now - @@last_featured_collections_update -unless read_fragment({}) and cache_age < 1.day - colls=Collection.find(:all) + def featured_collections + cache_age = Time.now - @@last_featured_collections_update + unless read_fragment({}) and cache_age < 1.day + colls=Collection.find(:all) - old_ids = Array.new(11) + old_ids = Array.new(11) - @@featured_collections.each do |collection| - old_ids.push(collection.object_id) - end + @@featured_collections.each do |collection| + old_ids.push(collection.object_id) + end - @@featured_collections.clear - new_ids = Array(11) + @@featured_collections.clear + new_ids = Array(11) - begin - next_coll = rand(colls.length) - if !old_ids.include?(next_coll) && !new_ids.include?(next_coll) && colls[next_coll].get_image_url != "" - @@featured_collections.push(colls[next_coll]) - new_ids.push(next_coll) - end - end while @@featured_collections.size < 11 + begin + next_coll = rand(colls.length) + if !old_ids.include?(next_coll) && !new_ids.include?(next_coll) && colls[next_coll].get_image_url != "" + @@featured_collections.push(colls[next_coll]) + new_ids.push(next_coll) + end + end while @@featured_collections.size < 11 - #make featured collections always update at about the same time regardless of when the page is browsed - @@last_featured_collections_update = Time.mktime(Time.now.year, Time.now.month, Time.now.day, 1, 0, 0) + #make featured collections always update at about the same time regardless of when the page is browsed + @@last_featured_collections_update = Time.mktime(Time.now.year, Time.now.month, Time.now.day, 1, 0, 0) - @featured_colls = @@featured_collections -end -end + @featured_colls = @@featured_collections + end + end -def tag_cloud -@heading_tag = 'a' -per_page = 30 -# order = "item_count/grand_total desc, item_count desc, normalized_text" -order = "hs.item_count desc, normalized_text" + def tag_cloud + @heading_tag = 'a' + per_page = 30 + # order = "item_count/grand_total desc, item_count desc, normalized_text" + order = "hs.item_count desc, normalized_text" -@collection_id = 0 -conditions = ["headings.tags like '%%#{@heading_tag}%%' and hs.tag = '#{@heading_tag}' and hs.collection_id = #{@collection_id}"] -# @legal_sorts = ['frequency','uniqueness','rarity','heading'] -# @legal_sorts.insert( 0, 'distinctiveness' ) unless @collection_id == 0 + @collection_id = 0 + conditions = ["headings.tags like '%%#{@heading_tag}%%' and hs.tag = '#{@heading_tag}' and hs.collection_id = #{@collection_id}"] + # @legal_sorts = ['frequency','uniqueness','rarity','heading'] + # @legal_sorts.insert( 0, 'distinctiveness' ) unless @collection_id == 0 -joins = "left join heading_stats hs on ( headings.id = hs.heading_id )" + joins = "left join heading_stats hs on ( headings.id = hs.heading_id )" -puts "conditions=#{conditions.inspect}" -@headings = Heading.paginate( :page => params[:page], :joins => joins, :conditions => conditions, :order => order, :per_page => per_page ) -end + puts "conditions=#{conditions.inspect}" + @headings = Heading.paginate( :page => params[:page], :joins => joins, :conditions => conditions, :order => order, :per_page => per_page ) + end + # + #def time_tree + #facet_counts,recs = SolrSearch.search('',['year_facet'],[]) + # + #@time_tree = Hash.new + #year_facets = facet_counts['facet_fields']['year_facet'] + # + #year_facets.keys.sort.each do |year| + # next if year.to_i < 1600 or year.to_i > Time.new.year + # century = ( year.to_i / 100 * 100 ).to_i + # decade = ( year.to_i / 10 * 10 ).to_i + # records = year_facets[ year ] + # + # unless @time_tree[ century ] + # @time_tree[ century ] = {:name=>"#{century}'s",:records=>0,:children=>Hash.new} + # end + # + # node = @time_tree[ century ] + # node[ :records ] += records + # + # unless node[ :children ][ decade ] + # node[ :children ][ decade ] = { + # :name=>"#{decade}'s", + # :link_options=>{:controller=>'search',:action=>'',:new_search=>1,:facet_tag=>'decade',:facet_browse => decade, :facet=> "year"}, + # :records=>0, + # :children=>Hash.new + # } + # end + # node = node[ :children ][ decade ] + # node[ :records ] += records + # node[ :children ][ year ] = { + # :name=>year, + # :link_options=>{ + # :controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'year', :facet_browse => year, :facet => "state"}, + # :records=>records + # } + #end + #end + #def place_tree + #facet_counts,recs = SolrSearch.search('',['city_state_facet'],[]) + #@place_tree = Hash.new + #place_facets = facet_counts['facet_fields']['city_state_facet'] + # + #place_facets.keys.sort.each do |place| + # match = /(.*), ([A-Z][A-Z])/.match( place ) + # city = match[1] + # state_code = match[2] + # state = UsState.code_to_name( match[2] ) + # next unless state + # records = place_facets[ place ] + # + # unless @place_tree[ state ] + # @place_tree[ state ] = { + # :name=>state, + # :link_options=>{ + # :controller => 'search', :action=>'index',:new_search=>1, + # :facet_tag => 'state', :facet_browse => state_code, :facet => "city_state" + # }, + # :records=>0, + # :children=>Hash.new + # } + # end + # @place_tree[ state ][ :records ] += records + # @place_tree[ state ][ :children ][ city ] = { + # :name=>city, + # :link_options=>{ + # :controller => 'search', :action=>'index',:new_search=>1, + # :facet_tag => 'city_state', :facet_browse => place, :facet => "decade" + # }, + # :records=>records + # } + #end + #end + # + #def subject_tree + #@subject_tree = Hash.new + #Collection.get_asho_subject_hash.each do |k,v| + # @subject_tree[ k ] = { + # :name=>k, + # :link_options=>{ + # :controller => 'search', :action=>'index',:new_search=>1, + # :facet_tag => 'subject', :facet_browse => k, :facet => "set_spec" + # }, + # :records=>v[0] + # } + #end + #end -def time_tree -facet_counts,recs = SolrSearch.search('',['year_facet'],[]) -@time_tree = Hash.new -year_facets = facet_counts['facet_fields']['year_facet'] + # build simple trees for various front page facets + # node is hash 'name' => [link_to_options,count,children] + def front_widget + facet_counts,recs = SolrSearch.search('',['year_facet'],[]) -year_facets.keys.sort.each do |year| - next if year.to_i < 1600 or year.to_i > Time.new.year - century = ( year.to_i / 100 * 100 ).to_i - decade = ( year.to_i / 10 * 10 ).to_i - records = year_facets[ year ] + @time_tree = Hash.new + year_facets = facet_counts['facet_fields']['year_facet'] - unless @time_tree[ century ] - @time_tree[ century ] = {:name=>"#{century}'s",:records=>0,:children=>Hash.new} - end + year_facets.keys.sort.each do |year| + next if year.to_i < 1600 or year.to_i > Time.new.year + century = ( year.to_i / 100 * 100 ).to_i + decade = ( year.to_i / 10 * 10 ).to_i + records = year_facets[ year ] - node = @time_tree[ century ] - node[ :records ] += records + unless @time_tree[ century ] + @time_tree[ century ] = {:name=>"#{century}'s",:records=>0,:children=>Hash.new} + end - unless node[ :children ][ decade ] - node[ :children ][ decade ] = { - :name=>"#{decade}'s", - :link_options=>{:controller=>'search',:action=>'',:new_search=>1,:facet_tag=>'decade',:facet_browse => decade, :facet=> "year"}, - :records=>0, - :children=>Hash.new - } - end - node = node[ :children ][ decade ] - node[ :records ] += records - node[ :children ][ year ] = { - :name=>year, - :link_options=>{ - :controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'year', :facet_browse => year, :facet => "state"}, - :records=>records - } -end -end -def place_tree -facet_counts,recs = SolrSearch.search('',['city_state_facet'],[]) -@place_tree = Hash.new -place_facets = facet_counts['facet_fields']['city_state_facet'] + node = @time_tree[ century ] + node[ :records ] += records -place_facets.keys.sort.each do |place| - match = /(.*), ([A-Z][A-Z])/.match( place ) - city = match[1] - state_code = match[2] - state = UsState.code_to_name( match[2] ) - next unless state - records = place_facets[ place ] + unless node[ :children ][ decade ] + node[ :children ][ decade ] = { + :name=>"#{decade}'s", + :link_options=>{:controller=>'search',:action=>'',:new_search=>1,:facet_tag=>'decade',:facet_browse => decade, :facet=> "year"}, + :records=>0, + :children=>Hash.new + } + end + node = node[ :children ][ decade ] + node[ :records ] += records + node[ :children ][ year ] = { + :name=>year, + :link_options=>{ + :controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'year', :facet_browse => year, :facet => "state"}, + :records=>records + } + end - unless @place_tree[ state ] - @place_tree[ state ] = { - :name=>state, - :link_options=>{ - :controller => 'search', :action=>'index',:new_search=>1, - :facet_tag => 'state', :facet_browse => state_code, :facet => "city_state" - }, - :records=>0, - :children=>Hash.new - } - end - @place_tree[ state ][ :records ] += records - @place_tree[ state ][ :children ][ city ] = { - :name=>city, - :link_options=>{ - :controller => 'search', :action=>'index',:new_search=>1, - :facet_tag => 'city_state', :facet_browse => place, :facet => "decade" - }, - :records=>records - } -end -end + facet_counts,recs = SolrSearch.search('',['city_state_facet'],[]) + @place_tree = Hash.new + place_facets = facet_counts['facet_fields']['city_state_facet'] -def subject_tree -@subject_tree = Hash.new -Collection.get_asho_subject_hash.each do |k,v| - @subject_tree[ k ] = { - :name=>k, - :link_options=>{ - :controller => 'search', :action=>'index',:new_search=>1, - :facet_tag => 'subject', :facet_browse => k, :facet => "set_spec" - }, - :records=>v[0] - } -end -end + place_facets.keys.sort.each do |place| + match = /(.*), ([A-Z][A-Z])/.match( place ) + city = match[1] + state_code = match[2] + state = UsState.code_to_name( match[2] ) + next unless state + records = place_facets[ place ] -# build simple trees for various front page facets -# node is hash 'name' => [link_to_options,count,children] -def front_widget + unless @place_tree[ state ] + @place_tree[ state ] = { + :name=>state, + :link_options=>{ + :controller => 'search', :action=>'index',:new_search=>1, + :facet_tag => 'state', :facet_browse => state_code, :facet => "city_state" + }, + :records=>0, + :children=>Hash.new + } + end + @place_tree[ state ][ :records ] += records + @place_tree[ state ][ :children ][ city ] = { + :name=>city, + :link_options=>{ + :controller => 'search', :action=>'index',:new_search=>1, + :facet_tag => 'city_state', :facet_browse => place, :facet => "decade" + }, + :records=>records + } + end -# if params[:data]=='times' + @subject_tree = Hash.new + Collection.get_asho_subject_hash.each do |k,v| + @subject_tree[ k ] = { + :name=>k, + :link_options=>{ + :controller => 'search', :action=>'index',:new_search=>1, + :facet_tag => 'subject', :facet_browse => k, :facet => "set_spec" + }, + :records=>v[0] + } + end + end -# elsif params[:data]=='places' - -# elsif params[:data]=='subjects' - end - -end Modified: ruby/trunk/aquifer/app/views/collection/shortlist.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/shortlist.rhtml 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/app/views/collection/shortlist.rhtml 2010-03-12 23:27:41 UTC (rev 652) @@ -9,7 +9,7 @@ </div> -<div class="clearfix"> +<div id="main_content" class="clearfix"> <% cnt =0 %> <% @collections2.each do |collection| %> <% if collection %> Modified: ruby/trunk/aquifer/app/views/home/_front_widget.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_front_widget.rhtml 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/app/views/home/_front_widget.rhtml 2010-03-12 23:27:41 UTC (rev 652) @@ -1,17 +1,10 @@ - <h3><a href="#">Subjects</a></h3> - <div class="tree_widget"> - <%= render :partial => "tree_widget_node", :locals => { :div_base => "subject_tree", :tree_nodes => @subject_tree, :depth=>0 } %> - </div> - - <h3><a href="#">Places</a></h3> - - <div class="tree_widget"> - <%= render :partial => "tree_widget_node", :locals => { :div_base => "place_tree", :tree_nodes => @place_tree, :depth=>0 } %> - </div> - - <h3><a href="#">Times</a></h3> - - <div class="tree_widget"> - <%= render :partial => "tree_widget_node", :locals => { :div_base => "time_tree", :tree_nodes => @time_tree, :depth=>0 } %> - </div> +<div id="subjects" class="tree_widget"> + <%= render :partial => "tree_widget_node", :locals => { :div_base => "subject_tree", :tree_nodes => @subject_tree, :depth=>0 } %> +</div> +<div id="places" class="tree_widget"> + <%= render :partial => "tree_widget_node", :locals => { :div_base => "place_tree", :tree_nodes => @place_tree, :depth=>0 } %> +</div> +<div id="times" class="tree_widget"> + <%= render :partial => "tree_widget_node", :locals => { :div_base => "time_tree", :tree_nodes => @time_tree, :depth=>0 } %> +</div> Modified: ruby/trunk/aquifer/app/views/home/_header.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_header.rhtml 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/app/views/home/_header.rhtml 2010-03-12 23:27:41 UTC (rev 652) @@ -4,7 +4,7 @@ <div id="logo" class=""> - <%= link_to( image_tag( "ah_logo.png", :size=> "403x95", :border => 0, :alt => "Home" ), { :controller => :home, :action => "index" } ) %> + <%= link_to( image_tag( "ah_logo.png", :size=> "403x95", :alt => "Home" ), { :controller => :home, :action => "index" } ) %> </div> <div id="header_controls" class=""> Modified: ruby/trunk/aquifer/app/views/home/conditions_of_use.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/conditions_of_use.rhtml 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/app/views/home/conditions_of_use.rhtml 2010-03-12 23:27:41 UTC (rev 652) @@ -1,28 +1,37 @@ -<strong>Copyright </strong> -<p>The images, text, audio and video recordings, and all other content in Aquifer - American Social History Online are made publicly available by the collection-holding - repositories for use in research, teaching, and private study. Whenever possible, - the Aquifer American Social History Online interface provides information about - copyright owners and terms and conditions of use.</p> -<p>Permission and possible fees may be required from the copyright owner independently - of Aquifer American Social History Online. It is the user's obligation to determine - and satisfy copyright or other use restrictions when publishing or distributing - materials.</p> -<p>View more information about copyright law from the <a href="http://www.copyright.gov/">U.S. - Copyright Office</a>.</p> -<p><strong>Conditions of Use</strong></p> -<p>By their use of these digital images, texts, and audio and video recordings, - users agree to follow these conditions of use:</p> -<ul> - <li> For purposes of research, teaching, and private study, users may reproduce - (print or download) in accordance with fair use materials or link to materials - from this web site without prior permission, on the condition they give proper - credit of the collection-owning repository.</li> - <li> Materials may not be used for any commercial purpose without prior written - permission from the copyright owner.</li> - <li> Materials may not be republished in print or electronic form without prior - written permission from the copyright owner and/or the repository.</li> - <li> Materials may not be mounted on an additional server for public use, or - for use by a set of subscribers, without prior written permission from the - copyright owner.</li> -</ul> \ No newline at end of file + +<div class="main_wrapper"> + <div id="main_content"> + + + <h3>Copyright </h3> + <p>The images, text, audio and video recordings, and all other content in Aquifer + American Social History Online are made publicly available by the collection-holding + repositories for use in research, teaching, and private study. Whenever possible, + the Aquifer American Social History Online interface provides information about + copyright owners and terms and conditions of use.</p> + <p>Permission and possible fees may be required from the copyright owner independently + of Aquifer American Social History Online. It is the user's obligation to determine + and satisfy copyright or other use restrictions when publishing or distributing + materials.</p> + <p>View more information about copyright law from the <a href="http://www.copyright.gov/">U.S. + Copyright Office</a>.</p> + + <h3>Conditions of Use</h3> + <p>By their use of these digital images, texts, and audio and video recordings, + users agree to follow these conditions of use:</p> + <ul class="content"> + <li> For purposes of research, teaching, and private study, users may reproduce + (print or download) in accordance with fair use materials or link to materials + from this web site without prior permission, on the condition they give proper + credit of the collection-owning repository.</li> + <li> Materials may not be used for any commercial purpose without prior written + permission from the copyright owner.</li> + <li> Materials may not be republished in print or electronic form without prior + written permission from the copyright owner and/or the repository.</li> + <li> Materials may not be mounted on an additional server for public use, or + for use by a set of subscribers, without prior written permission from the + copyright owner.</li> + </ul> + + </div> +</div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/faq.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/faq.rhtml 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/app/views/home/faq.rhtml 2010-03-12 23:27:41 UTC (rev 652) @@ -1,21 +1,23 @@ <h2 id="main_heading">Frequently Asked Questions</h2> -<ol> - <li>What is the correct way to cite a resource found using Aquifer American Social History Online in a paper or presentation? -<p>The Library of Congress web site has a <a href="http://lcweb2.loc.gov/ammem/ndlpedu/start/cite/">guide</a> - for citing primary source material.</p> -<p><em>Example citation for a photograph (MLA-style Citation Format):</em></p> -<p>O'Sullivan, Timothy H. <em>Incidents of the War</em>. c1865. <em>Selected Civil War Photographs from the Library of Congress, 1861-1865</em>. 12 Jan. 2000. <em>American Memory</em>. Lib. of Congress. 2 Aug. 2005 <http://memory.loc.gov/cgibin/query/r?ammem/cwar:@field(NUMBER+@band(cwp+4a40875))>. -</p> -<p>Please note - the url of the location of the item should refer to the collection's location, such as the Library of Congress, not the location in the Aquifer American Social History Online.</p> - </li> - <li>How can I find out more about a particular item? -<p>If you have a question about a collection or an item from a collection that you found through this site, or if would like to see the original, you will need to contact the institution that owns the item. Aquifer hosts these historical documents from U.S. universities, libraries and cultural institutions such as the Library of Congress. The original materials reside in the contributing institution, and have been digitized for viewing online.</p> - </li> - <li>Do I need permission to use a particular item from Aquifer American Social History Online? -<p>Users may reproduce (print or download) in accordance with fair use materials or link to materials from this web site on the condition they give proper credit of the collection-owning repository (the institution that owns the collection). The Library of Congress has a guide for understanding <a href="http://memory.loc.gov/ammem/ndlpedu/start/cpyrt/">copyright and fair use</a>. If there is no information in a record about access condition and you would like permission to publish or reproduce an item, please contact the institution that owns the item, since Aquifer does not own these items.</p> - </li> - <li>What is Zotero? -<p><a href="http://www.zotero.org">Zotero</a> is a free, easy-to-use research tool that helps you gather and organize resources (bibliography or full text of articles), and then lets you to annotate, organize and share the results of your research. You can download the extention at: <a href="http://www.zotero.org">http://www.zotero.org/</a>. Please note that Zotero works only in Firefox.<br> -</p> - </li> -</ol> \ No newline at end of file +<div id="main_content"> + <ol class="content"> + <li>What is the correct way to cite a resource found using Aquifer American Social History Online in a paper or presentation? + <p>The Library of Congress web site has a <a href="http://lcweb2.loc.gov/ammem/ndlpedu/start/cite/">guide</a> + for citing primary source material.</p> + <p><em>Example citation for a photograph (MLA-style Citation Format):</em></p> + <p>O'Sullivan, Timothy H. <em>Incidents of the War</em>. c1865. <em>Selected Civil War Photographs from the Library of Congress, 1861-1865</em>. 12 Jan. 2000. <em>American Memory</em>. Lib. of Congress. 2 Aug. 2005 <http://memory.loc.gov/cgibin/query/r?ammem/cwar:@field(NUMBER+@band(cwp+4a40875))>. + </p> + <p>Please note - the url of the location of the item should refer to the collection's location, such as the Library of Congress, not the location in the Aquifer American Social History Online.</p> + </li> + <li>How can I find out more about a particular item? + <p>If you have a question about a collection or an item from a collection that you found through this site, or if would like to see the original, you will need to contact the institution that owns the item. Aquifer hosts these historical documents from U.S. universities, libraries and cultural institutions such as the Library of Congress. The original materials reside in the contributing institution, and have been digitized for viewing online.</p> + </li> + <li>Do I need permission to use a particular item from Aquifer American Social History Online? + <p>Users may reproduce (print or download) in accordance with fair use materials or link to materials from this web site on the condition they give proper credit of the collection-owning repository (the institution that owns the collection). The Library of Congress has a guide for understanding <a href="http://memory.loc.gov/ammem/ndlpedu/start/cpyrt/">copyright and fair use</a>. If there is no information in a record about access condition and you would like permission to publish or reproduce an item, please contact the institution that owns the item, since Aquifer does not own these items.</p> + </li> + <li>What is Zotero? + <p><a href="http://www.zotero.org">Zotero</a> is a free, easy-to-use research tool that helps you gather and organize resources (bibliography or full text of articles), and then lets you to annotate, organize and share the results of your research. You can download the extention at: <a href="http://www.zotero.org">http://www.zotero.org/</a>. Please note that Zotero works only in Firefox.<br> + </p> + </li> + </ol> +</div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/help.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/help.rhtml 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/app/views/home/help.rhtml 2010-03-12 23:27:41 UTC (rev 652) @@ -1,84 +1,89 @@ - <h2 id="main_heading">Help</h2> +<h2 id="main_heading">Help</h2> -<div> +<div id="main_content"> - <ul> + <ul class="content"> - <li><a href="#browse">Browse</a></li> - <li><a href="#searchtips">Search Tips</a></li> - <li><a href="#advsearch">Advanced Search</a></li> - <li><a href="#viewitems">Viewing Items</a> - <ul> - <li><a href="#searchresults">Search Results</a></li> + <li><a href="#browse">Browse</a></li> + <li><a href="#searchtips">Search Tips</a></li> + <li><a href="#advsearch">Advanced Search</a></li> + <li><a href="#viewitems">Viewing Items</a> + <ul> + <li><a href="#searchresults">Search Results</a></li> - <li><a href="#breakresultsdown">Break Results Down</a></li> - </ul> - </li> - <li><a href="#searchhistory">Search History</a></li> - <li><a href="#whylogin?">Why login?</a></li> - <li><a href="#contactus">Additional Resources</a></li> + <li><a href="#breakresultsdown">Break Results Down</a></li> + </ul> + </li> + <li><a href="#searchhistory">Search History</a></li> + <li><a href="#contactus">Additional Resources</a></li> - </ul> - - <h3><a name="browse"></a>Browse</h3> - <p>A navigation area to the right hand side on the home page provides three ways to browse American Social History Online: Collections, Places, and Times. Each heading is independently expandable/collapsible by clicking the arrow to the left. Expanding a heading reveals a tree view of the relevant list. Clicking the heading itself displays the browse list in the main part of the window. When you click Browse in the main navigation bar, Collections is active by default.</p> - <ul> - <li>Collections: a list of all the collections accesible from American Social History Online.</li> + </ul> - <li>Times: Resources accessible in American Social History Online, grouped by decades, with individual years available in the tree view under decades. </li> - <li>Places: Resources accessible in American Social History Online, grouped by state, with headings available in the tree view under state.</li> - </ul> + <h3><a name="browse"></a>Browse</h3> + <p>A navigation area to the right hand side on the home page provides three ways to browse American Social History Online: Collections, Places, and Times. Each heading is independently expandable/collapsible by clicking the arrow to the left. Expanding a heading reveals a tree view of the relevant list. Clicking the heading itself displays the browse list in the main part of the window. When you click Browse in the main navigation bar, Collections is active by default.</p> + <ul class="content"> + <li>Collections: a list of all the collections accesible from American Social History Online.</li> - <h3><a name="searchtips"></a>Search Tips</h3> - <p>To do a simple search, type one or more words into the search box located in the upper right corner of every page, then click the "go" button. </p> -<ul> -<li>By default, searching on multiple keywords retrieves items in which ALL of the keywords occur.Entering a multiple keyword search will work like Boolean AND. Results will be returned only when ALL of the keywords appear. For example: <i>war contraband </i> will retrieve items with both <i>war</i> and <i>contraband</i></li> - <li>Use quotes [" "] to search for an exact phrase. For example: "chinese immigrants", "Charles Cushman".<br /> -</li> -<li>An asterisk [*] can be used as a wildcard to replace one or many characters (truncation). For example: <i>cemeta*</i> will retrieve <i>cemetary</i>, <i>cemetaries</i>. -<li>Searches are not case-sensitive; a search for "Abraham Lincoln" or "abraham lincoln" will return the same results.</li></ul> + <li>Times: Resources accessible in American Social History Online, grouped by decades, with individual years available in the tree view under decades. </li> + <li>Places: Resources accessible in American Social History Online, grouped by state, with headings available in the tree view under state.</li> + </ul> + <p><a href="#main" class="backtotop">» back to top</a></p> - <p><a href="#content" class="backtotop">» back to top</a></p> - <h3><a name="advsearch"></a>Advanced Search</h3> - -<p>Advanced search supports Boolean operators (AND, OR, NOT). For example, <i>churches</i> AND <i>immigrants</i>. <i> Immigrants</i> and NOT <i>Irish</i> </p> - <h3>Date Range Search</h3> - <p>You may limit your search by date range. Enter a beginning and an end date. Leaving the end date blank means an open ended search.</p> - <h3>Collection</h3> - <p>You may limit your search to specific <a href"./collection"> collections.</a></p> - <p><a href="#content" class="backtotop">» back to top</a></p> + <h3><a name="searchtips"></a>Search Tips</h3> + <p>To do a simple search, type one or more words into the search box located in the upper right corner of every page, then click the "go" button. </p> + <ul class="content"> + <li>By default, searching on multiple keywords retrieves items in which ALL of the keywords occur.Entering a multiple keyword search will work like Boolean AND. Results will be returned only when ALL of the keywords appear. For example: <i>war contraband </i> will retrieve items with both <i>war</i> and <i>contraband</i></li> + <li>Use quotes [" "] to search for an exact phrase. For example: "chinese immigrants", "Charles Cushman".<br /> + </li> + <li>An asterisk [*] can be used as a wildcard to replace one or many characters (truncation). For example: <i>cemeta*</i> will retrieve <i>cemetary</i>, <i>cemetaries</i>. </li> + <li>Searches are not case-sensitive; a search for "Abraham Lincoln" or "abraham lincoln" will return the same results.</li></ul> - <h3><a name="viewitems"></a>Viewing Items</h3> -<h3><a name="searchresults"></a>Search Results</h3> -<li>Clicking on the title of any individual result will take you out of the American Social History Online site to the site of the collection (and the individual result).</i> -<li> Clicking on the <i>full record</i> link will take you to an individual record with additional information about the item, such as physical description and classification.</li> -<li>Clicking on the <i>Subject</i> url in the full record display will initiate a search under that subject.</li> - <li>List View/Image View - Clicking 'List View' displays all search results in a single column. Clicking 'Image View' displays search results in a grid layout.</li> - <li>Results per page: You can choose how many items to display on the page if you are logged in.</li> - <li>Sort by: The default sort order is by relevance. You may also sort by date ascending, date descending, and title.</li> - <li>Use the boxes to the left of Years: to enter the beginning and end date of the range of years you would like to search. Leaving the second box blank leaves the search open ended.</li> -</ul> + <p><a href="#main" class="backtotop">» back to top</a></p> + <h3><a name="advsearch"></a>Advanced Search</h3> -<h3><a name="breakresultsdown"></a>Break Results Down</h3> -<p> After an initial keyword search, results can be narrowed by using the "Break results down" feature, including subject (broader heading), topic (more specific heading), place, name, city, state, genre, decade, year, collection, language, and media type. </p> + <p>Advanced search supports Boolean operators (AND, OR, NOT). For example, <i>churches</i> AND <i>immigrants</i>. <i> Immigrants</i> and NOT <i>Irish</i> </p> + <p><a href="#main" class="backtotop">» back to top</a></p> -<p><a href="#whylogin?" class="backtotop"> back to top</a></p> -<h3>Why login to American Social History Online?</h3> -<p>Logging in using <a href"http://openid.net/what/"> OpenID </a> allows you to keep a profile of your searches, including records viewed and records selected.</p> -<h3><a name="additional resources"></a>Additional Resources</h3> -<p>On American Social History Online results pages, you will find at the bottom of the page a list of possible other sites with results corresponding to your keyword search. Some of these, such as Amazon Books and Google Books, can be accessed without a license. Sites such as Ebsco, Elsevier and Web of Science can be accessed if your institution subscribes to these publishers. In all cases, when you click on one of these links, you leave the American Social History Online site. -</p> - <p><a href="#content" class="backtotop">» back to top</a></p> + <h3>Date Range Search</h3> + <p>You may limit your search by date range. Enter a beginning and an end date. Leaving the end date blank means an open ended search.</p> + <p><a href="#main" class="backtotop">» back to top</a></p> + <h3>Collection</h3> + <p>You may limit your search to specific <a href"./collection"> collections.</a></p> + <p><a href="#main" class="backtotop">» back to top</a></p> - </div> - </div> - </div> + <h3><a name="viewitems"></a>Viewing Items</h3> + <h4><a name="searchresults"></a>Search Results</h4> + <ul class="content"> + <li>Clicking on the title of any individual result will take you out of the American Social History Online site to the site of the collection (and the individual result).</li> + <li> Clicking on the <i>full record</i> link will take you to an individual record with additional information about the item, such as physical description and classification.</li> + <li>Clicking on the <i>Subject</i> url in the full record display will initiate a search under that subject.</li> + <li>List View/Image View - Clicking 'List View' displays all search results in a single column. Clicking 'Image View' displays search results in a grid layout.</li> + <li>Results per page: You can choose how many items to display on the page if you are logged in.</li> + <li>Sort by: The default sort order is by relevance. You may also sort by date ascending, date descending, and title.</li> + <li>Use the boxes to the left of Years: to enter the beginning and end date of the range of years you would like to search. Leaving the second box blank leaves the search open ended.</li> - \ No newline at end of file + </ul> + + + <h4><a name="breakresultsdown"></a>Break Results Down</h4> + <p> After an initial keyword search, results can be narrowed by using the "Break results down" feature, including subject (broader heading), topic (more specific heading), place, name, city, state, genre, decade, year, collection, language, and media type. </p> + + <p><a href="#main" class="backtotop">» back to top</a></p> + + + <h3><a name="additional resources"></a>Additional Resources</h3> + <p>On American Social History Online results pages, you will find at the bottom of the page a list of possible other sites with results corresponding to your keyword search. Some of these, such as Amazon Books and Google Books, can be accessed without a license. Sites such as Ebsco, Elsevier and Web of Science can be accessed if your institution subscribes to these publishers. In all cases, when you click on one of these links, you leave the American Social History Online site. + </p> + <p><a href="#main" class="backtotop">» back to top</a></p> + + + +</div> + Modified: ruby/trunk/aquifer/app/views/home/index.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/index.rhtml 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/app/views/home/index.rhtml 2010-03-12 23:27:41 UTC (rev 652) @@ -46,10 +46,11 @@ </div> <script type="text/javascript"> /* <![CDATA[ */ - $(function(){ - load_front_widget_data('subjects'); - load_front_widget_data('places'); - load_front_widget_data('times'); + $(function(){ + load_front_widget_data(); + <%#*load_front_widget_data('subjects');%> + <%#*load_front_widget_data('places');%> + <%#*load_front_widget_data('times');%> }); /* ]]> */ </script> Modified: ruby/trunk/aquifer/app/views/home/load_front_widget_data.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/load_front_widget_data.rhtml 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/app/views/home/load_front_widget_data.rhtml 2010-03-12 23:27:41 UTC (rev 652) @@ -1,17 +1,19 @@ -<%# if params[:data] == 'subjects' %> - <% cache do %> - <%= render :partial => "tree_widget_node", :locals => { :div_base => 'subject_tree', :tree_nodes => @subject_tree, :depth=>0 } %> - <% end %> -<%# end %> -<%# if params[:data] == 'times' %> - <%# cache do %> - <%#= render :partial => "tree_widget_node", :locals => { :div_base => 'time_tree', :tree_nodes => @time_tree, :depth=>0 } %> - <%# end %> -<%# end %> +<div> +<% cache(:action => 'load_front_widget_data', :action_suffix => 'front_widget') do %> +<%#= render :partial => "front_widget", :locals => { :div_base => "place_tree", :tree_nodes => @place_tree, :depth=>0 } %> + <div id="subjects" class="tree_widget"> + <%#= @subject_tree.inspect %> + <%= render :partial => "tree_widget_node", :locals => { :div_base => "subject_tree", :tree_nodes => @subject_tree, :depth=>0 } %> + </div> + <div id="places" class="tree_widget"> + <%#= @place_tree.inspect %> -<%# if params[:data] == 'places' %> - <%# cache do %> - <%#= render :partial => "tree_widget_node", :locals => { :div_base => 'place_tree', :tree_nodes => @place_tree, :depth=>0 } %> - <%# end %> -<%# end %> -<%# end %> + <%= render :partial => "tree_widget_node", :locals => { :div_base => "place_tree", :tree_nodes => @place_tree, :depth=>0 } %> + </div> + <div id="times" class="tree_widget"> + <%#= @time_tree.inspect %> + + <%= render :partial => "tree_widget_node", :locals => { :div_base => "time_tree", :tree_nodes => @time_tree, :depth=>0 } %> + </div> +<% end %> +</div> \ No newline at end of file Modified: ruby/trunk/aquifer/public/images/collection/CE.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/Lehman.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/UTMods_armods.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/UTMods_famods.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/cdl69.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/coll.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/dlps_moa.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/fm.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/gr.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/lb.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/collection/northwestern-wwii.thumb.jpg =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/images/favicon.ico =================================================================== (Binary files differ) Modified: ruby/trunk/aquifer/public/javascripts/application.js =================================================================== --- ruby/trunk/aquifer/public/javascripts/application.js 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/public/javascripts/application.js 2010-03-12 23:27:41 UTC (rev 652) @@ -1,17 +1,288 @@ // Place your application-specific JavaScript functions and classes here // This file is automatically included by javascript_include_tag :defaults $(function() { + $('a.external').attr({ + target: "_blank" + }); + $("#accordion").accordion(); - $('.widget_tree_node').toggle( - function (e){ - $(e.target).next().show(); - $(e.target).addClass('expanded'); - return false; + + $("#dialog").dialog({ + autoOpen: false, + modal: true, + resizable: false, + draggable: true, + overlay: true, + minHeight: 400, + width: 800 + }); + + + $('.collection img').hoverIntent( + function(e){ + $(e.target).parent().siblings('.actions').show(); + }, - function (e){ - $(e.target).removeClass('expanded'); - $(e.target).next().hide(); + function() { + }); + + $('.thumbnailarea .actions').mouseleave( + function(){ + $(this).hide(); + }); + + var leftmargin = ($('#main').outerWidth() - 280 - $('#collectionlist.featured').outerWidth())/2; + $('#collectionlist.featured').css('margin-left', leftmargin); + + $(window).bind('resize', function(){ + var leftmargin = ($('#main').outerWidth() - 280 - $('#collectionlist.featured').outerWidth())/2; + $('#collectionlist.featured').css('margin-left', leftmargin); + }); + + $('#facet_results').tablesorter(); + + $('.pagination a').click(function (){ + load_pagination($(this)); + return false; + }); + + $('.full_record a').click(function (){ + show_full_record($(this)); + return false; + }); +}); + +function exec_metasearch(id, query, db){ + var params = { + q: query, + db: db + } + $('#'+id).load("meta_search/search", params); +} + +function toggle_searchoptions() +{ + var searchopts = $('#searchoptions'); + if(searchopts.hasClass('hidden')){ + searchopts.animate({ + display: 'block', + height: 'toggle', + opacity: 'toggle' + }, + 200, + function(){ + searchopts.removeClass('hidden') + $('#searchoptions_toggle').addClass('toggled'); + }); + }else{ + searchopts.animate({ + display: 'none', + height: 'toggle', + opacity: 'toggle' + }, + 200, + function(){ + searchopts.addClass('hidden') + $('#searchoptions_toggle').removeClass('toggled'); + }); + } +} + +function launch_faceted_search(facet){ + + var params = { + facet: facet + } + $('#facet_list').empty(); + $('#facet_list').append($('#loading').html()); + if($('#facet_list').css('display')=='none'){ + $('#facet_list').fadeIn(600); + } + $('#facet_list').load("search #facet_list >*", params); +} + +function clear_faceted_search(){ + $('#active_facets').fadeOut(600); + $('#facet_menu a').removeClass('chosen'); + update_facets('search/index', { + facet: 'none' + }); +} + +function update_facets(href, params){ + + $('#main_content').empty(); + $('#main_content').append($('#loading').html()); + + $('#facet_list').empty(); + $('#facet_list').append($('#loading').html()); + + + $.post(href, params, function(data){ + $('#active_facets').html($(data).find('#active_facets').html()); + if($('#active_facets .facet').length){ + if($('#active_facets').css('display')=='none'){ + $('#active_facets').fadeIn(600); + } + }else{ + $('#active_facets').fadeOut(600); + } + $('#main_content').hide(); + $('#main_content').html($(data).find('#main_content').html()); + + $('#main_content .full_record a').click(function (){ + show_full_record($(this)); return false; + }); + + $('#main_content').fadeIn(600); + + + $('#facet_list').html($(data).find('#facet_list').html()); + $('.pagemenu.top').html($(data).find('.pagemenu.top').html()); + $('.pagemenu.bottom').html($(data).find('.pagemenu.bottom').html()); + + $('.pagemenu .pagination a').click(function (){ + load_pagination($(this)); + return false; + }); + + }); +} + + +function load_front_widget_data(){ + $.get("home/load_front_widget_data", function(data){ + $('#subjects').html($(data).find('#subjects').html()); + $('#places').html($(data).find('#places').html()); + $('#times').html($(data).find('#times').html()); + + $('.widget_tree_node').toggle( + function (e){ + var node = $(e.target); + + if(node.is('a')){ + location.href = node.attr('href'); + return true; + }else{ + if(!node.is('li')){ + node = node.closest('li'); + } + node.next('.widget_children').show(); + node.addClass('expanded'); + return false; + } + }, + function (e){ + var node = $(e.target); + + if(node.is('a')){ + location.href = node.attr('href'); + return true; + }else{ + if(!node.is('li')){ + node = node.closest('li'); + } + node.removeClass('expanded'); + node.next('.widget_children').hide(); + return false; + } + } + ); + }); +} + + + +function load_pagination(link){ + var href = link.attr('href'); + var num = href.replace(/(.*)page=(\d)(.*)/gi, '$2'); + if(num != null){ + var params = { + page: num } - ); -}); \ No newline at end of file + $('#main_content').empty(); + $('#main_content').append($('#loading').html()); + $('.pagemenu').hide(); + $.post(href, params, function(data){ + $('#main_content').hide(); + $('#main_content').html($(data).find('#main_content').html()); + + $('#main_content .full_record a').click(function (){ + show_full_record($(this)); + return false; + }); + + $('.full_record a').click(function (){ + show_full_record($(this)); + return false; + }); + + $('#main_content').fadeIn(600); + + $('.pagemenu.top').html($(data).find('.pagemenu.top').html()); + $('.pagemenu.bottom').html($(data).find('.pagemenu.bottom').html()); + $('.pagination a').click(function (){ + load_pagination($(this)); + return false; + }); + $('.pagemenu').fadeIn(600); + }); + }else{ + location.href = href; + } +} + + +function toggle_facet_list(){ + $('#facet_list .panel').toggleClass('hidden'); + + var txt = ''; + if($('#facet_list .panel').hasClass('hidden')){ + txt = 'Show'; + }else{ + txt = 'Hide'; + } + + $('#facet_list_toggle a').text(txt); +} + +function show_full_record(link){ + + var href= link.attr('href'); + var d = $('#dialog'); + + d.empty(); + d.append($('#loading').html()); + + if(!d.dialog('isOpen')){ + d.dialog('open'); + } + + + + d.load(href+ ' #main >*', function(){ + var prev = $('#dialog .prev a'); + var next = $('#dialog .next a'); + var buttons = {}; + + if(next.is('a')){ + buttons['Next'] = function() { + show_full_record(next); + }; + } + if(prev.is('a')){ + buttons['Previous'] = function() { + show_full_record(prev); + }; + } + d.dialog('option', 'buttons', buttons); + d.dialog('option', 'title', 'Item Details'); + }); +} + +function update_record_follow(idnumber){ + $.post('search/record_follow', { + id: idnumber + }); +} \ No newline at end of file Modified: ruby/trunk/aquifer/public/stylesheets/base.css =================================================================== --- ruby/trunk/aquifer/public/stylesheets/base.css 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/public/stylesheets/base.css 2010-03-12 23:27:41 UTC (rev 652) @@ -20,34 +20,34 @@ dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - line-height: 1; - font-family: inherit; - text-align: left; - vertical-align: baseline; + margin: 0; + padding: 0; + border: 0; + font-weight: inherit; + font-style: inherit; + font-size: 100%; + line-height: 1; + font-family: inherit; + text-align: left; + vertical-align: baseline; } a img, :link img, :visited img { - border: 0; + border: 0; } table { - border-collapse: collapse; - border-spacing: 0; + border-collapse: collapse; + border-spacing: 0; } ol, ul { - list-style: none; + list-style: none; } q:before, q:after, blockquote:before, blockquote:after { - content: ""; + content: ""; } :focus { - outline: 0; + outline: 0; } @@ -58,34 +58,58 @@ display: block; } +html,body{ + height:100%; +} + body { font-family:Arial, Helvetica, sans-serif; } - a:link +a:link { - color: #009999; - text-decoration: none; + color:#487FB4; + /*color:#0066FF;*/ + + text-decoration: none; } a:visited { - color: #009999; - text-decoration: none; + color:#487FB4; + text-decoration: none; } a:active { - color: #009999; - text-decoration: none; + color:#487FB4; + text-decoration: none; } a:hover { - color: #009999; - text-decoration: underline; + color:#487FB4; + text-decoration: underline; } +a.external +{ + padding-right: 16px; + background: transparent url('/images/externallink.png') right center no-repeat; +} + +a.external.image{ + background: transparent; +} + +p{ + margin:1em 0; +} + +.highlighted{ + background: yellow; + +} /*h1 { font: 150% sans-serif; color: #226; @@ -103,48 +127,77 @@ color:#8A1915; font-size:2.1em; font-style:italic; -font-family: Cambria, - "Hoefler Text", - Utopia, - "Liberation Serif", - "Nimbus Roman No9 L", - Times, - "Times New Roman", - serif; + font-family: Cambria, + "Hoefler Text", + Utopia, + "Liberation Serif", + "Nimbus Roman No9 L", + Times, + "Times New Roman", + serif; letter-spacing: -0.05em; /*margin: 2px 2px 6px;*/ } table {font-family:Arial, Helvetica, sans-serif; - color: #41383C; - font-size:12px; + color: #41383C; + font-size:12px; } input,select,textarea {font-family:Arial, Helvetica, sans-serif; - color: #41383C; - font-size:10px; + color: #41383C; + font-size:10px; } +p { + font-family: "Segoe UI", + Candara, + "Bitstream Vera Sans", + "DejaVu Sans", + "Trebuchet MS", + Verdana, + sans-serif; -.redText {font-family:Arial, Helvetica, sans-serif; - color: #990033; - font-size:12px; - font-weight:bold; + /* font-family: Corbel, + "Lucida Grande", + "Lucida Sans Unicode", + "Lucida Sans", + "DejaVu Sans", + "Bitstream Vera Sans", + "Liberation Sans", + Verdana, + sans-serif;*/ + + line-height: 160%; } -.blueText {font-family:Arial, Helvetica, sans-serif; - color: #009999; - font-size:12px; + +ol { + list-style-type:decimal; + list-style-position: inside; } -.blueTextbig {font-family:Arial, Helvetica, sans-serif; - color: #009999; - font-size:20px; - font-weight:bold; +.hidden { + display:none; } -.smallBlue {font-family:Arial, Helvetica, sans-serif; - color: #009999; - font-size:9px; +.notice{ + background: #F1FAFF; + border: 1px solid #BDE5F8; + color: #7BB4D2; + padding: 4px 8px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + margin: 14px 4px 4px; + font-size: 87%; + } +.notice span{ + font-weight:bold; +} + +.bold{ + font-weight:bold; +} \ No newline at end of file Modified: ruby/trunk/aquifer/public/stylesheets/layout.css =================================================================== --- ruby/trunk/aquifer/public/stylesheets/layout.css 2010-03-12 02:35:38 UTC (rev 651) +++ ruby/trunk/aquifer/public/stylesheets/layout.css 2010-03-12 23:27:41 UTC (rev 652) @@ -1,47 +1,315 @@ -#main_heading{ - margin: 10px 10px 30px; - padding: 24px; - border: 1px solid #F2EAD7; - -moz-border-radius: 32px 0; - -webkit-border-top-left-radius: 32px; - -webkit-border-bottom-right-radius: 32px; - background: #fff; -} + + + #collectionlist{ /*border-collapse: collapse;*/ /*border: 1px #ddd... [truncated message content] |
From: <pau...@us...> - 2010-03-12 02:35:45
|
Revision: 651 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=651&view=rev Author: paulnsorensen Date: 2010-03-12 02:35:38 +0000 (Fri, 12 Mar 2010) Log Message: ----------- Paul's latest changes Modified Paths: -------------- ruby/trunk/aquifer/app/controllers/collection_controller.rb ruby/trunk/aquifer/app/controllers/home_controller.rb ruby/trunk/aquifer/app/controllers/search_controller.rb ruby/trunk/aquifer/app/helpers/application_helper.rb ruby/trunk/aquifer/app/models/collection.rb ruby/trunk/aquifer/app/models/search.rb ruby/trunk/aquifer/app/views/collection/_mods_element.rhtml ruby/trunk/aquifer/app/views/collection/list.rhtml ruby/trunk/aquifer/app/views/collection/shortlist.rhtml ruby/trunk/aquifer/app/views/collection/show.rhtml ruby/trunk/aquifer/app/views/home/_footer.rhtml ruby/trunk/aquifer/app/views/home/_front_widget.rhtml ruby/trunk/aquifer/app/views/home/_list.rhtml ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml ruby/trunk/aquifer/app/views/home/about.rhtml ruby/trunk/aquifer/app/views/home/contact_us.rhtml ruby/trunk/aquifer/app/views/home/faq.rhtml ruby/trunk/aquifer/app/views/home/help.rhtml ruby/trunk/aquifer/app/views/home/index.rhtml ruby/trunk/aquifer/app/views/layouts/search.rhtml ruby/trunk/aquifer/app/views/meta_search/search.rhtml ruby/trunk/aquifer/app/views/search/_brief_field.rhtml ruby/trunk/aquifer/app/views/search/_brief_record.rhtml ruby/trunk/aquifer/app/views/search/_facet_box.rhtml ruby/trunk/aquifer/app/views/search/_facet_menu.rhtml ruby/trunk/aquifer/app/views/search/_field.rhtml ruby/trunk/aquifer/app/views/search/_link_to_source.rhtml ruby/trunk/aquifer/app/views/search/_meta_search.rhtml ruby/trunk/aquifer/app/views/search/_record.rhtml ruby/trunk/aquifer/app/views/search/_thumbnail.rhtml ruby/trunk/aquifer/app/views/search/full_record.rhtml ruby/trunk/aquifer/app/views/search/index.rhtml Added Paths: ----------- ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml ruby/trunk/aquifer/app/views/home/_header.rhtml ruby/trunk/aquifer/app/views/home/index_orig.rhtml ruby/trunk/aquifer/app/views/home/layout.rhtml ruby/trunk/aquifer/app/views/home/layout2.rhtml ruby/trunk/aquifer/app/views/home/load_front_widget_data.rhtml ruby/trunk/aquifer/app/views/home/load_places_widget_data.rhtml ruby/trunk/aquifer/app/views/home/load_subjects_widget_data.rhtml ruby/trunk/aquifer/app/views/home/load_times_widget_data.rhtml ruby/trunk/aquifer/app/views/layouts/default.rhtml ruby/trunk/aquifer/app/views/layouts/home_orig.rhtml ruby/trunk/aquifer/app/views/layouts/search_orig.rhtml ruby/trunk/aquifer/app/views/search/_collection_box.rhtml ruby/trunk/aquifer/app/views/search/_facet_list.rhtml ruby/trunk/aquifer/app/views/search/_search_bar.rhtml ruby/trunk/aquifer/app/views/search/load_front_widget.rhtml ruby/trunk/aquifer/app/views/search/loading.rhtml ruby/trunk/aquifer/app/views/search/search_collections.rhtml Modified: ruby/trunk/aquifer/app/controllers/collection_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/collection_controller.rb 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/controllers/collection_controller.rb 2010-03-12 02:35:38 UTC (rev 651) @@ -1,5 +1,5 @@ class CollectionController < ApplicationController - layout "search" + layout "default" def index list @@ -12,10 +12,10 @@ def list if params[:q].blank? - @collections2 = Collection.paginate(:page=>params[:page],:per_page=>12,:order=>'title_sort',:conditions=>"oai_id!=''") + @collections2 = Collection.paginate(:page=>params[:page],:per_page=>15,:order=>'title_sort',:conditions=>"oai_id!=''") else rlike = make_mysql_collection_qry(params[:q]) - @collections2 = Collection.paginate(:page=>params[:page],:per_page=>12,:order=>'title_sort',:conditions=>"oai_id!=''#{rlike}") + @collections2 = Collection.paginate(:page=>params[:page],:per_page=>15,:order=>'title_sort',:conditions=>"oai_id!=''#{rlike}") end end Modified: ruby/trunk/aquifer/app/controllers/home_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-03-12 02:35:38 UTC (rev 651) @@ -1,25 +1,30 @@ class HomeController < ApplicationController - layout 'search', :except=>[:maintenance] + layout 'default', :except=>[:maintenance,:load_subjects_widget_data,:load_places_widget_data,:load_times_widget_data] @@last_widget_cache = Time.local(2000,1,1) @@last_featured_collections_update = Time.local(2000,1,1,1,0) - @@featured_collections = Array.new(9) + @@featured_collections = Array.new(11) + + @@last_time_tree_cache = Time.local(2000,1,1) + @@last_place_tree_cache = Time.local(2000,1,1) + @@last_subject_tree_cache = Time.local(2000,1,1) + -# def index -# @featured_coll = FeaturedCollection.find(:first) -# @item_cnt = Item.count('id',:conditions => nil).to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,") -# @coll_cnt = Collection.count('id',:conditions => nil) -# @fmt_cnt = 9 -# -# front_widget if params[:ffw]=='true' #force a refresh of the front widget -# # a better expiration should be done, but this is ok -# # no caching on dev because class level vars, not held there -# cache_age = Time.now - @@last_widget_cache -# unless read_fragment({}) and cache_age < 0.5.days -# front_widget # setup facet widget -# @@last_widget_cache = Time.now -# end -# end + # def index + # @featured_coll = FeaturedCollection.find(:first) + # @item_cnt = Item.count('id',:conditions => nil).to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,") + # @coll_cnt = Collection.count('id',:conditions => nil) + # @fmt_cnt = 9 + # + # front_widget if params[:ffw]=='true' #force a refresh of the front widget + # # a better expiration should be done, but this is ok + # # no caching on dev because class level vars, not held there + # cache_age = Time.now - @@last_widget_cache + # unless read_fragment({}) and cache_age < 0.5.days + # front_widget # setup facet widget + # @@last_widget_cache = Time.now + # end + # end def index @item_cnt = Item.count('id',:conditions => nil).to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,") @@ -28,6 +33,38 @@ featured_collections + + + tag_cloud + + end + + + def load_subjects_widget_data + cache_age = Time.now - @@last_subject_tree_cache + unless params[:ffw]=='true' or read_fragment({}) and cache_age < 1.days + subject_tree + @@last_subject_tree_cache = Time.now + end + end + + def load_times_widget_data + cache_age = Time.now - @@last_time_tree_cache + unless params[:ffw]=='true' or read_fragment({}) and cache_age < 1.days + time_tree + @@last_time_tree_cache = Time.now + end + end + + def load_places_widget_data + cache_age = Time.now - @@last_place_tree_cache + unless params[:ffw]=='true' or read_fragment({}) and cache_age < 1.days + place_tree + @@last_place_tree_cache = Time.now + end + end + + def load_front_widget_data front_widget if params[:ffw]=='true' #force a refresh of the front widget # a better expiration should be done, but this is ok # no caching on dev because class level vars, not held there @@ -37,204 +74,205 @@ @@last_widget_cache = Time.now end +end -# list - - tag_cloud - - end - - - - +def layout + +end - - def home2 +def home2 - end +end - def maintenance +def maintenance - end +end - def about +def about - end +end - def help +def help - end +end - def contact_us +def contact_us - end +end - def message_sent - UserFeedback.deliver_feedback( params ) - end +def message_sent +UserFeedback.deliver_feedback( params ) +end - def faq +def faq - end +end - def conditions_of_use +def conditions_of_use - end +end - def tools +def tools - end +end - def debug - unless User.get_current.is_super_user? - render(:status=>'403 Forbidden') - end - end +def debug +unless User.get_current.is_super_user? + render(:status=>'403 Forbidden') +end +end - private +private - def featured_collections - cache_age = Time.now - @@last_featured_collections_update - unless read_fragment({}) and cache_age < 1.day - colls=Collection.find(:all) +def featured_collections +cache_age = Time.now - @@last_featured_collections_update +unless read_fragment({}) and cache_age < 1.day + colls=Collection.find(:all) - old_ids = Array.new(9) + old_ids = Array.new(11) - @@featured_collections.each do |collection| - old_ids.push(collection.object_id) - end + @@featured_collections.each do |collection| + old_ids.push(collection.object_id) + end - @@featured_collections.clear + @@featured_collections.clear + new_ids = Array(11) - begin - next_coll = rand(colls.length) - if !old_ids.include?(next_coll) && colls[next_coll].get_image_url != "" - @@featured_collections.push(colls[next_coll]) - end - end while @@featured_collections.size < 9 - - #make featured collections always update at about the same time regardless of when the page is browsed - @@last_featured_collections_update = Time.mktime(Time.now.year, Time.now.month, Time.now.day, 1, 0, 0) - - @featured_colls = @@featured_collections + begin + next_coll = rand(colls.length) + if !old_ids.include?(next_coll) && !new_ids.include?(next_coll) && colls[next_coll].get_image_url != "" + @@featured_collections.push(colls[next_coll]) + new_ids.push(next_coll) end - end + end while @@featured_collections.size < 11 + #make featured collections always update at about the same time regardless of when the page is browsed + @@last_featured_collections_update = Time.mktime(Time.now.year, Time.now.month, Time.now.day, 1, 0, 0) + @featured_colls = @@featured_collections +end +end - def list - @collections2 = Collection.paginate(:page=>params[:page],:per_page=>9,:order=>'title_sort',:conditions=>"oai_id!=''") - end - - - def tag_cloud - @heading_tag = 'a' - per_page = 30 +def tag_cloud +@heading_tag = 'a' +per_page = 30 # order = "item_count/grand_total desc, item_count desc, normalized_text" - order = "hs.item_count desc, normalized_text" +order = "hs.item_count desc, normalized_text" - @collection_id = 0 - conditions = ["headings.tags like '%%#{@heading_tag}%%' and hs.tag = '#{@heading_tag}' and hs.collection_id = #{@collection_id}"] +@collection_id = 0 +conditions = ["headings.tags like '%%#{@heading_tag}%%' and hs.tag = '#{@heading_tag}' and hs.collection_id = #{@collection_id}"] # @legal_sorts = ['frequency','uniqueness','rarity','heading'] # @legal_sorts.insert( 0, 'distinctiveness' ) unless @collection_id == 0 - joins = "left join heading_stats hs on ( headings.id = hs.heading_id )" +joins = "left join heading_stats hs on ( headings.id = hs.heading_id )" - puts "conditions=#{conditions.inspect}" - @headings = Heading.paginate( :page => params[:page], :joins => joins, :conditions => conditions, :order => order, :per_page => per_page ) - end +puts "conditions=#{conditions.inspect}" +@headings = Heading.paginate( :page => params[:page], :joins => joins, :conditions => conditions, :order => order, :per_page => per_page ) +end +def time_tree +facet_counts,recs = SolrSearch.search('',['year_facet'],[]) +@time_tree = Hash.new +year_facets = facet_counts['facet_fields']['year_facet'] - # build simple trees for various front page facets - # node is hash 'name' => [link_to_options,count,children] - def front_widget - facet_counts,recs = SolrSearch.search('',['year_facet'],[]) - - @time_tree = Hash.new - year_facets = facet_counts['facet_fields']['year_facet'] - - year_facets.keys.sort.each do |year| - next if year.to_i < 1600 or year.to_i > Time.new.year - century = ( year.to_i / 100 * 100 ).to_i - decade = ( year.to_i / 10 * 10 ).to_i - records = year_facets[ year ] - - unless @time_tree[ century ] - @time_tree[ century ] = {:name=>"#{century}'s",:records=>0,:children=>Hash.new} - end - - node = @time_tree[ century ] - node[ :records ] += records - - unless node[ :children ][ decade ] - node[ :children ][ decade ] = { - :name=>"#{decade}'s", - :link_options=>{:controller=>'search',:action=>'',:new_search=>1,:facet_tag=>'decade_facet',:facet_browse => decade, :facet=> "year"}, - :records=>0, - :children=>Hash.new - } - end - node = node[ :children ][ decade ] - node[ :records ] += records - node[ :children ][ year ] = { - :name=>year, - :link_options=>{ - :controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'year_facet', :facet_browse => year, :facet => "state"}, - :records=>records - } - end - - facet_counts,recs = SolrSearch.search('',['city_state_facet'],[]) - @place_tree = Hash.new - place_facets = facet_counts['facet_fields']['city_state_facet'] - - place_facets.keys.sort.each do |place| - match = /(.*), ([A-Z][A-Z])/.match( place ) - city = match[1] - state_code = match[2] - state = UsState.code_to_name( match[2] ) - next unless state - records = place_facets[ place ] - - unless @place_tree[ state ] - @place_tree[ state ] = { - :name=>state, - :link_options=>{ - :controller => 'search', :action=>'index',:new_search=>1, - :facet_tag => 'state_facet', :facet_browse => state_code, :facet => "city_state" - }, - :records=>0, - :children=>Hash.new - } - end - @place_tree[ state ][ :records ] += records - @place_tree[ state ][ :children ][ city ] = { - :name=>city, - :link_options=>{ - :controller => 'search', :action=>'index',:new_search=>1, - :facet_tag => 'city_state_facet', :facet_browse => place, :facet => "decade" - }, - :records=>records - } - end - - @subject_tree = Hash.new - Collection.get_asho_subject_hash.each do |k,v| - @subject_tree[ k ] = { - :name=>k, - :link_options=>{ - :controller => 'search', :action=>'index',:new_search=>1, - :facet_tag => 'asho_subject_facet', :facet_browse => k, :facet => "set_spec" - }, - :records=>v[0] - } - end +year_facets.keys.sort.each do |year| + next if year.to_i < 1600 or year.to_i > Time.new.year + century = ( year.to_i / 100 * 100 ).to_i + decade = ( year.to_i / 10 * 10 ).to_i + records = year_facets[ year ] + + unless @time_tree[ century ] + @time_tree[ century ] = {:name=>"#{century}'s",:records=>0,:children=>Hash.new} end + node = @time_tree[ century ] + node[ :records ] += records + + unless node[ :children ][ decade ] + node[ :children ][ decade ] = { + :name=>"#{decade}'s", + :link_options=>{:controller=>'search',:action=>'',:new_search=>1,:facet_tag=>'decade',:facet_browse => decade, :facet=> "year"}, + :records=>0, + :children=>Hash.new + } + end + node = node[ :children ][ decade ] + node[ :records ] += records + node[ :children ][ year ] = { + :name=>year, + :link_options=>{ + :controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'year', :facet_browse => year, :facet => "state"}, + :records=>records + } end +end +def place_tree +facet_counts,recs = SolrSearch.search('',['city_state_facet'],[]) +@place_tree = Hash.new +place_facets = facet_counts['facet_fields']['city_state_facet'] + +place_facets.keys.sort.each do |place| + match = /(.*), ([A-Z][A-Z])/.match( place ) + city = match[1] + state_code = match[2] + state = UsState.code_to_name( match[2] ) + next unless state + records = place_facets[ place ] + + unless @place_tree[ state ] + @place_tree[ state ] = { + :name=>state, + :link_options=>{ + :controller => 'search', :action=>'index',:new_search=>1, + :facet_tag => 'state', :facet_browse => state_code, :facet => "city_state" + }, + :records=>0, + :children=>Hash.new + } + end + @place_tree[ state ][ :records ] += records + @place_tree[ state ][ :children ][ city ] = { + :name=>city, + :link_options=>{ + :controller => 'search', :action=>'index',:new_search=>1, + :facet_tag => 'city_state', :facet_browse => place, :facet => "decade" + }, + :records=>records + } +end +end + +def subject_tree +@subject_tree = Hash.new +Collection.get_asho_subject_hash.each do |k,v| + @subject_tree[ k ] = { + :name=>k, + :link_options=>{ + :controller => 'search', :action=>'index',:new_search=>1, + :facet_tag => 'subject', :facet_browse => k, :facet => "set_spec" + }, + :records=>v[0] + } +end +end + +# build simple trees for various front page facets +# node is hash 'name' => [link_to_options,count,children] +def front_widget + +# if params[:data]=='times' + + +# elsif params[:data]=='places' + +# elsif params[:data]=='subjects' + +end + +end Modified: ruby/trunk/aquifer/app/controllers/search_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/search_controller.rb 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/controllers/search_controller.rb 2010-03-12 02:35:38 UTC (rev 651) @@ -1,6 +1,7 @@ class SearchController < ApplicationController - layout "search", :except => [:raw_mods_record,:timeline,:map_data,:add_tags] - + # layout "search", :except => [:raw_mods_record,:timeline,:map_data,:add_tags] + layout "default", :except => [:raw_mods_record,:timeline,:map_data,:add_tags,:search_collections] + require 'open-uri' require 'cgi' require 'csv' @@ -167,9 +168,11 @@ flash[:notice] = "No records found" end -# rescue -# logger.error( 'problem doing search #{$!}') -# flash[:notice] = "There was a problem with your search" + # search_collections + + # rescue + # logger.error( 'problem doing search #{$!}') + # flash[:notice] = "There was a problem with your search" end def log_search( term, hits ) @@ -200,8 +203,8 @@ @num_found = HeadingItem.count( count_conditions ) @items = Item.paginate( :joins => "left join heading_items hi on (items.id = hi.item_id) ", - :conditions => conditions, - :page => params[ :page ] ) + :conditions => conditions, + :page => params[ :page ] ) # next line fixes id, which were munged by join @items.each {|item| item.id = item.item_id } @@ -288,8 +291,8 @@ end def record_follow - item_id = params[ :id ] - ItemHistory.log( item_id, 'f' ) + @item_id = params[ :id ] + ItemHistory.log( @item_id, 'f' ) #puts "item #{item_id} followed to source" render( :layout => false ) @@ -322,9 +325,9 @@ @xsl_transform = XslTransform.find( @transform_id ) @xsl = @xsl_transform.xsl @transform_doc = REXML::Document.new( @xsl ) -# @xsl_transform_kind = @xsl_transform.kind -# @trans = open("http://localhost:8585/#{@xsl_transform.kind}?item_id=#{@item.id}&transform_id=#{params[:transform_id]}" ) -# @transform_output = @trans.read + # @xsl_transform_kind = @xsl_transform.kind + # @trans = open("http://localhost:8585/#{@xsl_transform.kind}?item_id=#{@item.id}&transform_id=#{params[:transform_id]}" ) + # @transform_output = @trans.read xslt.xsl = @xsl # xslt.xml = REXML::Document.new @transform_input @@ -375,7 +378,48 @@ local_item = items[0] redirect_to :action => 'full_record', :id => local_item.id end - + + + + def search_collections + if params[:q].blank? + @collections2 = Collection.paginate(:page=>params[:page],:per_page=>15,:order=>'title_sort',:conditions=>"oai_id!=''") + else + rlike = make_mysql_collection_qry(params[:q]) + @collections2 = Collection.paginate(:page=>params[:page],:per_page=>15,:order=>'title_sort',:conditions=>"oai_id!=''#{rlike}") + end + end + + + def split_for_query(q) + #take a query string and split it into its words and phrases, such as + # "this "is a" test becomes" ["this", "is a", "test"] + ret=[] + re = /([^"]*)("[^"]*")*/im + re2 = /\S+/im + + q.scan(re) do |words, literal| + unless words.blank? + words.scan(re2) do |word| + ret << word.gsub(/'/,"''") + end + end + + unless literal.blank? + ret << literal[1..-2].gsub(/'/,"''").gsub(/\s+/,'[[:space:]]+') + end + end + ret + end + + def make_mysql_collection_qry(q) + ret = "" + split_for_query(q).each do |trm| + ret = ret + " and replace(raw_xml,'Grainger Engineering Library Information Center, University of Illinois at Urbana-Champaign','') rlike '<m:[^<]+#{trm}[^<]+</m:'" + end + ret + end + def timeline @start_year = params[:year] || 1923 render :layout => "timeline" @@ -410,34 +454,34 @@ @items = @search.get_items :limit => 200, :no_facet => true @items.each do |item| -# ttitle = ( item.mods_fields[ 'title' ][0] if item.mods_fields[ 'title' ] ) || "" -# field = Field.new( 'title', ttitle ) -# item.timeline_title = render_to_string :partial => "brief_field", :locals => { :item => item, :field => field } + # ttitle = ( item.mods_fields[ 'title' ][0] if item.mods_fields[ 'title' ] ) || "" + # field = Field.new( 'title', ttitle ) + # item.timeline_title = render_to_string :partial => "brief_field", :locals => { :item => item, :field => field } item.timeline_description = render_to_string :partial => "record", :locals => { :item => item, :mode => 'index', :display_fields => SearchOptions.full_tags } #puts "render s=#{item.timeline_description}" #puts "item id = #{item.id}" end -# last_year = 0 -# last_month = 1 -# @items.each do |item| -# key_date = item.mods_fields[ 'key_date' ] -# if key_date -# key_date = DateTime.parse( key_date[0] ) -# if key_date.year = last_year -# date_count += 1 -# key_date.month = last_month -# if date_count > 8 -# last_month != 1 -# date_count = 0 -# else -# last_year = key_date.year -# last_month = 1 -# end -# end -# item.mods_fields[ 'key_date' ] = [key_date.to_s] -# puts "item id=#{item.id} kd=#{item.mods_fields[ 'key_date' ].inspect}" -# end -# end + # last_year = 0 + # last_month = 1 + # @items.each do |item| + # key_date = item.mods_fields[ 'key_date' ] + # if key_date + # key_date = DateTime.parse( key_date[0] ) + # if key_date.year = last_year + # date_count += 1 + # key_date.month = last_month + # if date_count > 8 + # last_month != 1 + # date_count = 0 + # else + # last_year = key_date.year + # last_month = 1 + # end + # end + # item.mods_fields[ 'key_date' ] = [key_date.to_s] + # puts "item id=#{item.id} kd=#{item.mods_fields[ 'key_date' ].inspect}" + # end + # end year_counts = HashCount.new @items.each do |item| @@ -456,8 +500,8 @@ puts "timeline count=#{@items.length}" render :partial => 'timeline_json' -# rescue -# logger.error( 'problem doing search #{$!}') -# flash[:notice] = "There was a problem with your search" + # rescue + # logger.error( 'problem doing search #{$!}') + # flash[:notice] = "There was a problem with your search" end end Modified: ruby/trunk/aquifer/app/helpers/application_helper.rb =================================================================== --- ruby/trunk/aquifer/app/helpers/application_helper.rb 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/helpers/application_helper.rb 2010-03-12 02:35:38 UTC (rev 651) @@ -76,5 +76,6 @@ color_txt = "color:#{@@cloud_colors[0]};" unless hide_colours #puts "cloud style=#{[ size_txt, color_txt ].join}" - return [ color_txt, size_txt ].join +# return [ color_txt, size_txt ].join +return size_txt end Modified: ruby/trunk/aquifer/app/models/collection.rb =================================================================== --- ruby/trunk/aquifer/app/models/collection.rb 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/models/collection.rb 2010-03-12 02:35:38 UTC (rev 651) @@ -45,6 +45,8 @@ @@titles[set_spec]=t.to_s break end + else + @@titles[set_spec]='[title unavailable]' end return @@titles[set_spec] Modified: ruby/trunk/aquifer/app/models/search.rb =================================================================== --- ruby/trunk/aquifer/app/models/search.rb 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/models/search.rb 2010-03-12 02:35:38 UTC (rev 651) @@ -188,7 +188,7 @@ end def to_html_with_query_words_highlighted( s ) - ERB::Util::h( s ).gsub( get_search_words_regex, '<font color="red">\1</font>' ) + ERB::Util::h( s ).gsub( get_search_words_regex, '<span class="highlighted">\1</span>' ) end def advanced_params_to_query( params ) Added: ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml (rev 0) +++ ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -0,0 +1,33 @@ +<% if collections %> + <% collections.each do |collection| %> + <% if collection %> + + <div class="collection"> + + <div class="thumbnailarea"> + <ul class="actions"> + <li><%= link_to('Go to Collection',collection.primary_display_location, :class => 'external') %></li> + + <li><%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)</li> + <li><%= link_to('View Details',{:controller => 'collection', :action=>'show',:id=>collection.id}) %></li> + <%#*<li><%= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(collection.set_spec)}) % ></li>%> + </ul> + <% if collection.get_image_url != "" %> + <%= link_to(image_tag(collection.get_image_url),collection.primary_display_location, :class=>'thumbnail') %> + <% else %> + <%= link_to(image_tag('image_unavailable.png'),collection.primary_display_location, :class => "thumbnail") %> + <% end %> + + </div> + <div class="collectioninfo"> + <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> + <b><%=truncate(t.to_s, 30)%></b><br/> + <% end %> + <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> + <%=truncate(orig.publisher[0].to_s.gsub(/\[\]/,''), 35)%> + <% end %> + </div> + </div> + <% end %> + <% end %> + <% end %> Property changes on: ruby/trunk/aquifer/app/views/collection/_collection_list.rhtml ___________________________________________________________________ Added: svn:executable + * Modified: ruby/trunk/aquifer/app/views/collection/_mods_element.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/_mods_element.rhtml 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/views/collection/_mods_element.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -1,12 +1,25 @@ - <% new_head=true %> - <% mods_element.each do |elem| %> - <tr> - <% if new_head %> - <th align='left' valign='top'><%=pre_label%><%=label.blank? ? h(elem.labelize) : label %><%=post_label%></th> - <% else %> - <td></td> - <% end %> - <td><%= auto_link(elem.to_s) %></td> - </tr> - <% new_head=false %> - <% end %> +<% first_item=true %> +<% label_str = '' %> +<% field_str = '' %> +<% mods_element.each do |elem| %> + <% if first_item %> + <% label_str = label.blank? ? h(elem.labelize) : label %> + <% else %> + <% field_str += '<br />' %> + <%end%> + <% field_str += auto_link(elem.to_s) %> + <% first_item=false %> +<% end %> + +<% if label_str != '' %> + <tr> + <td class="label"> + <%=pre_label%> + <%=label_str %> + <%=post_label%> + </td> + <td class="field"> + <%= field_str %> + </td> + </tr> +<% end %> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/collection/list.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/list.rhtml 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/views/collection/list.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -1,43 +1,17 @@ -<table width="100%" style="font:150% sans-serif; color: #226;"> - <tr> - <td align="left"> - Collection Pages: <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %> - </td> - <td align="center"> - <% form_tag do %> - <label title='Searches complete collection description; use quotes for exact phrase' for='q'>Search collections:</label> <%= text_field_tag :q, params[:q] %> <%= submit_tag 'GO' %> - <% end %> - </td> - <td align="right"> - <%= link_to('List View',{:action=>'shortlist',:page=>@collections2.current_page,:q=>params[:q]}) %> - </td> - </tr> -</table> - -<div style="clear:both;"></div> -<table frame='border' cellpadding='10'> -<% @collections2.in_groups_of(4) do |slice| %> - <tr> - <% slice.each do |collection| %> - <% if collection %> - <td align='center' valign='top'> - <%= link_to(image_tag(collection.get_image_url,:border=>'0'),collection.primary_display_location) %><br/> - <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> - <b><%=t%></b><br/> - <% end %> - <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> - <%=orig.publisher[0].to_s.gsub(/\[\]/,'')%><br/> - <% end %> - <br/> - - <%= link_to('Go to Collection',collection.primary_display_location) %> <%=image_tag("externallinks.gif")%>   - <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec_facet', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)   - <%= link_to('View Details',{:action=>'show',:id=>collection.id}) %>   - <%= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(collection.set_spec)}) %> - </td> - <% end %> - <% end %> - </tr> -<% end %> -</table> -<h1 class="top_border">Collection Pages: <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></h1> \ No newline at end of file +<div class="pagemenu top clearfix"> + <div class="menuwrapper"> + <div class="menutext">Collections Pages:</div> + <div class="pagination"> <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></div> + <div class="menubuttons"> + <%= link_to('List View',{:action=>'shortlist',:page=>@collections2.current_page,:q=>params[:q]}) %> + </div> + </div> +</div> +<div id="main_content"> + <div id="collectionlist" class="clearfix"> + <%= render :partial=>'collection_list', :locals => {:collections => @collections2}%> + </div> +</div> +<div class="pagemenu bottom clearfix"> + <div class="pagination bottom"> <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></div> +</div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/collection/shortlist.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/shortlist.rhtml 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/views/collection/shortlist.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -1,43 +1,41 @@ -<table width="100%" style="font:150% sans-serif; color: #226;"> - <tr> - <td align="left"> - Collection Pages: <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %> - </td> - <td align="center"> - <% form_tag do %> - <label title='Searches complete collection description; use quotes for exact phrase' for='q'>Search collections:</label> <%= text_field_tag :q, params[:q] %> <%= submit_tag 'GO' %> - <% end %> - </td> - <td align="right"> +<div class="pagemenu top clearfix"> + <div class="menuwrapper"> + <div class="menutext">Collections Pages:</div> + <div class="pagination"> <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></div> + <div class="menubuttons"> <%= link_to('Grid View',{:action=>'list',:page=>@collections2.current_page,:q=>params[:q]}) %> - </td> - </tr> -</table> - -<div style="clear:both;"></div> -<table frame='border' rules='rows'> + </div> + </div> +</div> + + +<div class="clearfix"> <% cnt =0 %> <% @collections2.each do |collection| %> <% if collection %> <% cnt = cnt + 1%> - <% bkgnd = cnt % 2 == 0 ? "background-color:beige" : "" %> - <tr style="border-bottom:1px solid black;height:144px;<%=bkgnd%>"> - <td align="right" valign="top"><%= link_to(image_tag(collection.get_image_url,:border=>'0',:width=>'144'),collection.primary_display_location) %></td> - <td style="padding-left:2em" valign="top"> - <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> - <h2><%=t%></h2> + <% odd = cnt % 2 == 1 ? "odd" : "" %> + <div class="listitem clearfix <%=odd%>"> + <div style="float:left"> +<%= link_to(image_tag(collection.get_image_url,:border=>'0',:width=>'144'),collection.primary_display_location) %> + </div> + <div style="float:left; max-width: 70%; margin: 0 18px"> + <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> + <h3><%=t%></h3> <% end %> <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> <%=orig.publisher[0].to_s.gsub(/\[\]/,'')%><br/> <% end %> <p><%=collection.mods.abstract[0].to_s%></p> - <%= link_to('Go to Collection',collection.primary_display_location) %> <%=image_tag("externallinks.gif")%>   - <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec_facet', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)   + <%= link_to('Go to Collection',collection.primary_display_location, :class=>'external') %>   + <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)   <%= link_to('View Details',{:action=>'show',:id=>collection.id}) %>   - <%= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(collection.set_spec)}) %> - </td> - </tr> + <%#= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(collection.set_spec)}) %> + </div> + </div> <% end %> <% end %> -</table> -<h1 class="top_border">Collection Pages: <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></h1> \ No newline at end of file +</div> +<div class="pagemenu bottom clearfix"> + <div class="pagination bottom"> <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></div> +</div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/collection/show.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/collection/show.rhtml 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/views/collection/show.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -1,31 +1,54 @@ -<div style='float:right;text-align:center;'> - <%=link_to(image_tag(@collection.get_image_url,:border=>0),@collection.primary_display_location)%> - <br/> - <br/> - <%= link_to('Go to Collection',@collection.primary_display_location) %> <%=image_tag("externallinks.gif")%>    - <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec_facet', :facet_browse => @collection.set_spec}) %> (<%= @collection.count_set_spec %>)    - <%= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(@collection.set_spec)}) %> + +<div class="columnmask twocolumn"> + <div class="leftposition"> + <div class="main_wrapper"> + <div id="main_content"> + + + <table class="details"> + <%= render(:partial=>'mods_element',:object=>@collection.mods.titleInfo({'@type'=>nil}),:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.titleInfo({'@type'=>'alternative'}),:locals=>{:pre_label=>'Alternative ',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.name,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.typeOfResource,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.genre,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.originInfo,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.language,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.physicalDescription,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.abstract,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.tableOfContents,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.targetAudience,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.note,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.subject,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.classification,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.relatedItem,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.identifier,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.location,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.accessCondition,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.part,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.extension,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + <%= render(:partial=>'mods_element',:object=>@collection.mods.recordInfo,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> + </table> + </div> + + </div> + <div id="aux_content"> + <div style='text-align: center'> + <%=link_to(image_tag(@collection.get_image_url),@collection.primary_display_location)%> + <br/> + <br/> + <ul style> + <li> + <%= link_to('Go to Collection',@collection.primary_display_location,:class=>'external') %> + + </li> + <li> + <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec', :facet_browse => @collection.set_spec}) %> (<%= @collection.count_set_spec %>)    + </li> + </ul> +<%#= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(@collection.set_spec)}) %> + </div> + + </div> + + </div> </div> -<table> - <%= render(:partial=>'mods_element',:object=>@collection.mods.titleInfo({'@type'=>nil}),:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.titleInfo({'@type'=>'alternative'}),:locals=>{:pre_label=>'Alternative ',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.name,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.typeOfResource,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.genre,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.originInfo,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.language,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.physicalDescription,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.abstract,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.tableOfContents,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.targetAudience,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.note,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.subject,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.classification,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.relatedItem,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.identifier,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.location,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.accessCondition,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.part,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.extension,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> - <%= render(:partial=>'mods_element',:object=>@collection.mods.recordInfo,:locals=>{:pre_label=>'',:label=>nil,:post_label=>''})%> -</table> Modified: ruby/trunk/aquifer/app/views/home/_footer.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_footer.rhtml 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/views/home/_footer.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -1,13 +1,17 @@ <div id="footer"> - <img src="/images/AmericanSocialHistoryOnl-52.gif" width="81" height="25" alt=""> - - <a href="/home/conditions_of_use" class="submenu3">conditions of use</a> - | - <a href="/home/faq" class="submenu3">faq</a> - | - <a href="/home/contact_us" class="submenu3">contact us</a> - <br/> - The Aquifer American Social History Online Project gratefully acknowledges - The Andrew W. Mellon Foundation for its support. - copyright © <%= Time.now.year %> + <div id="footer_menu" class="contain"> + <ul> + <li><a href="/home/conditions_of_use" class="submenu3">conditions of use</a></li> + <li> - </li> + <li><a href="/home/faq" class="submenu3">faq</a></li> + <li> - </li> + <li><a href="/home/contact_us" class="submenu3">contact us</a></li> + </ul> + </div> + <p> + <a rel="license" href="http://creativecommons.org/licenses/by/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by/3.0/us/88x31.png" /></a><br /><span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/StillImage" property="dc:title" rel="dc:type">american history online</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="dlfaquifer.org" property="cc:attributionName" rel="cc:attributionURL">american history website</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution 3.0 United States License</a>. + </p> + <p> + American History Online gratefully acknowledges The Andrew W. Mellon Foundation for its support. + </p> </div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/_front_widget.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_front_widget.rhtml 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/views/home/_front_widget.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -1,5 +1,4 @@ -<% cache do %> -<div id="accordion" class=""> + <h3><a href="#">Subjects</a></h3> <div class="tree_widget"> <%= render :partial => "tree_widget_node", :locals => { :div_base => "subject_tree", :tree_nodes => @subject_tree, :depth=>0 } %> @@ -16,11 +15,3 @@ <div class="tree_widget"> <%= render :partial => "tree_widget_node", :locals => { :div_base => "time_tree", :tree_nodes => @time_tree, :depth=>0 } %> </div> - -</div> - -<%#*<script type="text/javascript">%> -<%#*var acc1 = new Spry.Widget.Accordion("Acc1");%> -<%#*</script>%> - -<% end %> \ No newline at end of file Added: ruby/trunk/aquifer/app/views/home/_header.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_header.rhtml (rev 0) +++ ruby/trunk/aquifer/app/views/home/_header.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -0,0 +1,47 @@ +<div id="header" class="clearfix"> + <div id="header_top_container"> + <div id="header_top" class="clearfix"> + + <div id="logo" class=""> + + <%= link_to( image_tag( "ah_logo.png", :size=> "403x95", :border => 0, :alt => "Home" ), { :controller => :home, :action => "index" } ) %> + </div> + + <div id="header_controls" class=""> + + + + <div id="submenu" class=""> + + + <%#= link_to( 'tools', { :controller => :home, :action => :tools }, { :class => 'submenu' } ) %> + <%= link_to( 'contact us', { :controller => :home, :action => :contact_us }, { :class => 'submenu' } ) %> + <%= link_to( 'help', { :controller => :home, :action => :help }, { :class => 'submenu' } ) %> + <%= link_to( 'faq', { :controller => :home, :action => :faq }, { :class => 'submenu' } ) %> + + </div> + </div> + <h2 id="slogan">find and use primary resources from historical digital collections</h2> + + </div> + </div> + <div id="menubar_container"> + <div id="menubar" class=""> + + <%= render :partial => "search/search_bar", :controller => :search, :new_search => 1, :locals => { :params => params } %> + + + <div id="menuitems"> + <%= link_to( 'home', { :controller => :home, :action => :index }, { :class => 'menubarlink first' } ) %> + <%= link_to( 'about', { :controller => :home, :action => :about }, { :class => 'menubarlink' } ) %> + <%= link_to( 'collections', { :controller => :collection }, { :class => 'menubarlink' } ) %> + <%#= link_to( 'browse', { :controller => :heading }, { :class => 'menubarlink last' } ) %> + + </div> + + </div> + + + </div> + <div id="header_bottom" class="clearfix"><div id="header_bottom_container" class="contain clearfix"></div></div> + </div> \ No newline at end of file Property changes on: ruby/trunk/aquifer/app/views/home/_header.rhtml ___________________________________________________________________ Added: svn:executable + * Modified: ruby/trunk/aquifer/app/views/home/_list.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_list.rhtml 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/views/home/_list.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -30,7 +30,7 @@ <% end %> <br/> - <%= link_to('Go to Collection',collection.primary_display_location) %> <%=image_tag("externallinks.gif")%>   + <%= link_to('Go to Collection',collection.primary_display_location) %> <%=image_tag("externallink.png")%>   <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec_facet', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)   <%= link_to('View Details',{:action=>'show',:id=>collection.id}) %>   <%= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(collection.set_spec)}) %> Modified: ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -1,39 +1,39 @@ <% node_num = 0 %> <% tree_nodes.keys.sort.each do |key| %> - <% tree_node = tree_nodes[ key ] %> - <% if tree_node[ :children ] %> - <% ul_class = "widget_tree_nodes" %> - <% li_class = "widget_tree_node" %> - <% else %> - <% ul_class = "widget_leaf_nodes" %> - <% li_class = "widget_leaf_node" %> - <% end %> - <% if depth == 0 %> - <% ul_class += " root" %> - <% end %> - <%= "<ul class ='#{ul_class}'>" %> + <% tree_node = tree_nodes[ key ] %> + <% if tree_node[ :children ] %> + <% ul_class = "widget_tree_nodes" %> + <% li_class = "widget_tree_node" %> + <% else %> + <% ul_class = "widget_leaf_nodes" %> + <% li_class = "widget_leaf_node" %> + <% end %> + <% if depth == 0 %> + <% ul_class += " root" %> + <% end %> + <%= "<ul class ='#{ul_class}'>" %> - <% child_div = "#{div_base}_#{node_num}" %> - <% node_num += 1 %> + <% child_div = "#{div_base}_#{node_num}" %> + <% node_num += 1 %> - <%= "<li class ='#{li_class}'>" %> + <%= "<li class ='#{li_class}'>" %> - - <% if tree_node[ :link_options ] %> - <%= link_to( tree_node[ :name ], tree_node[ :link_options ] ) %> - <% else %> - <%= tree_node[ :name ] %> - <% end %> - <%#= " (#{tree_node[ :records ]} records)" %> - <%= "<span>(#{tree_node[ :records ]})</span>" %> - </li> - - <% if tree_node[ :children ] %> - <%#= "<div id=\"#{child_div}\" style=\"display:none;\" >" %> - <li class="widget_children"> - <%= render :partial => "tree_widget_node", :locals => { :div_base => child_div, :tree_nodes => tree_node[ :children ], :depth => depth+1 } %> - </li> - <%#*</div>%> - <% end %> - </ul> + + <% if tree_node[ :link_options ] %> + <%= link_to( tree_node[ :name ], tree_node[ :link_options ] ) %> + <% else %> + <%= tree_node[ :name ] %> + <% end %> + <%#= " (#{tree_node[ :records ]} records)" %> + <%= "<span>(#{tree_node[ :records ]})</span>" %> + </li> + + <% if tree_node[ :children ] %> + <%#= "<div id=\"#{child_div}\" style=\"display:none;\" >" %> + <li class="widget_children"> + <%= render :partial => "tree_widget_node", :locals => { :div_base => child_div, :tree_nodes => tree_node[ :children ], :depth => depth+1 } %> + </li> + <%#*</div>%> + <% end %> + </ul> <% end %> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/about.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/about.rhtml 2010-01-28 19:28:17 UTC (rev 650) +++ ruby/trunk/aquifer/app/views/home/about.rhtml 2010-03-12 02:35:38 UTC (rev 651) @@ -1,97 +1,27 @@ -<table width="100%"> - <tr> - <td colspan="3" align="center" valign="top"> - <%= image_tag( "about_banner.jpg", { :width => "100%", :height => "183px" } ) %> - </td> - </tr> - <tr> - <td colspan="3" align="center" valign="top"> </td> - </tr> - <tr> - <td colspan="3" align="center" valign="top"><table width="98%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td>home > about american social history online </td> - </tr> - <tr> - <td> </td> - </tr> - <tr> - <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td width="44%"> - <%= image_tag( "about.gif", { :size => "370x18" } ) %> - </td> - <td width="56%" class="submenu"> - <a href="http://wiki.dlib.indiana.edu/confluence/display/DLFAquifer">wiki</a> - | - <a href="http://sourceforge.net/projects/dlf-aquifer/">source forge</a> - </td> - </tr> - </table></td> - </tr> - - <tr> - <td> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td width="12%"> - <div> - <div style="float:left;padding-right:20px;padding-bottom:20px;"> - <%= image_tag( "about_sample.jpg", { :size => "92x92", :align => "left" } ) %> - </div> - <div> -<div style="float:right;width:12%;border:1px solid black;margin:1em;padding:1em"> -<p><strong>Aquifer Blogs</strong><br><br> -<a href="http://dlfaquifer.blogspot.com/">Aquifer (Group)</a><br> -<a href="http://mblog.lib.umich.edu/~khage/">Kat Hagedorn</a><br> -<a href="http://harumsusan.blogspot.com/">Susan Harum</a><br> -<a href="http://bitbrick.blogspot.com/">Chick Markley</a><br> -</div> -<p><strong>Aquifer American Social History Online (AASHO)</strong>: <strong>One Place - Many Collections </strong></p> -<p>Aquifer American Social History Online, a project of the<a href="http://www.dliglib.org"> Digital Library Federation</a>, provides scholars with access to distributed <a href="/collection">digital library collections</a> pertaining to 19th and 20th century United States social history. AASHO is available through locally supported tools so that you can find, organize, use, and share items from diverse collections. To optimize your teaching, learning and research while using Aquifer American Social History Online, we recommend that you:</p> -<ul> - <li>Sign up for an <a href="http://www.openid.org/">OpenID</a> to use when you login to AASHO. <span id="ctl00_ContentPlaceHolder1_ucPreamble"> With OpenID, you create a single username and password</span> that you can use to <span id="ctl00_ContentPlaceHolder1_ucPreamble2">log into an increasing number of sites without registering each time. </span>You can use Aquifer American Social History Online without registering, but logging in with your OpenID allows you to save your search histories, set your profile preferences, access a record in its native format, and access metadata transformation tools.</li> - <li>Download and install the <a href="http://www.zotero.org">Zotero</a> extention. Zotero is a free, easy-to-use research tool that helps you gather and organize resources (bibliography or full text of articles), and then lets you annotate, organize and share the results of your research. Please note that Zotero works only in Firefox.</li> -</ul> -<p>We welcome new partners and new collections. To find out more about partnering and contributing, please <a href="/contact_us">contact us</a>.</p> -<p><strong>Aquifer American Social History Online Products for Digital Library Development:</strong></p> -<p><strong>Guidelines </strong></p> -<p>The <a href="http://wiki.dlib.indiana.edu/confluence/display/DLFAquifer/Collection+Submission" mce_href="http://wiki.dlib.indiana.edu/confluence/display/DLFAquifer/Collection+Submission" rel="nofollow" linktype="raw" linktext="Collection Submission|http://wiki.dlib.indiana.edu/confluence/display/DLFAquifer/Collection+Submission">Collection Submission</a> document details how to make your collection available for harvesting.</p> -<p><a href="http://wiki.dlib.indiana.edu/confluence/download/attachments/28330/DLFMODS_ImplementationGuidelines_Version1.pdf?version=1">Digital Library Federation / Aquifer Implementation Guidelines for Sharable Metadata</a> and <a href="http://wiki.dlib.indiana.edu/confluence/download/attachments/28330/MODSGuidelines_Letter.pdf?version=1">release notes</a>, describing how MODS should be used for sharing metadata for use in the Aquifer initiative</p> -<p><a href="http://wiki.dlib.indiana.edu/confluence/display/DLFAquiferMeta/Levels+of+Compliance" mce_href="http://wiki.dlib.indiana.edu/confluence/display/DLFAquiferMeta/Levels+of+Compliance" rel="nofollow" linktype="raw" linktext="MODS Guidelines Levels of Adoption|http://wiki.dlib.indiana.edu/confluence/display/DLFAquiferMeta/Levels+of+Compliance">MODS Guidelines Levels of Adoption</a> provides guidance on the use of MODS for metadata. This document describes five general categories of user functionality that are likely to be supported by following specific recommendations from the Guidelines. It documents what functionality is possible when certain elements of the Guidelines are followed.</p> -<p><a href="http://wiki.dlib.indiana.edu/confluence/display/DLFAquiferMeta/FAQ+for+MODS+Guidelines+Implementers" mce_href="http://wiki.dlib.indiana.edu/confluence/display/DLFAquiferMeta/FAQ+for+MODS+Guidelines+Implementers" rel="nofollow" linktype="raw" linktext="FAQ for MODS Gu... [truncated message content] |
From: <pau...@us...> - 2010-01-28 19:28:32
|
Revision: 650 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=650&view=rev Author: paulnsorensen Date: 2010-01-28 19:28:17 +0000 (Thu, 28 Jan 2010) Log Message: ----------- Paul's latest changes Modified Paths: -------------- ruby/trunk/aquifer/app/controllers/home_controller.rb ruby/trunk/aquifer/app/models/collection.rb ruby/trunk/aquifer/app/views/home/_footer.rhtml ruby/trunk/aquifer/app/views/home/_front_widget.rhtml ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml ruby/trunk/aquifer/app/views/home/index.rhtml ruby/trunk/aquifer/app/views/layouts/home.rhtml ruby/trunk/aquifer/app/views/layouts/search.rhtml ruby/trunk/aquifer/app/views/search/_very_simple_search.rhtml ruby/trunk/aquifer/public/javascripts/application.js Added Paths: ----------- ruby/trunk/aquifer/app/views/home/_list.rhtml ruby/trunk/aquifer/db/migrate/024_change_rawxmls_text_to_mediumtext.rb ruby/trunk/aquifer/public/images/aho_logo.png ruby/trunk/aquifer/public/images/aho_logo2.png ruby/trunk/aquifer/public/images/aho_logo_scaled.png ruby/trunk/aquifer/public/images/highlight.png ruby/trunk/aquifer/public/images/menubg.png ruby/trunk/aquifer/public/images/search.png ruby/trunk/aquifer/public/images/searchbg.png ruby/trunk/aquifer/public/images/searchbuttonbg.png ruby/trunk/aquifer/public/images/searchbuttonbg_hover.png ruby/trunk/aquifer/public/images/searchfieldbg.png ruby/trunk/aquifer/public/images/topcontentbg.png ruby/trunk/aquifer/public/images/ui-bg_flat_0_aaaaaa_40x100.png ruby/trunk/aquifer/public/images/ui-bg_flat_75_ffffff_40x100.png ruby/trunk/aquifer/public/images/ui-bg_glass_55_F9F2E4_1x400.png ruby/trunk/aquifer/public/images/ui-bg_glass_65_92B6DA_1x400.png ruby/trunk/aquifer/public/images/ui-bg_glass_75_B2D0ED_1x400.png ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_153f69_1x100.png ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_441615_1x100.png ruby/trunk/aquifer/public/images/ui-bg_inset-soft_95_fef1ec_1x100.png ruby/trunk/aquifer/public/images/ui-icons_222222_256x240.png ruby/trunk/aquifer/public/images/ui-icons_2e83ff_256x240.png ruby/trunk/aquifer/public/images/ui-icons_5e7c98_256x240.png ruby/trunk/aquifer/public/images/ui-icons_cccccc_256x240.png ruby/trunk/aquifer/public/images/ui-icons_cd0a0a_256x240.png ruby/trunk/aquifer/public/javascripts/jquery-min.js ruby/trunk/aquifer/public/javascripts/jquery-ui-min.js ruby/trunk/aquifer/public/stylesheets/base.css ruby/trunk/aquifer/public/stylesheets/jquery-ui/ ruby/trunk/aquifer/public/stylesheets/jquery-ui/images/ ruby/trunk/aquifer/public/stylesheets/jquery-ui.css ruby/trunk/aquifer/public/stylesheets/layout.css ruby/trunk/aquifer/vendor/plugins/acts_as_solr/solr/tmp/development_pid.u1conflict Modified: ruby/trunk/aquifer/app/controllers/home_controller.rb =================================================================== --- ruby/trunk/aquifer/app/controllers/home_controller.rb 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/app/controllers/home_controller.rb 2010-01-28 19:28:17 UTC (rev 650) @@ -2,23 +2,54 @@ layout 'search', :except=>[:maintenance] @@last_widget_cache = Time.local(2000,1,1) + @@last_featured_collections_update = Time.local(2000,1,1,1,0) + @@featured_collections = Array.new(9) +# def index +# @featured_coll = FeaturedCollection.find(:first) +# @item_cnt = Item.count('id',:conditions => nil).to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,") +# @coll_cnt = Collection.count('id',:conditions => nil) +# @fmt_cnt = 9 +# +# front_widget if params[:ffw]=='true' #force a refresh of the front widget +# # a better expiration should be done, but this is ok +# # no caching on dev because class level vars, not held there +# cache_age = Time.now - @@last_widget_cache +# unless read_fragment({}) and cache_age < 0.5.days +# front_widget # setup facet widget +# @@last_widget_cache = Time.now +# end +# end + def index - @featured_coll = FeaturedCollection.find(:first) @item_cnt = Item.count('id',:conditions => nil).to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,") @coll_cnt = Collection.count('id',:conditions => nil) @fmt_cnt = 9 - + + featured_collections + front_widget if params[:ffw]=='true' #force a refresh of the front widget # a better expiration should be done, but this is ok # no caching on dev because class level vars, not held there cache_age = Time.now - @@last_widget_cache - unless read_fragment({}) and cache_age < 0.5.days + unless read_fragment({}) and cache_age < 1.days front_widget # setup facet widget + @@last_widget_cache = Time.now end + +# list + + tag_cloud + end + + + + + + def home2 end @@ -62,6 +93,64 @@ end private + + def featured_collections + cache_age = Time.now - @@last_featured_collections_update + unless read_fragment({}) and cache_age < 1.day + colls=Collection.find(:all) + + old_ids = Array.new(9) + + @@featured_collections.each do |collection| + old_ids.push(collection.object_id) + end + + @@featured_collections.clear + + begin + next_coll = rand(colls.length) + if !old_ids.include?(next_coll) && colls[next_coll].get_image_url != "" + @@featured_collections.push(colls[next_coll]) + end + end while @@featured_collections.size < 9 + + #make featured collections always update at about the same time regardless of when the page is browsed + @@last_featured_collections_update = Time.mktime(Time.now.year, Time.now.month, Time.now.day, 1, 0, 0) + + @featured_colls = @@featured_collections + end + end + + + + + def list + @collections2 = Collection.paginate(:page=>params[:page],:per_page=>9,:order=>'title_sort',:conditions=>"oai_id!=''") + end + + + + def tag_cloud + @heading_tag = 'a' + per_page = 30 +# order = "item_count/grand_total desc, item_count desc, normalized_text" + order = "hs.item_count desc, normalized_text" + + @collection_id = 0 + conditions = ["headings.tags like '%%#{@heading_tag}%%' and hs.tag = '#{@heading_tag}' and hs.collection_id = #{@collection_id}"] +# @legal_sorts = ['frequency','uniqueness','rarity','heading'] +# @legal_sorts.insert( 0, 'distinctiveness' ) unless @collection_id == 0 + + joins = "left join heading_stats hs on ( headings.id = hs.heading_id )" + + puts "conditions=#{conditions.inspect}" + @headings = Heading.paginate( :page => params[:page], :joins => joins, :conditions => conditions, :order => order, :per_page => per_page ) + end + + + + + # build simple trees for various front page facets # node is hash 'name' => [link_to_options,count,children] def front_widget Modified: ruby/trunk/aquifer/app/models/collection.rb =================================================================== --- ruby/trunk/aquifer/app/models/collection.rb 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/app/models/collection.rb 2010-01-28 19:28:17 UTC (rev 650) @@ -535,7 +535,8 @@ elsif File.exists?("#{coll_image_base}.gif") ret = "/images/collection/#{file_base}.gif" else - ret = "/images/logo.gif" +# ret = "/images/logo.gif" + ret = "" end return ret Modified: ruby/trunk/aquifer/app/views/home/_footer.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_footer.rhtml 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/app/views/home/_footer.rhtml 2010-01-28 19:28:17 UTC (rev 650) @@ -1,19 +1,13 @@ -<tr> - <td colspan="3"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td width="11%"><img src="/images/AmericanSocialHistoryOnl-52.gif" width="81" height="25" alt=""></td> - <td width="52%" class="submenu3"> +<div id="footer"> + <img src="/images/AmericanSocialHistoryOnl-52.gif" width="81" height="25" alt=""> + <a href="/home/conditions_of_use" class="submenu3">conditions of use</a> | <a href="/home/faq" class="submenu3">faq</a> | <a href="/home/contact_us" class="submenu3">contact us</a> - </td> - <td width="37%" align="right" class="copyright">The Aquifer American Social History Online Project gratefully acknowledges<br> - The Andrew W. Mellon Foundation for its support.<br> - copyright © 2008</td> - </tr> - </table> - </td> -</tr> + <br/> + The Aquifer American Social History Online Project gratefully acknowledges + The Andrew W. Mellon Foundation for its support. + copyright © <%= Time.now.year %> +</div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/_front_widget.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_front_widget.rhtml 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/app/views/home/_front_widget.rhtml 2010-01-28 19:28:17 UTC (rev 650) @@ -1,27 +1,26 @@ <% cache do %> -<div id="Acc1" class="Accordion"> - <div class="AccordionPanel"> - <div class="AccordionPanelTab">Subjects</div> - <div class="AccordionPanelContent"> +<div id="accordion" class=""> + <h3><a href="#">Subjects</a></h3> + <div class="tree_widget"> <%= render :partial => "tree_widget_node", :locals => { :div_base => "subject_tree", :tree_nodes => @subject_tree, :depth=>0 } %> </div> - </div> - <div class="AccordionPanel"> - <div class="AccordionPanelTab">Places</div> - <div class="AccordionPanelContent"> + + <h3><a href="#">Places</a></h3> + + <div class="tree_widget"> <%= render :partial => "tree_widget_node", :locals => { :div_base => "place_tree", :tree_nodes => @place_tree, :depth=>0 } %> </div> - </div> - <div class="AccordionPanel"> - <div class="AccordionPanelTab">Times</div> - <div class="AccordionPanelContent"> + + <h3><a href="#">Times</a></h3> + + <div class="tree_widget"> <%= render :partial => "tree_widget_node", :locals => { :div_base => "time_tree", :tree_nodes => @time_tree, :depth=>0 } %> </div> - </div> + </div> -<script type="text/javascript"> -var acc1 = new Spry.Widget.Accordion("Acc1"); -</script> +<%#*<script type="text/javascript">%> +<%#*var acc1 = new Spry.Widget.Accordion("Acc1");%> +<%#*</script>%> <% end %> \ No newline at end of file Added: ruby/trunk/aquifer/app/views/home/_list.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_list.rhtml (rev 0) +++ ruby/trunk/aquifer/app/views/home/_list.rhtml 2010-01-28 19:28:17 UTC (rev 650) @@ -0,0 +1,43 @@ +<table style="font:150% sans-serif; color: #226;"> + <tr> + <td align="left"> + Collection Pages: <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %> + </td> + <td align="center"> + <% form_tag do %> + <label title='Searches complete collection description; use quotes for exact phrase' for='q'>Search collections:</label> <%= text_field_tag :q, params[:q] %> <%= submit_tag 'GO' %> + <% end %> + </td> + <td align="right"> + <%= link_to('List View',{:action=>'shortlist',:page=>@collections2.current_page,:q=>params[:q]}) %> + </td> + </tr> +</table> + +<div style="clear:both;"></div> +<table> +<% @collections2.in_groups_of(3) do |slice| %> + <tr> + <% slice.each do |collection| %> + <% if collection %> + <td align='center' valign='top'> + <%= link_to(image_tag(collection.get_image_url,:border=>'0'),collection.primary_display_location) %><br/> + <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> + <b><%=t%></b><br/> + <% end %> + <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> + <%=orig.publisher[0].to_s.gsub(/\[\]/,'')%><br/> + <% end %> + <br/> + + <%= link_to('Go to Collection',collection.primary_display_location) %> <%=image_tag("externallinks.gif")%>   + <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec_facet', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)   + <%= link_to('View Details',{:action=>'show',:id=>collection.id}) %>   + <%= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(collection.set_spec)}) %> + </td> + <% end %> + <% end %> + </tr> +<% end %> +</table> +<div style="text-align:center; font-size:1.2em; margin: 1.5em; padding-top: 0.5em; border-top: #ddd dotted 2px;">Collection Pages: <%= will_paginate(@collections2, :container=>false, :params=>{:q=>params[:q]}) %></div> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/app/views/home/_tree_widget_node.rhtml 2010-01-28 19:28:17 UTC (rev 650) @@ -1,40 +1,39 @@ <% node_num = 0 %> <% tree_nodes.keys.sort.each do |key| %> <% tree_node = tree_nodes[ key ] %> - <div style='clear:both'> + <% if tree_node[ :children ] %> + <% ul_class = "widget_tree_nodes" %> + <% li_class = "widget_tree_node" %> + <% else %> + <% ul_class = "widget_leaf_nodes" %> + <% li_class = "widget_leaf_node" %> + <% end %> + <% if depth == 0 %> + <% ul_class += " root" %> + <% end %> + <%= "<ul class ='#{ul_class}'>" %> + <% child_div = "#{div_base}_#{node_num}" %> <% node_num += 1 %> - <div> - <% depth.times do %> - <div style="float:left"> - <%= image_tag( 'blank.gif' ) %> - </div> - <% end %> - <% if tree_node[ :children ] %> - <% div_id = "#{key}_" %> - <%= "<div id=\"#{child_div}_open\" style=\"float:left;display:inline;\" >" %> - <%= link_to_function( image_tag( 'plus.gif' ,:border=>0), "Element.toggle( '#{child_div}' );Element.toggle( '#{child_div}_open' );Element.toggle( '#{child_div}_closed' );" ) %> - </div> - <%= "<div id=\"#{child_div}_closed\" style=\"float:left;display:none;\" >" %> - <%= link_to_function( image_tag( 'minus.gif' ,:border=>0), "Element.toggle( '#{child_div}' );Element.toggle( '#{child_div}_closed' );Element.toggle( '#{child_div}_open' );" ) %> - </div> - <% else %> - <div style="float:left"> - <%= image_tag( 'leaf.gif' ) %> - </div> - <% end %> + + <%= "<li class ='#{li_class}'>" %> + + <% if tree_node[ :link_options ] %> <%= link_to( tree_node[ :name ], tree_node[ :link_options ] ) %> <% else %> <%= tree_node[ :name ] %> <% end %> - <%= " (#{tree_node[ :records ]} records)" %> - </div> - </div> + <%#= " (#{tree_node[ :records ]} records)" %> + <%= "<span>(#{tree_node[ :records ]})</span>" %> + </li> <% if tree_node[ :children ] %> - <%= "<div id=\"#{child_div}\" style=\"display:none;\" >" %> + <%#= "<div id=\"#{child_div}\" style=\"display:none;\" >" %> + <li class="widget_children"> <%= render :partial => "tree_widget_node", :locals => { :div_base => child_div, :tree_nodes => tree_node[ :children ], :depth => depth+1 } %> - </div> + </li> + <%#*</div>%> <% end %> + </ul> <% end %> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/home/index.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/home/index.rhtml 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/app/views/home/index.rhtml 2010-01-28 19:28:17 UTC (rev 650) @@ -1,105 +1,73 @@ -<table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td valign="top"> - <table width="672" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td><nobr> - <% # generate 4 random numbers - imgs = Array.new(4) - (0..3).each do |i| - begin - img="featured/#{rand(FEATURED_IMAGE_COUNT)+1}.jpg" - end while imgs.include?(img) - imgs[i]=img - end - imgs.each do |img| %><%= image_tag( img, :alt => "Sample Image" ) -%><% end %> - </nobr></td> - </tr> - <tr> - <td> </td> - </tr> - <tr> - <td align="center"><table width="97%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td colspan="2"><%= image_tag( "welcome.gif", :alt => "Welcome", :size => "112x15" ) %></td> - </tr> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td colspan="2"> - Aquifer American Social History Online - Find and use 19th and 20th century primary resources from unique historical digital collections. + <h1 id="main_heading">Find and use primary resources from unique historical digital collections</h1> + +<div style="float: left; max-width:70%"> + + Aquifer American History Online - Find and use 19th and 20th century primary resources from unique historical digital collections. - <ul> - <li>search diverse digital content from <%=@coll_cnt%> American Social History research <%= link_to( "collections" , {:controller=>'collection'}) %></li> - <li>find more than <%=@item_cnt%> digitized objects in <%=@fmt_cnt%> formats, including images (photographs and cultural materials), books and pamphlets, journal articles, maps, sheet music, videos, data sets, political cartoons and posters, and oral histories</li> - <li>collect, manage, and cite the digital sources you find with <a href="http://zotero.org">Zotero</a></li> - </ul> - Aquifer American Social History Online is a research project of the <a href="http://diglib.org">Digital Library Federation</a> and is focused on finding, gathering, and collecting distributed and disparate scholarly content in American Social History. - </td> - </tr> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td width="49%" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td colspan="3"><img src="images/AmericanSocialHistoryOnl-40.gif" width="143" height="18" alt=""></td> - </tr> - <tr> - <td colspan="3"> </td> - </tr> - - <tr> - <td valign='top' style="padding:1ex"> - <img src="<%=@featured_coll.img_src%>" > - </td> - <td valign="top"> - <b><%= link_to( @featured_coll.label, { :controller => :collection, :action => :show, :id => @featured_coll.collection_id } ) %></b><br/> - <%=@featured_coll.tag_line%> - </td> - </tr> - </table></td> - <td width="51%" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td colspan="3"><img src="images/AmericanSocialHistoryOnl-42.gif" width="90" height="18" alt=""></td> - </tr> - <tr> - <td colspan="3"> </td> - </tr> - <%= render(:partial => 'whats_new') %> - </table></td> - </tr> - </table></td> - </tr> - </table> - </td> - <td> </td> - <td valign="top"> - <!-- <div style="padding:1em;border: 1px solid black;width:250px;overflow: hidden; "> --> - <div style='height:44em;overflow:hidden'> - <span>Browsing Shortcuts</span> - <div style="overflow: hidden;"> + + + <%= link_to("Browse all #@coll_cnt collections" , {:controller=>'collection'}) %> + + + + <%#=@featured_colls.each {|fc| print }%> + + + <table id="collectionlist"> +<% @featured_colls.in_groups_of(3) do |slice| %> + <tr> + <% slice.each do |collection| %> + <% if collection %> + <td align='center' valign='top'> + <div class="collection"> + <% if collection.get_image_url != "" %> + <%= link_to(image_tag(collection.get_image_url,:border=>'0'),collection.primary_display_location) %><br/> + <% else %> + <%= link_to("Image Unavailable",collection.primary_display_location, :class => "noimage") %><br/> + <% end %> + <% collection.mods.titleInfo({'@type'=>nil}).each do |t|%> + <b><%=t%></b><br/> + <% end %> + <% (collection.mods.originInfo.select {|orig| orig.publisher?}).each do |orig| %> + <%=orig.publisher[0].to_s.gsub(/\[\]/,'')%><br/> + <% end %> + <br/> + + <%= link_to('Go to Collection',collection.primary_display_location) %> <%=image_tag("externallinks.gif")%>   + <%= link_to('Browse Records',{:controller => 'search', :action=>'',:new_search=>1,:facet_tag => 'set_spec_facet', :facet_browse => collection.set_spec}) %> (<%= commify(collection.count_set_spec) %>)   + <%= link_to('View Details',{:action=>'show',:id=>collection.id}) %>   + <%= link_to('View Headings',{:controller=>'heading',:action=>'list',:id=>SetSpec.set_spec_to_id(collection.set_spec)}) %> + </div> + </td> + <% end %> + <% end %> + </tr> +<% end %> +</table> +Aquifer American History Online is a research project of the <a href="http://diglib.org">Digital Library Federation</a> and is focused on finding, gathering, and collecting distributed and disparate scholarly content in American Social History. + + + + + +</div> + <div id="aux_content"> + <span style="float:right">Browsing Shortcuts</span> + <div style="float:right"> <%= render :partial => "front_widget", :locals => { :div_base => "place_tree", :tree_nodes => @place_tree, :depth=>0 } %> </div> + + + <div id='tag_cloud' > +<% for heading in @headings.sort {|a,b| a.original_text <=> b.original_text } %> + <%= link_to( heading.original_text, + { :controller => :search, :q => "#{heading.original_text}" }, + { :style => "#{font_size_for_tag_cloud( heading.grand_total, + @headings.last.grand_total, + @headings.first.grand_total, { :max_font_size => 40, :min_font_size => 14 } )}" } ) %> + +<% end %> +</div> </div> - <!-- - <div style="padding:1em;border: 1px solid black;width:250px;overflow: hidden; "> - <div class="submenu" style="padding:1em;border: 1px solid black">Blogs About Aquifer</div><br/> - <div style="padding:1em;border: 1px solid black;width:250px;overflow: hidden;"> - <script language="JavaScript" -src="http://www.personalbee.com/bee_service.php?method=embed&template=widget/readerRecent&grpno=1967&numart=10&widget=norate&view=open&showImage=top&userStyle=yes&title=Our+Blogs <http://www.personalbee.combee_service.php?method=embed&template=widget/readerRecent&grpno=1967&numart=10&widget=norate&view=open&showImage=top&userStyle=yes&title=" -type="text/javascript"> -</script> - </div> - </div> - --> - </td> - </tr> - <tr> - <td> </td> - <td> </td> - <td align="right"> </td> - </tr> -</table> \ No newline at end of file + Modified: ruby/trunk/aquifer/app/views/layouts/home.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/layouts/home.rhtml 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/app/views/layouts/home.rhtml 2010-01-28 19:28:17 UTC (rev 650) @@ -26,7 +26,7 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td width="41%"> - <%= link_to( image_tag( "AmericanSocialHistoryOnline.jpg", :size=> "344x41", :border => 0, :alt => "Home" ), { :controller => :home, :action => "index" } ) %> + <%= link_to( image_tag( "aho_logo_scaled.png", :size=> "423x120", :border => 0, :alt => "Home" ), { :controller => :home, :action => "index" } ) %> </td> <td width="59%" rowspan="2"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> Modified: ruby/trunk/aquifer/app/views/layouts/search.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/layouts/search.rhtml 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/app/views/layouts/search.rhtml 2010-01-28 19:28:17 UTC (rev 650) @@ -1,159 +1,154 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" -"http://www.w3.org/TR/html4/strict.dtd"> + "http://www.w3.org/TR/html4/strict.dtd"> <html> - <head> - <title><%= truncate(@page_title,45,"...") || "American Social History" %></title> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <% if @page_description %> - <meta name="description" content="<%=h(@page_description)%>" > - <% else %> - <meta name="description" content="Aquifer American Social History Online is a research project of the Digital Library - Federation and is focused on finding, gathering, and collecting distributed and disparate scholarly content in - American Social History. American Social History Online allows researchers to find and use 19th and 20th century - primary resources from unique historical digital collections in 9 formats, including images (photographs and - cultural materials), books and pamphlets, journal articles, maps, sheet music, videos, data sets, political - cartoons and posters, and oral histories."> - <% end %> - <% if @page_keywords %> - <meta name="keywords" content="<%=h(@page_keywords)%>" > - <% else %> - <meta name="keywords" content="Aquifer, dlfaquifer.com, Social History, Digital Library Federation, United States, - U.S., American, history, historical, full text, digital, images, imprints, newspapers, government, publications, - documents, broadsides, ephemera, pamphlets, 20th century, 19th century, college, university, library, sheet music, - political cartoons, posters, video, oral histories, maps, cultural materials, data sets, negatives, civil - war photographs, african american photographs, great depression, world war II, abraham lincoln, - charles cushman photographs, edison motion pictures, Edward S. Curtis collection, Frances Benjamin Johnston Collection, - the Emancipator, Lawrence & Houseworth Collection, Making of America, George Grantham Bain Collection, - John C. H. Grabill Collection, National Child Labor Committee Collection, Panoramic Photographs, - National Photo Company Collection, Sam DeVincent Collection, Stereograph Cards, Starr Sheet Music Collection, - Southern Spaces, Photographs by Theodor Horydczak, Transportation History Collection: Railroad, Wright Brothers - Negatives, Public Papers of the Presidents of the United States."> - <% end %> - <%= stylesheet_link_tag "aquifer", :media => "all" %> - <%= stylesheet_link_tag "asho", :media => "all" %> - <%= stylesheet_link_tag "SpryAccordion", :media => "all" %> - - <link rel="shortcut icon" href="/images/favicon.ico" type="image/jpg"> - <link rel="icon" href="/images/favicon.png" type="image/jpg"> - <link rel="unapi-server" type="application/xml" title="unAPI" href="<%=url_for :controller => 'unapi', :only_path=>false %>" /> - <meta name='ZoteroItemType' content='mods'/> - <%= javascript_include_tag "prototype" %> - <%= javascript_include_tag "effects" %> - <%= javascript_include_tag "dragdrop" %> - <%= javascript_include_tag "controls" %> - <%= javascript_include_tag "application" %> - <%= javascript_include_tag "SpryAccordion" %> - <% if @rendering_map %> - <% # the API constant is currently in environments/*.rb, should be in a table %> - <script src="http://maps.google.com/maps?file=api&v=2&key=<%= GOOGLE_MAPS_API_KEY %>" type="text/javascript"></script> - <% end %> - <!--% end %--> - </head> -<% if @rendering_map %> - <body onunload="GUnload()"> -<% else %> - <body> -<% end %> + <head> + <title><%= truncate(@page_title,45,"...") || "American Social History" %></title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <% if @page_description %> + <meta name="description" content="<%=h(@page_description)%>" > + <% else %> + <meta name="description" content="Aquifer American Social History Online is a research project of the Digital Library + Federation and is focused on finding, gathering, and collecting distributed and disparate scholarly content in + American Social History. American Social History Online allows researchers to find and use 19th and 20th century + primary resources from unique historical digital collections in 9 formats, including images (photographs and + cultural materials), books and pamphlets, journal articles, maps, sheet music, videos, data sets, political + cartoons and posters, and oral histories."> + <% end %> + <% if @page_keywords %> + <meta name="keywords" content="<%=h(@page_keywords)%>" > + <% else %> + <meta name="keywords" content="Aquifer, dlfaquifer.com, Social History, Digital Library Federation, United States, + U.S., American, history, historical, full text, digital, images, imprints, newspapers, government, publications, + documents, broadsides, ephemera, pamphlets, 20th century, 19th century, college, university, library, sheet music, + political cartoons, posters, video, oral histories, maps, cultural materials, data sets, negatives, civil + war photographs, african american photographs, great depression, world war II, abraham lincoln, + charles cushman photographs, edison motion pictures, Edward S. Curtis collection, Frances Benjamin Johnston Collection, + the Emancipator, Lawrence & Houseworth Collection, Making of America, George Grantham Bain Collection, + John C. H. Grabill Collection, National Child Labor Committee Collection, Panoramic Photographs, + National Photo Company Collection, Sam DeVincent Collection, Stereograph Cards, Starr Sheet Music Collection, + Southern Spaces, Photographs by Theodor Horydczak, Transportation History Collection: Railroad, Wright Brothers + Negatives, Public Papers of the Presidents of the United States."> + <% end %> +<%#= stylesheet_link_tag "aquifer", :media => "all" %> +<%#= stylesheet_link_tag "asho", :media => "all" %> + <%= stylesheet_link_tag "base", :media => "all" %> + + <%= stylesheet_link_tag "SpryAccordion", :media => "all" %> + <%= stylesheet_link_tag "layout", :media => "all" %> + <%= stylesheet_link_tag "jquery-ui", :media => "all" %> + + + <link rel="shortcut icon" href="/images/favicon.ico" type="image/jpg"> + <link rel="icon" href="/images/favicon.png" type="image/jpg"> + <link rel="unapi-server" type="application/xml" title="unAPI" href="<%=url_for :controller => 'unapi', :only_path=>false %>" /> + <meta name='ZoteroItemType' content='mods'/> + <%#= javascript_include_tag "prototype" %> + <%#= javascript_include_tag "effects" %> + <%#= javascript_include_tag "dragdrop" %> + <%#= javascript_include_tag "controls" %> + <%= javascript_include_tag "jquery-min" %> + <%= javascript_include_tag "jquery-ui-min" %> + <%= javascript_include_tag "application" %> + + <script type="text/javascript"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td colspan="3"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td width="41%"> - <%= link_to( image_tag( "AmericanSocialHistoryOnline.jpg", :size=> "344x41", :border => 0, :alt => "Home" ), { :controller => :home, :action => "index" } ) %> - </td> - <td width="59%" rowspan="2"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td width="53%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td width="44%"></td> - <td width="56%" align="right" valign='middle'> - <%= render :partial => "search/very_simple_search", :controller => :search, :new_search => 1, :locals => { :params => params } %> - </td> - </tr> - </table> - </td> - <td width="5%"> </td> - <td width="42%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="submenu"> - <tr> - <td width="52%"> - <%= link_to( 'advanced search', { :controller => :search, :search_form_type => 'advanced', :new_search => 1 }, { :class => 'submenu' } ) %> - </td> - <td width="31%"> - <%= link_to( 'browse', { :controller => :heading }, { :class => 'submenu' } ) %> - </td> - <td width="17%"> - <%= link_to( 'help', { :controller => :home, :action => :help }, { :class => 'submenu' } ) %> - </td> - </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td valign="middle" width="100%" background="/images/AmericanSocialHistoryOnl-12.gif" class="submenu2"> - <div style="vertical-align:middle;padding-top:10px;"> - <div style="float:left"><img src="/images/AmericanSocialHistoryOnl-12.gif" width="10" height="28" alt=""></div> - <div style="float:left"><%= link_to( 'home', { :controller => :home, :action => :index }, { :class => 'submenu2' } ) %></div> - <div style="float:left"> |  </div> - <div style="float:left"><%= link_to( 'about', { :controller => :home, :action => :about }, { :class => 'submenu2' } ) %></div> - <div style="float:left"> |  </div> - <div style="float:left"><%= link_to( 'collections', { :controller => :collection }, { :class => 'submenu2' } ) %></div> - <div style="float:left"> |  </div> - <div style="float:left"><%= link_to( 'tools', { :controller => :home, :action => :tools }, { :class => 'submenu2' } ) %></div> - <div style="float:left"> </div> + - <div style="float:right"> - <% if User.get_current.is_registered? and not User.get_current.is_bot > 0%> - <%= "Hello #{User.get_current.display_name}" %> - |  - <%= link_to( 'Profile', { :controller => :my_profile }, { :class => "submenu2" } ) %> - | - <% if User.get_current.is_admin? %> - <%= link_to( 'Tags', { :controller => :tag_admin }, { :class => "submenu2" } ) %> - | - <% end %> - <% if User.get_current.is_super_user? %> - <%= link_to( 'Users', { :controller => :user_admin }, { :class => "submenu2" } ) %> - | - <% end %> - <%= link_to( 'Logout', { :controller => :openid_account, :action => :logout }, { :class => "submenu2" } ) %> - <% else %> - <%= link_to( 'login', { :controller => :openid_account, :action => :login }, { :class => "submenu2" } ) %> - <% end %> - - </div> - </div> - </td> - </tr> - <tr> - <td colspan="3"> - <%= image_tag( "AmericanSocialHistoryOnl-19.gif", { :size => "10x3" } ) %> - </td> - </tr> + </script> + <% if @rendering_map %> + <% # the API constant is currently in environments/*.rb, should be in a table %> + <script src="http://maps.google.com/maps?file=api&v=2&key=<%= GOOGLE_MAPS_API_KEY %>" type="text/javascript"></script> + <% end %> + <!--% end %--> + </head> + <% if @rendering_map %> + <body onunload="GUnload()"> + <% else %> + <body> + <% end %> - <tr> - <td colspan="3"> - <div id="main"> - <% if flash[:notice]%><p style="color: green"><%= flash[:notice] %><% flash[:notice] = nil %></p><% end %> - <%= @content_for_layout %> - </div> - </td> - </tr> - <tr> - <td colspan="3"> </td> - </tr> - <%= render(:partial => 'home/footer') %> - </table> - <!-- End ImageReady Slices --> - </body> + <div id="header" class="clearfix"> + <div id="header_top_container"> + <div id="header_top" class="clearfix"> + + <div id="logo" class=""> + + <%= link_to( image_tag( "aho_logo.png", :size=> "403x95", :border => 0, :alt => "Home" ), { :controller => :home, :action => "index" } ) %> + </div> + + <div id="header_controls" class="clearfix"> + + + + <div id="submenu" class=""> + + + <%= link_to( 'tools', { :controller => :home, :action => :tools }, { :class => 'submenu' } ) %> + + <%= link_to( 'help', { :controller => :home, :action => :help }, { :class => 'submenu' } ) %> + + </div> + </div> + </div> + </div> + <div id="menubar_container"> + <div id="menubar" class=""> + + <div id="searchbar" class=""> + <%= render :partial => "search/very_simple_search", :controller => :search, :new_search => 1, :locals => { :params => params } %> + <div id="searchbarmenu" class=""> + <%= link_to( 'advanced', { :controller => :search, :search_form_type => 'advanced', :new_search => 1 }, {} ) %> + </div> + </div> + + <div style="vertical-align:middle;padding-top:10px;"> + <%= link_to( 'home', { :controller => :home, :action => :index }, { :class => 'menubarlink first' } ) %> + <%= link_to( 'about', { :controller => :home, :action => :about }, { :class => 'menubarlink' } ) %> + <%= link_to( 'collections', { :controller => :collection }, { :class => 'menubarlink' } ) %> + <%= link_to( 'browse', { :controller => :heading }, { :class => 'menubarlink last' } ) %> + + + <%#*<div style="float:right">%> + <%# if User.get_current.is_registered? and not User.get_current.is_bot > 0%> + <%#= "Hello #{User.get_current.display_name}" %> + <%#* |  %> + <%#= link_to( 'Profile', { :controller => :my_profile }, { :class => "submenu2" } ) %> + <%#* | %> + <%# if User.get_current.is_admin? %> + <%#= link_to( 'Tags', { :controller => :tag_admin }, { :class => "submenu2" } ) %> + <%#* | %> + <%# end %> + <%# if User.get_current.is_super_user? %> + <%#= link_to( 'Users', { :controller => :user_admin }, { :class => "submenu2" } ) %> + <%#* | %> + <%# end %> + <%#= link_to( 'Logout', { :controller => :openid_account, :action => :logout }, { :class => "submenu2" } ) %> + <%# else %> + <%#= link_to( 'login', { :controller => :openid_account, :action => :login }, { :class => "submenu2" } ) %> + <%# end %> + <%#* %> + <%#*</div>%> + </div> + + </div> + + + </div> + <div id="header_bottom" class="clearfix"><div id="header_bottom_container" class="contain clearfix"></div></div> + </div> + <div id="container"> + + + + + <div id="main"> + <% if flash[:notice]%><p style="color: green"><%= flash[:notice] %><% flash[:notice] = nil %></p><% end %> + <%= @content_for_layout %> + </div> + + + <%= render(:partial => 'home/footer') %> + </div> + <!-- End ImageReady Slices --> + </body> </html> \ No newline at end of file Modified: ruby/trunk/aquifer/app/views/search/_very_simple_search.rhtml =================================================================== --- ruby/trunk/aquifer/app/views/search/_very_simple_search.rhtml 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/app/views/search/_very_simple_search.rhtml 2010-01-28 19:28:17 UTC (rev 650) @@ -1,8 +1,9 @@ <% @search = Search.new unless @search %> -<div id="very_simple_search_form" style="float:left;"> +<div id="very_simple_search_form"> + <div id="mag_glass"></div> <% form_tag :controller => 'search' do -%> <%= hidden_field_tag 'search_form_type', "simple" %> <%= hidden_field_tag 'new_search', "1" %> - <%= text_field_tag( 'q', @search.query, :size => 20 ) %><%= submit_tag 'GO' %> + <%= text_field_tag( 'q', @search.query, :size => 27, :id => 'searchfield' ) %><%= submit_tag 'Search', { :id => 'searchbutton'} %> <% end %> </div> \ No newline at end of file Added: ruby/trunk/aquifer/db/migrate/024_change_rawxmls_text_to_mediumtext.rb =================================================================== --- ruby/trunk/aquifer/db/migrate/024_change_rawxmls_text_to_mediumtext.rb (rev 0) +++ ruby/trunk/aquifer/db/migrate/024_change_rawxmls_text_to_mediumtext.rb 2010-01-28 19:28:17 UTC (rev 650) @@ -0,0 +1,11 @@ +class ChangeRawxmlsTextToMediumtext < ActiveRecord::Migration + def self.up + change_column(:raw_xmls, :data, :text, {:limit => 2.megabytes, :null => false}) + change_column(:raw_xmls, :json, :text, {:limit => 2.megabytes, :null => true}) + end + + def self.down + change_column(:raw_xmls, :data, :text, :null => false) + change_column(:raw_xmls, :json, :text, :null => true) + end +end Added: ruby/trunk/aquifer/public/images/aho_logo.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/aho_logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/aho_logo2.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/aho_logo2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/aho_logo_scaled.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/aho_logo_scaled.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/highlight.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/highlight.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/menubg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/menubg.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/search.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/search.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/searchbg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/searchbg.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/searchbuttonbg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/searchbuttonbg.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/searchbuttonbg_hover.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/searchbuttonbg_hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/searchfieldbg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/searchfieldbg.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/topcontentbg.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/topcontentbg.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-bg_flat_0_aaaaaa_40x100.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-bg_flat_75_ffffff_40x100.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-bg_flat_75_ffffff_40x100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-bg_glass_55_F9F2E4_1x400.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-bg_glass_55_F9F2E4_1x400.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-bg_glass_65_92B6DA_1x400.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-bg_glass_65_92B6DA_1x400.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-bg_glass_75_B2D0ED_1x400.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-bg_glass_75_B2D0ED_1x400.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_153f69_1x100.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_153f69_1x100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_441615_1x100.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-bg_highlight-soft_20_441615_1x100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-bg_inset-soft_95_fef1ec_1x100.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-icons_222222_256x240.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-icons_2e83ff_256x240.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-icons_2e83ff_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-icons_5e7c98_256x240.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-icons_5e7c98_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-icons_cccccc_256x240.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-icons_cccccc_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: ruby/trunk/aquifer/public/images/ui-icons_cd0a0a_256x240.png =================================================================== (Binary files differ) Property changes on: ruby/trunk/aquifer/public/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: ruby/trunk/aquifer/public/javascripts/application.js =================================================================== --- ruby/trunk/aquifer/public/javascripts/application.js 2009-11-10 20:22:37 UTC (rev 649) +++ ruby/trunk/aquifer/public/javascripts/application.js 2010-01-28 19:28:17 UTC (rev 650) @@ -1,2 +1,17 @@ // Place your application-specific JavaScript functions and classes here // This file is automatically included by javascript_include_tag :defaults +$(function() { + $("#accordion").accordion(); + $('.widget_tree_node').toggle( + function (e){ + $(e.target).next().show(); + $(e.target).addClass('expanded'); + return false; + }, + function (e){ + $(e.target).removeClass('expanded'); + $(e.target).next().hide(); + return false; + } + ); +}); \ No newline at end of file Added: ruby/trunk/aquifer/public/javascripts/jquery-min.js =================================================================== --- ruby/trunk/aquifer/public/javascripts/jquery-min.js (rev 0) +++ ruby/trunk/aquifer/public/javascripts/jquery-min.js 2010-01-28 19:28:17 UTC (rev 650) @@ -0,0 +1,19 @@ +/* + * jQuery JavaScript Library v1.3.2 + * http://jquery.com/ + * + * Copyright (c) 2009 John Resig + * Dual licensed under the MIT and GPL licenses. + * http://docs.jquery.com/License + * + * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) + * Revision: 6246 + */ +(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&... [truncated message content] |
From: <th...@us...> - 2009-11-10 20:22:53
|
Revision: 649 http://dlf-aquifer.svn.sourceforge.net/dlf-aquifer/?rev=649&view=rev Author: thabing Date: 2009-11-10 20:22:37 +0000 (Tue, 10 Nov 2009) Log Message: ----------- fix typo in desc Modified Paths: -------------- ruby/trunk/aquifer/config/deploy.rb Modified: ruby/trunk/aquifer/config/deploy.rb =================================================================== --- ruby/trunk/aquifer/config/deploy.rb 2009-11-10 19:59:09 UTC (rev 648) +++ ruby/trunk/aquifer/config/deploy.rb 2009-11-10 20:22:37 UTC (rev 649) @@ -32,7 +32,7 @@ namespace :deploy do - desc "Restarting Phusion Passenger (mod_rails) with restart,txt" + desc "Restarting Phusion Passenger (mod_rails) with restart.txt" task :restart, :roles => :app do run "touch #{current_path}/tmp/restart.txt" end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |