diff --git a/example.deploy.properties b/example.deploy.properties deleted file mode 100644 index dff5f5cf..00000000 --- a/example.deploy.properties +++ /dev/null @@ -1,147 +0,0 @@ -# ----------------------------------------------------------------------------- -# -# VIVO deployment properties -# -# This file is provided as example.deploy.properties. -# -# Save a copy of this file as deploy.properties, and edit the properties as -# needed for your deployment. -# -# ----------------------------------------------------------------------------- - -# -# This namespace will be used when generating URIs for objects created in the -# editor. Change it to reflect your own domain. For example, Cornell's -# namespace is http://vivo.cornell.edu/individual/ -# -# Note: it is essential that this namespace end with a trailing slash. -# -Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/ - -# -# Where is the Vitro core directory? -# In most deployments, this is set to ./vitro-core (It is not uncommon for this -# setting to point elsewhere in development environments). -# Examples: -# vitro.core.dir = ./vitro-core -# vitro.core.dir = ../vitro -# vitro.core.dir = /usr/local/vitro/trunk -vitro.core.dir = ./vitro-core - -# -# The base install directory for your Tomcat server. The VIVO application -# will be deployed in the /webapps directory below this base. -# -tomcat.home = /usr/local/tomcat - -# -# The name of the VIVO application. This will be used as the name of the -# subdirectory within your Tomcat server's /webapps directory. It also appears -# in the URL for the application. For example, http://my.vivo.server/vivo -# -webapp.name = vivo - -# -# URL of Solr context used in local VIVO search. Should consist of -# scheme + servername + port + contextpath + "solr" -# -vitro.local.solr.url = http://localhost:8080/vivosolr - -# -# The location where the VIVO application will store the data that it creates. -# This includes uploaded files (usually images) and the Lucene search index. -# -vitro.home.directory = /usr/local/vivo/data - -# -# Email parameters which VIVO can use to send mail. If these are left empty, -# the "Contact Us" form will be disabled and users will not be notified of -# changes to their accounts. -# -email.smtpHost = smtp.my.domain.edu -email.replyTo = vivoAdmin@my.domain.edu - -# -# The basic parameters for a database connection. Change the end of the -# URL to reflect your database name (if it is not "vitrodb"). Change the username -# and password to match the authorized database user you created. -# -VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb -VitroConnection.DataSource.username = vitrodbUsername -VitroConnection.DataSource.password = vitrodbPassword - -# -# The maximum number of active connections in the database connection pool. -# Increase this value to support a greater number of concurrent page requests. -# -VitroConnection.DataSource.pool.maxActive = 40 - -# -# The maximum number of database connections that will be allowed -# to remain idle in the connection pool. Default is 25% -# of the maximum number of active connections. -# -VitroConnection.DataSource.pool.maxIdle = 10 - -# -# Parameters to change in order to use VIVO with a database other than -# MySQL. -# -VitroConnection.DataSource.dbtype = MySQL -VitroConnection.DataSource.driver = com.mysql.jdbc.Driver -VitroConnection.DataSource.validationQuery = SELECT 1 - -# -# The email address of the root user for the VIVO application. The password -# for this user is initially set to "rootPassword", but you will be asked to -# change the password the first time you log in. -# -rootUser.emailAddress = root@myDomain.com - -# -# How is a logged-in user associated with a particular Individual? One way is -# for the Individual to have a property whose value is the username of the user. -# This value should be the URI for that property. -# -selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId - -# -# If an external authentication system like Shibboleth or CUWebAuth is to be -# used, these properties say how the login button should be labeled, and which -# HTTP header will contain the user ID from the authentication system. If such -# a system is not to be used, leave these commented out. Consult the -# installation instructions for more details. -# -#externalAuth.buttonText = Log in using BearCat Shibboleth -#externalAuth.netIdHeaderName = remote_userID - -# -# The temporal graph visualization can require extensive machine resources. -# This can have a particularly noticable impact on memory usage if -# - VIVO is configured to use Jena SDB, -# - The organization tree is deep, -# - The number of grants and publications is large. -# VIVO release 1.2 guards against this impact by disabling the temporal graph -# visualization unless the "visualization.temporal" flag is set to "enabled". -# -# visualization.temporal = enabled - -# -# The temporal graph visualization is used to compare different organizations/people -# within an organization on parameters like number of publications or grants. -# By default, the app will attempt to make its best guess at the top level -# organization in your instance. If you're unhappy with this selection, uncomment out -# the property below and set it to the URI of the organization individual you want to -# identify as the top level organization. It will be used as the default whenever the -# temporal graph visualization is rendered without being passed an explicit org. -# For example, to use "Ponce School of Medicine" as the top organization: -# visualization.topLevelOrg = http://vivo.psm.edu/individual/n2862 -# -# visualization.topLevelOrg = http://vivo.mydomain.edu/individual/topLevelOrgURI - -# -# Default type(s) for Google Refine Reconciliation Service -# The format for this property is id, name; id1, name1; id2, name2 etc. -# See Service Metadata from this page http://code.google.com/p/google-refine/wiki/ReconciliationServiceApi -# for more information. -Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Course, Course; http://vivoweb.org/ontology/core#Grant, Grant; http://aims.fao.org/aos/geopolitical.owl, Location; http://xmlns.com/foaf/0.1/Organization, Organization; http://xmlns.com/foaf/0.1/Person, Person; http://purl.org/ontology/bibo/Article, Publication diff --git a/productMods/WEB-INF/filegraph/tbox/scires-1.3.owl b/productMods/WEB-INF/filegraph/tbox/scires-1.3.owl index 0071feab..8eccfa0f 100644 --- a/productMods/WEB-INF/filegraph/tbox/scires-1.3.owl +++ b/productMods/WEB-INF/filegraph/tbox/scires-1.3.owl @@ -112,11 +112,6 @@ NOTE that we are not addressing for now the issue of whether a foaf:Person is a An organism is a material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. - - - - - @@ -142,6 +137,11 @@ NOTE that we are not addressing for now the issue of whether a foaf:Person is a An implement used to facilitate work, especially precision work. + + + + + diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.3.owl b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.3.owl index 7d05f011..5c56328a 100644 --- a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.3.owl +++ b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.3.owl @@ -27,8 +27,13 @@ - 1 - + + + + + + + http://purl.org/ontology/bibo/ @@ -39,16 +44,6 @@ Notes or annotations about a resource stable - - - 1 - - - - - 1 - - @@ -70,6 +65,16 @@ + + + + + + + + + + For individual seminars, use seminar instead. core:ConferenceSeries and core:SeminarSeries are very similar. @@ -77,14 +82,14 @@ An organized series of a meeting for an exchange of ideas, typically put on by a department or center. + + + + + - - - - - unstable @@ -108,17 +113,12 @@ + UN Cartographic Section UN Cartographic Section - - - - - - - - + + @@ -126,35 +126,55 @@ + + + + + + + + + + - - - - - + + + + + + + + + + Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - + + A position classified as professional, staff, support, or any other non-academic role - + + + 1 + + @@ -169,10 +189,10 @@ Serial Item and Contribution Identifier - + - - + + @@ -190,10 +210,15 @@ A government agency is a permanent or semi-permanent organization in the machinery of government that is responsible for the oversight and administration of specific functions. - + - - + + + + + + 1 + @@ -236,36 +261,44 @@ Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. + + + + + Official or legal permission to do something Licenses are usually issued in order to regulate some activity that is deemed to be dangerous or a threat to the person or the public or which involves a high level of specialized skill. See also core:Licensure. - - - - - Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. Also note that this is the administering organization for the grant at the awardee side. - - - - - The most general classification of a person - - + + The most general classification of a person + + + + + + + + + + + 1 + + http://purl.org/ontology/bibo/ @@ -274,41 +307,41 @@ Starting page number within a continuous page range. stable - + - - - - - - 1 - + + + + + + + + + + 1 + + - - - 1 - - - - - - - - + - + + + + + + @@ -318,10 +351,25 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + + + + + + + + + + + 1 - + + + + + + @@ -332,11 +380,6 @@ Works prepared by hand including handwritten or typescript drafts of pre-publication papers or works not otherwise reproduced in multiple copies http://purl.org/ontology/bibo/ - - - - - @@ -347,10 +390,10 @@ - + - - + + @@ -366,13 +409,12 @@ Short definition was partially taken from http://en.wikipedia.org/wiki/Subnational_entity. + + + + + - - - - - - @@ -382,12 +424,14 @@ - + + + @@ -396,38 +440,37 @@ - - - + - + + + + + + + - + - - + 1 + - + - - + + - + - - - - - - - + + @@ -446,10 +489,20 @@ - + - - + + + + + + + + + + + + http://www.fao.org/termportal/contr/es/ @@ -464,6 +517,11 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology + + + 1 + + 2010-06-24 @@ -477,6 +535,11 @@ http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/ar/ + + + + + @@ -491,36 +554,26 @@ - - - 1 - - - - - - - - - - - - A retired faculty member who has retained their rank, title and privileges. - + - - + + Audiovisual recording in video format + + + + + Short Definition from the bibo ontology @@ -530,10 +583,10 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - + - - + + @@ -541,9 +594,14 @@ + + + 1 + + - + In VIVO, a collection point for metadata regarding a digital file that has been uploaded and stored in the VIVO system. Includes metadata such as the filename, mime type, link to a thumbnail image (for image files), etc. A File instance refers to its FileByteStream through the "downloadLocation" property. A digital file on a computer file system @@ -552,6 +610,11 @@ An explicit individual period considered by an academic institution to be its primary academic cycle. + + + 1 + + @@ -568,23 +631,13 @@ http://www.fao.org/termportal/contr/es/ - - - - - - - - - - - + - - + + @@ -596,6 +649,21 @@ UN Statistics Division + + + 1 + + + + + + + + + + + + http://faostat.fao.org http://faostat.fao.org @@ -606,32 +674,42 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - + - - + + A role of attending an Event or EventSeries + + + + + Currently being used by a restriction on organization. - + - - + 1 + A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. + + + + + @@ -645,16 +723,6 @@ - - - - - - - - - - http://www.fao.org/termportal/en/ http://www.fao.org/termportal/en/ @@ -674,12 +742,17 @@ - Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. + Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. Currently any abstract name is given to members of this class. This could change in the future. + + + + + A seminar, discussion group, or the like, that emphasizes zxchange of ideas and the demonstration and application of techniques, skills, etc. stable @@ -688,10 +761,25 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + - - + + + + + + + + + + + 1 + + + + + 1 + @@ -710,18 +798,13 @@ This class allows for linking an author to a publication while indicating inform stable - - - - - Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement - - + + @@ -730,15 +813,29 @@ This class allows for linking an author to a publication while indicating inform + - - + A group of related documents issued at regular intervals. http://purl.org/ontology/bibo/ stable - - + + + + + + + + + + + + + + + + @@ -768,6 +865,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + A large contiguous landmass that is at least partially surrounded by water, together with any islands on its continental shelf. @@ -775,6 +877,11 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. + + + + + @@ -793,28 +900,23 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ 2010-06-24 - - - - - - - - - - This is done through a restriction on the foaf:Person class. + + + + + @@ -829,23 +931,43 @@ This class allows for linking an author to a publication while indicating inform - - - This is done through a restriction on the foaf:Person class. - - - see also core:Certificate An issued certificate + + + This is done through a restriction on the foaf:Person class. + + + + + + + + + + + + + + + + 1 + + A role of observing or treating patients + + + + + This is done through a restriction on academic degree to allow the values from to be foaf:organization to be used as the range. @@ -910,6 +1032,10 @@ Contents Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + + FAO terminology @@ -923,27 +1049,18 @@ Contents http://www.fao.org/termportal/contr/en/ - - - - - - - - - - A negotiated arrangement between two or more parties regarding a course of action - - - + + + + - + - - + + @@ -954,27 +1071,27 @@ Contents A legal decision that affirms a ruling. - + - - - - - - + - - - - - + + + + + + + + + + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. Distinct from the organization that runs it; e.g., a laboratory may be an organization but may be run by another organization and only consist of facilities housing equipment or services. Can be a building or place that provides a particular service or is used for a particular activity. Use the specific Building or Room whenever possible. Short definition from http://dictionary.reference.com/browse/facility. @@ -991,17 +1108,17 @@ Contents A gathering of people for a defined purpose, not necessarily public or announced + + + + + - - - - - Library of Congress Blog @@ -1009,6 +1126,11 @@ Contents Regularly updated online journal or newsletter by one or more writers, called bloggers, containing articles and commentary of interest to the blogger + + + 1 + + @@ -1042,16 +1164,16 @@ Contents http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ - + - 1 - - - - - + + + + + + @@ -1059,11 +1181,6 @@ Contents - - - - 2 - @@ -1074,10 +1191,15 @@ Contents Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - + - - + + + + + + + @@ -1089,20 +1211,25 @@ Contents That is a position held by an academic faculty member who works for administration. - - + + Associate Dean An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) server; Bruker Vector-33 FT-IR - + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - + A physical object provided for specific purpose, task or occupation. - + + + + + + @@ -1112,31 +1239,26 @@ Contents http://purl.org/ontology/bibo/ - - - - - + - http://purl.org/ontology/bibo/ A specific journal article - - + http://purl.org/ontology/bibo/ + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book + Short Definition modified from the bibo ontology. - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. stable - Director of Admissions and Placement; Associate University Librarian Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. - An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. + + Digital images (such as JPEG, PNG, GIF bitmaps, SVG diagrams etc.) @@ -1161,9 +1283,9 @@ Contents The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." + - An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials @@ -1173,34 +1295,23 @@ Contents - - - - + + + + - + - Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - + + - - - 1 - - - - - - - The International classification(s) to which the published application has been assigned. @@ -1242,6 +1353,11 @@ Contents + + + + + @@ -1253,16 +1369,6 @@ Contents A role of serving as an educator - - - 1 - - - - - 1 - - http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=fr#ancor @@ -1280,20 +1386,10 @@ Contents US Patent Data; US Job Data A named collection of data, usually containing only one type of data - - - - - - - - - - + Computer program and its related documentation; directs the operation of a computer - @@ -1329,6 +1425,11 @@ Contents + + + 1 + + http://www.fao.org/termportal/contr/es/ @@ -1359,11 +1460,6 @@ Contents - - - 1 - - http://purl.org/ontology/bibo/ @@ -1385,26 +1481,6 @@ Contents Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. Also note that this is the administering organization for the grant at the awardee side. - - - - - - - - - - - - - - - - - - - - @@ -1428,27 +1504,22 @@ Contents + + + + + stable - + A scholarly academic article, typically published in a journal. + http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography - A specific academic journal article - - - - - - - - - - @@ -1460,6 +1531,11 @@ Contents + + + + + stable @@ -1467,16 +1543,6 @@ Contents http://purl.org/ontology/bibo/ Digital Object Identifier - - - - 1 - - - - 1 - - A short description of the resource. @@ -1496,11 +1562,6 @@ Contents http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section - - - 1 - - @@ -1527,11 +1588,6 @@ Contents School of Architecture; School of Music An institution for instruction in a particular skill or field. - - - 1 - - http://www.fao.org/termportal/contr/fr/ http://www.fao.org/termportal/contr/es/ @@ -1545,11 +1601,6 @@ Contents http://www.fao.org/termportal/en/ - - - - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1563,6 +1614,16 @@ Contents http://www.fao.org/termportal/contr/es/ + + + + + + + + + + @@ -1574,11 +1635,6 @@ Contents - - - - - @@ -1590,18 +1646,13 @@ Contents Bibo has the domain of bibo:issue as the class Issue, but an example on their site uses it with Article, referring to the issue number "4" - - - - - Definition taken from: http://en.wikipedia.org/wiki/University University of Florida; Washington University in St. Louis + An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. - @@ -1615,35 +1666,25 @@ Contents It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Top level of all location classes. - - - - - - - - - - - A document created as a basis for discussion or a very early draft of a formal paper + - - - 1 - - - 1 - + + 1 + + + + + @@ -1675,11 +1716,6 @@ Contents International Standard Serial Number - - - 1 - - @@ -1700,7 +1736,6 @@ Contents - http://purl.org/ontology/bibo/ @@ -1709,6 +1744,12 @@ Contents A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics + + + + + + http://purl.org/ontology/bibo/ @@ -1719,16 +1760,6 @@ Contents Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - - - 1 - - - - - - - @@ -1752,20 +1783,25 @@ Contents + + + + + 1 - + The most general classification of an information resource + + - - - - + + @@ -1775,15 +1811,15 @@ Contents - + - - + 1 + Wiley Prize in Biomedical Sciences - + An Award or Honor An Award or Honor @@ -1800,16 +1836,6 @@ Contents - - - 1 - - - - - 1 - - @@ -1824,25 +1850,25 @@ Contents An agent that receives a communication document. - + - + + + + - - - Only use if no specific subclasses of core:EventSeries desribe the activity. Two or more events that occur at different times and are connected to each other. + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - + + - - @@ -1852,22 +1878,32 @@ Contents - - - - - + + + 1 + + + + + + + + + + + + @@ -1881,10 +1917,10 @@ Contents use one freetextKeyword assertion for each keyword or phrase. - + - - + + @@ -1892,26 +1928,31 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + - 1 - + + An attestation of qualification, competence, or authority issued to an individual by a third party with a relevant or de facto authority or assumed competence to do so. - + An attestation of qualification, competence, or authority issued to an individual by a third party with a relevant or de facto authority or assumed competence to do so. - + - + - 1 - + + + + + + + @@ -1920,6 +1961,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -1927,19 +1973,24 @@ We would like the range of core:outcome to be the union of Event and Process; an an information resource (typically a publication) supported by (typically via funding) an agreement (such as a grant) + + + + + - Represents educational training that has been received. + This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. Currently any abstract name is given to individuals of this class. This could change in the future. - + - - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue + @@ -1947,14 +1998,9 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - http://purl.org/ontology/bibo/ - + Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. A group of webpages available within a specific parent address or URL on the World Wide Web @@ -1975,12 +2021,17 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/zh/ + + + + + Work consisting of collections of previously published works + Short Definition is the Medical Subject Heading (MeSH) definition - A document that simultaneously contains other documents. http://purl.org/ontology/bibo/ stable @@ -1990,10 +2041,10 @@ We would like the range of core:outcome to be the union of Event and Process; an functions as an n-ary predicate a reified relationship - + - - + + @@ -2003,13 +2054,13 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of corporate activity organized as an administrative or functional unit. Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. - + Cardiovascular Medicine (division within medicine) - + - 1 - + + The Ornithological Newsletter @@ -2017,23 +2068,28 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn't seem to be being used. - + - - + + VIVO Outreach Team; VIVO Ontology Team - An informal organization brought together for the purposes of a project or event. + In the future we may be able to make this a defined class that would not need to be directly asserted, but the consensus seems to be that some organizations "are" clinical and some "are" research organizations and that the distinction is important enough to warrant the additional class and class assertions @@ -2056,6 +2112,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + Definition take from: http://dictionary.reference.com/browse/hospital. Shands at the University of Florida @@ -2074,7 +2135,7 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis - + Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center @@ -2092,6 +2153,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx + + + + + Indicates the precision of the value of a DateTimeValue instance. @@ -2109,14 +2175,14 @@ We would like the range of core:outcome to be the union of Event and Process; an - Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. stable - + http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation + @@ -2128,8 +2194,18 @@ We would like the range of core:outcome to be the union of Event and Process; an - - + + + + + + + + + + + + UN Statistics Division @@ -2144,19 +2220,19 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + A person's, group's or organization's role in an endeavor + Only use if no specific subclasses of core:Role describe the role. + + + Only use this broad role class if no subclasses of role describe the item being classified. + + + - - A person's, group's or organization's role in an endeavor - - Only use if no specific subclasses of core:Role describe the role. - - - Only use this broad role class if no subclasses of role describe the item being classified. - @@ -2170,6 +2246,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2178,6 +2259,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2197,7 +2283,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - + PubMed @@ -2208,8 +2294,13 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + + + + stable @@ -2220,12 +2311,12 @@ We would like the range of core:outcome to be the union of Event and Process; an A meeting for consultation or discussion. - + - + - - + + @@ -2234,43 +2325,28 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. Legal (department within a company); Use for any non-academic department - + - + - - - - - - - + 1 + An online article or commentary appearing on a blog + A specific blog posting - - - - - - - + stable Collection of information resources that have a unified identity @@ -2280,6 +2356,11 @@ We would like the range of core:outcome to be the union of Event and Process; an A collection of Documents or Collections + + + + + The status of a document with respect to its publication. submitted; accepted; in-press; published; invited; refereed. @@ -2303,28 +2384,23 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - - - - - - + - - + + - + B.A. Bachelor of Arts - This list may have multiple abbreviations for some degrees. An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. + @@ -2342,16 +2418,27 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal document proposing or enacting a law or a group of laws. - + - + + + + + + + + + + + - A role of reviewing + A role that encompasses both ongoing reviewer responsibility for a bibo:Collection, such as a Journal or Series, and also a review performed for a bibo:Document, such as a book, academic article or conference paper. + A role that encompasses both ongoing reviewer responsibility for a bibo:Collection, such as a Journal or Series, and also a review performed for a bibo:Document, such as a book, academic article or conference paper. - + Minnesota; Michigan; Indiana; New York; Quebec; Manitoba; Ontario @@ -2375,20 +2462,20 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - + + + 1 + + - + phonograph record; tape; CD; DVD; DAT An audio document; aka record. @@ -2409,11 +2496,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -2427,15 +2509,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - + - - - - - - - + + FAO terminology @@ -2450,9 +2527,9 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ 2010-06-24 - + - + @@ -2460,8 +2537,8 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Audiovisual recording in any format - + stable An audio-visual document; film, video, and so forth. @@ -2473,6 +2550,11 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of land distinguished by its political autonomy. Politically independent territories. + + + + + Use subclasses of core:Geographic Region subclasses instead of this class if possible. @@ -2494,22 +2576,32 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ + + + + + http://xmlns.com/foaf/spec/#term_lastName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." - + - - + + When the URI of an instance of this Class is dereferenced it returns the data contained in the associated File. All information about the file will be stored in a corresponding File instance, which refers to its FileByteStream through the "downloadLocation" property. Represents the stream of data that is contained within a File + + + 1 + + @@ -2543,8 +2635,8 @@ We would like the range of core:outcome to be the union of Event and Process; an - A defined class of organizations that fund Grants. + National Institute of Health (NIH) @@ -2557,34 +2649,29 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. + Elsevier; Harper & Row; Indiana University Press - - - - - - - - - - - - - - - - - - - - - + + + + + + + + 1 + + + + + + + A student organization is an organization, operated by students at a university, whose membership normally consists only of students. Dancin' Gators @@ -2597,6 +2684,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America + + + 1 + + @@ -2632,16 +2724,6 @@ We would like the range of core:outcome to be the union of Event and Process; an an information resource (typically a publication) supported by (typically via funding) an agreement (such as a grant) - - - - - - - - - - @@ -2651,16 +2733,11 @@ We would like the range of core:outcome to be the union of Event and Process; an The full URL. - Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. + http://info.slis.indiana.edu/~katy/ - - - - - - + @@ -2676,19 +2753,19 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - + - - + + + + + + + 2 @@ -2698,15 +2775,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - - - - - - - + 1 + + + + + 1 + http://www.fao.org/termportal/contr/ar/ @@ -2750,31 +2827,20 @@ We would like the range of core:outcome to be the union of Event and Process; an Institute for Fundamental Theory - - - - - - - - This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. - + This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. Only use if no specific subclasses of foaf:organization desribe the organization. - A generic class encompassing several types of organizations. - + + - + + + Ued to describe an organization related to bibliographic items such as a publishing company, etc. - - - 1 - - http://www.fao.org/termportal/contr/fr/ http://www.fao.org/termportal/contr/es/ @@ -2794,11 +2860,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -2810,10 +2871,10 @@ We would like the range of core:outcome to be the union of Event and Process; an A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term) - + - - + 1 + @@ -2823,11 +2884,6 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - - - - - @@ -2835,21 +2891,11 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented - - - - - An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. @@ -2867,39 +2913,29 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - - - + - + + Only use if no specific subclasses of event:Event are appropriate. - - - - - - + + + Something that happens at a given place and time. - + + + + + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - @@ -2909,10 +2945,10 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + - - + 1 + http://www.fao.org/termportal/en/ @@ -2933,22 +2969,12 @@ The previous short definition was: "An arbitrary classification of a space/time - - - 1 - - - - - - - @@ -2969,18 +2995,13 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - The award bestowed may be represented with the Award class. - + - - + The bestowal of an award, honor, or distinction to a person or person's at a particular time. + @@ -3003,10 +3024,10 @@ The previous short definition was: "An arbitrary classification of a space/time Draft legislation presented for discussion to a legal body. stable - + - - + 1 + @@ -3024,25 +3045,15 @@ The previous short definition was: "An arbitrary classification of a space/time Role of co-principal investigator of an Agreement (for example, a grant), who devotes a specified percentage of time and is considered key personnel. - - - 1 - - Professor, associate professor and assistant professor are common positions for academic faculty. Professor; Associate Professor; Assistant Professor Academic position in a university or institution - + + - - - - - - stable @@ -3052,20 +3063,15 @@ The previous short definition was: "An arbitrary classification of a space/time Global Trade Item Number 14 - + A dual relationship of one person being advised or mentored by another person, typically including start and end dates - + - - - - - - - + + @@ -3074,16 +3080,6 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - 1 - - @@ -3094,20 +3090,20 @@ The previous short definition was: "An arbitrary classification of a space/time - + - 1 - + + An explicit individual academic term, quarter, or semester rather than the generic fall, spring or summer semester. - + - - + + @@ -3130,16 +3126,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - 1 - - - - Used to relate a reference citation to a bibliographic resource. - - This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - http://www.fao.org/termportal/contr/en/ http://www.fao.org/termportal/contr/es/ @@ -3153,6 +3139,11 @@ modern society using the world of Star trek. Los Angeles Times, March http://www.fao.org/termportal/en/ 2010-06-24 + + Used to relate a reference citation to a bibliographic resource. + + This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + http://purl.org/ontology/bibo/ @@ -3168,20 +3159,15 @@ modern society using the world of Star trek. Los Angeles Times, March - + - - + + - + - - - - - - - + + @@ -3195,16 +3181,6 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - - - 1 - - - - - - - @@ -3215,32 +3191,32 @@ modern society using the world of Star trek. Los Angeles Times, March A document describing the exclusive right granted by a government to an inventor to manufacture, use, or sell an invention for a certain number of years - + http://purl.org/ontology/bibo/ stable - + A document describing the exclusive right granted by a government to an inventor to manufacture, use, or sell an invention for a certain number of years. Short Definition from bibo ontology - + - - + + + + + + + Written script for a film production, including dialogue and descriptions of gestures, actions, shooting directions - + - - - - - - + @@ -3279,16 +3255,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - 1 - - - - - - - We can't yet assume that we will only have a single ORCID id for a person. @@ -3304,6 +3270,16 @@ We wanted this property to be visible so that people would be aware that we inte + + + + + + + + + + Public definition source: http://dublincore.org/2008/01/14/dcterms.rdf# . Examples of a Publisher include a person, an organization, or a service. Typically, the name of a Publisher should be used to indicate the entity. @@ -3329,11 +3305,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical - - - - - @@ -3353,11 +3324,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable - - - - - @@ -3371,6 +3337,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical + + + + + @@ -3397,15 +3368,15 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ - + - - + + - + - 1 - + 1 + http://www.fao.org/termportal/contr/es/ @@ -3420,24 +3391,19 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 + + + + + A distinct, usually specialized educational unit within an educational organization. - - + + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) - - - - - - - - - - RearcherID is a Thomson Reuters project where researchers have a place to manage and share their professional information. It will allow them to solve author identity issues while simultaneously adding dynamic citation metrics and collaboration networks to your personal profile. Definition source: http://isiwebofknowledge.com/researcherid/ @@ -3445,15 +3411,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - - - - - - + + @@ -3473,6 +3434,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/A passage selected from a larger work. http://purl.org/ontology/bibo/ + + + + + @@ -3482,21 +3448,21 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. - + - - + + + + - An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - - - - + + + Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity @@ -3504,6 +3470,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Written musical composition for voice or instruments or both + + + + + + + + + + 2010-06-24 http://www.fao.org/termportal/contr/ar/ @@ -3517,6 +3493,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + 1 + + @@ -3532,10 +3513,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Information Science; Computer Science; Anthropology - + - - 1 + + This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3546,11 +3527,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - @@ -3571,10 +3547,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ - + - - + + Universal Product Code @@ -3590,10 +3566,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + + + + + + + @@ -3602,25 +3583,30 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - + - - - - - - - - - - - + 1 - + + + + + + + + + + + + + + + + 1 @@ -3636,10 +3622,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable - + - - + + @@ -3647,10 +3633,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + + @@ -3664,15 +3650,20 @@ Definition source: http://isiwebofknowledge.com/researcherid/ An academic course, normally but not always for credit - + - - + + 0.7 + + + + + http://purl.org/ontology/bibo/ New Yorker @@ -3688,21 +3679,21 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 A specification of a location. To classify US specific addresses, use core:US Postal Code. - + - - Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials + + - + - - + + http://www.fao.org/termportal/contr/zh/ @@ -3722,36 +3713,52 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Typically a student or a recent graduate undergoing supervised practical training. - + - 1 - + 1 + + + + + + + + + + + + + + + + + An ongoing editorial responsibility for a bibo:Collection, such as a Journal or Series - - A role of editing + + An ongoing editorial responsibility for a bibo:Collection, such as a Journal or Series - + - - + + - + - - + + @@ -3760,15 +3767,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - - - - - - 1 + + http://purl.org/ontology/bibo/ @@ -3778,9 +3780,14 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - + - + 1 + + + + + @@ -3790,24 +3797,24 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + - 1 - + 1 + A collection of individual agents (and may itself play the role of a Agent, ie. something that can perform actions). + A group can also be an organization but need not be; typically used for looser associations of people or organizations acting together in some fashion, not necessarily through formal agreement or on a long-term basis. Added to the VIVO ontology to be able to support informal and perhaps even private groups of people around an idea, funding opportunity, or event. see: http://xmlns.com/foaf/spec/#term_Group - - - - - - http://purl.org/ontology/bibo/ @@ -3817,14 +3824,24 @@ see: http://xmlns.com/foaf/spec/#term_Group A chapter of a book. A main division of a book + + + + + Curriculum Steering Committee; PhD Advisory Committee - + A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. + + + 1 + + Short Definition from OCLC Input Standards, EntW http://purl.org/ontology/bibo/ @@ -3847,11 +3864,6 @@ see: http://xmlns.com/foaf/spec/#term_Group http://purl.org/ontology/bibo/ a document that states some contractual relationship or grants some right - - - 1 - - @@ -3863,24 +3875,19 @@ see: http://xmlns.com/foaf/spec/#term_Group - - - - - This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - Formal address in US postal address system. - - US postal address follow the format street, apt or office number (optional), city, state, and zipcode. + + + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3895,10 +3902,10 @@ see: http://xmlns.com/foaf/spec/#term_Group - + - 1 - + + @@ -3914,13 +3921,12 @@ see: http://xmlns.com/foaf/spec/#term_Group A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. - - + + Short Definition from the bibo ontology + unstable - - A section of a book http://purl.org/ontology/bibo/ @@ -3931,22 +3937,17 @@ see: http://xmlns.com/foaf/spec/#term_Group Not intended to be an institution name. + + + + + - - - - - - - - - - A court associated with a legal document; for example, that which issues a decision. @@ -3986,13 +3987,13 @@ see: http://xmlns.com/foaf/spec/#term_Group - + 1 - + - - + + unstable @@ -4008,11 +4009,6 @@ see: http://xmlns.com/foaf/spec/#term_Group Indiana; Florida; Minnesota; Michigan; New York; Quebec; Manitoba; Ontario - - - - - FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -4032,30 +4028,25 @@ see: http://xmlns.com/foaf/spec/#term_Group - + - - + + - - - - - - + - - + 1 + @@ -4069,6 +4060,16 @@ see: http://xmlns.com/foaf/spec/#term_Group + + + + + + + + 1 + + @@ -4082,11 +4083,6 @@ see: http://xmlns.com/foaf/spec/#term_Group - - - - - A small reference book, especially one giving instructions. unstable @@ -4096,6 +4092,11 @@ see: http://xmlns.com/foaf/spec/#term_Group SDB User Manual + + + + 1 + sub-Saharan Africa, North America @@ -4104,10 +4105,10 @@ see: http://xmlns.com/foaf/spec/#term_Group Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. - + - - + + @@ -4122,10 +4123,10 @@ see: http://xmlns.com/foaf/spec/#term_Group - + - - + 1 + @@ -4133,11 +4134,6 @@ see: http://xmlns.com/foaf/spec/#term_Group B.A. A short form for an longer title or name. - - - - - @@ -4216,11 +4212,6 @@ see: http://xmlns.com/foaf/spec/#term_Group - - - - - An agent that is interviewed by another agent. stable @@ -4242,6 +4233,11 @@ see: http://xmlns.com/foaf/spec/#term_Group Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities + + + 1 + + Examples of research can be seen at: http://www.ufl.edu/research/products/index.html. Note these may have been funded, but the research doesn't have to be funded. Also, the research may be linked to an Agreement (for example, a Grant), but does not need to be. A role of conducting funded or unfunded research, sometimes linked to an Agreement. @@ -4281,14 +4277,19 @@ see: http://xmlns.com/foaf/spec/#term_Group + + + + + - - - + + - + An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - + + @@ -4338,11 +4339,6 @@ bibo has the domain of this property set to the union of Collection and Document 2010-06-24 - - - - - FAO terminology @@ -4356,10 +4352,15 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + + + + + + 1 - + @@ -4389,16 +4390,16 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - + + + + + @@ -4460,29 +4461,29 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + - - - 1 - - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate + - + Short Definition from the bibo ontology - - stable + http://purl.org/ontology/bibo/ + + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. - - @@ -4551,11 +4552,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ European Article Number/Uniform Commercier Code 13 - - - - - Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. @@ -4563,21 +4559,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi An edited book. - http://purl.org/ontology/bibo/ + Best American Science Writing 2009 + + stable An edited collection of stand-alone articles published as a book - - - - - - - 1 - Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4586,6 +4576,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity. + + + 1 + + @@ -4599,11 +4594,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. - - - 1 - - @@ -4612,51 +4602,46 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + - - - - - - + - - - - - - - - - + - - - - - - - - - - - - - @@ -4689,15 +4674,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - 1 - + + - + - 1 - + 1 + @@ -4717,18 +4702,13 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - @@ -4752,20 +4732,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - 1 - - - - - - - + 1 - + @@ -4796,15 +4766,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - Are we assuming that a PresenterRole is in a Presentation? Or could you have a PresenterRole in, say, a committee? A role of presenting information - + @@ -4813,10 +4778,17 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + + + + + + + + - - + + @@ -4829,18 +4801,13 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://xmlns.com/foaf/spec/#term_firstName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." - - - 1 - - + UITS service UITS service is the information technology services provided by Indiana University. SC. - A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) - + @@ -4848,11 +4815,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - @@ -4888,22 +4850,32 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ Short Definition from the bibo ontology + + + + + + + + 1 + + + + + 1 + + This is done with a restriction on agent. - - - - - Code of Federal Regulations @@ -4914,27 +4886,22 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. - - - - - - - - - - - + 1 - + + + + + + + Used information from this definition: http://dictionary.reference.com/browse/library. A collection of any materials, for study and enjoyment, which has been systematically arranged. - Marston Science Library @@ -4946,11 +4913,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - @@ -4964,15 +4926,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - + - - + + - + - - + + + + + + 1 + http://www.fao.org/termportal/contr/ar/ @@ -5005,45 +4972,35 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + 1 - + + + + + + - - - - - - + 1 - + - - - - - - + - - - - - - - + + @@ -5052,27 +5009,33 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. + Agents are things that do stuff - + + + see: http://xmlns.com/foaf/spec/#term_Agent - - - - - + + + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. + + + 1 + + Chicago; New York; Bloomington; Gainesville - + - - + 1 + @@ -5081,36 +5044,31 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + For data ingest from authoritative sources to record the actual way a person was listed, as potentially valuable information for provenance and person disambiguation. Represents one person's information from one source at one particular time. For data ingest from authoritative sources to record the actual way a person was listed, as potentially valuable information for provenance and person disambiguation. - - - - - - - - - - A person who has already received a bachelor's degree and is working toward a Master's or Doctoral degree. - - - - - + + + 1 + + @@ -5124,24 +5082,24 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub - - - 1 - - Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - - - - - - + 1 - + + + + + 1 + + + + + + @@ -5160,20 +5118,20 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + + 1 Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles - + - 1 - + + @@ -5191,11 +5149,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -5203,16 +5156,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - - - - - http://www.fao.org/figis/servlet/RefServlet http://www.fao.org/figis/servlet/RefServlet @@ -5225,15 +5168,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. - + A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. http://purl.org/ontology/bibo/ A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. @@ -5258,6 +5201,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/es/ FAO terminology + + + + + 2010-06-24 http://www.fao.org/termportal/en/ @@ -5271,6 +5219,21 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/fr/ + + + 1 + + + + + + + + + + + + @@ -5278,35 +5241,20 @@ We would like the range of core:outcome to be the union of Event and Process; an A series of actions, changes, or functions bringing about a result - - - - + + + + + - When placing VIVO core in the Basic Formal Ontology (BFO) hierarchy, this is a subclass of BFO process which is defined as: "A processual entity that is a maximally connected spatiotemporal whole and has bona fide beginnings and endings corresponding to real discontinuities." - - + + - - - - - - - - 1 - - - - - - - @@ -5317,10 +5265,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + + + + 1 - + @@ -5328,10 +5281,25 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + + + + + 1 + + + + + + + + + + + @@ -5339,10 +5307,10 @@ We would like the range of core:outcome to be the union of Event and Process; an A retired professor who has retained their rank, title and privileges. - + - 1 - + + @@ -5356,16 +5324,16 @@ We would like the range of core:outcome to be the union of Event and Process; an An organized series of a meeting for consultation or discussion. - - - - - A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. + + + 1 + + An excerpted collection of words @@ -5375,18 +5343,18 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - + - 1 - + 1 + - + A position involving academic work but without faculty status Researcher; Academic Extension Associate; Postdoctoral Associate - + Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. @@ -5406,11 +5374,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - The example is one outreach role required by US space agency NASA, which is related with one project in NASA. Name of the outreach role should be put here. @@ -5418,21 +5381,31 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - + - 1 - + + + + + + + stable - A loose, thematic, collection of Documents, often Books. A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - + Methods in Molecular Biology + + + + + + @@ -5440,6 +5413,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5456,11 +5434,6 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.). - - - - - @@ -5488,31 +5461,36 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - A role of organizing - + 1 - + - + - - + 1 + The showing of an object or a collection of objects, in an organized manner. + + + 1 + + + + + + + @@ -5521,13 +5499,18 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + 1 + + + Short Definition modified from the one found here: http://www.thefreedictionary.com/county. Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. - @@ -5535,11 +5518,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A document confirming certain characteristics of a person or organization, usually provided by some form of external review, education, or assessment. - - - - - Home page for Scopus: http://www.scopus.com/home.url @@ -5564,34 +5542,34 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - + + + Short Definition from the bibo ontology A distinct part of a larger document or collected document - http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. - unstable + + + 1 + + - - - + - Short Definition copied from bibo ontology - + + http://purl.org/ontology/bibo/ + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers stable @@ -5608,13 +5586,13 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A laboratory that exists primarily to conduct research vs. to provide services - + + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - - - + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. @@ -5623,21 +5601,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Postdoctoral research is academic or scholarly research conducted by a person who has completed his or her doctoral studies, normally within the following five years. It is intended to further deepen expertise in a specialist subject. - - - 1 - - - + - - + + @@ -5650,6 +5623,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik See also core:localAwardId. + + + 1 + + @@ -5665,18 +5643,17 @@ See also core:localAwardId. - - Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + Definition from bibo: A person having managerial and sometimes policy-making responsibility for the editorial part of a publishing firm or of a newspaper, magazine, or other publication. A postdoctoral training appointment (job) - + - 1 - + + @@ -5700,11 +5677,6 @@ See also core:localAwardId. - - - 1 - - @@ -5723,6 +5695,11 @@ See also core:localAwardId. + + + 1 + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/es/ @@ -5756,10 +5733,10 @@ See also core:localAwardId. - + - 1 - + + @@ -5768,11 +5745,6 @@ See also core:localAwardId. http://purl.org/ontology/bibo/ - - - - - FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/zh/ @@ -5786,6 +5758,11 @@ See also core:localAwardId. http://www.fao.org/termportal/en/ 2010-06-24 + + + 1 + + @@ -5805,10 +5782,10 @@ See also core:localAwardId. http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm - + - 1 - + + @@ -5818,11 +5795,11 @@ See also core:localAwardId. A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them - - + NLM Catalog + Short Definition is the Medical Subject Heading (MeSH) definition diff --git a/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf b/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf index f1dc8a38..55709b60 100644 --- a/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf @@ -551,15 +551,16 @@ report identifier - addEditorRoleToPerson.jsp - true - true - - 5 - editor for - - 2 + + + 5 + + true + true + use this property to record editorial management or oversight responsibilities for a collection or a series such as a journal. + addEditorRoleToPerson.jsp + collection or series editor for @@ -1091,10 +1092,10 @@ + 2 2 - 2 Editor Role @@ -1948,11 +1949,11 @@ -1 - Undergraduate Advising Relationship - 1 - 1 + 1 + 1 + Undergraduate Advising Relationship Position @@ -1983,11 +1984,11 @@ Non-Academic - Postdoc or Fellow Advising Relationship - 1 - 1 + 1 + 1 + Postdoc or Fellow Advising Relationship 5 @@ -2035,16 +2036,15 @@ true - This relates the information resource for which a person has managerial and sometimes policy-making responsibility to the person. - true - - true - editor of - 20 - - - editorOf 5 + + + 20 + editor of + true + + use this property to record editorial work performed for a document, such as a book, an academic article or a conference paper. + true @@ -3181,6 +3181,16 @@ 60 primary phone + + + 5 + true + 20 + + editor + true + + @@ -3587,12 +3597,12 @@ Relationship - email - 1 - 9 + 9 + 1 + email pvs @@ -3736,11 +3746,11 @@ Date/Time Value Precision - Graduate Advising Relationship - 1 - 1 + 1 + 1 + Graduate Advising Relationship @@ -3923,13 +3933,13 @@ has prerequisite - 2 - true - true + true - valid in + true 5 + 2 + valid in @@ -4407,8 +4417,8 @@ -1 -1 - Non-Faculty Academic Position + Non-Faculty Academic Position true @@ -4556,15 +4566,16 @@ linkShortView.jsp - 5 - true - reviewer of - - - addReviewerRoleToPerson.jsp - true - 2 + + true + addReviewerRoleToPerson.jsp + + + use this property to indicate ongoing reviewer responsibility for a bibo:Collection, such as a Journal or Series, and also to record a review performed for a bibo:Document such as a book, academic article or conference paper. + reviewer of + true + 5 @@ -4903,16 +4914,13 @@ number of pages - editor - 20 - A person having managerial and sometimes policy-making responsibility for the editorial part of a publishing firm or of a newspaper, magazine, or other publication. - true - editor - - 5 - + true - + 5 + + editor + + 20 -1 @@ -5140,11 +5148,11 @@ - Faculty Mentoring Relationship - 1 - 1 + 1 + 1 + Faculty Mentoring Relationship -1 diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index 337c9579..704944b4 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -117,11 +117,14 @@ - + edu.cornell.mannlib.vitro.webapp.servlet.setup.AttachSubmodels + + + edu.cornell.mannlib.vitro.webapp.servlet.setup.PelletReasonerSetup @@ -1077,18 +1080,6 @@ dwr-invoker /dwr/* - - - - sendmail - edu.cornell.mannlib.vitro.webapp.controller.ContactMailServlet - 5 - - - sendmail - /sendmail - - sendMail diff --git a/productMods/css/visualization/mapofscience/layout.css b/productMods/css/visualization/mapofscience/layout.css index 429f6309..732f23bd 100644 --- a/productMods/css/visualization/mapofscience/layout.css +++ b/productMods/css/visualization/mapofscience/layout.css @@ -11,7 +11,7 @@ #map-of-science-info { margin-bottom: 6px; - margin-top: -6px; + margin-top: 6px; } .hide-dom-on-init { diff --git a/productMods/edit/forms/addMemberRoleToPerson.jsp b/productMods/edit/forms/addMemberRoleToPerson.jsp index 930c892d..01ee33d3 100644 --- a/productMods/edit/forms/addMemberRoleToPerson.jsp +++ b/productMods/edit/forms/addMemberRoleToPerson.jsp @@ -5,7 +5,7 @@ - - + + \ No newline at end of file diff --git a/productMods/edit/forms/addReviewerRoleToPerson.jsp b/productMods/edit/forms/addReviewerRoleToPerson.jsp index 3e3c6275..302f9c66 100644 --- a/productMods/edit/forms/addReviewerRoleToPerson.jsp +++ b/productMods/edit/forms/addReviewerRoleToPerson.jsp @@ -6,6 +6,6 @@ - + \ No newline at end of file diff --git a/productMods/js/menupage/browseByVClassPeople.js b/productMods/js/menupage/browseByVClassPeople.js index 55032dbb..804ad6b9 100644 --- a/productMods/js/menupage/browseByVClassPeople.js +++ b/productMods/js/menupage/browseByVClassPeople.js @@ -91,8 +91,9 @@ browseByVClass.getIndividuals = function(vclassUri, alpha, page, scroll) { browseByVClass.pagination(pages, page); } - selectedClassHeading = '

'+ results.vclass.name +'

'; - browseByVClass.individualsContainer.prepend(selectedClassHeading); + // selectedClassHeading = '

'+ results.vclass.name +'

'; NIHVIVO-2483 tlw72 + // browseByVClass.individualsContainer.prepend(selectedClassHeading); + $('h4#selectedClassHeading').text(results.vclass.name); // NIHVIVO-2483 tlw72 // set selected class, alpha and page browseByVClass.selectedVClass(results.vclass.URI); diff --git a/productMods/js/visualization/mapofscience/Utils.js b/productMods/js/visualization/mapofscience/Utils.js new file mode 100644 index 00000000..90778902 --- /dev/null +++ b/productMods/js/visualization/mapofscience/Utils.js @@ -0,0 +1,49 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +$(document).ready(function(){ + + // This function creates and styles the "qTip" tooltip that displays when the user hovers over the info icons. + $('.filterInfoIcon').each(function() + { + var tipText ; + var tipLocation = "topLeft"; + if ( $(this).attr('id') == 'imageIconOne' ) { + tipText = $('#toolTipOne').html(); + } + else if ( $(this).attr('id') == 'imageIconTwo' ) { + tipText = $('#toolTipTwo').html(); + } + else { + tipText = $('#toolTipThree').html(); + tipLocation = "topRight" + }; + $(this).qtip( + { + content: { + text: tipText + }, + position: { + corner: { + target: 'center', + tooltip: tipLocation + } + }, + show: { + when: {event: 'mouseover'} + }, + hide: { + fixed: true // Make it fixed so it can be hovered over + }, + style: { + padding: '6px 6px', // Give it some extra padding + width: 500, + textAlign: 'left', + backgroundColor: '#ffffc0', + fontSize: '.7em', + padding: '6px 10px 6px 10px', + lineHeight: '14px' + } + }); + }); + +}); \ No newline at end of file diff --git a/productMods/templates/freemarker/body/harvester/testfile.ftl b/productMods/templates/freemarker/body/harvester/testfile.ftl index 89934484..d9cfa7bc 100644 --- a/productMods/templates/freemarker/body/harvester/testfile.ftl +++ b/productMods/templates/freemarker/body/harvester/testfile.ftl @@ -1,5 +1,10 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#if jobKnown == "false"> +

Error: No file harvest job was specified, or an unknown job was specified.

+

The end user should not see this error under normal circumstances, so this is probably a bug and should be reported.

+<#else> + @@ -143,12 +154,15 @@ } - +

${jobSpecificHeader}

Step 1

Download template

-

We are providing a helpful template file for you to download.

+
+ +

We are providing a helpful template file for you to download.

+
@@ -173,8 +187,9 @@

Upload file(s)

Upload your filled-in template(s).

-
+ + @@ -226,4 +241,6 @@
+ + diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl index c91cc66f..797a4d11 100644 --- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl +++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl @@ -15,21 +15,12 @@ corresponding changes in the included Templates. -->
--> -

${entityLabel}  -information icon

+

${entityLabel}

Explore publications activity across 554 scientific sub-disciplines - information icon + title="" />
@@ -55,13 +46,9 @@ For more information on this and other maps of science, see http://mapofscience.
13 Disciplines | 554 Sub-Disciplines - information icon + title="" />
@@ -74,11 +61,32 @@ Each grey dot on the map represents one of the 554 sub-disciplines. A sub-discip
mapped % of publications - information icon
+ title="" />
-
\ No newline at end of file + + + + +${headScripts.add('')} + +${scripts.add('')} diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java new file mode 100644 index 00000000..bff4bed7 --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java @@ -0,0 +1,251 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.harvester; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.skife.csv.SimpleReader; + +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; + + + +/** + * An implementation of FileHarvestJob that can be used for any CSV file harvest. + */ +class CsvFileHarvestJob implements FileHarvestJob { + + /** + * Logger. + */ + private static final Log log = LogFactory.getLog(CsvFileHarvestJob.class); + + /** + * The HTTP request. + */ + private VitroRequest vreq; + + /** + * The template file against which uploaded CSV files will be validated. + */ + private File templateFile; + + /** + * The script which will be run after needed replacements are made. + */ + private File scriptFile; + + /** + * The namespace to be used for the harvest. + */ + private final String namespace; + + /** + * A name for the type of data being imported. For example "Grant" or "Person". + */ + private final String friendlyName; + + /** + * Constructor. + * @param templateFileName just the name of the template file. The directory is assumed to be standard. + */ + public CsvFileHarvestJob(VitroRequest vreq, String templateFileName, String scriptFileName, String namespace, String friendlyName) { + this.vreq = vreq; + this.templateFile = new File(getTemplateFileDirectory() + templateFileName); + this.scriptFile = new File(getScriptFileDirectory() + scriptFileName); + log.error(getTemplateFileDirectory() + templateFileName); + this.namespace = namespace; + this.friendlyName = friendlyName; + } + + /** + * Gets the path to the directory containing the template files. + * @return the path to the directory containing the template files + */ + private String getTemplateFileDirectory() { + String harvesterPath = TestFileController.getHarvesterPath(); + String pathToTemplateFiles = harvesterPath + TestFileController.PATH_TO_TEMPLATE_FILES; + return pathToTemplateFiles; + } + + /** + * Gets the path to the directory containing the script files. + * @return the path to the directory containing the script files + */ + private String getScriptFileDirectory() { + String harvesterPath = TestFileController.getHarvesterPath(); + String pathToScriptFiles = harvesterPath + TestFileController.PATH_TO_HARVESTER_SCRIPTS; + return pathToScriptFiles; + } + + + + private boolean[] getLinesEndingInComma(File file) throws IOException { + ArrayList linesEndingInCommaList = new ArrayList(); + + BufferedReader reader = new BufferedReader(new FileReader(file)); + + for(String line = reader.readLine(); line != null; line = reader.readLine()) { + boolean lineEndsInComma = line.endsWith(","); + linesEndingInCommaList.add(lineEndsInComma); + } + reader.close(); + + boolean[] linesEndingInComma = new boolean[linesEndingInCommaList.size()]; + for(int i = 0; i < linesEndingInComma.length; i++) { + linesEndingInComma[i] = linesEndingInCommaList.get(i); + } + return linesEndingInComma; + } + + + + @Override + @SuppressWarnings("rawtypes") + public String validateUpload(File file) { + try { + SimpleReader reader = new SimpleReader(); + + List templateCsv = reader.parse(this.templateFile); + String[] templateFirstLine = (String[])templateCsv.get(0); + + //if a line ends in a comma (absolutely a comma, no whitespace), SimpleReader will not consider the part after the comma to be a blank section. + List csv = reader.parse(file); + boolean[] linesEndingInComma = getLinesEndingInComma(file); + + int length = csv.size(); + + if(length == 0) + return "No data in file"; + + for(int i = 0; i < length; i++) { + String[] line = (String[])csv.get(i); + boolean endsInComma = linesEndingInComma[i]; + if(i == 0) { + String errorMessage = validateCsvFirstLine(templateFirstLine, line); + if(errorMessage != null) + return errorMessage; + } + else if(line.length != 0) { + int actualLineLength = line.length + (endsInComma ? 1 : 0); + if(actualLineLength != templateFirstLine.length) { + return "Mismatch in number of entries in row " + i + ": expected " + templateFirstLine.length + ", found " + actualLineLength; + } + } + } + + } catch (IOException e) { + log.error(e, e); + return e.getMessage(); + } + return null; + } + + /** + * Makes sure that the first line of the CSV file is identical to the first line of the template file. This is + * assuming we are expecting all user CSV files to contain an initial header line. If this is not the case, then + * this method is unnecessary. + * @param templateFirstLine the parsed-out contents of the first line of the template file + * @param line the parsed-out contents of the first line of the input file + * @return an error message if the two lines don't match, or null if they do + */ + private String validateCsvFirstLine(String[] templateFirstLine, String[] line) { + String errorMessage = "File header does not match template"; + if(line.length != templateFirstLine.length) { + //return errorMessage + ": " + "file header columns = " + line.length + ", template columns = " + templateFirstLine.length; + String errorMsg = ""; + errorMsg += "file header items: "; + for(int i = 0; i < line.length; i++) { + errorMsg += line[i] + ", "; + } + errorMsg += "template items: "; + for(int i = 0; i < templateFirstLine.length; i++) { + errorMsg += templateFirstLine[i] + ", "; + } + return errorMsg; + } + for(int i = 0; i < line.length; i++) + { + if(!line[i].equals(templateFirstLine[i])) + return errorMessage + ": file header column " + (i + 1) + " = " + line[i] + ", template column " + (i + 1) + " = " + templateFirstLine[i]; + } + return null; + } + + @Override + public String getScript() + { + File scriptTemplate = this.scriptFile; + + String scriptTemplateContents = readScriptTemplate(scriptTemplate); + String replacements = performScriptTemplateReplacements(scriptTemplateContents); + return replacements; + } + + + private String performScriptTemplateReplacements(String scriptTemplateContents) { + String replacements = scriptTemplateContents; + + String fileDirectory = TestFileController.getUploadPath(vreq); + + replacements = replacements.replace("${UPLOADS_FOLDER}", fileDirectory); + + /* + * What needs to be replaced? + * + * task directory name + */ + //todo: complete + return replacements; + } + + + private String readScriptTemplate(File scriptTemplate) { + String scriptTemplateContents = null; + BufferedReader reader = null; + try { + int fileSize = (int)(scriptTemplate.length()); + char[] buffer = new char[fileSize]; + reader = new BufferedReader(new FileReader(scriptTemplate), fileSize); + reader.read(buffer); + scriptTemplateContents = new String(buffer); + } catch (IOException e) { + log.error(e, e); + } finally { + try { + if(reader != null) + reader.close(); + } catch(IOException e) { + log.error(e, e); + } + } + + return scriptTemplateContents; + } + + @Override + public String getAdditionsFilePath() { + + return TestFileController.getHarvesterPath() + TestFileController.PATH_TO_ADDITIONS_FILE; + } + + @Override + public String getPageHeader() { + return "Harvest " + this.friendlyName + " data from CSV file(s)"; + } + + @Override + public String getTemplateFilePath() { + return this.templateFile.getPath(); + } + +} + + diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java index 1a919097..8c7db7c7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java @@ -18,6 +18,12 @@ interface FileHarvestJob { * @return null if success, message to be returned to the user if failure */ String validateUpload(File file); + + /** + * Gets the path on the server of the file which the user can download to serve as a guide for what to upload. + * @return the path on the server of the file which the user can download to serve as a guide for what to upload. + */ + String getTemplateFilePath(); /** * Gets the console script which can be used to run the harvest job. @@ -25,16 +31,16 @@ interface FileHarvestJob { */ String getScript(); - /** - * Runs a harvest on the files in the specified directory. - * @param directory the directory containing files to harvest - */ - void performHarvest(File directory); - /** * The path to the file containing the RDF/XML triples that get added to VIVO. * @return the path to the file containing the RDF/XML triples that get added to VIVO */ String getAdditionsFilePath(); + + /** + * A heading to be shown at the top of the page. + * @return a heading to be shown at the top of the page + */ + String getPageHeader(); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java index f7b1c4f5..b0d9a8ed 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java @@ -3,18 +3,22 @@ package edu.cornell.mannlib.vitro.webapp.controller.harvester; import java.io.BufferedReader; +import java.io.DataInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Hashtable; import java.util.List; import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.DocumentBuilderFactory; @@ -48,16 +52,72 @@ public class TestFileController extends FreemarkerHttpServlet { private static final String PARAMETER_FIRST_UPLOAD = "firstUpload"; private static final String PARAMETER_UPLOADED_FILE = "uploadedFile"; - private static final String PARAMETER_IS_HARVEST_CLICK = "isHarvestClick"; + private static final String PARAMETER_MODE = "mode"; + private static final String PARAMETER_JOB = "job"; + private static final String POST_TO = "/vivo/harvester/harvest"; + + private static final String JOB_CSV_GRANT = "csvGrant"; + private static final String JOB_CSV_PERSON = "csvPerson"; + + private static final String MODE_HARVEST = "harvest"; + private static final String MODE_CHECK_STATUS = "checkStatus"; + private static final String MODE_DOWNLOAD_TEMPLATE = "template"; + + + private static final List knownJobs = Arrays.asList(JOB_CSV_GRANT.toLowerCase(), JOB_CSV_PERSON.toLowerCase()); + + + /** + * Relative path from the VIVO Uploads directory to the root location where user-uploaded files will be stored. Include + * final slash. + */ + private static final String PATH_TO_UPLOADS = "harvester/"; + + /** + * Absolute path on the server of the Harvester root directory. Include final slash. + */ + private static final String PATH_TO_HARVESTER = "/home/mbarbieri/workspace/HarvesterDev/"; + + /** + * Relative path from the Harvester root directory to the Additions file containing rdf/xml added to VIVO from Harvest run. + */ + public static final String PATH_TO_ADDITIONS_FILE = "harvested-data/csv/additions.rdf.xml"; //todo: this is job-specific + + /** + * Relative path from the Harvester root directory to the directory where user-downloadable template files are stored. + */ + public static final String PATH_TO_TEMPLATE_FILES = "files/"; + + /** + * Relative path from the Harvester root directory to the directory containing the script templates. Include final slash. + */ + public static final String PATH_TO_HARVESTER_SCRIPTS = "scripts/"; + + + + @Override protected ResponseValues processRequest(VitroRequest vreq) { try { + String job = vreq.getParameter(PARAMETER_JOB); + String jobKnown = "false"; + if((job != null) && TestFileController.knownJobs.contains(job.toLowerCase())) + jobKnown = "true"; + Map body = new HashMap(); //body.put("uploadPostback", "false"); body.put("paramFirstUpload", PARAMETER_FIRST_UPLOAD); body.put("paramUploadedFile", PARAMETER_UPLOADED_FILE); - body.put("paramIsHarvestClick", PARAMETER_IS_HARVEST_CLICK); + body.put("paramMode", PARAMETER_MODE); + body.put("paramJob", PARAMETER_JOB); + body.put("modeHarvest", MODE_HARVEST); + body.put("modeCheckStatus", MODE_CHECK_STATUS); + body.put("modeDownloadTemplate", MODE_DOWNLOAD_TEMPLATE); + body.put("job", job); + body.put("jobKnown", jobKnown); + body.put("postTo", POST_TO + "?" + PARAMETER_JOB + "=" + job); + body.put("jobSpecificHeader", getJob(vreq, job).getPageHeader()); return new TemplateResponseValues(TEMPLATE_DEFAULT, body); } catch (Throwable e) { log.error(e, e); @@ -76,8 +136,7 @@ public class TestFileController extends FreemarkerHttpServlet { */ public static String getHarvesterPath() { - //String harvesterPath = "/usr/share/vivo/harvester/"; //todo: hack - String harvesterPath = "/home/mbarbieri/workspace/HarvesterDevTomcat2/"; + String harvesterPath = PATH_TO_HARVESTER; return harvesterPath; } @@ -94,7 +153,7 @@ public class TestFileController extends FreemarkerHttpServlet { throw new Exception("Vitro home directory name could not be found."); } - String pathBase = vitroHomeDirectoryName + "/" + FileStorageSetup.FILE_STORAGE_SUBDIRECTORY + "/harvester/"; + String pathBase = vitroHomeDirectoryName + "/" + FileStorageSetup.FILE_STORAGE_SUBDIRECTORY + "/" + PATH_TO_UPLOADS; return pathBase; } @@ -102,14 +161,27 @@ public class TestFileController extends FreemarkerHttpServlet { * Gets the FileHarvestJob implementation that is needed to handle the specified request. This * will depend on the type of harvest being performed (CSV, RefWorks, etc.) * @param vreq the request from the browser + * @param jobParameter the POST or GET parameter "job". Might not be available in vreq at this point, + * thus we are requiring that it be sent in. * @return the FileHarvestJob that will provide harvest-type-specific services for this request */ - private FileHarvestJob getJob(VitroRequest vreq) + private FileHarvestJob getJob(VitroRequest vreq, String jobParameter) { String namespace = vreq.getWebappDaoFactory().getDefaultNamespace(); - + + FileHarvestJob job = null; + //todo: complete - return new CsvHarvestJob(vreq, "granttemplate.csv", namespace); + if(jobParameter == null) + log.error("No job specified."); + else if(jobParameter.equalsIgnoreCase(JOB_CSV_GRANT)) + job = new CsvFileHarvestJob(vreq, "granttemplate.csv", "testCSVtoRDFgrant.sh", namespace, "Grant"); + else if(jobParameter.equalsIgnoreCase(JOB_CSV_PERSON)) + job = new CsvFileHarvestJob(vreq, "persontemplate.csv", "testCSVtoRDFperson.sh", namespace, "Person"); + else + log.error("Invalid job: " + jobParameter); + + return job; } /** @@ -137,12 +209,17 @@ public class TestFileController extends FreemarkerHttpServlet { try { boolean isMultipart = ServletFileUpload.isMultipartContent(request); + String mode = request.getParameter(PARAMETER_MODE); if(isMultipart) doFileUploadPost(request, response); - else if(request.getParameter(PARAMETER_IS_HARVEST_CLICK).toLowerCase().equals("true")) + else if(mode.equals(MODE_HARVEST)) doHarvestPost(request, response); - else + else if(mode.equals(MODE_CHECK_STATUS)) doCheckHarvestStatusPost(request, response); + else if(mode.equals(MODE_DOWNLOAD_TEMPLATE)) + doDownloadTemplatePost(request, response); + else + throw new Exception("Unrecognized post mode: " + mode); } catch(Exception e) { log.error(e, e); } @@ -172,6 +249,9 @@ public class TestFileController extends FreemarkerHttpServlet { Exception e = req.getFileUploadException(); new ExceptionVisibleToUser(e); } + + //get the job parameter + String jobParameter = req.getParameter(PARAMETER_JOB); //get the location where we want to save the files (it will end in a slash), then create a File object out of it String path = getUploadPath(vreq); @@ -197,7 +277,7 @@ public class TestFileController extends FreemarkerHttpServlet { directory.mkdirs(); //get the file harvest job for this request (this will determine what type of harvest is run) - FileHarvestJob job = getJob(vreq); + FileHarvestJob job = getJob(vreq, jobParameter); //get the files out of the parsed request (there should only be one) Map> fileStreams = req.getFiles(); @@ -285,7 +365,7 @@ public class TestFileController extends FreemarkerHttpServlet { log.error("harvest post."); try { VitroRequest vreq = new VitroRequest(request); - FileHarvestJob job = getJob(vreq); + FileHarvestJob job = getJob(vreq, vreq.getParameter(PARAMETER_JOB)); //String path = getUploadPath(vreq); @@ -366,6 +446,32 @@ public class TestFileController extends FreemarkerHttpServlet { } } + private void doDownloadTemplatePost(HttpServletRequest request, HttpServletResponse response) { + + VitroRequest vreq = new VitroRequest(request); + FileHarvestJob job = getJob(vreq, vreq.getParameter(PARAMETER_JOB)); + File fileToSend = new File(job.getTemplateFilePath()); + + response.setContentType("application/octet-stream"); + response.setContentLength((int)(fileToSend.length())); + response.setHeader("Content-Disposition", "attachment; filename=\"" + fileToSend.getName() + "\""); + + try { + byte[] byteBuffer = new byte[(int)(fileToSend.length())]; + DataInputStream inStream = new DataInputStream(new FileInputStream(fileToSend)); + + ServletOutputStream outputStream = response.getOutputStream(); + for(int length = inStream.read(byteBuffer); length != -1; length = inStream.read(byteBuffer)) { + outputStream.write(byteBuffer, 0, length); + } + + inStream.close(); + outputStream.flush(); + outputStream.close(); + } catch(IOException e) { + log.error(e, e); + } + } private File createScriptFile(String script) throws IOException { @@ -590,198 +696,3 @@ public class TestFileController extends FreemarkerHttpServlet { } - - - - - - -/** - * An implementation of FileHarvestJob that can be used for any CSV file harvest. - */ -class CsvHarvestJob implements FileHarvestJob { - - /** - * Logger. - */ - private static final Log log = LogFactory.getLog(CsvHarvestJob.class); - - /** - * The HTTP request. - */ - private VitroRequest vreq; - - /** - * The template file against which uploaded CSV files will be validated. - */ - private File templateFile; - - /** - * The namespace to be used for the harvest. - */ - private final String namespace; - - /** - * Constructor. - * @param templateFileName just the name of the template file. The directory is assumed to be standard. - */ - public CsvHarvestJob(VitroRequest vreq, String templateFileName, String namespace) { - this.vreq = vreq; - this.templateFile = new File(getTemplateFileDirectory() + templateFileName); - log.error(getTemplateFileDirectory() + templateFileName); - this.namespace = namespace; - } - - /** - * Gets the path to the directory containing the template files. - * @return the path to the directory containing the template files - */ - private String getTemplateFileDirectory() { - String harvesterPath = TestFileController.getHarvesterPath(); - String pathToTemplateFiles = harvesterPath + "files/"; - return pathToTemplateFiles; - } - - - @Override - @SuppressWarnings("rawtypes") - public String validateUpload(File file) { - try { - SimpleReader reader = new SimpleReader(); - - List templateCsv = reader.parse(this.templateFile); - String[] templateFirstLine = (String[])templateCsv.get(0); - - List csv = reader.parse(file); - - int length = csv.size(); - - if(length == 0) - return "No data in file"; - - for(int i = 0; i < length; i++) { - String[] line = (String[])csv.get(i); - if(i == 0) { - String errorMessage = validateCsvFirstLine(templateFirstLine, line); - if(errorMessage != null) - return errorMessage; - } - else if(line.length != 0) { - if(line.length != templateFirstLine.length) { - String retval = "Mismatch in number of entries in row " + i + ": expected , " + templateFirstLine.length + ", found " + line.length + " "; - for(int j = 0; j < line.length; j++) { - retval += "\"" + line[j] + "\", "; - } - //return retval; - return "Mismatch in number of entries in row " + i + ": expected , " + templateFirstLine.length + ", found " + line.length; - } - } - } - - } catch (IOException e) { - log.error(e, e); - return e.getMessage(); - } - return null; - } - - /** - * Makes sure that the first line of the CSV file is identical to the first line of the template file. This is - * assuming we are expecting all user CSV files to contain an initial header line. If this is not the case, then - * this method is unnecessary. - * @param templateFirstLine the parsed-out contents of the first line of the template file - * @param line the parsed-out contents of the first line of the input file - * @return an error message if the two lines don't match, or null if they do - */ - private String validateCsvFirstLine(String[] templateFirstLine, String[] line) { - String errorMessage = "File header does not match template"; - if(line.length != templateFirstLine.length) { - //return errorMessage + ": " + "file header columns = " + line.length + ", template columns = " + templateFirstLine.length; - String errorMsg = ""; - errorMsg += "file header items: "; - for(int i = 0; i < line.length; i++) { - errorMsg += line[i] + ", "; - } - errorMsg += "template items: "; - for(int i = 0; i < templateFirstLine.length; i++) { - errorMsg += templateFirstLine[i] + ", "; - } - return errorMsg; - } - for(int i = 0; i < line.length; i++) - { - if(!line[i].equals(templateFirstLine[i])) - return errorMessage + ": file header column " + (i + 1) + " = " + line[i] + ", template column " + (i + 1) + " = " + templateFirstLine[i]; - } - return null; - } - - @Override - public String getScript() - { - String path = TestFileController.getHarvesterPath() + "scripts/" + "testCSVtoRDFgrant.sh"; //todo: complete - File scriptTemplate = new File(path); - - String scriptTemplateContents = readScriptTemplate(scriptTemplate); - String replacements = performScriptTemplateReplacements(scriptTemplateContents); - return replacements; - } - - - private String performScriptTemplateReplacements(String scriptTemplateContents) { - String replacements = scriptTemplateContents; - - String fileDirectory = TestFileController.getUploadPath(vreq); - - replacements = replacements.replace("${UPLOADS_FOLDER}", fileDirectory); - - /* - * What needs to be replaced? - * - * task directory name - */ - //todo: complete - return replacements; - } - - - private String readScriptTemplate(File scriptTemplate) { - String scriptTemplateContents = null; - BufferedReader reader = null; - try { - int fileSize = (int)(scriptTemplate.length()); - char[] buffer = new char[fileSize]; - reader = new BufferedReader(new FileReader(scriptTemplate), fileSize); - reader.read(buffer); - scriptTemplateContents = new String(buffer); - } catch (IOException e) { - log.error(e, e); - } finally { - try { - if(reader != null) - reader.close(); - } catch(IOException e) { - log.error(e, e); - } - } - - return scriptTemplateContents; - } - - - @Override - public void performHarvest(File directory) { - - } - - @Override - public String getAdditionsFilePath() { - - return TestFileController.getHarvesterPath() + "harvested-data/csv/additions.rdf.xml"; - } - - - -} - - diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index dfaf98fc..3c7b2ebe 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -97,6 +97,11 @@ input.block { label { margin-top: .5em; } +label.inline { + display: inline; + font-weight: normal; + font-size: .9em; +} .verbose-toggle, .verbose-toggle:visited, #showAddFormButton, @@ -365,15 +370,19 @@ form select { border: 1px dotted #FFD324; } a.ingestMenu:link, -a.ingestMenu:visited { - text-decoration: none; - color: #5E6363; -} -a.ingestMenu:hover, -a.ingestMenu:active { +a.ingestMenu:visited, +a.account-menu:link, +a.account-menu:visited { text-decoration: none; color: #2485AE; } +a.ingestMenu:hover, +a.ingestMenu:active, +a.account-menu:hover, +a.account-menu:active { + text-decoration: none; + color: #5E6363; +} /* -------------------------------------------------> */ /* HOMEPAGE AND INTERIOR PAGES STYLES --------------> */ @@ -411,8 +420,8 @@ ul#header-nav { ul#header-nav li { float: left; display: block; - padding-left: 20px; - padding-right: 20px; + padding-left: 10px; + padding-right: 10px; border-right: 1px solid #7c7d7f; font-size: .7em; color: #fff; @@ -421,7 +430,7 @@ ul#header-nav li.last { border-right: none; } ul#header-nav li:last-child { - padding-left: 10px; + padding-left: 1px; padding-right: 0; border-right: none; } @@ -433,10 +442,13 @@ ul#header-nav a:visited { text-decoration: none } ul#header-nav a:hover, -ul#header-nav a:active { +ul#header-nav a:active { text-decoration: none; color: #999; } +ul#header-nav a.log-out { + padding-left: 10px; +} /* SEARCH ------> */ #search { position: absolute; @@ -680,6 +692,21 @@ p.password-note { margin-right:-10px; height:34px; } +p.external-auth { + margin: 0 auto; +} +p.external-auth a.blue, +p.external-auth a.blue:visited { + background-color: #398AAC; + width: 180px; + margin-bottom: 17px; + line-height: 1.3em; + padding-top: 10px; +} +p.external-auth a.blue:hover { + background-color: #58A2C1; + color: #fff; +} /* HOME SEARCH ------> */ #search-home { float: left; @@ -1044,10 +1071,7 @@ ul#browse-classes .count-classes { } /* ALPHA BROWSE------> */ ul#alpha-browse-individuals { - border: 1px solid #dde4e3; background-color: #fff; - border-left: 1px solid #dde4e3; - border-bottom: none; } ul#alpha-browse-individuals li { font-size: .8em; @@ -1072,6 +1096,16 @@ ul#alpha-browse-individuals .count-classes { .alphaIndex { font-size: .8em; } +nav#alpha-browse-container { + border: 1px solid #dde4e3; + background-color: #fff; + border-left: 1px solid #dde4e3; + border-bottom: none; + width: 619px; + float: left; + padding-left: 10px; + margin-left: 1px; +} /* BROWSE INDIVIDUALS------> */ #individuals-in-class { width: 629px; @@ -1467,7 +1501,7 @@ h2#hasResearchArea .verbosePropertyListing { display: block; } /* -------------------------------------------------> */ -/* ACCOUNTS PAGE -----------------------------------> */ +/* ACCOUNT PAGE ------------------------------------> */ /* -------------------------------------------------> */ .account-feedback p { line-height: 1.5em; @@ -1514,7 +1548,7 @@ table#account tr:nth-child(2n+1) { } .accounts { clear: left; - overflow: hidden; + height: 60px; border-top: 1px dotted #e1e5e7; padding-top: 0; border-bottom: 1px dotted #e1e5e7; @@ -1535,23 +1569,49 @@ section.accounts .delete-account{ .accounts-per-page-form { display: inline-block; } -/* -------------------------------------------------> */ -/* ADD ACCOUNTS -----------------------------------> */ -/* -------------------------------------------------> */ -#add-account p { - margin-top: 15px; -} -#reset-password { - background-color: green; +/* ADD ACCOUNTS ------> */ +form.customForm p { + margin-top: 8px; } form.customForm #reset-password { margin-top: 20px; + margin-left: 0; } -#add-account .note { +form.customForm p.note{ padding-bottom: 20px; padding-top: 0; - margin-top: 25px; } +#add-account p.note { + margin-top: 20px; + width: 400px; +} +#add-account input[type="text"], +#create-account input[type="text"], +#edit-account input[type="text"], +#my-account input[type="text"], +#my-account input[type="password"] { + width: 20em; +} +/* CREATE PASSWORD ------> */ +#create-password p.note { + margin-top: 0; +} +/* EDIT ACCOUNT ------> */ +#edit-account p.note { + margin-top: 3px; + width: 400px; +} +/* MY ACCOUNT ------> */ +#my-account p.note { + padding-bottom: 10px; + width: 400px; +} +#my-account input#email-address, +#my-account input#new-password { + margin-bottom: 0; +} +/* RESET PASSWORD ------> */ + /* -------------------------------------------------> */ /* DROP DOWN USER MENU ----------------------------> */ /* -------------------------------------------------> */ @@ -1582,7 +1642,6 @@ ul.dropdown li#user-menu:hover { color: #000 !important; position: relative; background: #fff url(../images/arrow-down-account.gif) right 9px no-repeat; - padding-right: 10px; border-bottom: 1px solid #cdcfcf; } ul.dropdown li.hover a, diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl index 8b2dbbd1..5be3fe37 100644 --- a/themes/wilma/templates/identity.ftl +++ b/themes/wilma/templates/identity.ftl @@ -29,7 +29,7 @@ ${scripts.add('')} <#else> -
  • Log in
    • +
  • Log in