From 34afa4e43b58f155d6450c96e0473daab62661f5 Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Wed, 2 Nov 2016 22:29:59 -0600 Subject: [PATCH 1/4] updating license path --- .../mannlib/semservices/service/impl/AgrovocService.java | 2 +- .../mannlib/semservices/service/impl/GemetService.java | 2 +- .../cornell/mannlib/semservices/service/impl/LCSHService.java | 2 +- .../cornell/mannlib/semservices/service/impl/UMLSService.java | 2 +- .../vitro/webapp/controller/AboutQrCodesController.java | 2 +- .../vitro/webapp/controller/ExportQrCodeController.java | 2 +- .../vitro/webapp/controller/ajax/GeoFocusMapLocations.java | 2 +- .../vitro/webapp/controller/ajax/GeoFocusResearcherCount.java | 2 +- .../vitro/webapp/controller/ajax/HomePageAjaxController.java | 2 +- .../vitro/webapp/controller/ajax/QrCodeAjaxController.java | 2 +- .../mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java | 2 +- .../freemarker/InstitutionalInternalClassController.java | 2 +- .../freemarker/ManageGrantsForIndividualController.java | 2 +- .../freemarker/ManagePeopleForOrganizationController.java | 2 +- .../freemarker/ManagePublicationsForIndividualController.java | 4 ++-- .../webapp/controller/freemarker/VIVOSiteAdminController.java | 2 +- .../vitro/webapp/controller/harvester/CsvFileHarvestJob.java | 2 +- .../webapp/controller/harvester/FileHarvestController.java | 4 ++-- .../vitro/webapp/controller/harvester/FileHarvestJob.java | 2 +- .../mannlib/vitro/webapp/controller/harvester/Harvester.java | 2 +- .../controller/visualization/AjaxVisualizationController.java | 2 +- .../controller/visualization/DataVisualizationController.java | 2 +- .../visualization/ShortURLVisualizationController.java | 2 +- .../visualization/StandardVisualizationController.java | 2 +- .../visualization/VisualizationFrameworkConstants.java | 2 +- .../controller/visualization/VisualizationInjector.java | 4 ++-- .../visualization/VisualizationsDependencyInjector.java | 2 +- .../edit/n3editing/AutocompleteRequiredInputValidator.java | 2 +- .../webapp/edit/n3editing/FirstAndLastNameValidator.java | 2 +- .../vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java | 2 +- .../webapp/edit/n3editing/PersonHasPublicationValidator.java | 2 +- .../webapp/edit/n3editing/PublicationHasAuthorValidator.java | 2 +- .../generators/AddAssociatedConceptGenerator.java | 2 +- .../generators/AddAttendeeRoleToPersonGenerator.java | 2 +- .../generators/AddAuthorsToInformationResourceGenerator.java | 2 +- .../generators/AddClinicalRoleToPersonGenerator.java | 2 +- .../generators/AddConceptThroughObjectPropertyGenerator.java | 2 +- .../configuration/generators/AddEditWebpageFormGenerator.java | 2 +- .../generators/AddEditorRoleToPersonGenerator.java | 2 +- .../generators/AddEditorsToInformationResourceGenerator.java | 2 +- .../generators/AddEditorshipToPersonGenerator.java | 4 ++-- .../generators/AddFullNameToPersonGenerator.java | 2 +- .../generators/AddGrantRoleToPersonGenerator.java | 2 +- .../generators/AddHeadOfRoleToPersonGenerator.java | 2 +- .../generators/AddMemberRoleToPersonGenerator.java | 2 +- .../configuration/generators/AddOrcidIdToPersonGenerator.java | 2 +- .../generators/AddOrganizerRoleToPersonGenerator.java | 2 +- .../generators/AddOutreachProviderRoleToPersonGenerator.java | 2 +- .../generators/AddPresenterRoleToPersonGenerator.java | 2 +- .../generators/AddPublicationToPersonGenerator.java | 2 +- .../generators/AddResearcherRoleToPersonGenerator.java | 2 +- .../generators/AddReviewerRoleToPersonGenerator.java | 2 +- .../generators/AddRoleToPersonTwoStageGenerator.java | 2 +- .../generators/AddServiceProviderRoleToPersonGenerator.java | 2 +- .../generators/AddTeacherRoleToPersonGenerator.java | 2 +- .../generators/AddUserDefinedConceptGenerator.java | 2 +- .../generators/AutocompleteDataPropertyFormGenerator.java | 2 +- .../generators/GrantAdministeredByGenerator.java | 2 +- .../generators/GrantHasContributorGenerator.java | 2 +- .../generators/ManageLabelsForPersonGenerator.java | 2 +- .../generators/ManageWebpagesForIndividualGenerator.java | 2 +- .../generators/OrganizationAdministersGrantGenerator.java | 2 +- .../generators/OrganizationForTrainingGenerator.java | 2 +- .../generators/OrganizationHasPositionHistoryGenerator.java | 2 +- .../generators/PersonHasAdviseeRelationshipGenerator.java | 2 +- .../generators/PersonHasAdvisorRelationshipGenerator.java | 2 +- .../generators/PersonHasAwardOrHonorGenerator.java | 2 +- .../generators/PersonHasEducationalTraining.java | 2 +- .../configuration/generators/PersonHasEmailGenerator.java | 2 +- .../generators/PersonHasIssuedCredentialGenerator.java | 2 +- .../generators/PersonHasPositionHistoryGenerator.java | 2 +- .../generators/PersonHasPreferredTitleGenerator.java | 2 +- .../generators/ProjectHasParticipantGenerator.java | 2 +- .../generators/SubjectHasMailingAddressGenerator.java | 2 +- .../generators/SubjectHasPhoneFaxNumberGenerator.java | 2 +- .../VIVODefaultAddMissingIndividualFormGenerator.java | 2 +- .../configuration/generators/VIVOManageLabelsGenerator.java | 2 +- .../generators/VIVONewIndividualFormGenerator.java | 2 +- .../n3editing/configuration/generators/VivoBaseGenerator.java | 2 +- .../preprocessors/AddAssociatedConceptsPreprocessor.java | 2 +- .../preprocessors/ConceptSemanticTypesPreprocessor.java | 2 +- .../preprocessors/ManageLabelsForPersonPreprocessor.java | 2 +- .../preprocessors/RoleToActivityPredicatePreprocessor.java | 2 +- .../preprocessors/RoleToPredicatePreprocessor.java | 2 +- .../preprocessors/utils/ProcessInternalClassDataGetterN3.java | 2 +- .../searchindex/documentBuilding/CalculateParameters.java | 2 +- .../searchindex/extensions/LabelsAcrossContextNodes.java | 2 +- .../mannlib/vitro/webapp/servlet/ConceptSearchServlet.java | 2 +- .../utils/ConceptSearchService/ConceptSearchServiceUtils.java | 2 +- .../utils/ConceptSearchService/VocabSourceDescription.java | 4 ++-- .../webapp/utils/dataGetter/InternalClassesDataGetter.java | 4 ++-- .../webapp/utils/menuManagement/ProcessInternalClasses.java | 4 ++-- .../utils/menuManagement/VIVOMenuManagementDataUtils.java | 4 ++-- .../capabilitymap/CapabilityMapRequestHandler.java | 2 +- .../visualization/capabilitymap/CapabilityMapResponse.java | 2 +- .../visualization/capabilitymap/CapabilityMapResult.java | 2 +- .../visualization/coauthorship/CoAuthorshipGraphMLWriter.java | 2 +- .../visualization/coauthorship/CoAuthorshipQueryRunner.java | 2 +- .../coauthorship/CoAuthorshipRequestHandler.java | 2 +- .../coauthorship/CoAuthorshipVisCodeGenerator.java | 4 ++-- .../visualization/collaborationutils/CoAuthorshipData.java | 2 +- .../visualization/collaborationutils/CoInvestigationData.java | 2 +- .../collaborationutils/CollaborationComparator.java | 2 +- .../visualization/collaborationutils/CollaborationData.java | 2 +- .../collaborationutils/CollaboratorComparator.java | 2 +- .../webapp/visualization/constants/MapOfScienceConstants.java | 2 +- .../vitro/webapp/visualization/constants/QueryConstants.java | 2 +- .../webapp/visualization/constants/QueryFieldLabels.java | 2 +- .../vitro/webapp/visualization/constants/VOConstants.java | 2 +- .../vitro/webapp/visualization/constants/VisConstants.java | 2 +- .../CoPIGrantCountConstructQueryRunner.java | 4 ++-- .../coprincipalinvestigator/CoPIGrantCountQueryRunner.java | 2 +- .../coprincipalinvestigator/CoPIGrantCountRequestHandler.java | 4 ++-- .../coprincipalinvestigator/CoPIGraphMLWriter.java | 2 +- .../coprincipalinvestigator/CoPIVisCodeGenerator.java | 2 +- .../exceptions/DocumentFieldNotFoundException.java | 2 +- .../IllegalConstructedModelIdentifierException.java | 2 +- .../exceptions/MalformedQueryParametersException.java | 2 +- .../mapofscience/MapOfScienceVisualizationRequestHandler.java | 2 +- .../vitro/webapp/visualization/model/ConceptLabelMap.java | 2 +- .../vitro/webapp/visualization/model/ConceptPeopleMap.java | 2 +- .../webapp/visualization/model/OrganizationPeopleMap.java | 2 +- .../mannlib/vitro/webapp/visualization/model/Person.java | 2 +- .../modelconstructor/ModelConstructorRequestHandler.java | 2 +- .../modelconstructor/ModelConstructorUtilities.java | 4 ++-- .../modelconstructor/PersonToGrantsModelConstructor.java | 2 +- .../modelconstructor/factory/ModelFactoryInterface.java | 2 +- .../persongrantcount/PersonGrantCountQueryRunner.java | 2 +- .../persongrantcount/PersonGrantCountRequestHandler.java | 4 ++-- .../persongrantcount/PersonGrantCountVisCodeGenerator.java | 4 ++-- .../visualization/personlevel/PersonLevelRequestHandler.java | 2 +- .../personpubcount/PersonPublicationCountQueryRunner.java | 2 +- .../personpubcount/PersonPublicationCountRequestHandler.java | 2 +- .../PersonPublicationCountVisCodeGenerator.java | 4 ++-- .../vitro/webapp/visualization/setup/VisualizationSetup.java | 2 +- .../temporalgraph/OrganizationUtilityFunctions.java | 2 +- .../TemporalGrantVisualizationRequestHandler.java | 2 +- .../TemporalPublicationVisualizationRequestHandler.java | 4 ++-- .../vitro/webapp/visualization/tools/ToolsRequestHandler.java | 2 +- .../visualization/utilities/CachingRDFServiceExecutor.java | 2 +- .../vitro/webapp/visualization/utilities/CounterUtils.java | 2 +- .../vitro/webapp/visualization/utilities/OrgUtils.java | 2 +- .../webapp/visualization/utilities/PersonPublicationMaps.java | 2 +- .../visualization/utilities/UtilitiesRequestHandler.java | 2 +- .../webapp/visualization/utilities/VisualizationCaches.java | 2 +- .../vitro/webapp/visualization/valueobjects/Activity.java | 2 +- .../webapp/visualization/valueobjects/Collaboration.java | 2 +- .../vitro/webapp/visualization/valueobjects/Collaborator.java | 2 +- .../webapp/visualization/valueobjects/ConstructedModel.java | 4 ++-- .../visualization/valueobjects/ConstructedModelTracker.java | 2 +- .../vitro/webapp/visualization/valueobjects/Entity.java | 2 +- .../webapp/visualization/valueobjects/GenericQueryMap.java | 2 +- .../vitro/webapp/visualization/valueobjects/Individual.java | 2 +- .../visualization/valueobjects/MapOfScienceActivity.java | 2 +- .../webapp/visualization/valueobjects/SparklineData.java | 2 +- .../vitro/webapp/visualization/valueobjects/SubEntity.java | 2 +- .../valueobjects/YearToEntityCountDataElement.java | 2 +- .../webapp/visualization/valueobjects/json/JsonObject.java | 2 +- .../webapp/visualization/valueobjects/json/MapOfScience.java | 2 +- .../visualization/valueobjects/json/SubjectEntityJSON.java | 2 +- .../visualization/visutils/AllPropertiesQueryRunner.java | 2 +- .../webapp/visualization/visutils/CachedModelConstructor.java | 2 +- .../visualization/visutils/CollaborationDataViewHelper.java | 2 +- .../vitro/webapp/visualization/visutils/CustomLock.java | 2 +- .../webapp/visualization/visutils/GenericQueryRunner.java | 2 +- .../visualization/visutils/GenericQueryRunnerOnModel.java | 2 +- .../vitro/webapp/visualization/visutils/ModelConstructor.java | 2 +- .../vitro/webapp/visualization/visutils/PDFDocument.java | 2 +- .../vitro/webapp/visualization/visutils/QueryRunner.java | 2 +- .../webapp/visualization/visutils/UniqueIDGenerator.java | 2 +- .../vitro/webapp/visualization/visutils/UtilityFunctions.java | 4 ++-- .../visualization/visutils/VisualizationRequestHandler.java | 2 +- .../individual/VIVOIndividualTemplateModel.java | 2 +- .../templatemodels/individuallist/VIVOListedIndividual.java | 2 +- .../searchresult/VIVOIndividualSearchResult.java | 4 ++-- .../mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java | 2 +- .../edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java | 2 +- .../edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java | 2 +- .../mannlib/vivo/auth/policy/InfoContentEntityChecker.java | 2 +- .../cornell/mannlib/vivo/auth/policy/PresentationChecker.java | 2 +- .../mannlib/vivo/auth/policy/ProjectOrServiceChecker.java | 2 +- .../vivo/auth/policy/SelfEditorRelationshipPolicy.java | 2 +- .../edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java | 2 +- .../edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java | 2 +- .../mannlib/vivo/orcid/controller/OrcidAbstractHandler.java | 2 +- .../vivo/orcid/controller/OrcidAddExternalIdHandler.java | 2 +- .../vivo/orcid/controller/OrcidAuthAuthenticateHandler.java | 2 +- .../vivo/orcid/controller/OrcidAuthExternalIdsHandler.java | 2 +- .../mannlib/vivo/orcid/controller/OrcidCallbackHandler.java | 2 +- .../mannlib/vivo/orcid/controller/OrcidConfirmationState.java | 2 +- .../mannlib/vivo/orcid/controller/OrcidDefaultHandler.java | 2 +- .../vivo/orcid/controller/OrcidIllegalStateException.java | 2 +- .../vivo/orcid/controller/OrcidIntegrationController.java | 2 +- .../vivo/orcid/controller/OrcidReadProfileHandler.java | 2 +- .../org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java | 2 +- .../java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java | 2 +- .../main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java | 2 +- .../java/org/vivoweb/webapp/startup/JSONWrapperSetup.java | 2 +- api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java | 2 +- .../searchindex/extensions/LabelsAcrossContextNodesTest.java | 2 +- .../vivo/auth/policy/SelfEditorRelationshipPolicyTest.java | 2 +- .../vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3 | 2 +- home/src/main/assembly/home.xml | 2 +- .../resources/rdf/display/everytime/homePageDataGetters.n3 | 2 +- .../resources/rdf/display/everytime/localeSelectionGUI.n3 | 2 +- .../rdf/display/everytime/n3ModelChangePreprocessors.n3 | 4 ++-- .../rdf/display/everytime/orcidInterfaceDataGetters.n3 | 2 +- .../resources/rdf/display/everytime/vivoConceptDataGetters.n3 | 2 +- .../rdf/display/everytime/vivoOrganizationDataGetters.n3 | 2 +- .../resources/rdf/display/everytime/vivoQrCodeDataGetter.n3 | 2 +- .../resources/rdf/display/everytime/vivoSearchProhibited.n3 | 2 +- home/src/main/resources/rdf/display/firsttime/aboutPage.n3 | 2 +- home/src/main/resources/rdf/display/firsttime/menu.n3 | 2 +- home/src/main/resources/rdf/tbox/filegraph/linkSuppression.n3 | 2 +- home/src/main/resources/rdf/tbox/filegraph/orcid-interface.n3 | 2 +- home/src/main/resources/rdf/tbox/filegraph/sameAs.n3 | 2 +- installer/example-settings.xml | 2 +- installer/home/src/main/assembly/home.xml | 2 +- legacy/build.xml | 2 +- .../languages/es_GO/rdf/display/firsttime/aboutPage_es_GO.n3 | 4 ++-- .../es_GO/templates/freemarker/aboutMapOfScience_es_GO.ftl | 2 +- .../es_GO/templates/freemarker/aboutQrCodes_es_GO.ftl | 2 +- .../es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl | 2 +- .../acceptance-tests/suites/SearchBoost/BoostClass.n3 | 2 +- .../acceptance-tests/suites/ShortViews/shortview_config.n3 | 2 +- .../suites/ShortViews/view-browse-faculty.ftl | 2 +- .../suites/ShortViews/view-index-department.ftl | 2 +- .../acceptance-tests/suites/ShortViews/view-index-faculty.ftl | 2 +- .../suites/ShortViews/view-search-faculty.ftl | 2 +- .../suites/SparqlQueryApi/SparqlQueryTestData.n3 | 2 +- .../acceptance-tests/testApp/TestLinkedOpenData.html | 4 ++-- legacy/utilities/acceptance-tests/testApp/TestListRDF.html | 4 ++-- .../acceptance-tests/testApp/TestSparqlQueryApi.html | 4 ++-- legacy/utilities/acceptance-tests/testApp/js/jquery.js | 2 +- legacy/utilities/pre-compileJSPs/jsp-build.xml | 4 ++-- legacy/utilities/xslt/generalizedXMLtoRDF.xsl | 2 +- .../test-output/Command line suite/Command line test.html | 2 +- selenium/test-output/emailable-report.html | 2 +- selenium/test-output/jquery-1.7.1.min.js | 2 +- .../old/Command line suite/Command line test.properties | 2 +- selenium/test-output/old/Command line suite/groups.html | 2 +- .../test-output/old/Command line suite/methods-not-run.html | 2 +- .../test-output/old/Command line suite/reporter-output.html | 2 +- selenium/test-output/old/Command line suite/testng.xml.html | 2 +- selenium/test-output/old/Command line suite/toc.html | 2 +- .../visualization/visualizations-beans-injection-fm.xml | 4 ++-- webapp/src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/config/listViewConfig-additionalEmail.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-advisorIn.xml | 2 +- .../main/webapp/config/listViewConfig-authorInAuthorship.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml | 2 +- .../main/webapp/config/listViewConfig-awardOrHonorGiven.xml | 2 +- .../main/webapp/config/listViewConfig-dateTimeInterval.xml | 2 +- .../src/main/webapp/config/listViewConfig-dateTimeValue.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-default.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-doi.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-editorship.xml | 2 +- .../main/webapp/config/listViewConfig-educationalTraining.xml | 2 +- .../main/webapp/config/listViewConfig-fauxPropertyDefault.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-faxNumber.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-fullName.xml | 2 +- .../main/webapp/config/listViewConfig-grantAdministeredBy.xml | 2 +- .../webapp/config/listViewConfig-hasAssociatedConcept.xml | 2 +- .../src/main/webapp/config/listViewConfig-hasAttendeeRole.xml | 2 +- .../main/webapp/config/listViewConfig-hasClinicalActivity.xml | 2 +- .../config/listViewConfig-hasCoPrincipalInvestigatorRole.xml | 2 +- .../src/main/webapp/config/listViewConfig-hasEditorRole.xml | 2 +- .../main/webapp/config/listViewConfig-hasInvestigatorRole.xml | 2 +- .../main/webapp/config/listViewConfig-hasPresenterRole.xml | 2 +- .../config/listViewConfig-hasPrincipalInvestigatorRole.xml | 2 +- .../src/main/webapp/config/listViewConfig-hasReviewerRole.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-hasRole.xml | 2 +- .../config/listViewConfig-informationResourceInAuthorship.xml | 2 +- .../config/listViewConfig-informationResourceInEditorship.xml | 2 +- .../main/webapp/config/listViewConfig-issuedCredential.xml | 2 +- .../src/main/webapp/config/listViewConfig-mailingAddress.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-orcidId.xml | 2 +- .../config/listViewConfig-organizationAdministersGrant.xml | 2 +- .../webapp/config/listViewConfig-organizationAwardsGrant.xml | 2 +- .../webapp/config/listViewConfig-organizationForPosition.xml | 2 +- .../webapp/config/listViewConfig-organizationForTraining.xml | 2 +- .../main/webapp/config/listViewConfig-personInPosition.xml | 2 +- .../src/main/webapp/config/listViewConfig-preferredTitle.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml | 2 +- .../main/webapp/config/listViewConfig-publicationVenueFor.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-publisherOf.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-relatedRole.xml | 2 +- .../main/webapp/config/listViewConfig-researchActivities.xml | 2 +- .../src/main/webapp/config/listViewConfig-researchAreaOf.xml | 2 +- .../main/webapp/config/listViewConfig-roleContributesTo.xml | 2 +- .../src/main/webapp/config/listViewConfig-roleRealizedIn.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-scopusId.xml | 2 +- .../src/main/webapp/config/listViewConfig-telephoneNumber.xml | 2 +- webapp/src/main/webapp/config/listViewConfig-webpage.xml | 2 +- webapp/src/main/webapp/css/harvester/fileharvest.css | 4 ++-- webapp/src/main/webapp/css/home-page-maps.css | 4 ++-- webapp/src/main/webapp/css/individual/ie7-quick-view.css | 2 +- webapp/src/main/webapp/css/individual/ie7-standard-view.css | 4 ++-- .../main/webapp/css/individual/individual-2column-view.css | 2 +- webapp/src/main/webapp/css/individual/individual-qr.css | 4 ++-- .../src/main/webapp/css/individual/individual-quick-view.css | 2 +- webapp/src/main/webapp/css/individual/individual-vivo.css | 2 +- webapp/src/main/webapp/css/jquery_plugins/ui.notify.css | 4 ++-- .../src/main/webapp/css/visualization/coauthorship/style.css | 4 ++-- .../css/visualization/entitycomparison/layout-ie-67.css | 4 ++-- .../webapp/css/visualization/entitycomparison/layout-ie.css | 4 ++-- .../main/webapp/css/visualization/entitycomparison/layout.css | 4 ++-- .../src/main/webapp/css/visualization/mapofscience/layout.css | 2 +- webapp/src/main/webapp/css/visualization/personlevel/page.css | 2 +- webapp/src/main/webapp/css/visualization/visualization.css | 2 +- webapp/src/main/webapp/jenaIngest/ingestMenu.jsp | 2 +- webapp/src/main/webapp/js/d3.min.js | 2 +- webapp/src/main/webapp/js/homePageMaps.js | 2 +- webapp/src/main/webapp/js/homePageUtils.js | 2 +- .../main/webapp/js/individual/individualProfilePageType.js | 2 +- webapp/src/main/webapp/js/individual/individualQtipBubble.js | 4 ++-- webapp/src/main/webapp/js/individual/individualUtils.js | 2 +- webapp/src/main/webapp/js/individual/propertyGroupControls.js | 4 ++-- .../src/main/webapp/js/jquery_plugins/jquery.blockUI.min.js | 3 ++- webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js | 2 +- webapp/src/main/webapp/js/jquery_plugins/jquery.notify.min.js | 2 +- webapp/src/main/webapp/js/latLongJson.js | 2 +- webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js | 2 +- webapp/src/main/webapp/js/leaflet/dist/leaflet.js | 2 +- webapp/src/main/webapp/js/menupage/processDataGetterUtils.js | 4 ++-- .../js/menupage/processInternalClassDataGetterContent.js | 4 ++-- .../webapp/js/visualization/coPIship/coPIship-person-level.js | 4 ++-- .../main/webapp/js/visualization/coauthorship/AC_OETags.js | 2 +- .../js/visualization/coauthorship/coauthorship-personlevel.js | 4 ++-- webapp/src/main/webapp/js/visualization/dataTables.helper.js | 4 ++-- .../webapp/js/visualization/entitycomparison/constants.js | 4 ++-- .../js/visualization/entitycomparison/gui-event-manager.js | 2 +- .../entitycomparison/jquery_plugins/datatable/demo_table.css | 2 +- .../entitycomparison/jquery_plugins/flot/excanvas.min.js | 2 +- .../jquery_plugins/flot/jquery.colorhelpers.min.js | 2 +- .../jquery_plugins/flot/jquery.flot.crosshair.min.js | 2 +- .../jquery_plugins/flot/jquery.flot.image.min.js | 2 +- .../entitycomparison/jquery_plugins/flot/jquery.flot.min.js | 2 +- .../jquery_plugins/flot/jquery.flot.navigate.min.js | 2 +- .../jquery_plugins/flot/jquery.flot.selection.min.js | 2 +- .../jquery_plugins/flot/jquery.flot.stack.min.js | 2 +- .../jquery_plugins/flot/jquery.flot.threshold.min.js | 2 +- .../entitycomparison/jquery_plugins/flot/r293/excanvas.min.js | 2 +- .../jquery_plugins/flot/r293/jquery.flot.min.js | 2 +- .../entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css | 2 +- .../entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js | 2 +- .../entitycomparison/jquery_plugins/jquery.AutoEllipsis.js | 2 +- .../src/main/webapp/js/visualization/entitycomparison/util.js | 2 +- .../webapp/js/visualization/mapofscience/ClassExtendUtils.js | 4 ++-- .../webapp/js/visualization/mapofscience/ColorStrategy.js | 2 +- .../visualization/mapofscience/ComparisonDataTableWidget.js | 4 ++-- .../js/visualization/mapofscience/ComparisonScimapWidget.js | 2 +- .../main/webapp/js/visualization/mapofscience/ControlPanel.js | 2 +- .../main/webapp/js/visualization/mapofscience/CustomMarker.js | 2 +- .../webapp/js/visualization/mapofscience/CustomScimaps.js | 4 ++-- .../webapp/js/visualization/mapofscience/DataTableWidget.js | 4 ++-- .../webapp/js/visualization/mapofscience/DownloadManager.js | 4 ++-- .../js/visualization/mapofscience/EntityTablesWidget.js | 4 ++-- .../js/visualization/mapofscience/ErrorDisplayWidget.js | 4 ++-- .../src/main/webapp/js/visualization/mapofscience/GMapAPI.js | 2 +- .../webapp/js/visualization/mapofscience/InitializeMap.js | 4 ++-- .../src/main/webapp/js/visualization/mapofscience/Marker.js | 2 +- .../webapp/js/visualization/mapofscience/MarkerManager.js | 2 +- .../main/webapp/js/visualization/mapofscience/NumberUtils.js | 4 ++-- .../src/main/webapp/js/visualization/mapofscience/Polygon.js | 4 ++-- .../main/webapp/js/visualization/mapofscience/ScimapWidget.js | 4 ++-- .../js/visualization/mapofscience/SimpleDataTableWidget.js | 4 ++-- .../main/webapp/js/visualization/mapofscience/SizeCoding.js | 2 +- .../src/main/webapp/js/visualization/mapofscience/Tooltip.js | 4 ++-- .../webapp/js/visualization/mapofscience/VisCommonControl.js | 4 ++-- .../js/visualization/mapofscience/VisModeControllers.js | 4 ++-- .../main/webapp/js/visualization/personlevel/person-level.js | 2 +- webapp/src/main/webapp/js/visualization/sparkline.js | 4 ++-- .../webapp/js/visualization/visualization-helper-functions.js | 4 ++-- .../main/webapp/templates/freemarker/body/aboutQrCodes.ftl | 2 +- .../templates/freemarker/body/foaf-person--exportQrCode.ftl | 4 ++-- .../templates/freemarker/body/harvester/fileharvest.ftl | 4 ++-- .../body/individual/individual--foaf-organization.ftl | 2 +- .../body/individual/individual--foaf-person-2column.ftl | 2 +- .../body/individual/individual--foaf-person-quickview.ftl | 2 +- .../freemarker/body/individual/individual--foaf-person.ftl | 2 +- .../freemarker/body/individual/individual--skos-concept.ftl | 2 +- .../freemarker/body/individual/individual-openSocial.ftl | 4 ++-- .../templates/freemarker/body/individual/individual.ftl | 4 ++-- .../body/individual/manageLabelsForIndividualAddForm.ftl | 4 ++-- .../individual/manageLabelsForIndividualSubmissionErrors.ftl | 4 ++-- .../body/individual/manageLabelsForIndividualTerms.ftl | 4 ++-- .../templates/freemarker/body/menupage/publications.ftl | 4 ++-- .../webapp/templates/freemarker/body/orcid/orcidConfirm.ftl | 4 ++-- .../partials/individual/individual-affiliated-departments.ftl | 2 +- .../individual/individual-affiliated-dept-details.ftl | 2 +- .../individual/individual-affiliated-res-area-details.ftl | 2 +- .../individual/individual-affiliated-research-areas.ftl | 2 +- .../body/partials/individual/individual-altmetric.ftl | 2 +- .../partials/individual/individual-contactInfo-2column.ftl | 2 +- .../body/partials/individual/individual-contactInfo.ftl | 2 +- .../partials/individual/individual-dept-active-grants.ftl | 2 +- .../partials/individual/individual-dept-res-area-details.ftl | 2 +- .../body/partials/individual/individual-geographicFocus.ftl | 2 +- .../body/partials/individual/individual-iconControls.ftl | 4 ++-- .../body/partials/individual/individual-orcidInterface.ftl | 4 ++-- .../body/partials/individual/individual-overview.ftl | 2 +- .../body/partials/individual/individual-positions.ftl | 2 +- .../body/partials/individual/individual-profilePageTypes.ftl | 2 +- .../body/partials/individual/individual-qrCodeGenerator.ftl | 4 ++-- .../body/partials/individual/individual-researchAreas.ftl | 2 +- .../freemarker/body/partials/individual/individual-setup.ftl | 4 ++-- .../individual/individual-visualizationFoafPerson.ftl | 2 +- .../individual/individual-visualizationMapOfScience.ftl | 4 ++-- .../partials/individual/individual-visualizationQuickView.ftl | 4 ++-- .../individual/individual-visualizationTemporalGraph.ftl | 4 ++-- .../body/partials/individual/individual-vocabularyService.ftl | 2 +- .../body/partials/individual/individual-webpage.ftl | 2 +- .../body/partials/individual/propStatement-adviseeIn.ftl | 4 ++-- .../body/partials/individual/propStatement-advisorIn.ftl | 4 ++-- .../partials/individual/propStatement-authorInAuthorship.ftl | 2 +- .../body/partials/individual/propStatement-awardOrHonor.ftl | 2 +- .../partials/individual/propStatement-awardOrHonorGiven.ftl | 2 +- .../body/partials/individual/propStatement-dataDefault.ftl | 2 +- .../partials/individual/propStatement-dateTimeInterval.ftl | 2 +- .../body/partials/individual/propStatement-dateTimeValue.ftl | 4 ++-- .../body/partials/individual/propStatement-default.ftl | 4 ++-- .../body/partials/individual/propStatement-degreeEarned.ftl | 2 +- .../freemarker/body/partials/individual/propStatement-doi.ftl | 2 +- .../body/partials/individual/propStatement-editorship.ftl | 2 +- .../partials/individual/propStatement-educationalTraining.ftl | 2 +- .../body/partials/individual/propStatement-emailAddress.ftl | 4 ++-- .../body/partials/individual/propStatement-fullName.ftl | 2 +- .../partials/individual/propStatement-grantAdministeredBy.ftl | 2 +- .../individual/propStatement-hasAssociatedConcept.ftl | 2 +- .../partials/individual/propStatement-hasAttendeeRole.ftl | 4 ++-- .../partials/individual/propStatement-hasEditReviewRole.ftl | 4 ++-- .../partials/individual/propStatement-hasInvestigatorRole.ftl | 4 ++-- .../partials/individual/propStatement-hasPresenterRole.ftl | 4 ++-- .../body/partials/individual/propStatement-hasRole.ftl | 4 ++-- .../propStatement-informationResourceInAuthorship.ftl | 4 ++-- .../propStatement-informationResourceInEditorship.ftl | 4 ++-- .../partials/individual/propStatement-issuedCredential.ftl | 2 +- .../body/partials/individual/propStatement-mailingAddress.ftl | 4 ++-- .../body/partials/individual/propStatement-orcidId.ftl | 2 +- .../individual/propStatement-organizationAdministersGrant.ftl | 2 +- .../individual/propStatement-organizationAwardsGrant.ftl | 2 +- .../individual/propStatement-organizationForPosition.ftl | 4 ++-- .../individual/propStatement-organizationForTraining.ftl | 2 +- .../partials/individual/propStatement-personInPosition.ftl | 2 +- .../body/partials/individual/propStatement-phoneFaxNumber.ftl | 4 ++-- .../body/partials/individual/propStatement-preferredTitle.ftl | 4 ++-- .../partials/individual/propStatement-publicationVenueFor.ftl | 2 +- .../body/partials/individual/propStatement-publisherOf.ftl | 2 +- .../body/partials/individual/propStatement-relatedRole.ftl | 2 +- .../body/partials/individual/propStatement-researchAreaOf.ftl | 2 +- .../body/partials/individual/propStatement-scopusId.ftl | 2 +- .../partials/individual/propStatement-webpage-quickview.ftl | 4 ++-- .../body/partials/individual/propStatement-webpage.ftl | 4 ++-- .../freemarker/body/partials/shortview/view-browse-people.ftl | 2 +- .../freemarker/body/partials/shortview/view-index-default.ftl | 4 ++-- .../body/partials/shortview/view-search-default.ftl | 4 ++-- .../templates/freemarker/body/search/search-csvResults.ftl | 2 +- .../templates/freemarker/body/search/search-xmlResults.ftl | 4 ++-- .../templates/freemarker/edit/forms/addAssociatedConcept.ftl | 2 +- .../edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl | 2 +- .../freemarker/edit/forms/addAttendeeRoleToPerson.ftl | 4 ++-- .../freemarker/edit/forms/addAuthorsToInformationResource.ftl | 4 ++-- .../freemarker/edit/forms/addClinicalRoleToPerson.ftl | 4 ++-- .../forms/addConceptThroughObjectPropertyAutoComplete.ftl | 2 +- .../edit/forms/addConceptThroughObjectPropertyCreateNew.ftl | 4 ++-- .../edit/forms/addConceptThroughObjectPropertyForm.ftl | 2 +- .../templates/freemarker/edit/forms/addEditWebpageForm.ftl | 2 +- .../templates/freemarker/edit/forms/addEditorRoleToPerson.ftl | 4 ++-- .../freemarker/edit/forms/addEditorsToInformationResource.ftl | 4 ++-- .../templates/freemarker/edit/forms/addEditorshipToPerson.ftl | 2 +- .../templates/freemarker/edit/forms/addFullNameToPerson.ftl | 2 +- .../templates/freemarker/edit/forms/addGrantRoleToPerson.ftl | 2 +- .../templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl | 4 ++-- .../templates/freemarker/edit/forms/addMemberRoleToPerson.ftl | 4 ++-- .../templates/freemarker/edit/forms/addOrcidIdToPerson.ftl | 2 +- .../freemarker/edit/forms/addOrganizerRoleToPerson.ftl | 4 ++-- .../freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl | 4 ++-- .../freemarker/edit/forms/addPresenterRoleToPerson.ftl | 2 +- .../freemarker/edit/forms/addPublicationToPerson.ftl | 2 +- .../freemarker/edit/forms/addResearcherRoleToPerson.ftl | 4 ++-- .../freemarker/edit/forms/addReviewerRoleToPerson.ftl | 2 +- .../freemarker/edit/forms/addRoleToPersonTwoStage.ftl | 4 ++-- .../freemarker/edit/forms/addServiceProviderRoleToPerson.ftl | 4 ++-- .../freemarker/edit/forms/addTeacherRoleToPerson.ftl | 4 ++-- .../templates/freemarker/edit/forms/addUserDefinedConcept.ftl | 4 ++-- .../freemarker/edit/forms/autoCompleteDataPropForm.ftl | 2 +- .../webapp/templates/freemarker/edit/forms/css/addConcept.css | 4 ++-- .../templates/freemarker/edit/forms/css/autocomplete.css | 4 ++-- .../freemarker/edit/forms/css/institutionalInternalClass.css | 4 ++-- .../freemarker/edit/forms/css/manageDragDropList.css | 4 ++-- .../templates/freemarker/edit/forms/dateTimeValueForm.ftl | 4 ++-- .../freemarker/edit/forms/defaultAddMissingIndividualForm.ftl | 4 ++-- .../templates/freemarker/edit/forms/grantAdministeredBy.ftl | 2 +- .../templates/freemarker/edit/forms/grantHasContributor.ftl | 2 +- .../freemarker/edit/forms/institutionalInternalClassForm.ftl | 4 ++-- .../edit/forms/js/addAuthorsToInformationResource.js | 2 +- .../webapp/templates/freemarker/edit/forms/js/addConcept.js | 2 +- .../edit/forms/js/addEditorsToInformationResource.js | 2 +- .../freemarker/edit/forms/js/addOrcidIdToPersonUtils.js | 2 +- .../freemarker/edit/forms/js/adviseeRelationshipUtils.js | 2 +- .../freemarker/edit/forms/js/advisorRelationshipUtils.js | 2 +- .../templates/freemarker/edit/forms/js/awardReceiptUtils.js | 4 ++-- .../edit/forms/js/customFormWithDataAutocomplete.js | 2 +- .../edit/forms/js/defaultAddMissingIndividualFormUtils.js | 2 +- .../freemarker/edit/forms/js/educationalTrainingUtils.js | 2 +- .../freemarker/edit/forms/js/grantHasContributorUtils.js | 2 +- .../freemarker/edit/forms/js/issuedCredentialUtils.js | 4 ++-- .../templates/freemarker/edit/forms/js/mailingAddressUtils.js | 4 ++-- .../freemarker/edit/forms/js/manageHideShowStatus.js | 2 +- .../freemarker/edit/forms/js/manageWebpagesForIndividual.js | 2 +- .../freemarker/edit/forms/js/newIndividualFormUtils.js | 2 +- .../templates/freemarker/edit/forms/js/orgHasPositionUtils.js | 2 +- .../freemarker/edit/forms/js/organizationForTrainingUtils.js | 2 +- .../freemarker/edit/forms/js/projectHasParticipantUtils.js | 2 +- .../freemarker/edit/forms/js/publicationToPersonUtils.js | 4 ++-- .../freemarker/edit/forms/manageGrantsForIndividual.ftl | 2 +- .../freemarker/edit/forms/managePeopleForOrganization.ftl | 2 +- .../freemarker/edit/forms/managePublicationsForIndividual.ftl | 2 +- .../freemarker/edit/forms/manageWebpagesForIndividual.ftl | 2 +- .../edit/forms/menuManagement--classIntersections.ftl | 4 ++-- .../templates/freemarker/edit/forms/newIndividualForm.ftl | 4 ++-- .../freemarker/edit/forms/organizationAdministersGrant.ftl | 2 +- .../freemarker/edit/forms/organizationForTraining.ftl | 2 +- .../freemarker/edit/forms/organizationHasPositionHistory.ftl | 2 +- .../edit/forms/pageManagement--browseClassGroupsScripts.ftl | 2 +- .../edit/forms/pageManagement--classIntersections.ftl | 4 ++-- .../edit/forms/pageManagement--customDataScript.ftl | 4 ++-- .../freemarker/edit/forms/personHasAdviseeRelationship.ftl | 2 +- .../freemarker/edit/forms/personHasAdvisorRelationship.ftl | 2 +- .../templates/freemarker/edit/forms/personHasAwardOrHonor.ftl | 2 +- .../freemarker/edit/forms/personHasEducationalTraining.ftl | 2 +- .../templates/freemarker/edit/forms/personHasEmailAddress.ftl | 2 +- .../freemarker/edit/forms/personHasIssuedCredential.ftl | 2 +- .../freemarker/edit/forms/personHasPositionHistory.ftl | 2 +- .../freemarker/edit/forms/personHasPreferredTitle.ftl | 2 +- .../templates/freemarker/edit/forms/projectHasParticipant.ftl | 2 +- .../freemarker/edit/forms/subjectHasMailingAddress.ftl | 2 +- .../freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl | 2 +- .../webapp/templates/freemarker/lib/lib-generator-classes.ftl | 2 +- .../main/webapp/templates/freemarker/lib/lib-home-page.ftl | 2 +- .../main/webapp/templates/freemarker/lib/lib-meta-tags.ftl | 4 ++-- .../main/webapp/templates/freemarker/lib/lib-microformats.ftl | 4 ++-- .../main/webapp/templates/freemarker/lib/lib-vivo-form.ftl | 2 +- .../webapp/templates/freemarker/lib/lib-vivo-properties.ftl | 2 +- .../templates/freemarker/page/partials/geoFocusMapScripts.ftl | 2 +- .../coauthorship/coAuthorshipDynamicActivator.ftl | 2 +- .../coauthorship/coAuthorshipSparklineContent.ftl | 4 ++-- .../coauthorship/coAuthorshipStandaloneActivator.ftl | 4 ++-- .../visualization/collaboratorToActivityCountTable.ftl | 4 ++-- .../visualization/copi/coInvestigationDynamicActivator.ftl | 2 +- .../visualization/copi/coInvestigationSparklineContent.ftl | 4 ++-- .../visualization/copi/coInvestigationStandaloneActivator.ftl | 4 ++-- .../templates/freemarker/visualization/dummyVisClient.ftl | 4 ++-- .../visualization/entitycomparison/entityComparisonBody.ftl | 2 +- .../entitycomparison/entityComparisonErrorCommonBody.ftl | 4 ++-- .../entitycomparison/entityComparisonOnGrantsStandalone.ftl | 2 +- .../entityComparisonOnPublicationsStandalone.ftl | 4 ++-- .../visualization/entitycomparison/entityComparisonSetup.ftl | 2 +- .../entitycomparison/entityGrantComparisonError.ftl | 4 ++-- .../entitycomparison/entityPublicationComparisonError.ftl | 4 ++-- .../visualization/grant/personGrantCountDynamicActivator.ftl | 2 +- .../grant/personGrantCountStandaloneActivator.ftl | 4 ++-- .../visualization/grant/personGrantSparklineContent.ftl | 4 ++-- .../visualization/mapOfScience/aboutMapOfScience.ftl | 2 +- .../visualization/mapOfScience/mapOfScienceSetup.ftl | 2 +- .../visualization/mapOfScience/mapOfScienceStandalone.ftl | 2 +- .../visualization/mapOfScience/mapOfScienceTooltips.ftl | 2 +- .../modelconstructor/regenerateConstructedModels.ftl | 4 ++-- .../visualization/personlevel/coAuthorPersonLevelD3.ftl | 2 +- .../visualization/personlevel/coPIPersonLevelD3.ftl | 2 +- .../publication/personPublicationCountDynamicActivator.ftl | 2 +- .../publication/personPublicationCountNoSparkline.ftl | 2 +- .../publication/personPublicationCountStandaloneActivator.ftl | 4 ++-- .../publication/personPublicationSparklineContent.ftl | 2 +- .../main/webapp/templates/freemarker/visualization/tools.ftl | 2 +- .../webapp/templates/freemarker/visualization/utilities.ftl | 2 +- .../templates/freemarker/visualization/visualizationError.ftl | 2 +- .../freemarker/visualization/yearToActivityCountTable.ftl | 4 ++-- .../src/main/webapp/themes/wilma/css/openSocial/gadgets.css | 2 +- webapp/src/main/webapp/themes/wilma/css/reset.css | 4 ++-- webapp/src/main/webapp/themes/wilma/css/screen.css | 4 ++-- webapp/src/main/webapp/themes/wilma/css/wilma.css | 2 +- webapp/src/main/webapp/themes/wilma/templates/footer.ftl | 4 ++-- .../src/main/webapp/themes/wilma/templates/gadgetDetails.ftl | 2 +- webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl | 2 +- .../main/webapp/themes/wilma/templates/googleAnalytics.ftl | 4 ++-- webapp/src/main/webapp/themes/wilma/templates/head.ftl | 4 ++-- webapp/src/main/webapp/themes/wilma/templates/identity.ftl | 4 ++-- .../webapp/themes/wilma/templates/individual--foaf-person.ftl | 2 +- webapp/src/main/webapp/themes/wilma/templates/menu.ftl | 4 ++-- webapp/src/main/webapp/themes/wilma/templates/page-home.ftl | 4 ++-- webapp/src/main/webapp/themes/wilma/templates/page.ftl | 4 ++-- webapp/src/main/webapp/themes/wilma/templates/search.ftl | 4 ++-- 597 files changed, 752 insertions(+), 751 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java index 17b719f6..d1862b56 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.semservices.service.impl; diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java index 843baab6..f4b84a55 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.semservices.service.impl; diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java index ed38ab52..9121434f 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.semservices.service.impl; diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java index d29955de..a6f4a537 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.semservices.service.impl; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java index 6b75946a..eefdf3ac 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java index 5cab4d9c..d17d303d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java index 3ddf3a39..7eddc06f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.ajax; import java.io.IOException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java index 8d654f02..50ccfc73 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.ajax; import java.io.IOException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java index 3674d7cf..70b980da 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.ajax; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java index b9e5da46..7e48f205 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.ajax; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java index 9d952fd6..da1a4118 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.ajax; import java.io.IOException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java index cef38622..1c67d93f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java index d8eb047a..2a47f84d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java index 483acde6..3ba32c45 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java index 74b193b1..7daa4aee 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.util.ArrayList; @@ -126,4 +126,4 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer Collections.sort(allSubclasses); return allSubclasses; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java index 80b00825..5163fd9e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java index 10efd694..cb0aad1d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.harvester; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java index aa3cdf00..8477b64d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.harvester; @@ -943,4 +943,4 @@ public class FileHarvestController extends FreemarkerHttpServlet { } } } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java index 90291a81..d1c08b34 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.harvester; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java index 15769d5e..9a6518a7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.harvester; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java index 48d63d8d..17d498a1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.visualization; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java index 1008e3ac..e61a0902 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.visualization; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java index d9d4c84f..d0545387 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.visualization; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java index 40f7d94e..fef6d7bc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.visualization; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java index 0b4cbdde..9c100798 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.visualization; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java index afc7a557..29c686d1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.visualization; import java.util.Map; @@ -16,4 +16,4 @@ public class VisualizationInjector { this.visualizationIDToClass = visualizationIDToClass; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java index c7918202..6c27572d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.controller.visualization; import java.util.Map; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java index 673f1b8c..57959a41 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java index 7e534b05..b4f829f8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java index 964855f8..28fd5225 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMapping; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java index e9202b73..020ca807 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java index b84005a3..910b0c1f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java index dca01826..b6ce7099 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java index 80bb5a90..be52c3d1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java index f2d541ff..6037e9e2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java index 96c73793..4a726b19 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java index 24c7eb26..6668687d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java index 703d1b41..130c1518 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java index 36721a5e..bb30661b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java index f37d0363..20a916bd 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java index 30ffe987..127cd4b6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.ArrayList; @@ -220,4 +220,4 @@ public class AddEditorshipToPersonGenerator extends VivoBaseGenerator implements return literalOptions; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java index fff071dc..af914e7f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java index 0f5121a6..f17faf24 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java index 24acefcc..6ebe6df5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java index e5ba2a95..acec8b4a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java index c2a3b735..da849473 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java index 7b429d3b..678fac48 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java index 733b71e3..00df49fa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java index 8a847782..53f315a3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java index 4e074dae..11c395bf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java index 8a70e00e..b70c27e0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java index 8a061c36..03140703 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java index 6ca72b64..a8e5d91a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java index 174d299d..968b6586 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java index f6f071e0..b059f952 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java index 6f3aab4b..4661793a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java index 73bfb45d..d73a7d0e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java @@ -1,5 +1,5 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java index 7a78e157..87c211e5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java index 37b942e2..89db1e5c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java index 4fd00a90..955164b5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_LITERAL; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java index eb6d57f7..2e2a2961 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java index b0d9192d..bfad4874 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java index a1db142c..4038a3aa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java index 6ac0b7c2..58447c1d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.Arrays; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java index 7f4866f0..8d842089 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java index 2081dbde..184fe17d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java index 061e2357..75dc75f1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java index ce5d54d4..f1a1a6c9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java index ffc997de..32cdd692 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java index 0ef994d6..8e6428e6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java index 1e77175a..f23852ce 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java index 2f51c8cc..056dbf38 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java index 5da85cba..6e1b3fc8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java index 5f9656ea..0ac42176 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java index 3f366408..d07fdb76 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java index 0dfac782..89a82f0e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVOManageLabelsGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVOManageLabelsGenerator.java index d0d67c0b..df952439 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVOManageLabelsGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVOManageLabelsGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.List; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java index 332d97d5..204c2b6b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java index cab2f6b3..2ea0413d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java index 04d8acf6..e2248853 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java index 2cb49bd7..cbd7dcb4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java index 47706581..3735d131 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java index 7ff66758..003f13d4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java index 7fa8599e..833929f0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java index 68243bdb..68d46119 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java index 1782fc09..9ad4d70b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java index 5bc9ebed..bb25b936 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.searchindex.extensions; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java index cf076989..2c62e774 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.servlet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java index 68705bd3..17c263f0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java index dd2fbab0..3119b4ea 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService; @@ -30,4 +30,4 @@ public class VocabSourceDescription { public String getDescription() { return description; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java index 38576344..38f7b953 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.utils.dataGetter; @@ -132,4 +132,4 @@ public class InternalClassesDataGetter extends IndividualsForClassesDataGetter{ " OPTIONAL { ?dataGetterUri <"+ DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?isInternal } .\n" + "} \n" ; -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java index d422e77f..e596e03f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.utils.menuManagement; @@ -79,4 +79,4 @@ public class ProcessInternalClasses extends ProcessIndividualsForClasses { return (internalClass != null && !internalClass.isEmpty()); } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java index 63b1c6ee..67d60a20 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.utils.menuManagement; @@ -57,4 +57,4 @@ public class VIVOMenuManagementDataUtils implements MenuManagementDataUtils.IMen } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapRequestHandler.java index 0588e0f4..0e4cfbcf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.capabilitymap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapResponse.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapResponse.java index c6d91fdc..aebd6614 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapResponse.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapResponse.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.capabilitymap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapResult.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapResult.java index 6e039ddc..c9231ff4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapResult.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/capabilitymap/CapabilityMapResult.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.capabilitymap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java index 0051fb69..9c66252d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java index 30acced1..7e7ee384 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java index 32dd0fad..1c9e4ae1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java index a29405b0..c63e2d1e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; @@ -254,4 +254,4 @@ public class CoAuthorshipVisCodeGenerator { public SparklineData getValueObjectContainer() { return this.sparklineParameterVO; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java index e1e220f0..4ad11a8d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.HashMap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java index 8a9a7d35..da5db8a8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.HashMap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java index 9b71a140..e0da2dac 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java index b5fdec18..4e94c24b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java index 178e9f89..24bfc739 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java index 2c79589a..40ebe6db 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.constants; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java index 53898382..3b59376e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.constants; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java index c4de5630..b5df83be 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.constants; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java index 597aee33..210810a6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.constants; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java index e792b969..344aef1d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.constants; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java index b3674764..0aacadd4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.io.InputStream; @@ -329,4 +329,4 @@ public class CoPIGrantCountConstructQueryRunner implements ModelConstructor { this.egoURI, "", "core:CoPrincipalInvestigatorRole")); } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java index 49e42073..6795cea7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java index 818dd96a..ea0a6321 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.HashMap; @@ -291,4 +291,4 @@ public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler return AuthorizationRequest.AUTHORIZED; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java index 00d5c890..52309bc6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java index 67040ba7..9f37bf2c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java index 2da34434..7d4de93b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.exceptions; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java index 0822717f..a5bf5b8d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.exceptions; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java index a721eb13..8b361fe1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.exceptions; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java index 941bc6c3..23b46557 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.mapofscience; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/ConceptLabelMap.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/ConceptLabelMap.java index ea0fd6a0..5a09e659 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/ConceptLabelMap.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/ConceptLabelMap.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.model; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/ConceptPeopleMap.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/ConceptPeopleMap.java index dd61ede3..7789676e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/ConceptPeopleMap.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/ConceptPeopleMap.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.model; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/OrganizationPeopleMap.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/OrganizationPeopleMap.java index 3c4d63b7..ac086c50 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/OrganizationPeopleMap.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/OrganizationPeopleMap.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.model; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/Person.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/Person.java index 8b7dedfe..87c4e218 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/Person.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/model/Person.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.model; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java index bd146adb..e5bfeadb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java index 9d184e44..760c3a22 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashMap; @@ -29,4 +29,4 @@ public class ModelConstructorUtilities { throws MalformedQueryParametersException { return modelTypeIdentifierToFactory.get(modelType).getOrCreateModel(uri, rdfService); } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java index 5c4ebfce..42300bd4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashSet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java index 109c910c..bb9f8adb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import org.apache.jena.rdf.model.Model; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java index c2899521..cf5b012c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java index 20454dbd..bdd111ba 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; @@ -268,4 +268,4 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl return null; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java index b237e3a8..ea13fbd5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; @@ -232,4 +232,4 @@ public class PersonGrantCountVisCodeGenerator { public SparklineData getValueObjectContainer() { return this.sparklineParameterVO; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java index 97159a7e..85aad034 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.personlevel; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java index 8af4dbb9..14835cd5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java index 52782528..8ff07624 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java index 00daf01e..182472ef 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; @@ -233,4 +233,4 @@ public class PersonPublicationCountVisCodeGenerator { public SparklineData getValueObjectContainer() { return this.sparklineParameterVO; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java index 2e8a485a..7b68f7fd 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.setup; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java index 56beb5e5..63c31e89 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph; import java.util.HashMap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java index 16e15873..eec48eff 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java index e40f846a..724272ff 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph; @@ -308,4 +308,4 @@ public class TemporalPublicationVisualizationRequestHandler implements // TODO Auto-generated method stub return null; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java index a12ba791..f0f95bc0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.tools; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CachingRDFServiceExecutor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CachingRDFServiceExecutor.java index d10e262e..ddbc68aa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CachingRDFServiceExecutor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CachingRDFServiceExecutor.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.utilities; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CounterUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CounterUtils.java index 86109695..fec45dfd 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CounterUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CounterUtils.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.utilities; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java index 2f8dbc29..8964ca0d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.utilities; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/PersonPublicationMaps.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/PersonPublicationMaps.java index 5143da50..e9ab6c4a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/PersonPublicationMaps.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/PersonPublicationMaps.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.utilities; import java.util.HashMap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java index 7facc943..aec2d898 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.utilities; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java index 18f15dbe..f9624b8a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.utilities; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java index eb3c9867..0ab14b45 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java index daf960d2..ebe666bf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java index 66025f66..d2c5bc40 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java index 26e9a4d4..5dfcbf16 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.ModelConstructorUtilities; @@ -37,4 +37,4 @@ public class ConstructedModel { return individualLabel; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java index 549131a1..da4e5c3b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.HashMap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java index 08449938..a3ec63aa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collection; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java index 2c01d34d..fde0df83 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java index 89c6ddd5..af8cada7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java index e65c7654..3e9fee18 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; public class MapOfScienceActivity extends Activity { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java index 0e48cb61..37685b92 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java index 87b341b6..c2bdbbbc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collection; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java index 0c7408f5..eb361aeb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; /** diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java index ee00ab7a..d57f968c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json; import java.util.ArrayList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java index 77d10ac1..edac28e1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json; import java.util.HashMap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java index a0a20782..dd7a1f97 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json; import java.util.HashMap; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java index 2be8094d..9a0e9afe 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java index 07f930b7..53f83811 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CollaborationDataViewHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CollaborationDataViewHelper.java index 5d3083fa..cdf2dce0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CollaborationDataViewHelper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CollaborationDataViewHelper.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CustomLock.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CustomLock.java index 8a9c4c98..58de7ceb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CustomLock.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CustomLock.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.concurrent.locks.ReentrantLock; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java index 6eaba8c0..d73f0cd6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java index 5de47afe..04c9e72b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java index fc65d3a6..269baaa9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java index 15b72e32..b87679cc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java index 58a572ae..614479b3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java index ddfa0b27..0f4b93e2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java index f981bd66..b269197a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; @@ -311,4 +311,4 @@ public class UtilityFunctions { } return individualLabel; } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java index d98ac993..7afd1237 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.Map; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java index fd2fef0f..2b911240 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java index 93f8ffd8..61d76ea4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java index b9316816..d12b6dda 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult; @@ -74,4 +74,4 @@ public class VIVOIndividualSearchResult extends IndividualSearchResult { public static void register() { IndividualSearchResult.registerResultClass(VIVOIndividualSearchResult.class); } -} \ No newline at end of file +} diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java index 41ed2fec..abea20e0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.auth.policy; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java index 8a66e70a..c5706d2c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.auth.policy; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java index 608974bc..ac77145b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.auth.policy; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java index 1805e231..bf5f6037 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.auth.policy; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java index d17a5300..5305b455 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.auth.policy; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java index ed0b5670..02eb8c09 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.auth.policy; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java index dce6456c..825ae164 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.auth.policy; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java index 6a07d5f8..df2c5f4b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java index 2f983281..e930e50c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAbstractHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAbstractHandler.java index 6bd1e49f..a84d6398 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAbstractHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAbstractHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java index 8e8f86e9..9ccd5145 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java index 0a635608..6ce25b0b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java index 3da78aa1..48d1dcaf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java index fc275631..9368dda4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java index e60a841b..3f54f50c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java index bcacfb5c..7a07689f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIllegalStateException.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIllegalStateException.java index 164c2396..717039f5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIllegalStateException.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIllegalStateException.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java index e06474d1..941b811c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java index 1e857429..7fc27fea 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.orcid.controller; diff --git a/api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java b/api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java index 659d778d..8048d3d7 100644 --- a/api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java +++ b/api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package org.vivoweb.reasoner.plugin; diff --git a/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java b/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java index 93fd0ca0..bb3fea16 100644 --- a/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java +++ b/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package org.vivoweb.reasoner.plugin; diff --git a/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java b/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java index eb4ec0fb..b7682c92 100644 --- a/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java +++ b/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package org.vivoweb.webapp.sitemap; diff --git a/api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java b/api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java index 7244fd34..1afc1f25 100644 --- a/api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java +++ b/api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package org.vivoweb.webapp.startup; diff --git a/api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java b/api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java index b59dc4ca..ac49cd53 100644 --- a/api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java +++ b/api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package org.vivoweb.webapp.util; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java index 5198c7df..44ed7f8c 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.searchindex.extensions; diff --git a/api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java b/api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java index dc7ccb47..ba437f61 100644 --- a/api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vivo.auth.policy; diff --git a/api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3 b/api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3 index 87d36aa4..c2c53caa 100644 --- a/api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3 +++ b/api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix rdf: . @prefix rdfs: . diff --git a/home/src/main/assembly/home.xml b/home/src/main/assembly/home.xml index ab7f29fd..e14c9193 100644 --- a/home/src/main/assembly/home.xml +++ b/home/src/main/assembly/home.xml @@ -27,4 +27,4 @@ / - \ No newline at end of file + diff --git a/home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3 index 02184a68..d536d389 100644 --- a/home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3 +++ b/home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix owl: . @prefix display: . diff --git a/home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3 b/home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3 index 8a81aa25..fea3c673 100644 --- a/home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3 +++ b/home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ # # Associate the LocaleSelectionDataGetter with the languageSelector.ftl Freemarker template. diff --git a/home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3 b/home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3 index a1f5403f..2f76ba96 100644 --- a/home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3 +++ b/home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix owl: . @prefix display: . @@ -15,4 +15,4 @@ # Testing to see if this will be read in BECAUSE this has changed and should be read in # -# a . \ No newline at end of file +# a . diff --git a/home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3 index 225ff88a..53939167 100644 --- a/home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3 +++ b/home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix foaf: . @prefix display: . diff --git a/home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3 index 3a0b2682..ab2419a0 100644 --- a/home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3 +++ b/home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix owl: . @prefix display: . diff --git a/home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3 index d3ca3db2..33dc66e0 100644 --- a/home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3 +++ b/home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix owl: . @prefix display: . diff --git a/home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3 b/home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3 index 55abd9f3..aaf16516 100644 --- a/home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3 +++ b/home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix owl: . @prefix display: . diff --git a/home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3 b/home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3 index 8e7b7063..2061d7ef 100644 --- a/home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3 +++ b/home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix owl: . @prefix vitroDisplay: . diff --git a/home/src/main/resources/rdf/display/firsttime/aboutPage.n3 b/home/src/main/resources/rdf/display/firsttime/aboutPage.n3 index c606c2d5..9aa2ceaa 100644 --- a/home/src/main/resources/rdf/display/firsttime/aboutPage.n3 +++ b/home/src/main/resources/rdf/display/firsttime/aboutPage.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix about: . diff --git a/home/src/main/resources/rdf/display/firsttime/menu.n3 b/home/src/main/resources/rdf/display/firsttime/menu.n3 index 418b3dd0..e6abb201 100644 --- a/home/src/main/resources/rdf/display/firsttime/menu.n3 +++ b/home/src/main/resources/rdf/display/firsttime/menu.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix owl: . @prefix display: . diff --git a/home/src/main/resources/rdf/tbox/filegraph/linkSuppression.n3 b/home/src/main/resources/rdf/tbox/filegraph/linkSuppression.n3 index 46ba42db..fcabadfe 100644 --- a/home/src/main/resources/rdf/tbox/filegraph/linkSuppression.n3 +++ b/home/src/main/resources/rdf/tbox/filegraph/linkSuppression.n3 @@ -10,4 +10,4 @@ core:hasResearchArea config:deleteLinkSuppressed "true"^^xsd:boolean . core:researchAreaOf config:deleteLinkSuppressed "true"^^xsd:boolean . core:hasSubjectArea config:deleteLinkSuppressed "true"^^xsd:boolean . core:subjectAreaFor config:deleteLinkSuppressed "true"^^xsd:boolean . -core:geographicFocusOf config:editLinkSuppressed "true"^^xsd:boolean . \ No newline at end of file +core:geographicFocusOf config:editLinkSuppressed "true"^^xsd:boolean . diff --git a/home/src/main/resources/rdf/tbox/filegraph/orcid-interface.n3 b/home/src/main/resources/rdf/tbox/filegraph/orcid-interface.n3 index 05a2dafa..2e45f681 100644 --- a/home/src/main/resources/rdf/tbox/filegraph/orcid-interface.n3 +++ b/home/src/main/resources/rdf/tbox/filegraph/orcid-interface.n3 @@ -14,4 +14,4 @@ core:confirmedOrcidId # When the orcidId triple is deleted, delete the ORCID ID object also. core:orcidId vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ; - \ No newline at end of file + diff --git a/home/src/main/resources/rdf/tbox/filegraph/sameAs.n3 b/home/src/main/resources/rdf/tbox/filegraph/sameAs.n3 index c01df372..e80d907d 100644 --- a/home/src/main/resources/rdf/tbox/filegraph/sameAs.n3 +++ b/home/src/main/resources/rdf/tbox/filegraph/sameAs.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ @prefix rdfs: . @prefix xsd: . diff --git a/installer/example-settings.xml b/installer/example-settings.xml index 0235418e..0007c79c 100644 --- a/installer/example-settings.xml +++ b/installer/example-settings.xml @@ -18,4 +18,4 @@ defaults - \ No newline at end of file + diff --git a/installer/home/src/main/assembly/home.xml b/installer/home/src/main/assembly/home.xml index 97f6d936..ad9cb626 100644 --- a/installer/home/src/main/assembly/home.xml +++ b/installer/home/src/main/assembly/home.xml @@ -19,4 +19,4 @@ true - \ No newline at end of file + diff --git a/legacy/build.xml b/legacy/build.xml index 3245b7b4..32ea6a3f 100644 --- a/legacy/build.xml +++ b/legacy/build.xml @@ -1,6 +1,6 @@ - + +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign aboutImagesRoot = '${urls.images}/visualization/mapofscience/about/'> diff --git a/legacy/languages/es_GO/templates/freemarker/aboutQrCodes_es_GO.ftl b/legacy/languages/es_GO/templates/freemarker/aboutQrCodes_es_GO.ftl index 950876f6..e0292853 100644 --- a/legacy/languages/es_GO/templates/freemarker/aboutQrCodes_es_GO.ftl +++ b/legacy/languages/es_GO/templates/freemarker/aboutQrCodes_es_GO.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Page providing details on how QR codes work --> diff --git a/legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl b/legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl index cd56c447..9faded02 100644 --- a/legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl +++ b/legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- START TOOLTIP TEXT --> diff --git a/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3 b/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3 index 9db0e166..725dd113 100644 --- a/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3 +++ b/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3 @@ -7,4 +7,4 @@ # 5000.0. - 500000.0. \ No newline at end of file + 500000.0. diff --git a/legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 b/legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 index 1c0a1866..f0ff92f0 100644 --- a/legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 +++ b/legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 @@ -1,4 +1,4 @@ -# $This file is distributed under the terms of the license in /doc/license.txt$ +# $This file is distributed under the terms of the license in LICENSE$ # # Short View configuration diff --git a/legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl b/legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl index 2aa59a6d..c223ec41 100644 --- a/legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl +++ b/legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-properties.ftl" as p> diff --git a/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl b/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl index 7e641b85..f04d9037 100644 --- a/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl +++ b/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-properties.ftl" as p> diff --git a/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl b/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl index c79534e9..6ada2ff0 100644 --- a/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl +++ b/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-properties.ftl" as p> diff --git a/legacy/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl b/legacy/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl index 52257857..cb9377bf 100644 --- a/legacy/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl +++ b/legacy/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-properties.ftl" as p> diff --git a/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 b/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 index 4419cb5c..a56554cc 100644 --- a/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 +++ b/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 @@ -8,4 +8,4 @@ myDomain:SQapiPerson a foaf:Person; rdfs:label "Baker, Able "^^xsd:string ; vitro:mostSpecificType foaf:Person; - vivo:overview "A simple bread-maker." . \ No newline at end of file + vivo:overview "A simple bread-maker." . diff --git a/legacy/utilities/acceptance-tests/testApp/TestLinkedOpenData.html b/legacy/utilities/acceptance-tests/testApp/TestLinkedOpenData.html index be0b32ea..866112b1 100644 --- a/legacy/utilities/acceptance-tests/testApp/TestLinkedOpenData.html +++ b/legacy/utilities/acceptance-tests/testApp/TestLinkedOpenData.html @@ -1,4 +1,4 @@ - + @@ -185,4 +185,4 @@ $(document).ready(function() {
Response code is 000
MIME type is No type
Text is:
-
No text
\ No newline at end of file +
No text
diff --git a/legacy/utilities/acceptance-tests/testApp/TestListRDF.html b/legacy/utilities/acceptance-tests/testApp/TestListRDF.html index 53f262b6..070b89f9 100644 --- a/legacy/utilities/acceptance-tests/testApp/TestListRDF.html +++ b/legacy/utilities/acceptance-tests/testApp/TestListRDF.html @@ -1,4 +1,4 @@ - + @@ -62,4 +62,4 @@ $(document).ready(function() {
Response code is 000
MIME type is No type
Text is:
-
No text
\ No newline at end of file +
No text
diff --git a/legacy/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html b/legacy/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html index 77ef5c57..b768215d 100644 --- a/legacy/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html +++ b/legacy/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html @@ -1,4 +1,4 @@ - + @@ -72,4 +72,4 @@ $(document).ready(function() {
Response code is 000
MIME type is No type
Text is:
-
No text
\ No newline at end of file +
No text
diff --git a/legacy/utilities/acceptance-tests/testApp/js/jquery.js b/legacy/utilities/acceptance-tests/testApp/js/jquery.js index 14fd6470..761a1e95 100644 --- a/legacy/utilities/acceptance-tests/testApp/js/jquery.js +++ b/legacy/utilities/acceptance-tests/testApp/js/jquery.js @@ -13,4 +13,4 @@ * * Date: Wed Feb 23 13:55:29 2011 -0500 */ -(function(a,b){function cg(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cd(a){if(!bZ[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";bZ[a]=c}return bZ[a]}function cc(a,b){var c={};d.each(cb.concat.apply([],cb.slice(0,b)),function(){c[this]=a});return c}function bY(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bX(){try{return new a.XMLHttpRequest}catch(b){}}function bW(){d(a).unload(function(){for(var a in bU)bU[a](0,1)})}function bQ(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g=0===c})}function N(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function F(a,b){return(a&&a!=="*"?a+".":"")+b.replace(r,"`").replace(s,"&")}function E(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,q=[],r=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;ic)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function C(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function w(){return!0}function v(){return!1}function g(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function f(a,c,f){if(f===b&&a.nodeType===1){f=a.getAttribute("data-"+c);if(typeof f==="string"){try{f=f==="true"?!0:f==="false"?!1:f==="null"?null:d.isNaN(f)?e.test(f)?d.parseJSON(f):f:parseFloat(f)}catch(g){}d.data(a,c,f)}else f=b}return f}var c=a.document,d=function(){function I(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(I,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x=!1,y,z="then done fail isResolved isRejected promise".split(" "),A,B=Object.prototype.toString,C=Object.prototype.hasOwnProperty,D=Array.prototype.push,E=Array.prototype.slice,F=String.prototype.trim,G=Array.prototype.indexOf,H={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.1",length:0,size:function(){return this.length},toArray:function(){return E.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?D.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(E.apply(this,arguments),"slice",E.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:D,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;y.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=!0;if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",A,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",A),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&I()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):H[B.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!C.call(a,"constructor")&&!C.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||C.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g1){var f=E.call(arguments,0),g=b,h=function(a){return function(b){f[a]=arguments.length>1?E.call(arguments,0):b,--g||c.resolveWith(e,f)}};while(b--)a=f[b],a&&d.isFunction(a.promise)?a.promise().then(h(b),c.reject):--g;g||c.resolveWith(e,f)}else c!==a&&c.resolve(a);return e},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),y=d._Deferred(),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){H["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),G&&(d.inArray=function(a,b){return G.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?A=function(){c.removeEventListener("DOMContentLoaded",A,!1),d.ready()}:c.attachEvent&&(A=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",A),d.ready())});return d}();(function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML="
a";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e),b=e=f=null}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
t
";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function"),b=null;return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}})();var e=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!g(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,h=b.nodeType,i=h?d.cache:b,j=h?b[d.expando]:d.expando;if(!i[j])return;if(c){var k=e?i[j][f]:i[j];if(k){delete k[c];if(!g(k))return}}if(e){delete i[j][f];if(!g(i[j]))return}var l=i[j][f];d.support.deleteExpando||i!=a?delete i[j]:i[j]=null,l?(i[j]={},h||(i[j].toJSON=d.noop),i[j][f]=l):h&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var g=this[0].attributes,h;for(var i=0,j=g.length;i-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var k=i?f:0,l=i?f+1:h.length;k=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=k.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&l.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var o=a.getAttributeNode("tabIndex");return o&&o.specified?o.value:m.test(a.nodeName)||n.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var p=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return p===null?b:p}h&&(a[c]=e);return a[c]}});var p=/\.(.*)$/,q=/^(?:textarea|input|select)$/i,r=/\./g,s=/ /g,t=/[^\w\s.|`]/g,u=function(a){return a.replace(t,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=v;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(){return typeof d!=="undefined"&&!d.event.triggered?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=v);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),u).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(p,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=!0,l[m]())}catch(q){}k&&(l["on"+m]=k),d.event.triggered=!1}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},B=function B(a){var c=a.target,e,f;if(q.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=A(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:B,beforedeactivate:B,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&B.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&B.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",A(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in z)d.event.add(this,c+".specialChange",z[c]);return q.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return q.test(this.nodeName)}},z=d.event.special.change.filters,z.focus=z.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function c(a){a=d.event.fix(a),a.type=b;return d.event.handle.call(this,a)}d.event.special[b]={setup:function(){this.addEventListener(a,c,!0)},teardown:function(){this.removeEventListener(a,c,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){return"text"===a.getAttribute("type")},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector,d=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(e){d=!0}b&&(k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(d||!l.match.PSEUDO.test(c)&&!/!=/.test(c))return b.call(a,c)}catch(e){}return k(c,null,null,[a]).length>0})}(),function(){var a=c.createElement("div");a.innerHTML="
";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(var g=c;g0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=L.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(N(c[0])||N(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=K.call(arguments);G.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!M[a]?d.unique(f):f,(this.length>1||I.test(e))&&H.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var P=/ jQuery\d+="(?:\d+|null)"/g,Q=/^\s+/,R=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,S=/<([\w:]+)/,T=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};X.optgroup=X.option,X.tbody=X.tfoot=X.colgroup=X.caption=X.thead,X.th=X.td,d.support.htmlSerialize||(X._default=[1,"div
","
"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(P,""):null;if(typeof a!=="string"||V.test(a)||!d.support.leadingWhitespace&&Q.test(a)||X[(S.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(R,"<$1>");try{for(var c=0,e=this.length;c1&&l0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){$(a,e),f=_(a),g=_(e);for(h=0;f[h];++h)$(f[h],g[h])}if(b){Z(a,e);if(c){f=_(a),g=_(e);for(h=0;f[h];++h)Z(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||U.test(i)){if(typeof i==="string"){i=i.replace(R,"<$1>");var j=(S.exec(i)||["",""])[1].toLowerCase(),k=X[j]||X._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=T.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]===""&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&Q.test(i)&&m.insertBefore(b.createTextNode(Q.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bb=/alpha\([^)]*\)/i,bc=/opacity=([^)]*)/,bd=/-([a-z])/ig,be=/([A-Z])/g,bf=/^-?\d+(?:px)?$/i,bg=/^-?\d/,bh={position:"absolute",visibility:"hidden",display:"block"},bi=["Left","Right"],bj=["Top","Bottom"],bk,bl,bm,bn=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bk(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bk)return bk(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bd,bn)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bo(a,b,e):d.swap(a,bh,function(){f=bo(a,b,e)});if(f<=0){f=bk(a,b,b),f==="0px"&&bm&&(f=bm(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bf.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return bc.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bb.test(f)?f.replace(bb,e):c.filter+" "+e}}),c.defaultView&&c.defaultView.getComputedStyle&&(bl=function(a,c,e){var f,g,h;e=e.replace(be,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bm=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bf.test(d)&&bg.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bk=bl||bm,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var bp=/%20/g,bq=/\[\]$/,br=/\r?\n/g,bs=/#.*$/,bt=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bu=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bv=/(?:^file|^widget|\-extension):$/,bw=/^(?:GET|HEAD)$/,bx=/^\/\//,by=/\?/,bz=/)<[^<]*)*<\/script>/gi,bA=/^(?:select|textarea)/i,bB=/\s+/,bC=/([?&])_=[^&]*/,bD=/(^|\-)([a-z])/g,bE=function(a,b,c){return b+c.toUpperCase()},bF=/^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,bG=d.fn.load,bH={},bI={},bJ,bK;try{bJ=c.location.href}catch(bL){bJ=c.createElement("a"),bJ.href="",bJ=bJ.href}bK=bF.exec(bJ.toLowerCase()),d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bG)return bG.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("
").append(c.replace(bz,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bA.test(this.nodeName)||bu.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(br,"\r\n")}}):{name:b.name,value:c.replace(br,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bJ,isLocal:bv.test(bK[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bM(bH),ajaxTransport:bM(bI),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bP(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bQ(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bD,bE)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bt.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bs,"").replace(bx,bK[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bB),e.crossDomain||(q=bF.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bK[1]||q[2]!=bK[2]||(q[3]||(q[1]==="http:"?80:443))!=(bK[3]||(bK[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bN(bH,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!bw.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(by.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bC,"$1_="+w);e.url=x+(x===e.url?(by.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bN(bI,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bO(g,a[g],c,f);return e.join("&").replace(bp,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bR=d.now(),bS=/(\=)\?(&|$)|()\?\?()/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bR++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bS.test(b.url)||f&&bS.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bS,l),b.url===j&&(f&&(k=k.replace(bS,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bT=d.now(),bU,bV;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bX()||bY()}:bX,bV=d.ajaxSettings.xhr(),d.support.ajax=!!bV,d.support.cors=bV&&"withCredentials"in bV,bV=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),(!a.crossDomain||a.hasContent)&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bU[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bU||(bU={},bW()),h=bT++,g.onreadystatechange=bU[h]=c):c()},abort:function(){c&&c(0,1)}}}});var bZ={},b$=/^(?:toggle|show|hide)$/,b_=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,ca,cb=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(cc("show",3),a,b,c);for(var g=0,h=this.length;g=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:cc("show",1),slideUp:cc("hide",1),slideToggle:cc("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!ca&&(ca=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b
";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),a=b=e=f=g=h=null,d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=e==="absolute"&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=cf.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!cf.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=cg(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=cg(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window); \ No newline at end of file +(function(a,b){function cg(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cd(a){if(!bZ[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";bZ[a]=c}return bZ[a]}function cc(a,b){var c={};d.each(cb.concat.apply([],cb.slice(0,b)),function(){c[this]=a});return c}function bY(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bX(){try{return new a.XMLHttpRequest}catch(b){}}function bW(){d(a).unload(function(){for(var a in bU)bU[a](0,1)})}function bQ(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g=0===c})}function N(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function F(a,b){return(a&&a!=="*"?a+".":"")+b.replace(r,"`").replace(s,"&")}function E(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,q=[],r=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;ic)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function C(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function w(){return!0}function v(){return!1}function g(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function f(a,c,f){if(f===b&&a.nodeType===1){f=a.getAttribute("data-"+c);if(typeof f==="string"){try{f=f==="true"?!0:f==="false"?!1:f==="null"?null:d.isNaN(f)?e.test(f)?d.parseJSON(f):f:parseFloat(f)}catch(g){}d.data(a,c,f)}else f=b}return f}var c=a.document,d=function(){function I(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(I,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x=!1,y,z="then done fail isResolved isRejected promise".split(" "),A,B=Object.prototype.toString,C=Object.prototype.hasOwnProperty,D=Array.prototype.push,E=Array.prototype.slice,F=String.prototype.trim,G=Array.prototype.indexOf,H={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.1",length:0,size:function(){return this.length},toArray:function(){return E.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?D.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(E.apply(this,arguments),"slice",E.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:D,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;y.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=!0;if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",A,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",A),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&I()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):H[B.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!C.call(a,"constructor")&&!C.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||C.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g1){var f=E.call(arguments,0),g=b,h=function(a){return function(b){f[a]=arguments.length>1?E.call(arguments,0):b,--g||c.resolveWith(e,f)}};while(b--)a=f[b],a&&d.isFunction(a.promise)?a.promise().then(h(b),c.reject):--g;g||c.resolveWith(e,f)}else c!==a&&c.resolve(a);return e},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),y=d._Deferred(),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){H["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),G&&(d.inArray=function(a,b){return G.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?A=function(){c.removeEventListener("DOMContentLoaded",A,!1),d.ready()}:c.attachEvent&&(A=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",A),d.ready())});return d}();(function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML="
a";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e),b=e=f=null}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
t
";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function"),b=null;return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}})();var e=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!g(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,h=b.nodeType,i=h?d.cache:b,j=h?b[d.expando]:d.expando;if(!i[j])return;if(c){var k=e?i[j][f]:i[j];if(k){delete k[c];if(!g(k))return}}if(e){delete i[j][f];if(!g(i[j]))return}var l=i[j][f];d.support.deleteExpando||i!=a?delete i[j]:i[j]=null,l?(i[j]={},h||(i[j].toJSON=d.noop),i[j][f]=l):h&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var g=this[0].attributes,h;for(var i=0,j=g.length;i-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var k=i?f:0,l=i?f+1:h.length;k=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=k.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&l.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var o=a.getAttributeNode("tabIndex");return o&&o.specified?o.value:m.test(a.nodeName)||n.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var p=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return p===null?b:p}h&&(a[c]=e);return a[c]}});var p=/\.(.*)$/,q=/^(?:textarea|input|select)$/i,r=/\./g,s=/ /g,t=/[^\w\s.|`]/g,u=function(a){return a.replace(t,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=v;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(){return typeof d!=="undefined"&&!d.event.triggered?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=v);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),u).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(p,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=!0,l[m]())}catch(q){}k&&(l["on"+m]=k),d.event.triggered=!1}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},B=function B(a){var c=a.target,e,f;if(q.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=A(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:B,beforedeactivate:B,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&B.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&B.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",A(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in z)d.event.add(this,c+".specialChange",z[c]);return q.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return q.test(this.nodeName)}},z=d.event.special.change.filters,z.focus=z.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function c(a){a=d.event.fix(a),a.type=b;return d.event.handle.call(this,a)}d.event.special[b]={setup:function(){this.addEventListener(a,c,!0)},teardown:function(){this.removeEventListener(a,c,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){return"text"===a.getAttribute("type")},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector,d=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(e){d=!0}b&&(k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(d||!l.match.PSEUDO.test(c)&&!/!=/.test(c))return b.call(a,c)}catch(e){}return k(c,null,null,[a]).length>0})}(),function(){var a=c.createElement("div");a.innerHTML="
";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(var g=c;g0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=L.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(N(c[0])||N(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=K.call(arguments);G.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!M[a]?d.unique(f):f,(this.length>1||I.test(e))&&H.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var P=/ jQuery\d+="(?:\d+|null)"/g,Q=/^\s+/,R=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,S=/<([\w:]+)/,T=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};X.optgroup=X.option,X.tbody=X.tfoot=X.colgroup=X.caption=X.thead,X.th=X.td,d.support.htmlSerialize||(X._default=[1,"div
","
"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(P,""):null;if(typeof a!=="string"||V.test(a)||!d.support.leadingWhitespace&&Q.test(a)||X[(S.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(R,"<$1>");try{for(var c=0,e=this.length;c1&&l0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){$(a,e),f=_(a),g=_(e);for(h=0;f[h];++h)$(f[h],g[h])}if(b){Z(a,e);if(c){f=_(a),g=_(e);for(h=0;f[h];++h)Z(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||U.test(i)){if(typeof i==="string"){i=i.replace(R,"<$1>");var j=(S.exec(i)||["",""])[1].toLowerCase(),k=X[j]||X._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=T.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]===""&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&Q.test(i)&&m.insertBefore(b.createTextNode(Q.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bb=/alpha\([^)]*\)/i,bc=/opacity=([^)]*)/,bd=/-([a-z])/ig,be=/([A-Z])/g,bf=/^-?\d+(?:px)?$/i,bg=/^-?\d/,bh={position:"absolute",visibility:"hidden",display:"block"},bi=["Left","Right"],bj=["Top","Bottom"],bk,bl,bm,bn=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bk(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bk)return bk(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bd,bn)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bo(a,b,e):d.swap(a,bh,function(){f=bo(a,b,e)});if(f<=0){f=bk(a,b,b),f==="0px"&&bm&&(f=bm(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bf.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return bc.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bb.test(f)?f.replace(bb,e):c.filter+" "+e}}),c.defaultView&&c.defaultView.getComputedStyle&&(bl=function(a,c,e){var f,g,h;e=e.replace(be,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bm=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bf.test(d)&&bg.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bk=bl||bm,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var bp=/%20/g,bq=/\[\]$/,br=/\r?\n/g,bs=/#.*$/,bt=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bu=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bv=/(?:^file|^widget|\-extension):$/,bw=/^(?:GET|HEAD)$/,bx=/^\/\//,by=/\?/,bz=/)<[^<]*)*<\/script>/gi,bA=/^(?:select|textarea)/i,bB=/\s+/,bC=/([?&])_=[^&]*/,bD=/(^|\-)([a-z])/g,bE=function(a,b,c){return b+c.toUpperCase()},bF=/^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,bG=d.fn.load,bH={},bI={},bJ,bK;try{bJ=c.location.href}catch(bL){bJ=c.createElement("a"),bJ.href="",bJ=bJ.href}bK=bF.exec(bJ.toLowerCase()),d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bG)return bG.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("
").append(c.replace(bz,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bA.test(this.nodeName)||bu.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(br,"\r\n")}}):{name:b.name,value:c.replace(br,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bJ,isLocal:bv.test(bK[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bM(bH),ajaxTransport:bM(bI),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bP(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bQ(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bD,bE)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bt.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bs,"").replace(bx,bK[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bB),e.crossDomain||(q=bF.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bK[1]||q[2]!=bK[2]||(q[3]||(q[1]==="http:"?80:443))!=(bK[3]||(bK[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bN(bH,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!bw.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(by.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bC,"$1_="+w);e.url=x+(x===e.url?(by.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bN(bI,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bO(g,a[g],c,f);return e.join("&").replace(bp,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bR=d.now(),bS=/(\=)\?(&|$)|()\?\?()/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bR++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bS.test(b.url)||f&&bS.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bS,l),b.url===j&&(f&&(k=k.replace(bS,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bT=d.now(),bU,bV;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bX()||bY()}:bX,bV=d.ajaxSettings.xhr(),d.support.ajax=!!bV,d.support.cors=bV&&"withCredentials"in bV,bV=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),(!a.crossDomain||a.hasContent)&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bU[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bU||(bU={},bW()),h=bT++,g.onreadystatechange=bU[h]=c):c()},abort:function(){c&&c(0,1)}}}});var bZ={},b$=/^(?:toggle|show|hide)$/,b_=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,ca,cb=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(cc("show",3),a,b,c);for(var g=0,h=this.length;g=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:cc("show",1),slideUp:cc("hide",1),slideToggle:cc("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!ca&&(ca=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b
";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),a=b=e=f=g=h=null,d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=e==="absolute"&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=cf.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!cf.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=cg(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=cg(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window); diff --git a/legacy/utilities/pre-compileJSPs/jsp-build.xml b/legacy/utilities/pre-compileJSPs/jsp-build.xml index 1d194505..bd4efbe8 100644 --- a/legacy/utilities/pre-compileJSPs/jsp-build.xml +++ b/legacy/utilities/pre-compileJSPs/jsp-build.xml @@ -1,6 +1,6 @@ - + + org.vivoweb.vivo.selenium.tests.RebuildSearchIndex@1cf56a1c

- \ No newline at end of file + diff --git a/selenium/test-output/emailable-report.html b/selenium/test-output/emailable-report.html index bffe84c4..83ef39ad 100644 --- a/selenium/test-output/emailable-report.html +++ b/selenium/test-output/emailable-report.html @@ -29,4 +29,4 @@ Driver info: driver.version: unknown at <anonymous class>.DelayedCommand.prototype.executeInternal_/h(file:///var/folders/7d/pmw9wv8n4nz_x9t4ztp_6tgw0000gn/T/anonymous8499514178617750884webdriver-profile/extensions/fxdriver@googlecode.com/components/command-processor.js:12534) at <anonymous class>.DelayedCommand.prototype.executeInternal_(file:///var/folders/7d/pmw9wv8n4nz_x9t4ztp_6tgw0000gn/T/anonymous8499514178617750884webdriver-profile/extensions/fxdriver@googlecode.com/components/command-processor.js:12539) at <anonymous class>.DelayedCommand.prototype.execute/<(file:///var/folders/7d/pmw9wv8n4nz_x9t4ztp_6tgw0000gn/T/anonymous8499514178617750884webdriver-profile/extensions/fxdriver@googlecode.com/components/command-processor.js:12481) -... Removed 46 stack frames

back to summary

\ No newline at end of file +... Removed 46 stack frames

back to summary

diff --git a/selenium/test-output/jquery-1.7.1.min.js b/selenium/test-output/jquery-1.7.1.min.js index 198b3ff0..2d323c72 100644 --- a/selenium/test-output/jquery-1.7.1.min.js +++ b/selenium/test-output/jquery-1.7.1.min.js @@ -1,4 +1,4 @@ /*! jQuery v1.7.1 jquery.com | jquery.org/license */ (function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
"+""+"
",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
t
",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() -{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file +{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="
"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); diff --git a/selenium/test-output/old/Command line suite/Command line test.properties b/selenium/test-output/old/Command line suite/Command line test.properties index 52f6bc17..264fa93f 100644 --- a/selenium/test-output/old/Command line suite/Command line test.properties +++ b/selenium/test-output/old/Command line suite/Command line test.properties @@ -1 +1 @@ -[SuiteResult context=Command line test] \ No newline at end of file +[SuiteResult context=Command line test] diff --git a/selenium/test-output/old/Command line suite/groups.html b/selenium/test-output/old/Command line suite/groups.html index 199cb3f1..00af59d6 100644 --- a/selenium/test-output/old/Command line suite/groups.html +++ b/selenium/test-output/old/Command line suite/groups.html @@ -1 +1 @@ -

Groups used for this test run

\ No newline at end of file +

Groups used for this test run

diff --git a/selenium/test-output/old/Command line suite/methods-not-run.html b/selenium/test-output/old/Command line suite/methods-not-run.html index 54b14cb8..3fcad334 100644 --- a/selenium/test-output/old/Command line suite/methods-not-run.html +++ b/selenium/test-output/old/Command line suite/methods-not-run.html @@ -1,2 +1,2 @@

Methods that were not run

-
\ No newline at end of file + diff --git a/selenium/test-output/old/Command line suite/reporter-output.html b/selenium/test-output/old/Command line suite/reporter-output.html index 063bc2e9..0a0ab3c1 100644 --- a/selenium/test-output/old/Command line suite/reporter-output.html +++ b/selenium/test-output/old/Command line suite/reporter-output.html @@ -1 +1 @@ -

Reporter output

\ No newline at end of file +

Reporter output

diff --git a/selenium/test-output/old/Command line suite/testng.xml.html b/selenium/test-output/old/Command line suite/testng.xml.html index d687d4c2..0ad8dff9 100644 --- a/selenium/test-output/old/Command line suite/testng.xml.html +++ b/selenium/test-output/old/Command line suite/testng.xml.html @@ -1 +1 @@ -testng.xml for Command line suite<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Command line suite">
  <test name="Command line test" preserve-order="false">
    <classes>
      <class name="org.vivoweb.vivo.selenium.tests.RebuildSearchIndex"/>
    </classes>
  </test> <!-- Command line test -->
  <test name="Command line test(failed)">
    <classes>
      <class name="org.vivoweb.vivo.selenium.tests.RebuildSearchIndex">
        <methods>
          <include name="cleanup"/>
          <include name="rebuildSearchIndexTest"/>
          <include name="vivoSetup"/>
          <include name="setUp"/>
          <include name="vivoTeardown"/>
          <include name="setup"/>
        </methods>
      </class> <!-- org.vivoweb.vivo.selenium.tests.RebuildSearchIndex -->
    </classes>
  </test> <!-- Command line test(failed) -->
</suite> <!-- Command line suite -->
 \ No newline at end of file +testng.xml for Command line suite<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Command line suite">
  <test name="Command line test" preserve-order="false">
    <classes>
      <class name="org.vivoweb.vivo.selenium.tests.RebuildSearchIndex"/>
    </classes>
  </test> <!-- Command line test -->
  <test name="Command line test(failed)">
    <classes>
      <class name="org.vivoweb.vivo.selenium.tests.RebuildSearchIndex">
        <methods>
          <include name="cleanup"/>
          <include name="rebuildSearchIndexTest"/>
          <include name="vivoSetup"/>
          <include name="setUp"/>
          <include name="vivoTeardown"/>
          <include name="setup"/>
        </methods>
      </class> <!-- org.vivoweb.vivo.selenium.tests.RebuildSearchIndex -->
    </classes>
  </test> <!-- Command line test(failed) -->
</suite> <!-- Command line suite -->
 diff --git a/selenium/test-output/old/Command line suite/toc.html b/selenium/test-output/old/Command line suite/toc.html index e9561341..6be85870 100644 --- a/selenium/test-output/old/Command line suite/toc.html +++ b/selenium/test-output/old/Command line suite/toc.html @@ -27,4 +27,4 @@

- \ No newline at end of file + diff --git a/webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml b/webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml index e59748bb..8f222669 100644 --- a/webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml +++ b/webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml @@ -1,4 +1,4 @@ - + - \ No newline at end of file + diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index 61cd93fe..137bfc37 100644 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -1,6 +1,6 @@ - + - + diff --git a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml index 6666a089..374a7576 100644 --- a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml +++ b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml b/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml index 320d319c..ea742f5a 100644 --- a/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml +++ b/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml b/webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml index 8df8e684..7cdd44aa 100644 --- a/webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml +++ b/webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml b/webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml index 025dd969..c5337daa 100644 --- a/webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml +++ b/webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml b/webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml index 32510e52..7d97fac5 100644 --- a/webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml +++ b/webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml index ddd3ed86..c8a99511 100644 --- a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml +++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml index 8b73336a..3ae4be3b 100644 --- a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml +++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-default.xml b/webapp/src/main/webapp/config/listViewConfig-default.xml index 533eb1c9..ab99b449 100644 --- a/webapp/src/main/webapp/config/listViewConfig-default.xml +++ b/webapp/src/main/webapp/config/listViewConfig-default.xml @@ -1,5 +1,5 @@ - + + diff --git a/webapp/src/main/webapp/config/listViewConfig-doi.xml b/webapp/src/main/webapp/config/listViewConfig-doi.xml index 1d580347..7a749c02 100644 --- a/webapp/src/main/webapp/config/listViewConfig-doi.xml +++ b/webapp/src/main/webapp/config/listViewConfig-doi.xml @@ -1,5 +1,5 @@ - + + diff --git a/webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml b/webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml index eb2f5fcf..ecb389d8 100644 --- a/webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml +++ b/webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml index 3efd7236..f494b183 100644 --- a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml +++ b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml @@ -1,5 +1,5 @@ - + + diff --git a/webapp/src/main/webapp/config/listViewConfig-fullName.xml b/webapp/src/main/webapp/config/listViewConfig-fullName.xml index 3610bf61..68bd65c6 100644 --- a/webapp/src/main/webapp/config/listViewConfig-fullName.xml +++ b/webapp/src/main/webapp/config/listViewConfig-fullName.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml b/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml index 8b000df2..3e71b954 100644 --- a/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml +++ b/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml index 885cf6e7..30966afb 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml index 378b56e0..5fd1804e 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml b/webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml index dc06bfc0..df35bbcb 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml index 231cb255..8028cef2 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml index d48fd321..857aec25 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml index 4188b905..7f1d20b7 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml index 8b0e88a6..1e58f394 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml index 3730e9c6..0f45cffc 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml index 4f3197a6..5ed07a31 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasRole.xml index 250f4261..138f0ca3 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasRole.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml index 98f4f697..9a3a10a6 100644 --- a/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml +++ b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml b/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml index c653ef9e..33482e33 100644 --- a/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml +++ b/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml index b5d5d40b..b3af3b38 100644 --- a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml +++ b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml b/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml index 1638df11..72878233 100644 --- a/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml +++ b/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-orcidId.xml b/webapp/src/main/webapp/config/listViewConfig-orcidId.xml index 86cb4b49..7cdb448b 100644 --- a/webapp/src/main/webapp/config/listViewConfig-orcidId.xml +++ b/webapp/src/main/webapp/config/listViewConfig-orcidId.xml @@ -1,5 +1,5 @@ - + + diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml b/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml index 269e7cc2..34d2c3e6 100644 --- a/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml +++ b/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml b/webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml index 7b1c8030..d7680741 100644 --- a/webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml +++ b/webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml b/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml index e5fa5828..bf958bd3 100644 --- a/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml +++ b/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-personInPosition.xml b/webapp/src/main/webapp/config/listViewConfig-personInPosition.xml index 6c7e7f34..11e18b5b 100644 --- a/webapp/src/main/webapp/config/listViewConfig-personInPosition.xml +++ b/webapp/src/main/webapp/config/listViewConfig-personInPosition.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml b/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml index 434208b0..13962524 100644 --- a/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml +++ b/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml b/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml index 664dceff..5d86edf2 100644 --- a/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml +++ b/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml b/webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml index dcacf0c7..45bcf692 100644 --- a/webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml +++ b/webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-publisherOf.xml b/webapp/src/main/webapp/config/listViewConfig-publisherOf.xml index 4e3a3c10..9fc42cfd 100644 --- a/webapp/src/main/webapp/config/listViewConfig-publisherOf.xml +++ b/webapp/src/main/webapp/config/listViewConfig-publisherOf.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml index 745edf03..3ebd5de6 100644 --- a/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml +++ b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml @@ -1,5 +1,5 @@ - + + diff --git a/webapp/src/main/webapp/config/listViewConfig-researchActivities.xml b/webapp/src/main/webapp/config/listViewConfig-researchActivities.xml index d955b3d7..a0723a71 100644 --- a/webapp/src/main/webapp/config/listViewConfig-researchActivities.xml +++ b/webapp/src/main/webapp/config/listViewConfig-researchActivities.xml @@ -1,5 +1,5 @@ - + diff --git a/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml b/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml index b3a6d9b4..0ce19349 100644 --- a/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml +++ b/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml @@ -1,5 +1,5 @@ - + + + diff --git a/webapp/src/main/webapp/config/listViewConfig-scopusId.xml b/webapp/src/main/webapp/config/listViewConfig-scopusId.xml index 944e6175..3498f5fc 100644 --- a/webapp/src/main/webapp/config/listViewConfig-scopusId.xml +++ b/webapp/src/main/webapp/config/listViewConfig-scopusId.xml @@ -1,5 +1,5 @@ - + + diff --git a/webapp/src/main/webapp/config/listViewConfig-webpage.xml b/webapp/src/main/webapp/config/listViewConfig-webpage.xml index 406f281e..6dac4bb3 100644 --- a/webapp/src/main/webapp/config/listViewConfig-webpage.xml +++ b/webapp/src/main/webapp/config/listViewConfig-webpage.xml @@ -1,5 +1,5 @@ - + +<#-- $This file is distributed under the terms of the license in LICENSE$ --> h3.testfile-step-header { float: left; @@ -42,4 +42,4 @@ a.help { font-family:"Courier New",Courier,mono; font-style: normal; color:#666; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/css/home-page-maps.css b/webapp/src/main/webapp/css/home-page-maps.css index 52cc6881..5a78685e 100644 --- a/webapp/src/main/webapp/css/home-page-maps.css +++ b/webapp/src/main/webapp/css/home-page-maps.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* styles for geographic focus maps on home page */ div#mapControls { @@ -50,4 +50,4 @@ div#researcherTotal { .leaflet-popup-content { line-height: 1.4; margin: 8px 8px; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/css/individual/ie7-quick-view.css b/webapp/src/main/webapp/css/individual/ie7-quick-view.css index 75472b4d..a74f33c9 100644 --- a/webapp/src/main/webapp/css/individual/ie7-quick-view.css +++ b/webapp/src/main/webapp/css/individual/ie7-quick-view.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* Fix for quickview admin panel */ #admin { diff --git a/webapp/src/main/webapp/css/individual/ie7-standard-view.css b/webapp/src/main/webapp/css/individual/ie7-standard-view.css index 37986a09..0e127139 100644 --- a/webapp/src/main/webapp/css/individual/ie7-standard-view.css +++ b/webapp/src/main/webapp/css/individual/ie7-standard-view.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* Fix for quickview admin panel */ #admin { @@ -33,4 +33,4 @@ a.edit-individual { } .iconControlsEditable { top:140px; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/css/individual/individual-2column-view.css b/webapp/src/main/webapp/css/individual/individual-2column-view.css index ec6c494d..9478e24b 100644 --- a/webapp/src/main/webapp/css/individual/individual-2column-view.css +++ b/webapp/src/main/webapp/css/individual/individual-2column-view.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* <------ INDIVIDUAL INTRO */ #individual-intro { diff --git a/webapp/src/main/webapp/css/individual/individual-qr.css b/webapp/src/main/webapp/css/individual/individual-qr.css index 080bac8e..9b8d31cd 100644 --- a/webapp/src/main/webapp/css/individual/individual-qr.css +++ b/webapp/src/main/webapp/css/individual/individual-qr.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ .qrCode { float: left; @@ -22,4 +22,4 @@ section h4 { section textarea { width: 600px; height: 120px; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/css/individual/individual-quick-view.css b/webapp/src/main/webapp/css/individual/individual-quick-view.css index d2e5f8a4..1c674306 100644 --- a/webapp/src/main/webapp/css/individual/individual-quick-view.css +++ b/webapp/src/main/webapp/css/individual/individual-quick-view.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* ADMIN PANEL------> */ #admin { diff --git a/webapp/src/main/webapp/css/individual/individual-vivo.css b/webapp/src/main/webapp/css/individual/individual-vivo.css index ff669b9f..4ae90b79 100644 --- a/webapp/src/main/webapp/css/individual/individual-vivo.css +++ b/webapp/src/main/webapp/css/individual/individual-vivo.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* <------ INDIVIDUAL INTRO - LEFT SIDE CONTENT */ ul#individual-tools { diff --git a/webapp/src/main/webapp/css/jquery_plugins/ui.notify.css b/webapp/src/main/webapp/css/jquery_plugins/ui.notify.css index f23f10a6..e699ce1d 100644 --- a/webapp/src/main/webapp/css/jquery_plugins/ui.notify.css +++ b/webapp/src/main/webapp/css/jquery_plugins/ui.notify.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ .ui-notify { width: 350px; @@ -73,4 +73,4 @@ } .ui-state-error p { color: #cd0a0a; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/css/visualization/coauthorship/style.css b/webapp/src/main/webapp/css/visualization/coauthorship/style.css index bca99d18..ca61f318 100644 --- a/webapp/src/main/webapp/css/visualization/coauthorship/style.css +++ b/webapp/src/main/webapp/css/visualization/coauthorship/style.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* CSS Document */ body { @@ -623,4 +623,4 @@ ul { text-align: right; width: 40px; float: left; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie-67.css b/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie-67.css index b58e34e5..4d28dc04 100644 --- a/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie-67.css +++ b/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie-67.css @@ -1,5 +1,5 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ #yaxislabel { margin-left: -27px; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie.css b/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie.css index 19bcc537..d57153f7 100644 --- a/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie.css +++ b/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie.css @@ -1,5 +1,5 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ .disabled-checkbox-event-receiver { background-color: #fff; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css b/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css index a902bd6c..a09e344a 100644 --- a/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css +++ b/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ #body { font: 0.9em Helvetica; @@ -319,4 +319,4 @@ p.displayCounter{ #noPubsOrGrants-span a { color: #84a655; font-size:16px; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/css/visualization/mapofscience/layout.css b/webapp/src/main/webapp/css/visualization/mapofscience/layout.css index 6562ce82..4db92f14 100644 --- a/webapp/src/main/webapp/css/visualization/mapofscience/layout.css +++ b/webapp/src/main/webapp/css/visualization/mapofscience/layout.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ #map-of-science-response { background-color: #FFFFFF; diff --git a/webapp/src/main/webapp/css/visualization/personlevel/page.css b/webapp/src/main/webapp/css/visualization/personlevel/page.css index ef72968f..8ccee4f7 100644 --- a/webapp/src/main/webapp/css/visualization/personlevel/page.css +++ b/webapp/src/main/webapp/css/visualization/personlevel/page.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ a.no_href_styles { border: 0; diff --git a/webapp/src/main/webapp/css/visualization/visualization.css b/webapp/src/main/webapp/css/visualization/visualization.css index 14d71aae..411199c1 100644 --- a/webapp/src/main/webapp/css/visualization/visualization.css +++ b/webapp/src/main/webapp/css/visualization/visualization.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /***************************** visualization styles diff --git a/webapp/src/main/webapp/jenaIngest/ingestMenu.jsp b/webapp/src/main/webapp/jenaIngest/ingestMenu.jsp index 84000e35..582503f8 100644 --- a/webapp/src/main/webapp/jenaIngest/ingestMenu.jsp +++ b/webapp/src/main/webapp/jenaIngest/ingestMenu.jsp @@ -1,4 +1,4 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> +<%-- $This file is distributed under the terms of the license in LICENSE$ --%> <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> diff --git a/webapp/src/main/webapp/js/d3.min.js b/webapp/src/main/webapp/js/d3.min.js index 1984d172..6733ae4c 100644 --- a/webapp/src/main/webapp/js/d3.min.js +++ b/webapp/src/main/webapp/js/d3.min.js @@ -2,4 +2,4 @@ },polygonEnd:function(){t.polygonEnd(),S.lineStart=r}};return S}function u(t,e,r,a,c,l,s,f,h,g,p,v,d,m){var y=s-t,M=f-e,x=y*y+M*M;if(x>4*i&&d--){var b=a+g,_=c+p,w=l+v,S=Math.sqrt(b*b+_*_+w*w),k=Math.asin(w/=S),E=ga(ga(w)-1)i||ga((y*z+M*q)/x-.5)>.3||o>a*g+c*p+l*v)&&(u(t,e,r,a,c,l,N,C,E,b/=S,_/=S,w,d,m),m.point(N,C),u(N,C,E,b,_,w,s,f,h,g,p,v,d,m))}}var i=.5,o=Math.cos(30*Da),a=16;return t.precision=function(n){return arguments.length?(a=(i=n*n)>0&&16,t):Math.sqrt(i)},t}function tr(n){var t=nr(function(t,e){return n([t*Pa,e*Pa])});return function(n){return or(t(n))}}function er(n){this.stream=n}function rr(n,t){return{point:t,sphere:function(){n.sphere()},lineStart:function(){n.lineStart()},lineEnd:function(){n.lineEnd()},polygonStart:function(){n.polygonStart()},polygonEnd:function(){n.polygonEnd()}}}function ur(n){return ir(function(){return n})()}function ir(n){function t(n){return n=a(n[0]*Da,n[1]*Da),[n[0]*h+c,l-n[1]*h]}function e(n){return n=a.invert((n[0]-c)/h,(l-n[1])/h),n&&[n[0]*Pa,n[1]*Pa]}function r(){a=Ae(o=lr(m,M,x),i);var n=i(v,d);return c=g-n[0]*h,l=p+n[1]*h,u()}function u(){return s&&(s.valid=!1,s=null),t}var i,o,a,c,l,s,f=nr(function(n,t){return n=i(n,t),[n[0]*h+c,l-n[1]*h]}),h=150,g=480,p=250,v=0,d=0,m=0,M=0,x=0,b=Lc,_=y,w=null,S=null;return t.stream=function(n){return s&&(s.valid=!1),s=or(b(o,f(_(n)))),s.valid=!0,s},t.clipAngle=function(n){return arguments.length?(b=null==n?(w=n,Lc):He((w=+n)*Da),u()):w},t.clipExtent=function(n){return arguments.length?(S=n,_=n?Ie(n[0][0],n[0][1],n[1][0],n[1][1]):y,u()):S},t.scale=function(n){return arguments.length?(h=+n,r()):h},t.translate=function(n){return arguments.length?(g=+n[0],p=+n[1],r()):[g,p]},t.center=function(n){return arguments.length?(v=n[0]%360*Da,d=n[1]%360*Da,r()):[v*Pa,d*Pa]},t.rotate=function(n){return arguments.length?(m=n[0]%360*Da,M=n[1]%360*Da,x=n.length>2?n[2]%360*Da:0,r()):[m*Pa,M*Pa,x*Pa]},ta.rebind(t,f,"precision"),function(){return i=n.apply(this,arguments),t.invert=i.invert&&e,r()}}function or(n){return rr(n,function(t,e){n.point(t*Da,e*Da)})}function ar(n,t){return[n,t]}function cr(n,t){return[n>qa?n-La:-qa>n?n+La:n,t]}function lr(n,t,e){return n?t||e?Ae(fr(n),hr(t,e)):fr(n):t||e?hr(t,e):cr}function sr(n){return function(t,e){return t+=n,[t>qa?t-La:-qa>t?t+La:t,e]}}function fr(n){var t=sr(n);return t.invert=sr(-n),t}function hr(n,t){function e(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,l=Math.sin(t),s=l*r+a*u;return[Math.atan2(c*i-s*o,a*r-l*u),tt(s*i+c*o)]}var r=Math.cos(n),u=Math.sin(n),i=Math.cos(t),o=Math.sin(t);return e.invert=function(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,l=Math.sin(t),s=l*i-c*o;return[Math.atan2(c*i+l*o,a*r+s*u),tt(s*r-a*u)]},e}function gr(n,t){var e=Math.cos(n),r=Math.sin(n);return function(u,i,o,a){var c=o*t;null!=u?(u=pr(e,u),i=pr(e,i),(o>0?i>u:u>i)&&(u+=o*La)):(u=n+o*La,i=n-.5*c);for(var l,s=u;o>0?s>i:i>s;s-=c)a.point((l=xe([e,-r*Math.cos(s),-r*Math.sin(s)]))[0],l[1])}}function pr(n,t){var e=pe(t);e[0]-=n,Me(e);var r=nt(-e[1]);return((-e[2]<0?-r:r)+2*Math.PI-Ca)%(2*Math.PI)}function vr(n,t,e){var r=ta.range(n,t-Ca,e).concat(t);return function(n){return r.map(function(t){return[n,t]})}}function dr(n,t,e){var r=ta.range(n,t-Ca,e).concat(t);return function(n){return r.map(function(t){return[t,n]})}}function mr(n){return n.source}function yr(n){return n.target}function Mr(n,t,e,r){var u=Math.cos(t),i=Math.sin(t),o=Math.cos(r),a=Math.sin(r),c=u*Math.cos(n),l=u*Math.sin(n),s=o*Math.cos(e),f=o*Math.sin(e),h=2*Math.asin(Math.sqrt(it(r-t)+u*o*it(e-n))),g=1/Math.sin(h),p=h?function(n){var t=Math.sin(n*=h)*g,e=Math.sin(h-n)*g,r=e*c+t*s,u=e*l+t*f,o=e*i+t*a;return[Math.atan2(u,r)*Pa,Math.atan2(o,Math.sqrt(r*r+u*u))*Pa]}:function(){return[n*Pa,t*Pa]};return p.distance=h,p}function xr(){function n(n,u){var i=Math.sin(u*=Da),o=Math.cos(u),a=ga((n*=Da)-t),c=Math.cos(a);Yc+=Math.atan2(Math.sqrt((a=o*Math.sin(a))*a+(a=r*i-e*o*c)*a),e*i+r*o*c),t=n,e=i,r=o}var t,e,r;Zc.point=function(u,i){t=u*Da,e=Math.sin(i*=Da),r=Math.cos(i),Zc.point=n},Zc.lineEnd=function(){Zc.point=Zc.lineEnd=b}}function br(n,t){function e(t,e){var r=Math.cos(t),u=Math.cos(e),i=n(r*u);return[i*u*Math.sin(t),i*Math.sin(e)]}return e.invert=function(n,e){var r=Math.sqrt(n*n+e*e),u=t(r),i=Math.sin(u),o=Math.cos(u);return[Math.atan2(n*i,r*o),Math.asin(r&&e*i/r)]},e}function _r(n,t){function e(n,t){o>0?-Ra+Ca>t&&(t=-Ra+Ca):t>Ra-Ca&&(t=Ra-Ca);var e=o/Math.pow(u(t),i);return[e*Math.sin(i*n),o-e*Math.cos(i*n)]}var r=Math.cos(n),u=function(n){return Math.tan(qa/4+n/2)},i=n===t?Math.sin(n):Math.log(r/Math.cos(t))/Math.log(u(t)/u(n)),o=r*Math.pow(u(n),i)/i;return i?(e.invert=function(n,t){var e=o-t,r=K(i)*Math.sqrt(n*n+e*e);return[Math.atan2(n,e)/i,2*Math.atan(Math.pow(o/r,1/i))-Ra]},e):Sr}function wr(n,t){function e(n,t){var e=i-t;return[e*Math.sin(u*n),i-e*Math.cos(u*n)]}var r=Math.cos(n),u=n===t?Math.sin(n):(r-Math.cos(t))/(t-n),i=r/u+n;return ga(u)u;u++){for(;r>1&&Q(n[e[r-2]],n[e[r-1]],n[u])<=0;)--r;e[r++]=u}return e.slice(0,r)}function zr(n,t){return n[0]-t[0]||n[1]-t[1]}function qr(n,t,e){return(e[0]-t[0])*(n[1]-t[1])<(e[1]-t[1])*(n[0]-t[0])}function Lr(n,t,e,r){var u=n[0],i=e[0],o=t[0]-u,a=r[0]-i,c=n[1],l=e[1],s=t[1]-c,f=r[1]-l,h=(a*(c-l)-f*(u-i))/(f*o-a*s);return[u+h*o,c+h*s]}function Tr(n){var t=n[0],e=n[n.length-1];return!(t[0]-e[0]||t[1]-e[1])}function Rr(){tu(this),this.edge=this.site=this.circle=null}function Dr(n){var t=el.pop()||new Rr;return t.site=n,t}function Pr(n){Xr(n),Qc.remove(n),el.push(n),tu(n)}function Ur(n){var t=n.circle,e=t.x,r=t.cy,u={x:e,y:r},i=n.P,o=n.N,a=[n];Pr(n);for(var c=i;c.circle&&ga(e-c.circle.x)s;++s)l=a[s],c=a[s-1],Kr(l.edge,c.site,l.site,u);c=a[0],l=a[f-1],l.edge=Jr(c.site,l.site,null,u),Vr(c),Vr(l)}function jr(n){for(var t,e,r,u,i=n.x,o=n.y,a=Qc._;a;)if(r=Fr(a,o)-i,r>Ca)a=a.L;else{if(u=i-Hr(a,o),!(u>Ca)){r>-Ca?(t=a.P,e=a):u>-Ca?(t=a,e=a.N):t=e=a;break}if(!a.R){t=a;break}a=a.R}var c=Dr(n);if(Qc.insert(t,c),t||e){if(t===e)return Xr(t),e=Dr(t.site),Qc.insert(c,e),c.edge=e.edge=Jr(t.site,c.site),Vr(t),void Vr(e);if(!e)return void(c.edge=Jr(t.site,c.site));Xr(t),Xr(e);var l=t.site,s=l.x,f=l.y,h=n.x-s,g=n.y-f,p=e.site,v=p.x-s,d=p.y-f,m=2*(h*d-g*v),y=h*h+g*g,M=v*v+d*d,x={x:(d*y-g*M)/m+s,y:(h*M-v*y)/m+f};Kr(e.edge,l,p,x),c.edge=Jr(l,n,null,x),e.edge=Jr(n,p,null,x),Vr(t),Vr(e)}}function Fr(n,t){var e=n.site,r=e.x,u=e.y,i=u-t;if(!i)return r;var o=n.P;if(!o)return-1/0;e=o.site;var a=e.x,c=e.y,l=c-t;if(!l)return a;var s=a-r,f=1/i-1/l,h=s/l;return f?(-h+Math.sqrt(h*h-2*f*(s*s/(-2*l)-c+l/2+u-i/2)))/f+r:(r+a)/2}function Hr(n,t){var e=n.N;if(e)return Fr(e,t);var r=n.site;return r.y===t?r.x:1/0}function Or(n){this.site=n,this.edges=[]}function Ir(n){for(var t,e,r,u,i,o,a,c,l,s,f=n[0][0],h=n[1][0],g=n[0][1],p=n[1][1],v=Kc,d=v.length;d--;)if(i=v[d],i&&i.prepare())for(a=i.edges,c=a.length,o=0;c>o;)s=a[o].end(),r=s.x,u=s.y,l=a[++o%c].start(),t=l.x,e=l.y,(ga(r-t)>Ca||ga(u-e)>Ca)&&(a.splice(o,0,new Qr(Gr(i.site,s,ga(r-f)Ca?{x:f,y:ga(t-f)Ca?{x:ga(e-p)Ca?{x:h,y:ga(t-h)Ca?{x:ga(e-g)=-za)){var g=c*c+l*l,p=s*s+f*f,v=(f*g-l*p)/h,d=(c*p-s*g)/h,f=d+a,m=rl.pop()||new Zr;m.arc=n,m.site=u,m.x=v+o,m.y=f+Math.sqrt(v*v+d*d),m.cy=f,n.circle=m;for(var y=null,M=tl._;M;)if(m.yd||d>=a)return;if(h>p){if(i){if(i.y>=l)return}else i={x:d,y:c};e={x:d,y:l}}else{if(i){if(i.yr||r>1)if(h>p){if(i){if(i.y>=l)return}else i={x:(c-u)/r,y:c};e={x:(l-u)/r,y:l}}else{if(i){if(i.yg){if(i){if(i.x>=a)return}else i={x:o,y:r*o+u};e={x:a,y:r*a+u}}else{if(i){if(i.xi||f>o||r>h||u>g)){if(p=n.point){var p,v=t-n.x,d=e-n.y,m=v*v+d*d;if(c>m){var y=Math.sqrt(c=m);r=t-y,u=e-y,i=t+y,o=e+y,a=p}}for(var M=n.nodes,x=.5*(s+h),b=.5*(f+g),_=t>=x,w=e>=b,S=w<<1|_,k=S+4;k>S;++S)if(n=M[3&S])switch(3&S){case 0:l(n,s,f,x,b);break;case 1:l(n,x,f,h,b);break;case 2:l(n,s,b,x,g);break;case 3:l(n,x,b,h,g)}}}(n,r,u,i,o),a}function gu(n,t){n=ta.rgb(n),t=ta.rgb(t);var e=n.r,r=n.g,u=n.b,i=t.r-e,o=t.g-r,a=t.b-u;return function(n){return"#"+xt(Math.round(e+i*n))+xt(Math.round(r+o*n))+xt(Math.round(u+a*n))}}function pu(n,t){var e,r={},u={};for(e in n)e in t?r[e]=mu(n[e],t[e]):u[e]=n[e];for(e in t)e in n||(u[e]=t[e]);return function(n){for(e in r)u[e]=r[e](n);return u}}function vu(n,t){return n=+n,t=+t,function(e){return n*(1-e)+t*e}}function du(n,t){var e,r,u,i=il.lastIndex=ol.lastIndex=0,o=-1,a=[],c=[];for(n+="",t+="";(e=il.exec(n))&&(r=ol.exec(t));)(u=r.index)>i&&(u=t.slice(i,u),a[o]?a[o]+=u:a[++o]=u),(e=e[0])===(r=r[0])?a[o]?a[o]+=r:a[++o]=r:(a[++o]=null,c.push({i:o,x:vu(e,r)})),i=ol.lastIndex;return ir;++r)a[(e=c[r]).i]=e.x(n);return a.join("")})}function mu(n,t){for(var e,r=ta.interpolators.length;--r>=0&&!(e=ta.interpolators[r](n,t)););return e}function yu(n,t){var e,r=[],u=[],i=n.length,o=t.length,a=Math.min(n.length,t.length);for(e=0;a>e;++e)r.push(mu(n[e],t[e]));for(;i>e;++e)u[e]=n[e];for(;o>e;++e)u[e]=t[e];return function(n){for(e=0;a>e;++e)u[e]=r[e](n);return u}}function Mu(n){return function(t){return 0>=t?0:t>=1?1:n(t)}}function xu(n){return function(t){return 1-n(1-t)}}function bu(n){return function(t){return.5*(.5>t?n(2*t):2-n(2-2*t))}}function _u(n){return n*n}function wu(n){return n*n*n}function Su(n){if(0>=n)return 0;if(n>=1)return 1;var t=n*n,e=t*n;return 4*(.5>n?e:3*(n-t)+e-.75)}function ku(n){return function(t){return Math.pow(t,n)}}function Eu(n){return 1-Math.cos(n*Ra)}function Au(n){return Math.pow(2,10*(n-1))}function Nu(n){return 1-Math.sqrt(1-n*n)}function Cu(n,t){var e;return arguments.length<2&&(t=.45),arguments.length?e=t/La*Math.asin(1/n):(n=1,e=t/4),function(r){return 1+n*Math.pow(2,-10*r)*Math.sin((r-e)*La/t)}}function zu(n){return n||(n=1.70158),function(t){return t*t*((n+1)*t-n)}}function qu(n){return 1/2.75>n?7.5625*n*n:2/2.75>n?7.5625*(n-=1.5/2.75)*n+.75:2.5/2.75>n?7.5625*(n-=2.25/2.75)*n+.9375:7.5625*(n-=2.625/2.75)*n+.984375}function Lu(n,t){n=ta.hcl(n),t=ta.hcl(t);var e=n.h,r=n.c,u=n.l,i=t.h-e,o=t.c-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.c:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return st(e+i*n,r+o*n,u+a*n)+""}}function Tu(n,t){n=ta.hsl(n),t=ta.hsl(t);var e=n.h,r=n.s,u=n.l,i=t.h-e,o=t.s-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.s:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return ct(e+i*n,r+o*n,u+a*n)+""}}function Ru(n,t){n=ta.lab(n),t=ta.lab(t);var e=n.l,r=n.a,u=n.b,i=t.l-e,o=t.a-r,a=t.b-u;return function(n){return ht(e+i*n,r+o*n,u+a*n)+""}}function Du(n,t){return t-=n,function(e){return Math.round(n+t*e)}}function Pu(n){var t=[n.a,n.b],e=[n.c,n.d],r=ju(t),u=Uu(t,e),i=ju(Fu(e,t,-u))||0;t[0]*e[1]180?s+=360:s-l>180&&(l+=360),u.push({i:r.push(r.pop()+"rotate(",null,")")-2,x:vu(l,s)})):s&&r.push(r.pop()+"rotate("+s+")"),f!=h?u.push({i:r.push(r.pop()+"skewX(",null,")")-2,x:vu(f,h)}):h&&r.push(r.pop()+"skewX("+h+")"),g[0]!=p[0]||g[1]!=p[1]?(e=r.push(r.pop()+"scale(",null,",",null,")"),u.push({i:e-4,x:vu(g[0],p[0])},{i:e-2,x:vu(g[1],p[1])})):(1!=p[0]||1!=p[1])&&r.push(r.pop()+"scale("+p+")"),e=u.length,function(n){for(var t,i=-1;++i=0;)e.push(u[r])}function Qu(n,t){for(var e=[n],r=[];null!=(n=e.pop());)if(r.push(n),(i=n.children)&&(u=i.length))for(var u,i,o=-1;++oe;++e)(t=n[e][1])>u&&(r=e,u=t);return r}function si(n){return n.reduce(fi,0)}function fi(n,t){return n+t[1]}function hi(n,t){return gi(n,Math.ceil(Math.log(t.length)/Math.LN2+1))}function gi(n,t){for(var e=-1,r=+n[0],u=(n[1]-r)/t,i=[];++e<=t;)i[e]=u*e+r;return i}function pi(n){return[ta.min(n),ta.max(n)]}function vi(n,t){return n.value-t.value}function di(n,t){var e=n._pack_next;n._pack_next=t,t._pack_prev=n,t._pack_next=e,e._pack_prev=t}function mi(n,t){n._pack_next=t,t._pack_prev=n}function yi(n,t){var e=t.x-n.x,r=t.y-n.y,u=n.r+t.r;return.999*u*u>e*e+r*r}function Mi(n){function t(n){s=Math.min(n.x-n.r,s),f=Math.max(n.x+n.r,f),h=Math.min(n.y-n.r,h),g=Math.max(n.y+n.r,g)}if((e=n.children)&&(l=e.length)){var e,r,u,i,o,a,c,l,s=1/0,f=-1/0,h=1/0,g=-1/0;if(e.forEach(xi),r=e[0],r.x=-r.r,r.y=0,t(r),l>1&&(u=e[1],u.x=u.r,u.y=0,t(u),l>2))for(i=e[2],wi(r,u,i),t(i),di(r,i),r._pack_prev=i,di(i,u),u=r._pack_next,o=3;l>o;o++){wi(r,u,i=e[o]);var p=0,v=1,d=1;for(a=u._pack_next;a!==u;a=a._pack_next,v++)if(yi(a,i)){p=1;break}if(1==p)for(c=r._pack_prev;c!==a._pack_prev&&!yi(c,i);c=c._pack_prev,d++);p?(d>v||v==d&&u.ro;o++)i=e[o],i.x-=m,i.y-=y,M=Math.max(M,i.r+Math.sqrt(i.x*i.x+i.y*i.y));n.r=M,e.forEach(bi)}}function xi(n){n._pack_next=n._pack_prev=n}function bi(n){delete n._pack_next,delete n._pack_prev}function _i(n,t,e,r){var u=n.children;if(n.x=t+=r*n.x,n.y=e+=r*n.y,n.r*=r,u)for(var i=-1,o=u.length;++i=0;)t=u[i],t.z+=e,t.m+=e,e+=t.s+(r+=t.c)}function Ci(n,t,e){return n.a.parent===t.parent?n.a:e}function zi(n){return 1+ta.max(n,function(n){return n.y})}function qi(n){return n.reduce(function(n,t){return n+t.x},0)/n.length}function Li(n){var t=n.children;return t&&t.length?Li(t[0]):n}function Ti(n){var t,e=n.children;return e&&(t=e.length)?Ti(e[t-1]):n}function Ri(n){return{x:n.x,y:n.y,dx:n.dx,dy:n.dy}}function Di(n,t){var e=n.x+t[3],r=n.y+t[0],u=n.dx-t[1]-t[3],i=n.dy-t[0]-t[2];return 0>u&&(e+=u/2,u=0),0>i&&(r+=i/2,i=0),{x:e,y:r,dx:u,dy:i}}function Pi(n){var t=n[0],e=n[n.length-1];return e>t?[t,e]:[e,t]}function Ui(n){return n.rangeExtent?n.rangeExtent():Pi(n.range())}function ji(n,t,e,r){var u=e(n[0],n[1]),i=r(t[0],t[1]);return function(n){return i(u(n))}}function Fi(n,t){var e,r=0,u=n.length-1,i=n[r],o=n[u];return i>o&&(e=r,r=u,u=e,e=i,i=o,o=e),n[r]=t.floor(i),n[u]=t.ceil(o),n}function Hi(n){return n?{floor:function(t){return Math.floor(t/n)*n},ceil:function(t){return Math.ceil(t/n)*n}}:ml}function Oi(n,t,e,r){var u=[],i=[],o=0,a=Math.min(n.length,t.length)-1;for(n[a]2?Oi:ji,c=r?Iu:Ou;return o=u(n,t,c,e),a=u(t,n,c,mu),i}function i(n){return o(n)}var o,a;return i.invert=function(n){return a(n)},i.domain=function(t){return arguments.length?(n=t.map(Number),u()):n},i.range=function(n){return arguments.length?(t=n,u()):t},i.rangeRound=function(n){return i.range(n).interpolate(Du)},i.clamp=function(n){return arguments.length?(r=n,u()):r},i.interpolate=function(n){return arguments.length?(e=n,u()):e},i.ticks=function(t){return Xi(n,t)},i.tickFormat=function(t,e){return $i(n,t,e)},i.nice=function(t){return Zi(n,t),u()},i.copy=function(){return Ii(n,t,e,r)},u()}function Yi(n,t){return ta.rebind(n,t,"range","rangeRound","interpolate","clamp")}function Zi(n,t){return Fi(n,Hi(Vi(n,t)[2]))}function Vi(n,t){null==t&&(t=10);var e=Pi(n),r=e[1]-e[0],u=Math.pow(10,Math.floor(Math.log(r/t)/Math.LN10)),i=t/r*u;return.15>=i?u*=10:.35>=i?u*=5:.75>=i&&(u*=2),e[0]=Math.ceil(e[0]/u)*u,e[1]=Math.floor(e[1]/u)*u+.5*u,e[2]=u,e}function Xi(n,t){return ta.range.apply(ta,Vi(n,t))}function $i(n,t,e){var r=Vi(n,t);if(e){var u=ic.exec(e);if(u.shift(),"s"===u[8]){var i=ta.formatPrefix(Math.max(ga(r[0]),ga(r[1])));return u[7]||(u[7]="."+Bi(i.scale(r[2]))),u[8]="f",e=ta.format(u.join("")),function(n){return e(i.scale(n))+i.symbol}}u[7]||(u[7]="."+Wi(u[8],r)),e=u.join("")}else e=",."+Bi(r[2])+"f";return ta.format(e)}function Bi(n){return-Math.floor(Math.log(n)/Math.LN10+.01)}function Wi(n,t){var e=Bi(t[2]);return n in yl?Math.abs(e-Bi(Math.max(ga(t[0]),ga(t[1]))))+ +("e"!==n):e-2*("%"===n)}function Ji(n,t,e,r){function u(n){return(e?Math.log(0>n?0:n):-Math.log(n>0?0:-n))/Math.log(t)}function i(n){return e?Math.pow(t,n):-Math.pow(t,-n)}function o(t){return n(u(t))}return o.invert=function(t){return i(n.invert(t))},o.domain=function(t){return arguments.length?(e=t[0]>=0,n.domain((r=t.map(Number)).map(u)),o):r},o.base=function(e){return arguments.length?(t=+e,n.domain(r.map(u)),o):t},o.nice=function(){var t=Fi(r.map(u),e?Math:xl);return n.domain(t),r=t.map(i),o},o.ticks=function(){var n=Pi(r),o=[],a=n[0],c=n[1],l=Math.floor(u(a)),s=Math.ceil(u(c)),f=t%1?2:t;if(isFinite(s-l)){if(e){for(;s>l;l++)for(var h=1;f>h;h++)o.push(i(l)*h);o.push(i(l))}else for(o.push(i(l));l++0;h--)o.push(i(l)*h);for(l=0;o[l]c;s--);o=o.slice(l,s)}return o},o.tickFormat=function(n,t){if(!arguments.length)return Ml;arguments.length<2?t=Ml:"function"!=typeof t&&(t=ta.format(t));var r,a=Math.max(.1,n/o.ticks().length),c=e?(r=1e-12,Math.ceil):(r=-1e-12,Math.floor);return function(n){return n/i(c(u(n)+r))<=a?t(n):""}},o.copy=function(){return Ji(n.copy(),t,e,r)},Yi(o,n)}function Gi(n,t,e){function r(t){return n(u(t))}var u=Ki(t),i=Ki(1/t);return r.invert=function(t){return i(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain((e=t.map(Number)).map(u)),r):e},r.ticks=function(n){return Xi(e,n)},r.tickFormat=function(n,t){return $i(e,n,t)},r.nice=function(n){return r.domain(Zi(e,n))},r.exponent=function(o){return arguments.length?(u=Ki(t=o),i=Ki(1/t),n.domain(e.map(u)),r):t},r.copy=function(){return Gi(n.copy(),t,e)},Yi(r,n)}function Ki(n){return function(t){return 0>t?-Math.pow(-t,n):Math.pow(t,n)}}function Qi(n,t){function e(e){return i[((u.get(e)||("range"===t.t?u.set(e,n.push(e)):0/0))-1)%i.length]}function r(t,e){return ta.range(n.length).map(function(n){return t+e*n})}var u,i,o;return e.domain=function(r){if(!arguments.length)return n;n=[],u=new l;for(var i,o=-1,a=r.length;++oe?[0/0,0/0]:[e>0?a[e-1]:n[0],et?0/0:t/i+n,[t,t+1/i]},r.copy=function(){return to(n,t,e)},u()}function eo(n,t){function e(e){return e>=e?t[ta.bisect(n,e)]:void 0}return e.domain=function(t){return arguments.length?(n=t,e):n},e.range=function(n){return arguments.length?(t=n,e):t},e.invertExtent=function(e){return e=t.indexOf(e),[n[e-1],n[e]]},e.copy=function(){return eo(n,t)},e}function ro(n){function t(n){return+n}return t.invert=t,t.domain=t.range=function(e){return arguments.length?(n=e.map(t),t):n},t.ticks=function(t){return Xi(n,t)},t.tickFormat=function(t,e){return $i(n,t,e)},t.copy=function(){return ro(n)},t}function uo(){return 0}function io(n){return n.innerRadius}function oo(n){return n.outerRadius}function ao(n){return n.startAngle}function co(n){return n.endAngle}function lo(n){return n&&n.padAngle}function so(n,t,e,r){return(n-e)*t-(t-r)*n>0?0:1}function fo(n,t,e,r,u){var i=n[0]-t[0],o=n[1]-t[1],a=(u?r:-r)/Math.sqrt(i*i+o*o),c=a*o,l=-a*i,s=n[0]+c,f=n[1]+l,h=t[0]+c,g=t[1]+l,p=(s+h)/2,v=(f+g)/2,d=h-s,m=g-f,y=d*d+m*m,M=e-r,x=s*g-h*f,b=(0>m?-1:1)*Math.sqrt(M*M*y-x*x),_=(x*m-d*b)/y,w=(-x*d-m*b)/y,S=(x*m+d*b)/y,k=(-x*d+m*b)/y,E=_-p,A=w-v,N=S-p,C=k-v;return E*E+A*A>N*N+C*C&&(_=S,w=k),[[_-c,w-l],[_*e/M,w*e/M]]}function ho(n){function t(t){function o(){l.push("M",i(n(s),a))}for(var c,l=[],s=[],f=-1,h=t.length,g=Et(e),p=Et(r);++f1&&u.push("H",r[0]),u.join("")}function mo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t1){a=t[1],i=n[c],c++,r+="C"+(u[0]+o[0])+","+(u[1]+o[1])+","+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1];for(var l=2;l9&&(u=3*t/Math.sqrt(u),o[a]=u*e,o[a+1]=u*r));for(a=-1;++a<=c;)u=(n[Math.min(c,a+1)][0]-n[Math.max(0,a-1)][0])/(6*(1+o[a]*o[a])),i.push([u||0,o[a]*u||0]);return i}function To(n){return n.length<3?go(n):n[0]+_o(n,Lo(n))}function Ro(n){for(var t,e,r,u=-1,i=n.length;++ur)return s();var u=i[i.active];u&&(--i.count,delete i[i.active],u.event&&u.event.interrupt.call(n,n.__data__,u.index)),i.active=r,o.event&&o.event.start.call(n,n.__data__,t),o.tween.forEach(function(e,r){(r=r.call(n,n.__data__,t))&&v.push(r)}),h=o.ease,f=o.duration,ta.timer(function(){return p.c=l(e||1)?Ne:l,1},0,a)}function l(e){if(i.active!==r)return 1;for(var u=e/f,a=h(u),c=v.length;c>0;)v[--c].call(n,a);return u>=1?(o.event&&o.event.end.call(n,n.__data__,t),s()):void 0}function s(){return--i.count?delete i[r]:delete n[e],1}var f,h,g=o.delay,p=ec,v=[];return p.t=g+a,u>=g?c(u-g):void(p.c=c)},0,a)}}function Bo(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate("+(isFinite(r)?r:e(n))+",0)"})}function Wo(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate(0,"+(isFinite(r)?r:e(n))+")"})}function Jo(n){return n.toISOString()}function Go(n,t,e){function r(t){return n(t)}function u(n,e){var r=n[1]-n[0],u=r/e,i=ta.bisect(Vl,u);return i==Vl.length?[t.year,Vi(n.map(function(n){return n/31536e6}),e)[2]]:i?t[u/Vl[i-1]1?{floor:function(t){for(;e(t=n.floor(t));)t=Ko(t-1);return t},ceil:function(t){for(;e(t=n.ceil(t));)t=Ko(+t+1);return t}}:n))},r.ticks=function(n,t){var e=Pi(r.domain()),i=null==n?u(e,10):"number"==typeof n?u(e,n):!n.range&&[{range:n},t];return i&&(n=i[0],t=i[1]),n.range(e[0],Ko(+e[1]+1),1>t?1:t)},r.tickFormat=function(){return e},r.copy=function(){return Go(n.copy(),t,e)},Yi(r,n)}function Ko(n){return new Date(n)}function Qo(n){return JSON.parse(n.responseText)}function na(n){var t=ua.createRange();return t.selectNode(ua.body),t.createContextualFragment(n.responseText)}var ta={version:"3.5.6"},ea=[].slice,ra=function(n){return ea.call(n)},ua=this.document;if(ua)try{ra(ua.documentElement.childNodes)[0].nodeType}catch(ia){ra=function(n){for(var t=n.length,e=new Array(t);t--;)e[t]=n[t];return e}}if(Date.now||(Date.now=function(){return+new Date}),ua)try{ua.createElement("DIV").style.setProperty("opacity",0,"")}catch(oa){var aa=this.Element.prototype,ca=aa.setAttribute,la=aa.setAttributeNS,sa=this.CSSStyleDeclaration.prototype,fa=sa.setProperty;aa.setAttribute=function(n,t){ca.call(this,n,t+"")},aa.setAttributeNS=function(n,t,e){la.call(this,n,t,e+"")},sa.setProperty=function(n,t,e){fa.call(this,n,t+"",e)}}ta.ascending=e,ta.descending=function(n,t){return n>t?-1:t>n?1:t>=n?0:0/0},ta.min=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u=r){e=r;break}for(;++ur&&(e=r)}else{for(;++u=r){e=r;break}for(;++ur&&(e=r)}return e},ta.max=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u=r){e=r;break}for(;++ue&&(e=r)}else{for(;++u=r){e=r;break}for(;++ue&&(e=r)}return e},ta.extent=function(n,t){var e,r,u,i=-1,o=n.length;if(1===arguments.length){for(;++i=r){e=u=r;break}for(;++ir&&(e=r),r>u&&(u=r))}else{for(;++i=r){e=u=r;break}for(;++ir&&(e=r),r>u&&(u=r))}return[e,u]},ta.sum=function(n,t){var e,r=0,i=n.length,o=-1;if(1===arguments.length)for(;++o1?c/(s-1):void 0},ta.deviation=function(){var n=ta.variance.apply(this,arguments);return n?Math.sqrt(n):n};var ha=i(e);ta.bisectLeft=ha.left,ta.bisect=ta.bisectRight=ha.right,ta.bisector=function(n){return i(1===n.length?function(t,r){return e(n(t),r)}:n)},ta.shuffle=function(n,t,e){(i=arguments.length)<3&&(e=n.length,2>i&&(t=0));for(var r,u,i=e-t;i;)u=Math.random()*i--|0,r=n[i+t],n[i+t]=n[u+t],n[u+t]=r;return n},ta.permute=function(n,t){for(var e=t.length,r=new Array(e);e--;)r[e]=n[t[e]];return r},ta.pairs=function(n){for(var t,e=0,r=n.length-1,u=n[0],i=new Array(0>r?0:r);r>e;)i[e]=[t=u,u=n[++e]];return i},ta.zip=function(){if(!(r=arguments.length))return[];for(var n=-1,t=ta.min(arguments,o),e=new Array(t);++n=0;)for(r=n[u],t=r.length;--t>=0;)e[--o]=r[t];return e};var ga=Math.abs;ta.range=function(n,t,e){if(arguments.length<3&&(e=1,arguments.length<2&&(t=n,n=0)),(t-n)/e===1/0)throw new Error("infinite range");var r,u=[],i=a(ga(e)),o=-1;if(n*=i,t*=i,e*=i,0>e)for(;(r=n+e*++o)>t;)u.push(r/i);else for(;(r=n+e*++o)=i.length)return r?r.call(u,o):e?o.sort(e):o;for(var c,s,f,h,g=-1,p=o.length,v=i[a++],d=new l;++g=i.length)return n;var r=[],u=o[e++];return n.forEach(function(n,u){r.push({key:n,values:t(u,e)})}),u?r.sort(function(n,t){return u(n.key,t.key)}):r}var e,r,u={},i=[],o=[];return u.map=function(t,e){return n(e,t,0)},u.entries=function(e){return t(n(ta.map,e,0),0)},u.key=function(n){return i.push(n),u},u.sortKeys=function(n){return o[i.length-1]=n,u},u.sortValues=function(n){return e=n,u},u.rollup=function(n){return r=n,u},u},ta.set=function(n){var t=new m;if(n)for(var e=0,r=n.length;r>e;++e)t.add(n[e]);return t},c(m,{has:h,add:function(n){return this._[s(n+="")]=!0,n},remove:g,values:p,size:v,empty:d,forEach:function(n){for(var t in this._)n.call(this,f(t))}}),ta.behavior={},ta.rebind=function(n,t){for(var e,r=1,u=arguments.length;++r=0&&(r=n.slice(e+1),n=n.slice(0,e)),n)return arguments.length<2?this[n].on(r):this[n].on(r,t);if(2===arguments.length){if(null==t)for(n in this)this.hasOwnProperty(n)&&this[n].on(r,null);return this}},ta.event=null,ta.requote=function(n){return n.replace(ma,"\\$&")};var ma=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,ya={}.__proto__?function(n,t){n.__proto__=t}:function(n,t){for(var e in t)n[e]=t[e]},Ma=function(n,t){return t.querySelector(n)},xa=function(n,t){return t.querySelectorAll(n)},ba=function(n,t){var e=n.matches||n[x(n,"matchesSelector")];return(ba=function(n,t){return e.call(n,t)})(n,t)};"function"==typeof Sizzle&&(Ma=function(n,t){return Sizzle(n,t)[0]||null},xa=Sizzle,ba=Sizzle.matchesSelector),ta.selection=function(){return ta.select(ua.documentElement)};var _a=ta.selection.prototype=[];_a.select=function(n){var t,e,r,u,i=[];n=N(n);for(var o=-1,a=this.length;++o=0&&(e=n.slice(0,t),n=n.slice(t+1)),wa.hasOwnProperty(e)?{space:wa[e],local:n}:n}},_a.attr=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node();return n=ta.ns.qualify(n),n.local?e.getAttributeNS(n.space,n.local):e.getAttribute(n)}for(t in n)this.each(z(t,n[t]));return this}return this.each(z(n,t))},_a.classed=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node(),r=(n=T(n)).length,u=-1;if(t=e.classList){for(;++uu){if("string"!=typeof n){2>u&&(e="");for(r in n)this.each(P(r,n[r],e));return this}if(2>u){var i=this.node();return t(i).getComputedStyle(i,null).getPropertyValue(n)}r=""}return this.each(P(n,e,r))},_a.property=function(n,t){if(arguments.length<2){if("string"==typeof n)return this.node()[n];for(t in n)this.each(U(t,n[t]));return this}return this.each(U(n,t))},_a.text=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.textContent=null==t?"":t}:null==n?function(){this.textContent=""}:function(){this.textContent=n}):this.node().textContent},_a.html=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.innerHTML=null==t?"":t}:null==n?function(){this.innerHTML=""}:function(){this.innerHTML=n}):this.node().innerHTML},_a.append=function(n){return n=j(n),this.select(function(){return this.appendChild(n.apply(this,arguments))})},_a.insert=function(n,t){return n=j(n),t=N(t),this.select(function(){return this.insertBefore(n.apply(this,arguments),t.apply(this,arguments)||null)})},_a.remove=function(){return this.each(F)},_a.data=function(n,t){function e(n,e){var r,u,i,o=n.length,f=e.length,h=Math.min(o,f),g=new Array(f),p=new Array(f),v=new Array(o);if(t){var d,m=new l,y=new Array(o);for(r=-1;++rr;++r)p[r]=H(e[r]);for(;o>r;++r)v[r]=n[r]}p.update=g,p.parentNode=g.parentNode=v.parentNode=n.parentNode,a.push(p),c.push(g),s.push(v)}var r,u,i=-1,o=this.length;if(!arguments.length){for(n=new Array(o=(r=this[0]).length);++ii;i++){u.push(t=[]),t.parentNode=(e=this[i]).parentNode;for(var a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return A(u)},_a.order=function(){for(var n=-1,t=this.length;++n=0;)(e=r[u])&&(i&&i!==e.nextSibling&&i.parentNode.insertBefore(e,i),i=e);return this},_a.sort=function(n){n=I.apply(this,arguments);for(var t=-1,e=this.length;++tn;n++)for(var e=this[n],r=0,u=e.length;u>r;r++){var i=e[r];if(i)return i}return null},_a.size=function(){var n=0;return Y(this,function(){++n}),n};var Sa=[];ta.selection.enter=Z,ta.selection.enter.prototype=Sa,Sa.append=_a.append,Sa.empty=_a.empty,Sa.node=_a.node,Sa.call=_a.call,Sa.size=_a.size,Sa.select=function(n){for(var t,e,r,u,i,o=[],a=-1,c=this.length;++ar){if("string"!=typeof n){2>r&&(t=!1);for(e in n)this.each(X(e,n[e],t));return this}if(2>r)return(r=this.node()["__on"+n])&&r._;e=!1}return this.each(X(n,t,e))};var ka=ta.map({mouseenter:"mouseover",mouseleave:"mouseout"});ua&&ka.forEach(function(n){"on"+n in ua&&ka.remove(n)});var Ea,Aa=0;ta.mouse=function(n){return J(n,k())};var Na=this.navigator&&/WebKit/.test(this.navigator.userAgent)?-1:0;ta.touch=function(n,t,e){if(arguments.length<3&&(e=t,t=k().changedTouches),t)for(var r,u=0,i=t.length;i>u;++u)if((r=t[u]).identifier===e)return J(n,r)},ta.behavior.drag=function(){function n(){this.on("mousedown.drag",i).on("touchstart.drag",o)}function e(n,t,e,i,o){return function(){function a(){var n,e,r=t(h,v);r&&(n=r[0]-M[0],e=r[1]-M[1],p|=n|e,M=r,g({type:"drag",x:r[0]+l[0],y:r[1]+l[1],dx:n,dy:e}))}function c(){t(h,v)&&(m.on(i+d,null).on(o+d,null),y(p&&ta.event.target===f),g({type:"dragend"}))}var l,s=this,f=ta.event.target,h=s.parentNode,g=r.of(s,arguments),p=0,v=n(),d=".drag"+(null==v?"":"-"+v),m=ta.select(e(f)).on(i+d,a).on(o+d,c),y=W(f),M=t(h,v);u?(l=u.apply(s,arguments),l=[l.x-M[0],l.y-M[1]]):l=[0,0],g({type:"dragstart"})}}var r=E(n,"drag","dragstart","dragend"),u=null,i=e(b,ta.mouse,t,"mousemove","mouseup"),o=e(G,ta.touch,y,"touchmove","touchend");return n.origin=function(t){return arguments.length?(u=t,n):u},ta.rebind(n,r,"on")},ta.touches=function(n,t){return arguments.length<2&&(t=k().touches),t?ra(t).map(function(t){var e=J(n,t);return e.identifier=t.identifier,e}):[]};var Ca=1e-6,za=Ca*Ca,qa=Math.PI,La=2*qa,Ta=La-Ca,Ra=qa/2,Da=qa/180,Pa=180/qa,Ua=Math.SQRT2,ja=2,Fa=4;ta.interpolateZoom=function(n,t){function e(n){var t=n*y;if(m){var e=rt(v),o=i/(ja*h)*(e*ut(Ua*t+v)-et(v));return[r+o*l,u+o*s,i*e/rt(Ua*t+v)]}return[r+n*l,u+n*s,i*Math.exp(Ua*t)]}var r=n[0],u=n[1],i=n[2],o=t[0],a=t[1],c=t[2],l=o-r,s=a-u,f=l*l+s*s,h=Math.sqrt(f),g=(c*c-i*i+Fa*f)/(2*i*ja*h),p=(c*c-i*i-Fa*f)/(2*c*ja*h),v=Math.log(Math.sqrt(g*g+1)-g),d=Math.log(Math.sqrt(p*p+1)-p),m=d-v,y=(m||Math.log(c/i))/Ua;return e.duration=1e3*y,e},ta.behavior.zoom=function(){function n(n){n.on(q,f).on(Oa+".zoom",g).on("dblclick.zoom",p).on(R,h)}function e(n){return[(n[0]-k.x)/k.k,(n[1]-k.y)/k.k]}function r(n){return[n[0]*k.k+k.x,n[1]*k.k+k.y]}function u(n){k.k=Math.max(N[0],Math.min(N[1],n))}function i(n,t){t=r(t),k.x+=n[0]-t[0],k.y+=n[1]-t[1]}function o(t,e,r,o){t.__chart__={x:k.x,y:k.y,k:k.k},u(Math.pow(2,o)),i(d=e,r),t=ta.select(t),C>0&&(t=t.transition().duration(C)),t.call(n.event)}function a(){b&&b.domain(x.range().map(function(n){return(n-k.x)/k.k}).map(x.invert)),w&&w.domain(_.range().map(function(n){return(n-k.y)/k.k}).map(_.invert))}function c(n){z++||n({type:"zoomstart"})}function l(n){a(),n({type:"zoom",scale:k.k,translate:[k.x,k.y]})}function s(n){--z||(n({type:"zoomend"}),d=null)}function f(){function n(){f=1,i(ta.mouse(u),g),l(a)}function r(){h.on(L,null).on(T,null),p(f&&ta.event.target===o),s(a)}var u=this,o=ta.event.target,a=D.of(u,arguments),f=0,h=ta.select(t(u)).on(L,n).on(T,r),g=e(ta.mouse(u)),p=W(u);Dl.call(u),c(a)}function h(){function n(){var n=ta.touches(p);return g=k.k,n.forEach(function(n){n.identifier in d&&(d[n.identifier]=e(n))}),n}function t(){var t=ta.event.target;ta.select(t).on(x,r).on(b,a),_.push(t);for(var e=ta.event.changedTouches,u=0,i=e.length;i>u;++u)d[e[u].identifier]=null;var c=n(),l=Date.now();if(1===c.length){if(500>l-M){var s=c[0];o(p,s,d[s.identifier],Math.floor(Math.log(k.k)/Math.LN2)+1),S()}M=l}else if(c.length>1){var s=c[0],f=c[1],h=s[0]-f[0],g=s[1]-f[1];m=h*h+g*g}}function r(){var n,t,e,r,o=ta.touches(p);Dl.call(p);for(var a=0,c=o.length;c>a;++a,r=null)if(e=o[a],r=d[e.identifier]){if(t)break;n=e,t=r}if(r){var s=(s=e[0]-n[0])*s+(s=e[1]-n[1])*s,f=m&&Math.sqrt(s/m);n=[(n[0]+e[0])/2,(n[1]+e[1])/2],t=[(t[0]+r[0])/2,(t[1]+r[1])/2],u(f*g)}M=null,i(n,t),l(v)}function a(){if(ta.event.touches.length){for(var t=ta.event.changedTouches,e=0,r=t.length;r>e;++e)delete d[t[e].identifier];for(var u in d)return void n()}ta.selectAll(_).on(y,null),w.on(q,f).on(R,h),E(),s(v)}var g,p=this,v=D.of(p,arguments),d={},m=0,y=".zoom-"+ta.event.changedTouches[0].identifier,x="touchmove"+y,b="touchend"+y,_=[],w=ta.select(p),E=W(p);t(),c(v),w.on(q,null).on(R,t)}function g(){var n=D.of(this,arguments);y?clearTimeout(y):(Dl.call(this),v=e(d=m||ta.mouse(this)),c(n)),y=setTimeout(function(){y=null,s(n)},50),S(),u(Math.pow(2,.002*Ha())*k.k),i(d,v),l(n)}function p(){var n=ta.mouse(this),t=Math.log(k.k)/Math.LN2;o(this,n,e(n),ta.event.shiftKey?Math.ceil(t)-1:Math.floor(t)+1)}var v,d,m,y,M,x,b,_,w,k={x:0,y:0,k:1},A=[960,500],N=Ia,C=250,z=0,q="mousedown.zoom",L="mousemove.zoom",T="mouseup.zoom",R="touchstart.zoom",D=E(n,"zoomstart","zoom","zoomend");return Oa||(Oa="onwheel"in ua?(Ha=function(){return-ta.event.deltaY*(ta.event.deltaMode?120:1)},"wheel"):"onmousewheel"in ua?(Ha=function(){return ta.event.wheelDelta},"mousewheel"):(Ha=function(){return-ta.event.detail},"MozMousePixelScroll")),n.event=function(n){n.each(function(){var n=D.of(this,arguments),t=k;Tl?ta.select(this).transition().each("start.zoom",function(){k=this.__chart__||{x:0,y:0,k:1},c(n)}).tween("zoom:zoom",function(){var e=A[0],r=A[1],u=d?d[0]:e/2,i=d?d[1]:r/2,o=ta.interpolateZoom([(u-k.x)/k.k,(i-k.y)/k.k,e/k.k],[(u-t.x)/t.k,(i-t.y)/t.k,e/t.k]);return function(t){var r=o(t),a=e/r[2];this.__chart__=k={x:u-r[0]*a,y:i-r[1]*a,k:a},l(n)}}).each("interrupt.zoom",function(){s(n)}).each("end.zoom",function(){s(n)}):(this.__chart__=k,c(n),l(n),s(n))})},n.translate=function(t){return arguments.length?(k={x:+t[0],y:+t[1],k:k.k},a(),n):[k.x,k.y]},n.scale=function(t){return arguments.length?(k={x:k.x,y:k.y,k:+t},a(),n):k.k},n.scaleExtent=function(t){return arguments.length?(N=null==t?Ia:[+t[0],+t[1]],n):N},n.center=function(t){return arguments.length?(m=t&&[+t[0],+t[1]],n):m},n.size=function(t){return arguments.length?(A=t&&[+t[0],+t[1]],n):A},n.duration=function(t){return arguments.length?(C=+t,n):C},n.x=function(t){return arguments.length?(b=t,x=t.copy(),k={x:0,y:0,k:1},n):b},n.y=function(t){return arguments.length?(w=t,_=t.copy(),k={x:0,y:0,k:1},n):w},ta.rebind(n,D,"on")};var Ha,Oa,Ia=[0,1/0];ta.color=ot,ot.prototype.toString=function(){return this.rgb()+""},ta.hsl=at;var Ya=at.prototype=new ot;Ya.brighter=function(n){return n=Math.pow(.7,arguments.length?n:1),new at(this.h,this.s,this.l/n)},Ya.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new at(this.h,this.s,n*this.l)},Ya.rgb=function(){return ct(this.h,this.s,this.l)},ta.hcl=lt;var Za=lt.prototype=new ot;Za.brighter=function(n){return new lt(this.h,this.c,Math.min(100,this.l+Va*(arguments.length?n:1)))},Za.darker=function(n){return new lt(this.h,this.c,Math.max(0,this.l-Va*(arguments.length?n:1)))},Za.rgb=function(){return st(this.h,this.c,this.l).rgb()},ta.lab=ft;var Va=18,Xa=.95047,$a=1,Ba=1.08883,Wa=ft.prototype=new ot;Wa.brighter=function(n){return new ft(Math.min(100,this.l+Va*(arguments.length?n:1)),this.a,this.b)},Wa.darker=function(n){return new ft(Math.max(0,this.l-Va*(arguments.length?n:1)),this.a,this.b)},Wa.rgb=function(){return ht(this.l,this.a,this.b)},ta.rgb=mt;var Ja=mt.prototype=new ot;Ja.brighter=function(n){n=Math.pow(.7,arguments.length?n:1);var t=this.r,e=this.g,r=this.b,u=30;return t||e||r?(t&&u>t&&(t=u),e&&u>e&&(e=u),r&&u>r&&(r=u),new mt(Math.min(255,t/n),Math.min(255,e/n),Math.min(255,r/n))):new mt(u,u,u)},Ja.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new mt(n*this.r,n*this.g,n*this.b)},Ja.hsl=function(){return _t(this.r,this.g,this.b)},Ja.toString=function(){return"#"+xt(this.r)+xt(this.g)+xt(this.b)};var Ga=ta.map({aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074});Ga.forEach(function(n,t){Ga.set(n,yt(t))}),ta.functor=Et,ta.xhr=At(y),ta.dsv=function(n,t){function e(n,e,i){arguments.length<3&&(i=e,e=null);var o=Nt(n,t,null==e?r:u(e),i);return o.row=function(n){return arguments.length?o.response(null==(e=n)?r:u(n)):e},o}function r(n){return e.parse(n.responseText)}function u(n){return function(t){return e.parse(t.responseText,n)}}function i(t){return t.map(o).join(n)}function o(n){return a.test(n)?'"'+n.replace(/\"/g,'""')+'"':n}var a=new RegExp('["'+n+"\n]"),c=n.charCodeAt(0);return e.parse=function(n,t){var r;return e.parseRows(n,function(n,e){if(r)return r(n,e-1);var u=new Function("d","return {"+n.map(function(n,t){return JSON.stringify(n)+": d["+t+"]"}).join(",")+"}");r=t?function(n,e){return t(u(n),e)}:u})},e.parseRows=function(n,t){function e(){if(s>=l)return o;if(u)return u=!1,i;var t=s;if(34===n.charCodeAt(t)){for(var e=t;e++s;){var r=n.charCodeAt(s++),a=1;if(10===r)u=!0;else if(13===r)u=!0,10===n.charCodeAt(s)&&(++s,++a);else if(r!==c)continue;return n.slice(t,s-a)}return n.slice(t)}for(var r,u,i={},o={},a=[],l=n.length,s=0,f=0;(r=e())!==o;){for(var h=[];r!==i&&r!==o;)h.push(r),r=e();t&&null==(h=t(h,f++))||a.push(h)}return a},e.format=function(t){if(Array.isArray(t[0]))return e.formatRows(t);var r=new m,u=[];return t.forEach(function(n){for(var t in n)r.has(t)||u.push(r.add(t))}),[u.map(o).join(n)].concat(t.map(function(t){return u.map(function(n){return o(t[n])}).join(n)})).join("\n")},e.formatRows=function(n){return n.map(i).join("\n")},e},ta.csv=ta.dsv(",","text/csv"),ta.tsv=ta.dsv(" ","text/tab-separated-values");var Ka,Qa,nc,tc,ec,rc=this[x(this,"requestAnimationFrame")]||function(n){setTimeout(n,17)};ta.timer=function(n,t,e){var r=arguments.length;2>r&&(t=0),3>r&&(e=Date.now());var u=e+t,i={c:n,t:u,f:!1,n:null};Qa?Qa.n=i:Ka=i,Qa=i,nc||(tc=clearTimeout(tc),nc=1,rc(qt))},ta.timer.flush=function(){Lt(),Tt()},ta.round=function(n,t){return t?Math.round(n*(t=Math.pow(10,t)))/t:Math.round(n)};var uc=["y","z","a","f","p","n","\xb5","m","","k","M","G","T","P","E","Z","Y"].map(Dt);ta.formatPrefix=function(n,t){var e=0;return n&&(0>n&&(n*=-1),t&&(n=ta.round(n,Rt(n,t))),e=1+Math.floor(1e-12+Math.log(n)/Math.LN10),e=Math.max(-24,Math.min(24,3*Math.floor((e-1)/3)))),uc[8+e/3]};var ic=/(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i,oc=ta.map({b:function(n){return n.toString(2)},c:function(n){return String.fromCharCode(n)},o:function(n){return n.toString(8)},x:function(n){return n.toString(16)},X:function(n){return n.toString(16).toUpperCase()},g:function(n,t){return n.toPrecision(t)},e:function(n,t){return n.toExponential(t)},f:function(n,t){return n.toFixed(t)},r:function(n,t){return(n=ta.round(n,Rt(n,t))).toFixed(Math.max(0,Math.min(20,Rt(n*(1+1e-15),t))))}}),ac=ta.time={},cc=Date;jt.prototype={getDate:function(){return this._.getUTCDate()},getDay:function(){return this._.getUTCDay()},getFullYear:function(){return this._.getUTCFullYear()},getHours:function(){return this._.getUTCHours()},getMilliseconds:function(){return this._.getUTCMilliseconds()},getMinutes:function(){return this._.getUTCMinutes()},getMonth:function(){return this._.getUTCMonth()},getSeconds:function(){return this._.getUTCSeconds()},getTime:function(){return this._.getTime()},getTimezoneOffset:function(){return 0},valueOf:function(){return this._.valueOf()},setDate:function(){lc.setUTCDate.apply(this._,arguments)},setDay:function(){lc.setUTCDay.apply(this._,arguments)},setFullYear:function(){lc.setUTCFullYear.apply(this._,arguments)},setHours:function(){lc.setUTCHours.apply(this._,arguments)},setMilliseconds:function(){lc.setUTCMilliseconds.apply(this._,arguments)},setMinutes:function(){lc.setUTCMinutes.apply(this._,arguments)},setMonth:function(){lc.setUTCMonth.apply(this._,arguments)},setSeconds:function(){lc.setUTCSeconds.apply(this._,arguments)},setTime:function(){lc.setTime.apply(this._,arguments)}};var lc=Date.prototype;ac.year=Ft(function(n){return n=ac.day(n),n.setMonth(0,1),n},function(n,t){n.setFullYear(n.getFullYear()+t)},function(n){return n.getFullYear()}),ac.years=ac.year.range,ac.years.utc=ac.year.utc.range,ac.day=Ft(function(n){var t=new cc(2e3,0);return t.setFullYear(n.getFullYear(),n.getMonth(),n.getDate()),t},function(n,t){n.setDate(n.getDate()+t)},function(n){return n.getDate()-1}),ac.days=ac.day.range,ac.days.utc=ac.day.utc.range,ac.dayOfYear=function(n){var t=ac.year(n);return Math.floor((n-t-6e4*(n.getTimezoneOffset()-t.getTimezoneOffset()))/864e5)},["sunday","monday","tuesday","wednesday","thursday","friday","saturday"].forEach(function(n,t){t=7-t;var e=ac[n]=Ft(function(n){return(n=ac.day(n)).setDate(n.getDate()-(n.getDay()+t)%7),n},function(n,t){n.setDate(n.getDate()+7*Math.floor(t))},function(n){var e=ac.year(n).getDay();return Math.floor((ac.dayOfYear(n)+(e+t)%7)/7)-(e!==t)});ac[n+"s"]=e.range,ac[n+"s"].utc=e.utc.range,ac[n+"OfYear"]=function(n){var e=ac.year(n).getDay();return Math.floor((ac.dayOfYear(n)+(e+t)%7)/7)}}),ac.week=ac.sunday,ac.weeks=ac.sunday.range,ac.weeks.utc=ac.sunday.utc.range,ac.weekOfYear=ac.sundayOfYear;var sc={"-":"",_:" ",0:"0"},fc=/^\s*\d+/,hc=/^%/;ta.locale=function(n){return{numberFormat:Pt(n),timeFormat:Ot(n)}};var gc=ta.locale({decimal:".",thousands:",",grouping:[3],currency:["$",""],dateTime:"%a %b %e %X %Y",date:"%m/%d/%Y",time:"%H:%M:%S",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});ta.format=gc.numberFormat,ta.geo={},ce.prototype={s:0,t:0,add:function(n){le(n,this.t,pc),le(pc.s,this.s,this),this.s?this.t+=pc.t:this.s=pc.t },reset:function(){this.s=this.t=0},valueOf:function(){return this.s}};var pc=new ce;ta.geo.stream=function(n,t){n&&vc.hasOwnProperty(n.type)?vc[n.type](n,t):se(n,t)};var vc={Feature:function(n,t){se(n.geometry,t)},FeatureCollection:function(n,t){for(var e=n.features,r=-1,u=e.length;++rn?4*qa+n:n,Mc.lineStart=Mc.lineEnd=Mc.point=b}};ta.geo.bounds=function(){function n(n,t){M.push(x=[s=n,h=n]),f>t&&(f=t),t>g&&(g=t)}function t(t,e){var r=pe([t*Da,e*Da]);if(m){var u=de(m,r),i=[u[1],-u[0],0],o=de(i,u);Me(o),o=xe(o);var c=t-p,l=c>0?1:-1,v=o[0]*Pa*l,d=ga(c)>180;if(d^(v>l*p&&l*t>v)){var y=o[1]*Pa;y>g&&(g=y)}else if(v=(v+360)%360-180,d^(v>l*p&&l*t>v)){var y=-o[1]*Pa;f>y&&(f=y)}else f>e&&(f=e),e>g&&(g=e);d?p>t?a(s,t)>a(s,h)&&(h=t):a(t,h)>a(s,h)&&(s=t):h>=s?(s>t&&(s=t),t>h&&(h=t)):t>p?a(s,t)>a(s,h)&&(h=t):a(t,h)>a(s,h)&&(s=t)}else n(t,e);m=r,p=t}function e(){b.point=t}function r(){x[0]=s,x[1]=h,b.point=n,m=null}function u(n,e){if(m){var r=n-p;y+=ga(r)>180?r+(r>0?360:-360):r}else v=n,d=e;Mc.point(n,e),t(n,e)}function i(){Mc.lineStart()}function o(){u(v,d),Mc.lineEnd(),ga(y)>Ca&&(s=-(h=180)),x[0]=s,x[1]=h,m=null}function a(n,t){return(t-=n)<0?t+360:t}function c(n,t){return n[0]-t[0]}function l(n,t){return t[0]<=t[1]?t[0]<=n&&n<=t[1]:nyc?(s=-(h=180),f=-(g=90)):y>Ca?g=90:-Ca>y&&(f=-90),x[0]=s,x[1]=h}};return function(n){g=h=-(s=f=1/0),M=[],ta.geo.stream(n,b);var t=M.length;if(t){M.sort(c);for(var e,r=1,u=M[0],i=[u];t>r;++r)e=M[r],l(e[0],u)||l(e[1],u)?(a(u[0],e[1])>a(u[0],u[1])&&(u[1]=e[1]),a(e[0],u[1])>a(u[0],u[1])&&(u[0]=e[0])):i.push(u=e);for(var o,e,p=-1/0,t=i.length-1,r=0,u=i[t];t>=r;u=e,++r)e=i[r],(o=a(u[1],e[0]))>p&&(p=o,s=e[0],h=u[1])}return M=x=null,1/0===s||1/0===f?[[0/0,0/0],[0/0,0/0]]:[[s,f],[h,g]]}}(),ta.geo.centroid=function(n){xc=bc=_c=wc=Sc=kc=Ec=Ac=Nc=Cc=zc=0,ta.geo.stream(n,qc);var t=Nc,e=Cc,r=zc,u=t*t+e*e+r*r;return za>u&&(t=kc,e=Ec,r=Ac,Ca>bc&&(t=_c,e=wc,r=Sc),u=t*t+e*e+r*r,za>u)?[0/0,0/0]:[Math.atan2(e,t)*Pa,tt(r/Math.sqrt(u))*Pa]};var xc,bc,_c,wc,Sc,kc,Ec,Ac,Nc,Cc,zc,qc={sphere:b,point:_e,lineStart:Se,lineEnd:ke,polygonStart:function(){qc.lineStart=Ee},polygonEnd:function(){qc.lineStart=Se}},Lc=Le(Ne,Pe,je,[-qa,-qa/2]),Tc=1e9;ta.geo.clipExtent=function(){var n,t,e,r,u,i,o={stream:function(n){return u&&(u.valid=!1),u=i(n),u.valid=!0,u},extent:function(a){return arguments.length?(i=Ie(n=+a[0][0],t=+a[0][1],e=+a[1][0],r=+a[1][1]),u&&(u.valid=!1,u=null),o):[[n,t],[e,r]]}};return o.extent([[0,0],[960,500]])},(ta.geo.conicEqualArea=function(){return Ye(Ze)}).raw=Ze,ta.geo.albers=function(){return ta.geo.conicEqualArea().rotate([96,0]).center([-.6,38.7]).parallels([29.5,45.5]).scale(1070)},ta.geo.albersUsa=function(){function n(n){var i=n[0],o=n[1];return t=null,e(i,o),t||(r(i,o),t)||u(i,o),t}var t,e,r,u,i=ta.geo.albers(),o=ta.geo.conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),a=ta.geo.conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),c={point:function(n,e){t=[n,e]}};return n.invert=function(n){var t=i.scale(),e=i.translate(),r=(n[0]-e[0])/t,u=(n[1]-e[1])/t;return(u>=.12&&.234>u&&r>=-.425&&-.214>r?o:u>=.166&&.234>u&&r>=-.214&&-.115>r?a:i).invert(n)},n.stream=function(n){var t=i.stream(n),e=o.stream(n),r=a.stream(n);return{point:function(n,u){t.point(n,u),e.point(n,u),r.point(n,u)},sphere:function(){t.sphere(),e.sphere(),r.sphere()},lineStart:function(){t.lineStart(),e.lineStart(),r.lineStart()},lineEnd:function(){t.lineEnd(),e.lineEnd(),r.lineEnd()},polygonStart:function(){t.polygonStart(),e.polygonStart(),r.polygonStart()},polygonEnd:function(){t.polygonEnd(),e.polygonEnd(),r.polygonEnd()}}},n.precision=function(t){return arguments.length?(i.precision(t),o.precision(t),a.precision(t),n):i.precision()},n.scale=function(t){return arguments.length?(i.scale(t),o.scale(.35*t),a.scale(t),n.translate(i.translate())):i.scale()},n.translate=function(t){if(!arguments.length)return i.translate();var l=i.scale(),s=+t[0],f=+t[1];return e=i.translate(t).clipExtent([[s-.455*l,f-.238*l],[s+.455*l,f+.238*l]]).stream(c).point,r=o.translate([s-.307*l,f+.201*l]).clipExtent([[s-.425*l+Ca,f+.12*l+Ca],[s-.214*l-Ca,f+.234*l-Ca]]).stream(c).point,u=a.translate([s-.205*l,f+.212*l]).clipExtent([[s-.214*l+Ca,f+.166*l+Ca],[s-.115*l-Ca,f+.234*l-Ca]]).stream(c).point,n},n.scale(1070)};var Rc,Dc,Pc,Uc,jc,Fc,Hc={point:b,lineStart:b,lineEnd:b,polygonStart:function(){Dc=0,Hc.lineStart=Ve},polygonEnd:function(){Hc.lineStart=Hc.lineEnd=Hc.point=b,Rc+=ga(Dc/2)}},Oc={point:Xe,lineStart:b,lineEnd:b,polygonStart:b,polygonEnd:b},Ic={point:We,lineStart:Je,lineEnd:Ge,polygonStart:function(){Ic.lineStart=Ke},polygonEnd:function(){Ic.point=We,Ic.lineStart=Je,Ic.lineEnd=Ge}};ta.geo.path=function(){function n(n){return n&&("function"==typeof a&&i.pointRadius(+a.apply(this,arguments)),o&&o.valid||(o=u(i)),ta.geo.stream(n,o)),i.result()}function t(){return o=null,n}var e,r,u,i,o,a=4.5;return n.area=function(n){return Rc=0,ta.geo.stream(n,u(Hc)),Rc},n.centroid=function(n){return _c=wc=Sc=kc=Ec=Ac=Nc=Cc=zc=0,ta.geo.stream(n,u(Ic)),zc?[Nc/zc,Cc/zc]:Ac?[kc/Ac,Ec/Ac]:Sc?[_c/Sc,wc/Sc]:[0/0,0/0]},n.bounds=function(n){return jc=Fc=-(Pc=Uc=1/0),ta.geo.stream(n,u(Oc)),[[Pc,Uc],[jc,Fc]]},n.projection=function(n){return arguments.length?(u=(e=n)?n.stream||tr(n):y,t()):e},n.context=function(n){return arguments.length?(i=null==(r=n)?new $e:new Qe(n),"function"!=typeof a&&i.pointRadius(a),t()):r},n.pointRadius=function(t){return arguments.length?(a="function"==typeof t?t:(i.pointRadius(+t),+t),n):a},n.projection(ta.geo.albersUsa()).context(null)},ta.geo.transform=function(n){return{stream:function(t){var e=new er(t);for(var r in n)e[r]=n[r];return e}}},er.prototype={point:function(n,t){this.stream.point(n,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}},ta.geo.projection=ur,ta.geo.projectionMutator=ir,(ta.geo.equirectangular=function(){return ur(ar)}).raw=ar.invert=ar,ta.geo.rotation=function(n){function t(t){return t=n(t[0]*Da,t[1]*Da),t[0]*=Pa,t[1]*=Pa,t}return n=lr(n[0]%360*Da,n[1]*Da,n.length>2?n[2]*Da:0),t.invert=function(t){return t=n.invert(t[0]*Da,t[1]*Da),t[0]*=Pa,t[1]*=Pa,t},t},cr.invert=ar,ta.geo.circle=function(){function n(){var n="function"==typeof r?r.apply(this,arguments):r,t=lr(-n[0]*Da,-n[1]*Da,0).invert,u=[];return e(null,null,1,{point:function(n,e){u.push(n=t(n,e)),n[0]*=Pa,n[1]*=Pa}}),{type:"Polygon",coordinates:[u]}}var t,e,r=[0,0],u=6;return n.origin=function(t){return arguments.length?(r=t,n):r},n.angle=function(r){return arguments.length?(e=gr((t=+r)*Da,u*Da),n):t},n.precision=function(r){return arguments.length?(e=gr(t*Da,(u=+r)*Da),n):u},n.angle(90)},ta.geo.distance=function(n,t){var e,r=(t[0]-n[0])*Da,u=n[1]*Da,i=t[1]*Da,o=Math.sin(r),a=Math.cos(r),c=Math.sin(u),l=Math.cos(u),s=Math.sin(i),f=Math.cos(i);return Math.atan2(Math.sqrt((e=f*o)*e+(e=l*s-c*f*a)*e),c*s+l*f*a)},ta.geo.graticule=function(){function n(){return{type:"MultiLineString",coordinates:t()}}function t(){return ta.range(Math.ceil(i/d)*d,u,d).map(h).concat(ta.range(Math.ceil(l/m)*m,c,m).map(g)).concat(ta.range(Math.ceil(r/p)*p,e,p).filter(function(n){return ga(n%d)>Ca}).map(s)).concat(ta.range(Math.ceil(a/v)*v,o,v).filter(function(n){return ga(n%m)>Ca}).map(f))}var e,r,u,i,o,a,c,l,s,f,h,g,p=10,v=p,d=90,m=360,y=2.5;return n.lines=function(){return t().map(function(n){return{type:"LineString",coordinates:n}})},n.outline=function(){return{type:"Polygon",coordinates:[h(i).concat(g(c).slice(1),h(u).reverse().slice(1),g(l).reverse().slice(1))]}},n.extent=function(t){return arguments.length?n.majorExtent(t).minorExtent(t):n.minorExtent()},n.majorExtent=function(t){return arguments.length?(i=+t[0][0],u=+t[1][0],l=+t[0][1],c=+t[1][1],i>u&&(t=i,i=u,u=t),l>c&&(t=l,l=c,c=t),n.precision(y)):[[i,l],[u,c]]},n.minorExtent=function(t){return arguments.length?(r=+t[0][0],e=+t[1][0],a=+t[0][1],o=+t[1][1],r>e&&(t=r,r=e,e=t),a>o&&(t=a,a=o,o=t),n.precision(y)):[[r,a],[e,o]]},n.step=function(t){return arguments.length?n.majorStep(t).minorStep(t):n.minorStep()},n.majorStep=function(t){return arguments.length?(d=+t[0],m=+t[1],n):[d,m]},n.minorStep=function(t){return arguments.length?(p=+t[0],v=+t[1],n):[p,v]},n.precision=function(t){return arguments.length?(y=+t,s=vr(a,o,90),f=dr(r,e,y),h=vr(l,c,90),g=dr(i,u,y),n):y},n.majorExtent([[-180,-90+Ca],[180,90-Ca]]).minorExtent([[-180,-80-Ca],[180,80+Ca]])},ta.geo.greatArc=function(){function n(){return{type:"LineString",coordinates:[t||r.apply(this,arguments),e||u.apply(this,arguments)]}}var t,e,r=mr,u=yr;return n.distance=function(){return ta.geo.distance(t||r.apply(this,arguments),e||u.apply(this,arguments))},n.source=function(e){return arguments.length?(r=e,t="function"==typeof e?null:e,n):r},n.target=function(t){return arguments.length?(u=t,e="function"==typeof t?null:t,n):u},n.precision=function(){return arguments.length?n:0},n},ta.geo.interpolate=function(n,t){return Mr(n[0]*Da,n[1]*Da,t[0]*Da,t[1]*Da)},ta.geo.length=function(n){return Yc=0,ta.geo.stream(n,Zc),Yc};var Yc,Zc={sphere:b,point:b,lineStart:xr,lineEnd:b,polygonStart:b,polygonEnd:b},Vc=br(function(n){return Math.sqrt(2/(1+n))},function(n){return 2*Math.asin(n/2)});(ta.geo.azimuthalEqualArea=function(){return ur(Vc)}).raw=Vc;var Xc=br(function(n){var t=Math.acos(n);return t&&t/Math.sin(t)},y);(ta.geo.azimuthalEquidistant=function(){return ur(Xc)}).raw=Xc,(ta.geo.conicConformal=function(){return Ye(_r)}).raw=_r,(ta.geo.conicEquidistant=function(){return Ye(wr)}).raw=wr;var $c=br(function(n){return 1/n},Math.atan);(ta.geo.gnomonic=function(){return ur($c)}).raw=$c,Sr.invert=function(n,t){return[n,2*Math.atan(Math.exp(t))-Ra]},(ta.geo.mercator=function(){return kr(Sr)}).raw=Sr;var Bc=br(function(){return 1},Math.asin);(ta.geo.orthographic=function(){return ur(Bc)}).raw=Bc;var Wc=br(function(n){return 1/(1+n)},function(n){return 2*Math.atan(n)});(ta.geo.stereographic=function(){return ur(Wc)}).raw=Wc,Er.invert=function(n,t){return[-t,2*Math.atan(Math.exp(n))-Ra]},(ta.geo.transverseMercator=function(){var n=kr(Er),t=n.center,e=n.rotate;return n.center=function(n){return n?t([-n[1],n[0]]):(n=t(),[n[1],-n[0]])},n.rotate=function(n){return n?e([n[0],n[1],n.length>2?n[2]+90:90]):(n=e(),[n[0],n[1],n[2]-90])},e([0,0,90])}).raw=Er,ta.geom={},ta.geom.hull=function(n){function t(n){if(n.length<3)return[];var t,u=Et(e),i=Et(r),o=n.length,a=[],c=[];for(t=0;o>t;t++)a.push([+u.call(this,n[t],t),+i.call(this,n[t],t),t]);for(a.sort(zr),t=0;o>t;t++)c.push([a[t][0],-a[t][1]]);var l=Cr(a),s=Cr(c),f=s[0]===l[0],h=s[s.length-1]===l[l.length-1],g=[];for(t=l.length-1;t>=0;--t)g.push(n[a[l[t]][2]]);for(t=+f;t=r&&l.x<=i&&l.y>=u&&l.y<=o?[[r,o],[i,o],[i,u],[r,u]]:[];s.point=n[a]}),t}function e(n){return n.map(function(n,t){return{x:Math.round(i(n,t)/Ca)*Ca,y:Math.round(o(n,t)/Ca)*Ca,i:t}})}var r=Ar,u=Nr,i=r,o=u,a=ul;return n?t(n):(t.links=function(n){return iu(e(n)).edges.filter(function(n){return n.l&&n.r}).map(function(t){return{source:n[t.l.i],target:n[t.r.i]}})},t.triangles=function(n){var t=[];return iu(e(n)).cells.forEach(function(e,r){for(var u,i,o=e.site,a=e.edges.sort(Yr),c=-1,l=a.length,s=a[l-1].edge,f=s.l===o?s.r:s.l;++c=l,h=r>=s,g=h<<1|f;n.leaf=!1,n=n.nodes[g]||(n.nodes[g]=su()),f?u=l:a=l,h?o=s:c=s,i(n,t,e,r,u,o,a,c)}var s,f,h,g,p,v,d,m,y,M=Et(a),x=Et(c);if(null!=t)v=t,d=e,m=r,y=u;else if(m=y=-(v=d=1/0),f=[],h=[],p=n.length,o)for(g=0;p>g;++g)s=n[g],s.xm&&(m=s.x),s.y>y&&(y=s.y),f.push(s.x),h.push(s.y);else for(g=0;p>g;++g){var b=+M(s=n[g],g),_=+x(s,g);v>b&&(v=b),d>_&&(d=_),b>m&&(m=b),_>y&&(y=_),f.push(b),h.push(_)}var w=m-v,S=y-d;w>S?y=d+w:m=v+S;var k=su();if(k.add=function(n){i(k,n,+M(n,++g),+x(n,g),v,d,m,y)},k.visit=function(n){fu(n,k,v,d,m,y)},k.find=function(n){return hu(k,n[0],n[1],v,d,m,y)},g=-1,null==t){for(;++g=0?n.slice(0,t):n,r=t>=0?n.slice(t+1):"in";return e=cl.get(e)||al,r=ll.get(r)||y,Mu(r(e.apply(null,ea.call(arguments,1))))},ta.interpolateHcl=Lu,ta.interpolateHsl=Tu,ta.interpolateLab=Ru,ta.interpolateRound=Du,ta.transform=function(n){var t=ua.createElementNS(ta.ns.prefix.svg,"g");return(ta.transform=function(n){if(null!=n){t.setAttribute("transform",n);var e=t.transform.baseVal.consolidate()}return new Pu(e?e.matrix:sl)})(n)},Pu.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var sl={a:1,b:0,c:0,d:1,e:0,f:0};ta.interpolateTransform=Hu,ta.layout={},ta.layout.bundle=function(){return function(n){for(var t=[],e=-1,r=n.length;++ea*a/d){if(p>c){var l=t.charge/c;n.px-=i*l,n.py-=o*l}return!0}if(t.point&&c&&p>c){var l=t.pointCharge/c;n.px-=i*l,n.py-=o*l}}return!t.charge}}function t(n){n.px=ta.event.x,n.py=ta.event.y,a.resume()}var e,r,u,i,o,a={},c=ta.dispatch("start","tick","end"),l=[1,1],s=.9,f=fl,h=hl,g=-30,p=gl,v=.1,d=.64,m=[],M=[];return a.tick=function(){if((r*=.99)<.005)return c.end({type:"end",alpha:r=0}),!0;var t,e,a,f,h,p,d,y,x,b=m.length,_=M.length;for(e=0;_>e;++e)a=M[e],f=a.source,h=a.target,y=h.x-f.x,x=h.y-f.y,(p=y*y+x*x)&&(p=r*i[e]*((p=Math.sqrt(p))-u[e])/p,y*=p,x*=p,h.x-=y*(d=f.weight/(h.weight+f.weight)),h.y-=x*d,f.x+=y*(d=1-d),f.y+=x*d);if((d=r*v)&&(y=l[0]/2,x=l[1]/2,e=-1,d))for(;++e0?n:0:n>0&&(c.start({type:"start",alpha:r=n}),ta.timer(a.tick)),a):r},a.start=function(){function n(n,r){if(!e){for(e=new Array(c),a=0;c>a;++a)e[a]=[];for(a=0;s>a;++a){var u=M[a];e[u.source.index].push(u.target),e[u.target.index].push(u.source)}}for(var i,o=e[t],a=-1,l=o.length;++at;++t)(r=m[t]).index=t,r.weight=0;for(t=0;s>t;++t)r=M[t],"number"==typeof r.source&&(r.source=m[r.source]),"number"==typeof r.target&&(r.target=m[r.target]),++r.source.weight,++r.target.weight;for(t=0;c>t;++t)r=m[t],isNaN(r.x)&&(r.x=n("x",p)),isNaN(r.y)&&(r.y=n("y",v)),isNaN(r.px)&&(r.px=r.x),isNaN(r.py)&&(r.py=r.y);if(u=[],"function"==typeof f)for(t=0;s>t;++t)u[t]=+f.call(this,M[t],t);else for(t=0;s>t;++t)u[t]=f;if(i=[],"function"==typeof h)for(t=0;s>t;++t)i[t]=+h.call(this,M[t],t);else for(t=0;s>t;++t)i[t]=h;if(o=[],"function"==typeof g)for(t=0;c>t;++t)o[t]=+g.call(this,m[t],t);else for(t=0;c>t;++t)o[t]=g;return a.resume()},a.resume=function(){return a.alpha(.1)},a.stop=function(){return a.alpha(0)},a.drag=function(){return e||(e=ta.behavior.drag().origin(y).on("dragstart.force",Xu).on("drag.force",t).on("dragend.force",$u)),arguments.length?void this.on("mouseover.force",Bu).on("mouseout.force",Wu).call(e):e},ta.rebind(a,c,"on")};var fl=20,hl=1,gl=1/0;ta.layout.hierarchy=function(){function n(u){var i,o=[u],a=[];for(u.depth=0;null!=(i=o.pop());)if(a.push(i),(l=e.call(n,i,i.depth))&&(c=l.length)){for(var c,l,s;--c>=0;)o.push(s=l[c]),s.parent=i,s.depth=i.depth+1;r&&(i.value=0),i.children=l}else r&&(i.value=+r.call(n,i,i.depth)||0),delete i.children;return Qu(u,function(n){var e,u;t&&(e=n.children)&&e.sort(t),r&&(u=n.parent)&&(u.value+=n.value)}),a}var t=ei,e=ni,r=ti;return n.sort=function(e){return arguments.length?(t=e,n):t},n.children=function(t){return arguments.length?(e=t,n):e},n.value=function(t){return arguments.length?(r=t,n):r},n.revalue=function(t){return r&&(Ku(t,function(n){n.children&&(n.value=0)}),Qu(t,function(t){var e;t.children||(t.value=+r.call(n,t,t.depth)||0),(e=t.parent)&&(e.value+=t.value)})),t},n},ta.layout.partition=function(){function n(t,e,r,u){var i=t.children;if(t.x=e,t.y=t.depth*u,t.dx=r,t.dy=u,i&&(o=i.length)){var o,a,c,l=-1;for(r=t.value?r/t.value:0;++lf?-1:1),p=(f-c*g)/ta.sum(l),v=ta.range(c),d=[];return null!=e&&v.sort(e===pl?function(n,t){return l[t]-l[n]}:function(n,t){return e(o[n],o[t])}),v.forEach(function(n){d[n]={data:o[n],value:a=l[n],startAngle:s,endAngle:s+=a*p+g,padAngle:h}}),d}var t=Number,e=pl,r=0,u=La,i=0;return n.value=function(e){return arguments.length?(t=e,n):t},n.sort=function(t){return arguments.length?(e=t,n):e},n.startAngle=function(t){return arguments.length?(r=t,n):r},n.endAngle=function(t){return arguments.length?(u=t,n):u},n.padAngle=function(t){return arguments.length?(i=t,n):i},n};var pl={};ta.layout.stack=function(){function n(a,c){if(!(h=a.length))return a;var l=a.map(function(e,r){return t.call(n,e,r)}),s=l.map(function(t){return t.map(function(t,e){return[i.call(n,t,e),o.call(n,t,e)]})}),f=e.call(n,s,c);l=ta.permute(l,f),s=ta.permute(s,f);var h,g,p,v,d=r.call(n,s,c),m=l[0].length;for(p=0;m>p;++p)for(u.call(n,l[0][p],v=d[p],s[0][p][1]),g=1;h>g;++g)u.call(n,l[g][p],v+=s[g-1][p][1],s[g][p][1]);return a}var t=y,e=ai,r=ci,u=oi,i=ui,o=ii;return n.values=function(e){return arguments.length?(t=e,n):t},n.order=function(t){return arguments.length?(e="function"==typeof t?t:vl.get(t)||ai,n):e},n.offset=function(t){return arguments.length?(r="function"==typeof t?t:dl.get(t)||ci,n):r},n.x=function(t){return arguments.length?(i=t,n):i},n.y=function(t){return arguments.length?(o=t,n):o},n.out=function(t){return arguments.length?(u=t,n):u},n};var vl=ta.map({"inside-out":function(n){var t,e,r=n.length,u=n.map(li),i=n.map(si),o=ta.range(r).sort(function(n,t){return u[n]-u[t]}),a=0,c=0,l=[],s=[];for(t=0;r>t;++t)e=o[t],c>a?(a+=i[e],l.push(e)):(c+=i[e],s.push(e));return s.reverse().concat(l)},reverse:function(n){return ta.range(n.length).reverse()},"default":ai}),dl=ta.map({silhouette:function(n){var t,e,r,u=n.length,i=n[0].length,o=[],a=0,c=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];r>a&&(a=r),o.push(r)}for(e=0;i>e;++e)c[e]=(a-o[e])/2;return c},wiggle:function(n){var t,e,r,u,i,o,a,c,l,s=n.length,f=n[0],h=f.length,g=[];for(g[0]=c=l=0,e=1;h>e;++e){for(t=0,u=0;s>t;++t)u+=n[t][e][1];for(t=0,i=0,a=f[e][0]-f[e-1][0];s>t;++t){for(r=0,o=(n[t][e][1]-n[t][e-1][1])/(2*a);t>r;++r)o+=(n[r][e][1]-n[r][e-1][1])/a;i+=o*n[t][e][1]}g[e]=c-=u?i/u*a:0,l>c&&(l=c)}for(e=0;h>e;++e)g[e]-=l;return g},expand:function(n){var t,e,r,u=n.length,i=n[0].length,o=1/u,a=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];if(r)for(t=0;u>t;t++)n[t][e][1]/=r;else for(t=0;u>t;t++)n[t][e][1]=o}for(e=0;i>e;++e)a[e]=0;return a},zero:ci});ta.layout.histogram=function(){function n(n,i){for(var o,a,c=[],l=n.map(e,this),s=r.call(this,l,i),f=u.call(this,s,l,i),i=-1,h=l.length,g=f.length-1,p=t?1:1/h;++i0)for(i=-1;++i=s[0]&&a<=s[1]&&(o=c[ta.bisect(f,a,1,g)-1],o.y+=p,o.push(n[i]));return c}var t=!0,e=Number,r=pi,u=hi;return n.value=function(t){return arguments.length?(e=t,n):e},n.range=function(t){return arguments.length?(r=Et(t),n):r},n.bins=function(t){return arguments.length?(u="number"==typeof t?function(n){return gi(n,t)}:Et(t),n):u},n.frequency=function(e){return arguments.length?(t=!!e,n):t},n},ta.layout.pack=function(){function n(n,i){var o=e.call(this,n,i),a=o[0],c=u[0],l=u[1],s=null==t?Math.sqrt:"function"==typeof t?t:function(){return t};if(a.x=a.y=0,Qu(a,function(n){n.r=+s(n.value)}),Qu(a,Mi),r){var f=r*(t?1:Math.max(2*a.r/c,2*a.r/l))/2;Qu(a,function(n){n.r+=f}),Qu(a,Mi),Qu(a,function(n){n.r-=f})}return _i(a,c/2,l/2,t?1:1/Math.max(2*a.r/c,2*a.r/l)),o}var t,e=ta.layout.hierarchy().sort(vi),r=0,u=[1,1];return n.size=function(t){return arguments.length?(u=t,n):u},n.radius=function(e){return arguments.length?(t=null==e||"function"==typeof e?e:+e,n):t},n.padding=function(t){return arguments.length?(r=+t,n):r},Gu(n,e)},ta.layout.tree=function(){function n(n,u){var s=o.call(this,n,u),f=s[0],h=t(f);if(Qu(h,e),h.parent.m=-h.z,Ku(h,r),l)Ku(f,i);else{var g=f,p=f,v=f;Ku(f,function(n){n.xp.x&&(p=n),n.depth>v.depth&&(v=n)});var d=a(g,p)/2-g.x,m=c[0]/(p.x+a(p,g)/2+d),y=c[1]/(v.depth||1);Ku(f,function(n){n.x=(n.x+d)*m,n.y=n.depth*y})}return s}function t(n){for(var t,e={A:null,children:[n]},r=[e];null!=(t=r.pop());)for(var u,i=t.children,o=0,a=i.length;a>o;++o)r.push((i[o]=u={_:i[o],parent:t,children:(u=i[o].children)&&u.slice()||[],A:null,a:null,z:0,m:0,c:0,s:0,t:null,i:o}).a=u);return e.children[0]}function e(n){var t=n.children,e=n.parent.children,r=n.i?e[n.i-1]:null;if(t.length){Ni(n);var i=(t[0].z+t[t.length-1].z)/2;r?(n.z=r.z+a(n._,r._),n.m=n.z-i):n.z=i}else r&&(n.z=r.z+a(n._,r._));n.parent.A=u(n,r,n.parent.A||e[0])}function r(n){n._.x=n.z+n.parent.m,n.m+=n.parent.m}function u(n,t,e){if(t){for(var r,u=n,i=n,o=t,c=u.parent.children[0],l=u.m,s=i.m,f=o.m,h=c.m;o=Ei(o),u=ki(u),o&&u;)c=ki(c),i=Ei(i),i.a=n,r=o.z+f-u.z-l+a(o._,u._),r>0&&(Ai(Ci(o,n,e),n,r),l+=r,s+=r),f+=o.m,l+=u.m,h+=c.m,s+=i.m;o&&!Ei(i)&&(i.t=o,i.m+=f-s),u&&!ki(c)&&(c.t=u,c.m+=l-h,e=n)}return e}function i(n){n.x*=c[0],n.y=n.depth*c[1]}var o=ta.layout.hierarchy().sort(null).value(null),a=Si,c=[1,1],l=null;return n.separation=function(t){return arguments.length?(a=t,n):a},n.size=function(t){return arguments.length?(l=null==(c=t)?i:null,n):l?null:c},n.nodeSize=function(t){return arguments.length?(l=null==(c=t)?null:i,n):l?c:null},Gu(n,o)},ta.layout.cluster=function(){function n(n,i){var o,a=t.call(this,n,i),c=a[0],l=0;Qu(c,function(n){var t=n.children;t&&t.length?(n.x=qi(t),n.y=zi(t)):(n.x=o?l+=e(n,o):0,n.y=0,o=n)});var s=Li(c),f=Ti(c),h=s.x-e(s,f)/2,g=f.x+e(f,s)/2;return Qu(c,u?function(n){n.x=(n.x-c.x)*r[0],n.y=(c.y-n.y)*r[1]}:function(n){n.x=(n.x-h)/(g-h)*r[0],n.y=(1-(c.y?n.y/c.y:1))*r[1]}),a}var t=ta.layout.hierarchy().sort(null).value(null),e=Si,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Gu(n,t)},ta.layout.treemap=function(){function n(n,t){for(var e,r,u=-1,i=n.length;++ut?0:t),e.area=isNaN(r)||0>=r?0:r}function t(e){var i=e.children;if(i&&i.length){var o,a,c,l=f(e),s=[],h=i.slice(),p=1/0,v="slice"===g?l.dx:"dice"===g?l.dy:"slice-dice"===g?1&e.depth?l.dy:l.dx:Math.min(l.dx,l.dy);for(n(h,l.dx*l.dy/e.value),s.area=0;(c=h.length)>0;)s.push(o=h[c-1]),s.area+=o.area,"squarify"!==g||(a=r(s,v))<=p?(h.pop(),p=a):(s.area-=s.pop().area,u(s,v,l,!1),v=Math.min(l.dx,l.dy),s.length=s.area=0,p=1/0);s.length&&(u(s,v,l,!0),s.length=s.area=0),i.forEach(t)}}function e(t){var r=t.children;if(r&&r.length){var i,o=f(t),a=r.slice(),c=[];for(n(a,o.dx*o.dy/t.value),c.area=0;i=a.pop();)c.push(i),c.area+=i.area,null!=i.z&&(u(c,i.z?o.dx:o.dy,o,!a.length),c.length=c.area=0);r.forEach(e)}}function r(n,t){for(var e,r=n.area,u=0,i=1/0,o=-1,a=n.length;++oe&&(i=e),e>u&&(u=e));return r*=r,t*=t,r?Math.max(t*u*p/r,r/(t*i*p)):1/0}function u(n,t,e,r){var u,i=-1,o=n.length,a=e.x,l=e.y,s=t?c(n.area/t):0;if(t==e.dx){for((r||s>e.dy)&&(s=e.dy);++ie.dx)&&(s=e.dx);++ie&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=ta.random.normal.apply(ta,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=ta.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},ta.scale={};var ml={floor:y,ceil:y};ta.scale.linear=function(){return Ii([0,1],[0,1],mu,!1)};var yl={s:1,g:1,p:1,r:1,e:1};ta.scale.log=function(){return Ji(ta.scale.linear().domain([0,1]),10,!0,[1,10])};var Ml=ta.format(".0e"),xl={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};ta.scale.pow=function(){return Gi(ta.scale.linear(),1,[0,1])},ta.scale.sqrt=function(){return ta.scale.pow().exponent(.5)},ta.scale.ordinal=function(){return Qi([],{t:"range",a:[[]]})},ta.scale.category10=function(){return ta.scale.ordinal().range(bl)},ta.scale.category20=function(){return ta.scale.ordinal().range(_l)},ta.scale.category20b=function(){return ta.scale.ordinal().range(wl)},ta.scale.category20c=function(){return ta.scale.ordinal().range(Sl)};var bl=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(Mt),_l=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(Mt),wl=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(Mt),Sl=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(Mt);ta.scale.quantile=function(){return no([],[])},ta.scale.quantize=function(){return to(0,1,[0,1])},ta.scale.threshold=function(){return eo([.5],[0,1])},ta.scale.identity=function(){return ro([0,1])},ta.svg={},ta.svg.arc=function(){function n(){var n=Math.max(0,+e.apply(this,arguments)),l=Math.max(0,+r.apply(this,arguments)),s=o.apply(this,arguments)-Ra,f=a.apply(this,arguments)-Ra,h=Math.abs(f-s),g=s>f?0:1;if(n>l&&(p=l,l=n,n=p),h>=Ta)return t(l,g)+(n?t(n,1-g):"")+"Z";var p,v,d,m,y,M,x,b,_,w,S,k,E=0,A=0,N=[];if((m=(+c.apply(this,arguments)||0)/2)&&(d=i===kl?Math.sqrt(n*n+l*l):+i.apply(this,arguments),g||(A*=-1),l&&(A=tt(d/l*Math.sin(m))),n&&(E=tt(d/n*Math.sin(m)))),l){y=l*Math.cos(s+A),M=l*Math.sin(s+A),x=l*Math.cos(f-A),b=l*Math.sin(f-A);var C=Math.abs(f-s-2*A)<=qa?0:1;if(A&&so(y,M,x,b)===g^C){var z=(s+f)/2;y=l*Math.cos(z),M=l*Math.sin(z),x=b=null}}else y=M=0;if(n){_=n*Math.cos(f-E),w=n*Math.sin(f-E),S=n*Math.cos(s+E),k=n*Math.sin(s+E);var q=Math.abs(s-f+2*E)<=qa?0:1;if(E&&so(_,w,S,k)===1-g^q){var L=(s+f)/2;_=n*Math.cos(L),w=n*Math.sin(L),S=k=null}}else _=w=0;if((p=Math.min(Math.abs(l-n)/2,+u.apply(this,arguments)))>.001){v=l>n^g?0:1;var T=null==S?[_,w]:null==x?[y,M]:Lr([y,M],[S,k],[x,b],[_,w]),R=y-T[0],D=M-T[1],P=x-T[0],U=b-T[1],j=1/Math.sin(Math.acos((R*P+D*U)/(Math.sqrt(R*R+D*D)*Math.sqrt(P*P+U*U)))/2),F=Math.sqrt(T[0]*T[0]+T[1]*T[1]);if(null!=x){var H=Math.min(p,(l-F)/(j+1)),O=fo(null==S?[_,w]:[S,k],[y,M],l,H,g),I=fo([x,b],[_,w],l,H,g);p===H?N.push("M",O[0],"A",H,",",H," 0 0,",v," ",O[1],"A",l,",",l," 0 ",1-g^so(O[1][0],O[1][1],I[1][0],I[1][1]),",",g," ",I[1],"A",H,",",H," 0 0,",v," ",I[0]):N.push("M",O[0],"A",H,",",H," 0 1,",v," ",I[0])}else N.push("M",y,",",M);if(null!=S){var Y=Math.min(p,(n-F)/(j-1)),Z=fo([y,M],[S,k],n,-Y,g),V=fo([_,w],null==x?[y,M]:[x,b],n,-Y,g);p===Y?N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",V[1],"A",n,",",n," 0 ",g^so(V[1][0],V[1][1],Z[1][0],Z[1][1]),",",1-g," ",Z[1],"A",Y,",",Y," 0 0,",v," ",Z[0]):N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",Z[0])}else N.push("L",_,",",w)}else N.push("M",y,",",M),null!=x&&N.push("A",l,",",l," 0 ",C,",",g," ",x,",",b),N.push("L",_,",",w),null!=S&&N.push("A",n,",",n," 0 ",q,",",1-g," ",S,",",k);return N.push("Z"),N.join("")}function t(n,t){return"M0,"+n+"A"+n+","+n+" 0 1,"+t+" 0,"+-n+"A"+n+","+n+" 0 1,"+t+" 0,"+n}var e=io,r=oo,u=uo,i=kl,o=ao,a=co,c=lo;return n.innerRadius=function(t){return arguments.length?(e=Et(t),n):e},n.outerRadius=function(t){return arguments.length?(r=Et(t),n):r},n.cornerRadius=function(t){return arguments.length?(u=Et(t),n):u},n.padRadius=function(t){return arguments.length?(i=t==kl?kl:Et(t),n):i},n.startAngle=function(t){return arguments.length?(o=Et(t),n):o},n.endAngle=function(t){return arguments.length?(a=Et(t),n):a},n.padAngle=function(t){return arguments.length?(c=Et(t),n):c},n.centroid=function(){var n=(+e.apply(this,arguments)+ +r.apply(this,arguments))/2,t=(+o.apply(this,arguments)+ +a.apply(this,arguments))/2-Ra;return[Math.cos(t)*n,Math.sin(t)*n]},n};var kl="auto";ta.svg.line=function(){return ho(y)};var El=ta.map({linear:go,"linear-closed":po,step:vo,"step-before":mo,"step-after":yo,basis:So,"basis-open":ko,"basis-closed":Eo,bundle:Ao,cardinal:bo,"cardinal-open":Mo,"cardinal-closed":xo,monotone:To});El.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var Al=[0,2/3,1/3,0],Nl=[0,1/3,2/3,0],Cl=[0,1/6,2/3,1/6];ta.svg.line.radial=function(){var n=ho(Ro);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},mo.reverse=yo,yo.reverse=mo,ta.svg.area=function(){return Do(y)},ta.svg.area.radial=function(){var n=Do(Ro);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},ta.svg.chord=function(){function n(n,a){var c=t(this,i,n,a),l=t(this,o,n,a);return"M"+c.p0+r(c.r,c.p1,c.a1-c.a0)+(e(c,l)?u(c.r,c.p1,c.r,c.p0):u(c.r,c.p1,l.r,l.p0)+r(l.r,l.p1,l.a1-l.a0)+u(l.r,l.p1,c.r,c.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=c.call(n,u,r)-Ra,s=l.call(n,u,r)-Ra;return{r:i,a0:o,a1:s,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(s),i*Math.sin(s)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>qa)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=mr,o=yr,a=Po,c=ao,l=co;return n.radius=function(t){return arguments.length?(a=Et(t),n):a},n.source=function(t){return arguments.length?(i=Et(t),n):i},n.target=function(t){return arguments.length?(o=Et(t),n):o},n.startAngle=function(t){return arguments.length?(c=Et(t),n):c},n.endAngle=function(t){return arguments.length?(l=Et(t),n):l},n},ta.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,c=[i,{x:i.x,y:a},{x:o.x,y:a},o];return c=c.map(r),"M"+c[0]+"C"+c[1]+" "+c[2]+" "+c[3]}var t=mr,e=yr,r=Uo;return n.source=function(e){return arguments.length?(t=Et(e),n):t},n.target=function(t){return arguments.length?(e=Et(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},ta.svg.diagonal.radial=function(){var n=ta.svg.diagonal(),t=Uo,e=n.projection;return n.projection=function(n){return arguments.length?e(jo(t=n)):t},n},ta.svg.symbol=function(){function n(n,r){return(zl.get(t.call(this,n,r))||Oo)(e.call(this,n,r))}var t=Ho,e=Fo;return n.type=function(e){return arguments.length?(t=Et(e),n):t},n.size=function(t){return arguments.length?(e=Et(t),n):e},n};var zl=ta.map({circle:Oo,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Ll)),e=t*Ll;return"M0,"+-t+"L"+e+",0 0,"+t+" "+-e+",0Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});ta.svg.symbolTypes=zl.keys();var ql=Math.sqrt(3),Ll=Math.tan(30*Da);_a.transition=function(n){for(var t,e,r=Tl||++Ul,u=Xo(n),i=[],o=Rl||{time:Date.now(),ease:Su,delay:0,duration:250},a=-1,c=this.length;++ai;i++){u.push(t=[]);for(var e=this[i],a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Yo(u,this.namespace,this.id)},Pl.tween=function(n,t){var e=this.id,r=this.namespace;return arguments.length<2?this.node()[r][e].tween.get(n):Y(this,null==t?function(t){t[r][e].tween.remove(n)}:function(u){u[r][e].tween.set(n,t)})},Pl.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Hu:mu,a=ta.ns.qualify(n);return Zo(this,"attr."+n,t,a.local?i:u)},Pl.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=ta.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Pl.style=function(n,e,r){function u(){this.style.removeProperty(n)}function i(e){return null==e?u:(e+="",function(){var u,i=t(this).getComputedStyle(this,null).getPropertyValue(n);return i!==e&&(u=mu(i,e),function(t){this.style.setProperty(n,u(t),r)})})}var o=arguments.length;if(3>o){if("string"!=typeof n){2>o&&(e="");for(r in n)this.style(r,n[r],e);return this}r=""}return Zo(this,"style."+n,e,i)},Pl.styleTween=function(n,e,r){function u(u,i){var o=e.call(this,u,i,t(this).getComputedStyle(this,null).getPropertyValue(n));return o&&function(t){this.style.setProperty(n,o(t),r)}}return arguments.length<3&&(r=""),this.tween("style."+n,u)},Pl.text=function(n){return Zo(this,"text",n,Vo)},Pl.remove=function(){var n=this.namespace;return this.each("end.transition",function(){var t;this[n].count<2&&(t=this.parentNode)&&t.removeChild(this)})},Pl.ease=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].ease:("function"!=typeof n&&(n=ta.ease.apply(ta,arguments)),Y(this,function(r){r[e][t].ease=n}))},Pl.delay=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].delay:Y(this,"function"==typeof n?function(r,u,i){r[e][t].delay=+n.call(r,r.__data__,u,i)}:(n=+n,function(r){r[e][t].delay=n}))},Pl.duration=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].duration:Y(this,"function"==typeof n?function(r,u,i){r[e][t].duration=Math.max(1,n.call(r,r.__data__,u,i))}:(n=Math.max(1,n),function(r){r[e][t].duration=n}))},Pl.each=function(n,t){var e=this.id,r=this.namespace;if(arguments.length<2){var u=Rl,i=Tl;try{Tl=e,Y(this,function(t,u,i){Rl=t[r][e],n.call(t,t.__data__,u,i)})}finally{Rl=u,Tl=i}}else Y(this,function(u){var i=u[r][e];(i.event||(i.event=ta.dispatch("start","end","interrupt"))).on(n,t)});return this},Pl.transition=function(){for(var n,t,e,r,u=this.id,i=++Ul,o=this.namespace,a=[],c=0,l=this.length;l>c;c++){a.push(n=[]);for(var t=this[c],s=0,f=t.length;f>s;s++)(e=t[s])&&(r=e[o][u],$o(e,s,o,i,{time:r.time,ease:r.ease,delay:r.delay+r.duration,duration:r.duration})),n.push(e)}return Yo(a,o,i)},ta.svg.axis=function(){function n(n){n.each(function(){var n,l=ta.select(this),s=this.__chart__||e,f=this.__chart__=e.copy(),h=null==c?f.ticks?f.ticks.apply(f,a):f.domain():c,g=null==t?f.tickFormat?f.tickFormat.apply(f,a):y:t,p=l.selectAll(".tick").data(h,f),v=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Ca),d=ta.transition(p.exit()).style("opacity",Ca).remove(),m=ta.transition(p.order()).style("opacity",1),M=Math.max(u,0)+o,x=Ui(f),b=l.selectAll(".domain").data([0]),_=(b.enter().append("path").attr("class","domain"),ta.transition(b));v.append("line"),v.append("text");var w,S,k,E,A=v.select("line"),N=m.select("line"),C=p.select("text").text(g),z=v.select("text"),q=m.select("text"),L="top"===r||"left"===r?-1:1;if("bottom"===r||"top"===r?(n=Bo,w="x",k="y",S="x2",E="y2",C.attr("dy",0>L?"0em":".71em").style("text-anchor","middle"),_.attr("d","M"+x[0]+","+L*i+"V0H"+x[1]+"V"+L*i)):(n=Wo,w="y",k="x",S="y2",E="x2",C.attr("dy",".32em").style("text-anchor",0>L?"end":"start"),_.attr("d","M"+L*i+","+x[0]+"H0V"+x[1]+"H"+L*i)),A.attr(E,L*u),z.attr(k,L*M),N.attr(S,0).attr(E,L*u),q.attr(w,0).attr(k,L*M),f.rangeBand){var T=f,R=T.rangeBand()/2;s=f=function(n){return T(n)+R}}else s.rangeBand?s=f:d.call(n,f,s);v.call(n,s,f),m.call(n,f,f)})}var t,e=ta.scale.linear(),r=jl,u=6,i=6,o=3,a=[10],c=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in Fl?t+"":jl,n):r},n.ticks=function(){return arguments.length?(a=arguments,n):a},n.tickValues=function(t){return arguments.length?(c=t,n):c},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var jl="bottom",Fl={top:1,right:1,bottom:1,left:1};ta.svg.brush=function(){function n(t){t.each(function(){var t=ta.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",i).on("touchstart.brush",i),o=t.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),t.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=t.selectAll(".resize").data(v,y);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return Hl[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var c,f=ta.transition(t),h=ta.transition(o);l&&(c=Ui(l),h.attr("x",c[0]).attr("width",c[1]-c[0]),r(f)),s&&(c=Ui(s),h.attr("y",c[0]).attr("height",c[1]-c[0]),u(f)),e(f)})}function e(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+f[+/e$/.test(n)]+","+h[+/^s/.test(n)]+")"})}function r(n){n.select(".extent").attr("x",f[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",f[1]-f[0])}function u(n){n.select(".extent").attr("y",h[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",h[1]-h[0])}function i(){function i(){32==ta.event.keyCode&&(C||(M=null,q[0]-=f[1],q[1]-=h[1],C=2),S())}function v(){32==ta.event.keyCode&&2==C&&(q[0]+=f[1],q[1]+=h[1],C=0,S())}function d(){var n=ta.mouse(b),t=!1;x&&(n[0]+=x[0],n[1]+=x[1]),C||(ta.event.altKey?(M||(M=[(f[0]+f[1])/2,(h[0]+h[1])/2]),q[0]=f[+(n[0]s?(u=r,r=s):u=s),v[0]!=r||v[1]!=u?(e?a=null:o=null,v[0]=r,v[1]=u,!0):void 0}function y(){d(),k.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),ta.select("body").style("cursor",null),L.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),z(),w({type:"brushend"})}var M,x,b=this,_=ta.select(ta.event.target),w=c.of(b,arguments),k=ta.select(b),E=_.datum(),A=!/^(n|s)$/.test(E)&&l,N=!/^(e|w)$/.test(E)&&s,C=_.classed("extent"),z=W(b),q=ta.mouse(b),L=ta.select(t(b)).on("keydown.brush",i).on("keyup.brush",v);if(ta.event.changedTouches?L.on("touchmove.brush",d).on("touchend.brush",y):L.on("mousemove.brush",d).on("mouseup.brush",y),k.interrupt().selectAll("*").interrupt(),C)q[0]=f[0]-q[0],q[1]=h[0]-q[1];else if(E){var T=+/w$/.test(E),R=+/^n/.test(E);x=[f[1-T]-q[0],h[1-R]-q[1]],q[0]=f[T],q[1]=h[R]}else ta.event.altKey&&(M=q.slice());k.style("pointer-events","none").selectAll(".resize").style("display",null),ta.select("body").style("cursor",_.style("cursor")),w({type:"brushstart"}),d()}var o,a,c=E(n,"brushstart","brush","brushend"),l=null,s=null,f=[0,0],h=[0,0],g=!0,p=!0,v=Ol[0];return n.event=function(n){n.each(function(){var n=c.of(this,arguments),t={x:f,y:h,i:o,j:a},e=this.__chart__||t;this.__chart__=t,Tl?ta.select(this).transition().each("start.brush",function(){o=e.i,a=e.j,f=e.x,h=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=yu(f,t.x),r=yu(h,t.y);return o=a=null,function(u){f=t.x=e(u),h=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){o=t.i,a=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(l=t,v=Ol[!l<<1|!s],n):l},n.y=function(t){return arguments.length?(s=t,v=Ol[!l<<1|!s],n):s},n.clamp=function(t){return arguments.length?(l&&s?(g=!!t[0],p=!!t[1]):l?g=!!t:s&&(p=!!t),n):l&&s?[g,p]:l?g:s?p:null},n.extent=function(t){var e,r,u,i,c;return arguments.length?(l&&(e=t[0],r=t[1],s&&(e=e[0],r=r[0]),o=[e,r],l.invert&&(e=l(e),r=l(r)),e>r&&(c=e,e=r,r=c),(e!=f[0]||r!=f[1])&&(f=[e,r])),s&&(u=t[0],i=t[1],l&&(u=u[1],i=i[1]),a=[u,i],s.invert&&(u=s(u),i=s(i)),u>i&&(c=u,u=i,i=c),(u!=h[0]||i!=h[1])&&(h=[u,i])),n):(l&&(o?(e=o[0],r=o[1]):(e=f[0],r=f[1],l.invert&&(e=l.invert(e),r=l.invert(r)),e>r&&(c=e,e=r,r=c))),s&&(a?(u=a[0],i=a[1]):(u=h[0],i=h[1],s.invert&&(u=s.invert(u),i=s.invert(i)),u>i&&(c=u,u=i,i=c))),l&&s?[[e,u],[r,i]]:l?[e,r]:s&&[u,i])},n.clear=function(){return n.empty()||(f=[0,0],h=[0,0],o=a=null),n},n.empty=function(){return!!l&&f[0]==f[1]||!!s&&h[0]==h[1]},ta.rebind(n,c,"on")};var Hl={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Ol=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Il=ac.format=gc.timeFormat,Yl=Il.utc,Zl=Yl("%Y-%m-%dT%H:%M:%S.%LZ");Il.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?Jo:Zl,Jo.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},Jo.toString=Zl.toString,ac.second=Ft(function(n){return new cc(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),ac.seconds=ac.second.range,ac.seconds.utc=ac.second.utc.range,ac.minute=Ft(function(n){return new cc(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),ac.minutes=ac.minute.range,ac.minutes.utc=ac.minute.utc.range,ac.hour=Ft(function(n){var t=n.getTimezoneOffset()/60;return new cc(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),ac.hours=ac.hour.range,ac.hours.utc=ac.hour.utc.range,ac.month=Ft(function(n){return n=ac.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),ac.months=ac.month.range,ac.months.utc=ac.month.utc.range;var Vl=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Xl=[[ac.second,1],[ac.second,5],[ac.second,15],[ac.second,30],[ac.minute,1],[ac.minute,5],[ac.minute,15],[ac.minute,30],[ac.hour,1],[ac.hour,3],[ac.hour,6],[ac.hour,12],[ac.day,1],[ac.day,2],[ac.week,1],[ac.month,1],[ac.month,3],[ac.year,1]],$l=Il.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",Ne]]),Bl={range:function(n,t,e){return ta.range(Math.ceil(n/e)*e,+t,e).map(Ko)},floor:y,ceil:y};Xl.year=ac.year,ac.scale=function(){return Go(ta.scale.linear(),Xl,$l)};var Wl=Xl.map(function(n){return[n[0].utc,n[1]]}),Jl=Yl.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",Ne]]);Wl.year=ac.year.utc,ac.scale.utc=function(){return Go(ta.scale.linear(),Wl,Jl)},ta.text=At(function(n){return n.responseText}),ta.json=function(n,t){return Nt(n,"application/json",Qo,t)},ta.html=function(n,t){return Nt(n,"text/html",na,t)},ta.xml=At(function(n){return n.responseXML}),"function"==typeof define&&define.amd?define(ta):"object"==typeof module&&module.exports&&(module.exports=ta),this.d3=ta}(); \ No newline at end of file +return i.size=function(n){return arguments.length?(l=n,i):l},i.padding=function(n){function t(t){var e=n.call(i,t,t.depth);return null==e?Ri(t):Di(t,"number"==typeof e?[e,e,e,e]:e)}function e(t){return Di(t,n)}if(!arguments.length)return s;var r;return f=null==(s=n)?Ri:"function"==(r=typeof n)?t:"number"===r?(n=[n,n,n,n],e):e,i},i.round=function(n){return arguments.length?(c=n?Math.round:Number,i):c!=Number},i.sticky=function(n){return arguments.length?(h=n,o=null,i):h},i.ratio=function(n){return arguments.length?(p=n,i):p},i.mode=function(n){return arguments.length?(g=n+"",i):g},Gu(i,a)},ta.random={normal:function(n,t){var e=arguments.length;return 2>e&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=ta.random.normal.apply(ta,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=ta.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},ta.scale={};var ml={floor:y,ceil:y};ta.scale.linear=function(){return Ii([0,1],[0,1],mu,!1)};var yl={s:1,g:1,p:1,r:1,e:1};ta.scale.log=function(){return Ji(ta.scale.linear().domain([0,1]),10,!0,[1,10])};var Ml=ta.format(".0e"),xl={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};ta.scale.pow=function(){return Gi(ta.scale.linear(),1,[0,1])},ta.scale.sqrt=function(){return ta.scale.pow().exponent(.5)},ta.scale.ordinal=function(){return Qi([],{t:"range",a:[[]]})},ta.scale.category10=function(){return ta.scale.ordinal().range(bl)},ta.scale.category20=function(){return ta.scale.ordinal().range(_l)},ta.scale.category20b=function(){return ta.scale.ordinal().range(wl)},ta.scale.category20c=function(){return ta.scale.ordinal().range(Sl)};var bl=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(Mt),_l=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(Mt),wl=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(Mt),Sl=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(Mt);ta.scale.quantile=function(){return no([],[])},ta.scale.quantize=function(){return to(0,1,[0,1])},ta.scale.threshold=function(){return eo([.5],[0,1])},ta.scale.identity=function(){return ro([0,1])},ta.svg={},ta.svg.arc=function(){function n(){var n=Math.max(0,+e.apply(this,arguments)),l=Math.max(0,+r.apply(this,arguments)),s=o.apply(this,arguments)-Ra,f=a.apply(this,arguments)-Ra,h=Math.abs(f-s),g=s>f?0:1;if(n>l&&(p=l,l=n,n=p),h>=Ta)return t(l,g)+(n?t(n,1-g):"")+"Z";var p,v,d,m,y,M,x,b,_,w,S,k,E=0,A=0,N=[];if((m=(+c.apply(this,arguments)||0)/2)&&(d=i===kl?Math.sqrt(n*n+l*l):+i.apply(this,arguments),g||(A*=-1),l&&(A=tt(d/l*Math.sin(m))),n&&(E=tt(d/n*Math.sin(m)))),l){y=l*Math.cos(s+A),M=l*Math.sin(s+A),x=l*Math.cos(f-A),b=l*Math.sin(f-A);var C=Math.abs(f-s-2*A)<=qa?0:1;if(A&&so(y,M,x,b)===g^C){var z=(s+f)/2;y=l*Math.cos(z),M=l*Math.sin(z),x=b=null}}else y=M=0;if(n){_=n*Math.cos(f-E),w=n*Math.sin(f-E),S=n*Math.cos(s+E),k=n*Math.sin(s+E);var q=Math.abs(s-f+2*E)<=qa?0:1;if(E&&so(_,w,S,k)===1-g^q){var L=(s+f)/2;_=n*Math.cos(L),w=n*Math.sin(L),S=k=null}}else _=w=0;if((p=Math.min(Math.abs(l-n)/2,+u.apply(this,arguments)))>.001){v=l>n^g?0:1;var T=null==S?[_,w]:null==x?[y,M]:Lr([y,M],[S,k],[x,b],[_,w]),R=y-T[0],D=M-T[1],P=x-T[0],U=b-T[1],j=1/Math.sin(Math.acos((R*P+D*U)/(Math.sqrt(R*R+D*D)*Math.sqrt(P*P+U*U)))/2),F=Math.sqrt(T[0]*T[0]+T[1]*T[1]);if(null!=x){var H=Math.min(p,(l-F)/(j+1)),O=fo(null==S?[_,w]:[S,k],[y,M],l,H,g),I=fo([x,b],[_,w],l,H,g);p===H?N.push("M",O[0],"A",H,",",H," 0 0,",v," ",O[1],"A",l,",",l," 0 ",1-g^so(O[1][0],O[1][1],I[1][0],I[1][1]),",",g," ",I[1],"A",H,",",H," 0 0,",v," ",I[0]):N.push("M",O[0],"A",H,",",H," 0 1,",v," ",I[0])}else N.push("M",y,",",M);if(null!=S){var Y=Math.min(p,(n-F)/(j-1)),Z=fo([y,M],[S,k],n,-Y,g),V=fo([_,w],null==x?[y,M]:[x,b],n,-Y,g);p===Y?N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",V[1],"A",n,",",n," 0 ",g^so(V[1][0],V[1][1],Z[1][0],Z[1][1]),",",1-g," ",Z[1],"A",Y,",",Y," 0 0,",v," ",Z[0]):N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",Z[0])}else N.push("L",_,",",w)}else N.push("M",y,",",M),null!=x&&N.push("A",l,",",l," 0 ",C,",",g," ",x,",",b),N.push("L",_,",",w),null!=S&&N.push("A",n,",",n," 0 ",q,",",1-g," ",S,",",k);return N.push("Z"),N.join("")}function t(n,t){return"M0,"+n+"A"+n+","+n+" 0 1,"+t+" 0,"+-n+"A"+n+","+n+" 0 1,"+t+" 0,"+n}var e=io,r=oo,u=uo,i=kl,o=ao,a=co,c=lo;return n.innerRadius=function(t){return arguments.length?(e=Et(t),n):e},n.outerRadius=function(t){return arguments.length?(r=Et(t),n):r},n.cornerRadius=function(t){return arguments.length?(u=Et(t),n):u},n.padRadius=function(t){return arguments.length?(i=t==kl?kl:Et(t),n):i},n.startAngle=function(t){return arguments.length?(o=Et(t),n):o},n.endAngle=function(t){return arguments.length?(a=Et(t),n):a},n.padAngle=function(t){return arguments.length?(c=Et(t),n):c},n.centroid=function(){var n=(+e.apply(this,arguments)+ +r.apply(this,arguments))/2,t=(+o.apply(this,arguments)+ +a.apply(this,arguments))/2-Ra;return[Math.cos(t)*n,Math.sin(t)*n]},n};var kl="auto";ta.svg.line=function(){return ho(y)};var El=ta.map({linear:go,"linear-closed":po,step:vo,"step-before":mo,"step-after":yo,basis:So,"basis-open":ko,"basis-closed":Eo,bundle:Ao,cardinal:bo,"cardinal-open":Mo,"cardinal-closed":xo,monotone:To});El.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var Al=[0,2/3,1/3,0],Nl=[0,1/3,2/3,0],Cl=[0,1/6,2/3,1/6];ta.svg.line.radial=function(){var n=ho(Ro);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},mo.reverse=yo,yo.reverse=mo,ta.svg.area=function(){return Do(y)},ta.svg.area.radial=function(){var n=Do(Ro);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},ta.svg.chord=function(){function n(n,a){var c=t(this,i,n,a),l=t(this,o,n,a);return"M"+c.p0+r(c.r,c.p1,c.a1-c.a0)+(e(c,l)?u(c.r,c.p1,c.r,c.p0):u(c.r,c.p1,l.r,l.p0)+r(l.r,l.p1,l.a1-l.a0)+u(l.r,l.p1,c.r,c.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=c.call(n,u,r)-Ra,s=l.call(n,u,r)-Ra;return{r:i,a0:o,a1:s,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(s),i*Math.sin(s)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>qa)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=mr,o=yr,a=Po,c=ao,l=co;return n.radius=function(t){return arguments.length?(a=Et(t),n):a},n.source=function(t){return arguments.length?(i=Et(t),n):i},n.target=function(t){return arguments.length?(o=Et(t),n):o},n.startAngle=function(t){return arguments.length?(c=Et(t),n):c},n.endAngle=function(t){return arguments.length?(l=Et(t),n):l},n},ta.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,c=[i,{x:i.x,y:a},{x:o.x,y:a},o];return c=c.map(r),"M"+c[0]+"C"+c[1]+" "+c[2]+" "+c[3]}var t=mr,e=yr,r=Uo;return n.source=function(e){return arguments.length?(t=Et(e),n):t},n.target=function(t){return arguments.length?(e=Et(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},ta.svg.diagonal.radial=function(){var n=ta.svg.diagonal(),t=Uo,e=n.projection;return n.projection=function(n){return arguments.length?e(jo(t=n)):t},n},ta.svg.symbol=function(){function n(n,r){return(zl.get(t.call(this,n,r))||Oo)(e.call(this,n,r))}var t=Ho,e=Fo;return n.type=function(e){return arguments.length?(t=Et(e),n):t},n.size=function(t){return arguments.length?(e=Et(t),n):e},n};var zl=ta.map({circle:Oo,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Ll)),e=t*Ll;return"M0,"+-t+"L"+e+",0 0,"+t+" "+-e+",0Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});ta.svg.symbolTypes=zl.keys();var ql=Math.sqrt(3),Ll=Math.tan(30*Da);_a.transition=function(n){for(var t,e,r=Tl||++Ul,u=Xo(n),i=[],o=Rl||{time:Date.now(),ease:Su,delay:0,duration:250},a=-1,c=this.length;++ai;i++){u.push(t=[]);for(var e=this[i],a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Yo(u,this.namespace,this.id)},Pl.tween=function(n,t){var e=this.id,r=this.namespace;return arguments.length<2?this.node()[r][e].tween.get(n):Y(this,null==t?function(t){t[r][e].tween.remove(n)}:function(u){u[r][e].tween.set(n,t)})},Pl.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Hu:mu,a=ta.ns.qualify(n);return Zo(this,"attr."+n,t,a.local?i:u)},Pl.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=ta.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Pl.style=function(n,e,r){function u(){this.style.removeProperty(n)}function i(e){return null==e?u:(e+="",function(){var u,i=t(this).getComputedStyle(this,null).getPropertyValue(n);return i!==e&&(u=mu(i,e),function(t){this.style.setProperty(n,u(t),r)})})}var o=arguments.length;if(3>o){if("string"!=typeof n){2>o&&(e="");for(r in n)this.style(r,n[r],e);return this}r=""}return Zo(this,"style."+n,e,i)},Pl.styleTween=function(n,e,r){function u(u,i){var o=e.call(this,u,i,t(this).getComputedStyle(this,null).getPropertyValue(n));return o&&function(t){this.style.setProperty(n,o(t),r)}}return arguments.length<3&&(r=""),this.tween("style."+n,u)},Pl.text=function(n){return Zo(this,"text",n,Vo)},Pl.remove=function(){var n=this.namespace;return this.each("end.transition",function(){var t;this[n].count<2&&(t=this.parentNode)&&t.removeChild(this)})},Pl.ease=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].ease:("function"!=typeof n&&(n=ta.ease.apply(ta,arguments)),Y(this,function(r){r[e][t].ease=n}))},Pl.delay=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].delay:Y(this,"function"==typeof n?function(r,u,i){r[e][t].delay=+n.call(r,r.__data__,u,i)}:(n=+n,function(r){r[e][t].delay=n}))},Pl.duration=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].duration:Y(this,"function"==typeof n?function(r,u,i){r[e][t].duration=Math.max(1,n.call(r,r.__data__,u,i))}:(n=Math.max(1,n),function(r){r[e][t].duration=n}))},Pl.each=function(n,t){var e=this.id,r=this.namespace;if(arguments.length<2){var u=Rl,i=Tl;try{Tl=e,Y(this,function(t,u,i){Rl=t[r][e],n.call(t,t.__data__,u,i)})}finally{Rl=u,Tl=i}}else Y(this,function(u){var i=u[r][e];(i.event||(i.event=ta.dispatch("start","end","interrupt"))).on(n,t)});return this},Pl.transition=function(){for(var n,t,e,r,u=this.id,i=++Ul,o=this.namespace,a=[],c=0,l=this.length;l>c;c++){a.push(n=[]);for(var t=this[c],s=0,f=t.length;f>s;s++)(e=t[s])&&(r=e[o][u],$o(e,s,o,i,{time:r.time,ease:r.ease,delay:r.delay+r.duration,duration:r.duration})),n.push(e)}return Yo(a,o,i)},ta.svg.axis=function(){function n(n){n.each(function(){var n,l=ta.select(this),s=this.__chart__||e,f=this.__chart__=e.copy(),h=null==c?f.ticks?f.ticks.apply(f,a):f.domain():c,g=null==t?f.tickFormat?f.tickFormat.apply(f,a):y:t,p=l.selectAll(".tick").data(h,f),v=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Ca),d=ta.transition(p.exit()).style("opacity",Ca).remove(),m=ta.transition(p.order()).style("opacity",1),M=Math.max(u,0)+o,x=Ui(f),b=l.selectAll(".domain").data([0]),_=(b.enter().append("path").attr("class","domain"),ta.transition(b));v.append("line"),v.append("text");var w,S,k,E,A=v.select("line"),N=m.select("line"),C=p.select("text").text(g),z=v.select("text"),q=m.select("text"),L="top"===r||"left"===r?-1:1;if("bottom"===r||"top"===r?(n=Bo,w="x",k="y",S="x2",E="y2",C.attr("dy",0>L?"0em":".71em").style("text-anchor","middle"),_.attr("d","M"+x[0]+","+L*i+"V0H"+x[1]+"V"+L*i)):(n=Wo,w="y",k="x",S="y2",E="x2",C.attr("dy",".32em").style("text-anchor",0>L?"end":"start"),_.attr("d","M"+L*i+","+x[0]+"H0V"+x[1]+"H"+L*i)),A.attr(E,L*u),z.attr(k,L*M),N.attr(S,0).attr(E,L*u),q.attr(w,0).attr(k,L*M),f.rangeBand){var T=f,R=T.rangeBand()/2;s=f=function(n){return T(n)+R}}else s.rangeBand?s=f:d.call(n,f,s);v.call(n,s,f),m.call(n,f,f)})}var t,e=ta.scale.linear(),r=jl,u=6,i=6,o=3,a=[10],c=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in Fl?t+"":jl,n):r},n.ticks=function(){return arguments.length?(a=arguments,n):a},n.tickValues=function(t){return arguments.length?(c=t,n):c},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var jl="bottom",Fl={top:1,right:1,bottom:1,left:1};ta.svg.brush=function(){function n(t){t.each(function(){var t=ta.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",i).on("touchstart.brush",i),o=t.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),t.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=t.selectAll(".resize").data(v,y);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return Hl[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var c,f=ta.transition(t),h=ta.transition(o);l&&(c=Ui(l),h.attr("x",c[0]).attr("width",c[1]-c[0]),r(f)),s&&(c=Ui(s),h.attr("y",c[0]).attr("height",c[1]-c[0]),u(f)),e(f)})}function e(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+f[+/e$/.test(n)]+","+h[+/^s/.test(n)]+")"})}function r(n){n.select(".extent").attr("x",f[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",f[1]-f[0])}function u(n){n.select(".extent").attr("y",h[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",h[1]-h[0])}function i(){function i(){32==ta.event.keyCode&&(C||(M=null,q[0]-=f[1],q[1]-=h[1],C=2),S())}function v(){32==ta.event.keyCode&&2==C&&(q[0]+=f[1],q[1]+=h[1],C=0,S())}function d(){var n=ta.mouse(b),t=!1;x&&(n[0]+=x[0],n[1]+=x[1]),C||(ta.event.altKey?(M||(M=[(f[0]+f[1])/2,(h[0]+h[1])/2]),q[0]=f[+(n[0]s?(u=r,r=s):u=s),v[0]!=r||v[1]!=u?(e?a=null:o=null,v[0]=r,v[1]=u,!0):void 0}function y(){d(),k.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),ta.select("body").style("cursor",null),L.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),z(),w({type:"brushend"})}var M,x,b=this,_=ta.select(ta.event.target),w=c.of(b,arguments),k=ta.select(b),E=_.datum(),A=!/^(n|s)$/.test(E)&&l,N=!/^(e|w)$/.test(E)&&s,C=_.classed("extent"),z=W(b),q=ta.mouse(b),L=ta.select(t(b)).on("keydown.brush",i).on("keyup.brush",v);if(ta.event.changedTouches?L.on("touchmove.brush",d).on("touchend.brush",y):L.on("mousemove.brush",d).on("mouseup.brush",y),k.interrupt().selectAll("*").interrupt(),C)q[0]=f[0]-q[0],q[1]=h[0]-q[1];else if(E){var T=+/w$/.test(E),R=+/^n/.test(E);x=[f[1-T]-q[0],h[1-R]-q[1]],q[0]=f[T],q[1]=h[R]}else ta.event.altKey&&(M=q.slice());k.style("pointer-events","none").selectAll(".resize").style("display",null),ta.select("body").style("cursor",_.style("cursor")),w({type:"brushstart"}),d()}var o,a,c=E(n,"brushstart","brush","brushend"),l=null,s=null,f=[0,0],h=[0,0],g=!0,p=!0,v=Ol[0];return n.event=function(n){n.each(function(){var n=c.of(this,arguments),t={x:f,y:h,i:o,j:a},e=this.__chart__||t;this.__chart__=t,Tl?ta.select(this).transition().each("start.brush",function(){o=e.i,a=e.j,f=e.x,h=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=yu(f,t.x),r=yu(h,t.y);return o=a=null,function(u){f=t.x=e(u),h=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){o=t.i,a=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(l=t,v=Ol[!l<<1|!s],n):l},n.y=function(t){return arguments.length?(s=t,v=Ol[!l<<1|!s],n):s},n.clamp=function(t){return arguments.length?(l&&s?(g=!!t[0],p=!!t[1]):l?g=!!t:s&&(p=!!t),n):l&&s?[g,p]:l?g:s?p:null},n.extent=function(t){var e,r,u,i,c;return arguments.length?(l&&(e=t[0],r=t[1],s&&(e=e[0],r=r[0]),o=[e,r],l.invert&&(e=l(e),r=l(r)),e>r&&(c=e,e=r,r=c),(e!=f[0]||r!=f[1])&&(f=[e,r])),s&&(u=t[0],i=t[1],l&&(u=u[1],i=i[1]),a=[u,i],s.invert&&(u=s(u),i=s(i)),u>i&&(c=u,u=i,i=c),(u!=h[0]||i!=h[1])&&(h=[u,i])),n):(l&&(o?(e=o[0],r=o[1]):(e=f[0],r=f[1],l.invert&&(e=l.invert(e),r=l.invert(r)),e>r&&(c=e,e=r,r=c))),s&&(a?(u=a[0],i=a[1]):(u=h[0],i=h[1],s.invert&&(u=s.invert(u),i=s.invert(i)),u>i&&(c=u,u=i,i=c))),l&&s?[[e,u],[r,i]]:l?[e,r]:s&&[u,i])},n.clear=function(){return n.empty()||(f=[0,0],h=[0,0],o=a=null),n},n.empty=function(){return!!l&&f[0]==f[1]||!!s&&h[0]==h[1]},ta.rebind(n,c,"on")};var Hl={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Ol=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Il=ac.format=gc.timeFormat,Yl=Il.utc,Zl=Yl("%Y-%m-%dT%H:%M:%S.%LZ");Il.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?Jo:Zl,Jo.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},Jo.toString=Zl.toString,ac.second=Ft(function(n){return new cc(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),ac.seconds=ac.second.range,ac.seconds.utc=ac.second.utc.range,ac.minute=Ft(function(n){return new cc(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),ac.minutes=ac.minute.range,ac.minutes.utc=ac.minute.utc.range,ac.hour=Ft(function(n){var t=n.getTimezoneOffset()/60;return new cc(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),ac.hours=ac.hour.range,ac.hours.utc=ac.hour.utc.range,ac.month=Ft(function(n){return n=ac.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),ac.months=ac.month.range,ac.months.utc=ac.month.utc.range;var Vl=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Xl=[[ac.second,1],[ac.second,5],[ac.second,15],[ac.second,30],[ac.minute,1],[ac.minute,5],[ac.minute,15],[ac.minute,30],[ac.hour,1],[ac.hour,3],[ac.hour,6],[ac.hour,12],[ac.day,1],[ac.day,2],[ac.week,1],[ac.month,1],[ac.month,3],[ac.year,1]],$l=Il.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",Ne]]),Bl={range:function(n,t,e){return ta.range(Math.ceil(n/e)*e,+t,e).map(Ko)},floor:y,ceil:y};Xl.year=ac.year,ac.scale=function(){return Go(ta.scale.linear(),Xl,$l)};var Wl=Xl.map(function(n){return[n[0].utc,n[1]]}),Jl=Yl.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",Ne]]);Wl.year=ac.year.utc,ac.scale.utc=function(){return Go(ta.scale.linear(),Wl,Jl)},ta.text=At(function(n){return n.responseText}),ta.json=function(n,t){return Nt(n,"application/json",Qo,t)},ta.html=function(n,t){return Nt(n,"text/html",na,t)},ta.xml=At(function(n){return n.responseXML}),"function"==typeof define&&define.amd?define(ta):"object"==typeof module&&module.exports&&(module.exports=ta),this.d3=ta}(); diff --git a/webapp/src/main/webapp/js/homePageMaps.js b/webapp/src/main/webapp/js/homePageMaps.js index fd08151d..8610d677 100644 --- a/webapp/src/main/webapp/js/homePageMaps.js +++ b/webapp/src/main/webapp/js/homePageMaps.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $(document).ready(function(){ diff --git a/webapp/src/main/webapp/js/homePageUtils.js b/webapp/src/main/webapp/js/homePageUtils.js index 9d3507ea..ef6809a1 100644 --- a/webapp/src/main/webapp/js/homePageUtils.js +++ b/webapp/src/main/webapp/js/homePageUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $(document).ready(function(){ diff --git a/webapp/src/main/webapp/js/individual/individualProfilePageType.js b/webapp/src/main/webapp/js/individual/individualProfilePageType.js index fcab2eae..17a6d018 100644 --- a/webapp/src/main/webapp/js/individual/individualProfilePageType.js +++ b/webapp/src/main/webapp/js/individual/individualProfilePageType.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var profilePageType = { diff --git a/webapp/src/main/webapp/js/individual/individualQtipBubble.js b/webapp/src/main/webapp/js/individual/individualQtipBubble.js index 661a25cb..974acafe 100644 --- a/webapp/src/main/webapp/js/individual/individualQtipBubble.js +++ b/webapp/src/main/webapp/js/individual/individualQtipBubble.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $(document).ready(function(){ // This function creates and styles the "qTip" tooltip that displays the bubble text when the user hovers @@ -80,4 +80,4 @@ $(document).ready(function(){ } }); }); -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/individual/individualUtils.js b/webapp/src/main/webapp/js/individual/individualUtils.js index 4da10242..430cf057 100644 --- a/webapp/src/main/webapp/js/individual/individualUtils.js +++ b/webapp/src/main/webapp/js/individual/individualUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $(document).ready(function(){ diff --git a/webapp/src/main/webapp/js/individual/propertyGroupControls.js b/webapp/src/main/webapp/js/individual/propertyGroupControls.js index 1f844409..14e940f0 100644 --- a/webapp/src/main/webapp/js/individual/propertyGroupControls.js +++ b/webapp/src/main/webapp/js/individual/propertyGroupControls.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $(document).ready(function(){ @@ -279,4 +279,4 @@ $(document).ready(function(){ } } -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.blockUI.min.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.blockUI.min.js index 20894843..bcb89194 100644 --- a/webapp/src/main/webapp/js/jquery_plugins/jquery.blockUI.min.js +++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.blockUI.min.js @@ -12,4 +12,5 @@ * Thanks to Amir-Hossein Sobhi for some excellent contributions! */ -!function(){"use strict";function e(e){function t(t,n){var s,h,k=t==window,y=n&&void 0!==n.message?n.message:void 0;if(n=e.extend({},e.blockUI.defaults,n||{}),!n.ignoreIfBlocked||!e(t).data("blockUI.isBlocked")){if(n.overlayCSS=e.extend({},e.blockUI.defaults.overlayCSS,n.overlayCSS||{}),s=e.extend({},e.blockUI.defaults.css,n.css||{}),n.onOverlayClick&&(n.overlayCSS.cursor="pointer"),h=e.extend({},e.blockUI.defaults.themedCSS,n.themedCSS||{}),y=void 0===y?n.message:y,k&&p&&o(window,{fadeOut:0}),y&&"string"!=typeof y&&(y.parentNode||y.jquery)){var m=y.jquery?y[0]:y,v={};e(t).data("blockUI.history",v),v.el=m,v.parent=m.parentNode,v.display=m.style.display,v.position=m.style.position,v.parent&&v.parent.removeChild(m)}e(t).data("blockUI.onUnblock",n.onUnblock);var g,I,w,U,x=n.baseZ;g=e(r||n.forceIframe?'':'

'),I=e(n.theme?'':''),n.theme&&k?(U='"):n.theme?(U='"):U=k?'':'',w=e(U),y&&(n.theme?(w.css(h),w.addClass("ui-widget-content")):w.css(s)),n.theme||I.css(n.overlayCSS),I.css("position",k?"fixed":"absolute"),(r||n.forceIframe)&&g.css("opacity",0);var C=[g,I,w],S=e(k?"body":t);e.each(C,function(){this.appendTo(S)}),n.theme&&n.draggable&&e.fn.draggable&&w.draggable({handle:".ui-dialog-titlebar",cancel:"li"});var O=f&&(!e.support.boxModel||e("object,embed",k?null:t).length>0);if(u||O){if(k&&n.allowBodyStretch&&e.support.boxModel&&e("html,body").css("height","100%"),(u||!e.support.boxModel)&&!k)var E=d(t,"borderTopWidth"),T=d(t,"borderLeftWidth"),M=E?"(0 - "+E+")":0,B=T?"(0 - "+T+")":0;e.each(C,function(e,t){var o=t[0].style;if(o.position="absolute",2>e)k?o.setExpression("height","Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.support.boxModel?0:"+n.quirksmodeOffsetHack+') + "px"'):o.setExpression("height",'this.parentNode.offsetHeight + "px"'),k?o.setExpression("width",'jQuery.support.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"'):o.setExpression("width",'this.parentNode.offsetWidth + "px"'),B&&o.setExpression("left",B),M&&o.setExpression("top",M);else if(n.centerY)k&&o.setExpression("top",'(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"'),o.marginTop=0;else if(!n.centerY&&k){var i=n.css&&n.css.top?parseInt(n.css.top,10):0,s="((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "+i+') + "px"';o.setExpression("top",s)}})}if(y&&(n.theme?w.find(".ui-widget-content").append(y):w.append(y),(y.jquery||y.nodeType)&&e(y).show()),(r||n.forceIframe)&&n.showOverlay&&g.show(),n.fadeIn){var j=n.onBlock?n.onBlock:c,H=n.showOverlay&&!y?j:c,z=y?j:c;n.showOverlay&&I._fadeIn(n.fadeIn,H),y&&w._fadeIn(n.fadeIn,z)}else n.showOverlay&&I.show(),y&&w.show(),n.onBlock&&n.onBlock.bind(w)();if(i(1,t,n),k?(p=w[0],b=e(n.focusableElements,p),n.focusInput&&setTimeout(l,20)):a(w[0],n.centerX,n.centerY),n.timeout){var W=setTimeout(function(){k?e.unblockUI(n):e(t).unblock(n)},n.timeout);e(t).data("blockUI.timeout",W)}}}function o(t,o){var s,l=t==window,a=e(t),d=a.data("blockUI.history"),c=a.data("blockUI.timeout");c&&(clearTimeout(c),a.removeData("blockUI.timeout")),o=e.extend({},e.blockUI.defaults,o||{}),i(0,t,o),null===o.onUnblock&&(o.onUnblock=a.data("blockUI.onUnblock"),a.removeData("blockUI.onUnblock"));var r;r=l?e("body").children().filter(".blockUI").add("body > .blockUI"):a.find(">.blockUI"),o.cursorReset&&(r.length>1&&(r[1].style.cursor=o.cursorReset),r.length>2&&(r[2].style.cursor=o.cursorReset)),l&&(p=b=null),o.fadeOut?(s=r.length,r.stop().fadeOut(o.fadeOut,function(){0===--s&&n(r,d,o,t)})):n(r,d,o,t)}function n(t,o,n,i){var s=e(i);if(!s.data("blockUI.isBlocked")){t.each(function(e,t){this.parentNode&&this.parentNode.removeChild(this)}),o&&o.el&&(o.el.style.display=o.display,o.el.style.position=o.position,o.el.style.cursor="default",o.parent&&o.parent.appendChild(o.el),s.removeData("blockUI.history")),s.data("blockUI.static")&&s.css("position","static"),"function"==typeof n.onUnblock&&n.onUnblock(i,n);var l=e(document.body),a=l.width(),d=l[0].style.width;l.width(a-1).width(a),l[0].style.width=d}}function i(t,o,n){var i=o==window,l=e(o);if((t||(!i||p)&&(i||l.data("blockUI.isBlocked")))&&(l.data("blockUI.isBlocked",t),i&&n.bindEvents&&(!t||n.showOverlay))){var a="mousedown mouseup keydown keypress keyup touchstart touchend touchmove";t?e(document).bind(a,n,s):e(document).unbind(a,s)}}function s(t){if("keydown"===t.type&&t.keyCode&&9==t.keyCode&&p&&t.data.constrainTabKey){var o=b,n=!t.shiftKey&&t.target===o[o.length-1],i=t.shiftKey&&t.target===o[0];if(n||i)return setTimeout(function(){l(i)},10),!1}var s=t.data,a=e(t.target);return a.hasClass("blockOverlay")&&s.onOverlayClick&&s.onOverlayClick(t),a.parents("div."+s.blockMsgClass).length>0?!0:0===a.parents().children().filter("div.blockUI").length}function l(e){if(b){var t=b[e===!0?b.length-1:0];t&&t.focus()}}function a(e,t,o){var n=e.parentNode,i=e.style,s=(n.offsetWidth-e.offsetWidth)/2-d(n,"borderLeftWidth"),l=(n.offsetHeight-e.offsetHeight)/2-d(n,"borderTopWidth");t&&(i.left=s>0?s+"px":"0"),o&&(i.top=l>0?l+"px":"0")}function d(t,o){return parseInt(e.css(t,o),10)||0}e.fn._fadeIn=e.fn.fadeIn;var c=e.noop||function(){},r=/MSIE/.test(navigator.userAgent),u=/MSIE 6.0/.test(navigator.userAgent)&&!/MSIE 8.0/.test(navigator.userAgent),f=(document.documentMode||0,e.isFunction(document.createElement("div").style.setExpression));e.blockUI=function(e){t(window,e)},e.unblockUI=function(e){o(window,e)},e.growlUI=function(t,o,n,i){var s=e('
');t&&s.append("

"+t+"

"),o&&s.append("

"+o+"

"),void 0===n&&(n=3e3);var l=function(t){t=t||{},e.blockUI({message:s,fadeIn:"undefined"!=typeof t.fadeIn?t.fadeIn:700,fadeOut:"undefined"!=typeof t.fadeOut?t.fadeOut:1e3,timeout:"undefined"!=typeof t.timeout?t.timeout:n,centerY:!1,showOverlay:!1,onUnblock:i,css:e.blockUI.defaults.growlCSS})};l();s.css("opacity");s.mouseover(function(){l({fadeIn:0,timeout:3e4});var t=e(".blockMsg");t.stop(),t.fadeTo(300,1)}).mouseout(function(){e(".blockMsg").fadeOut(1e3)})},e.fn.block=function(o){if(this[0]===window)return e.blockUI(o),this;var n=e.extend({},e.blockUI.defaults,o||{});return this.each(function(){var t=e(this);n.ignoreIfBlocked&&t.data("blockUI.isBlocked")||t.unblock({fadeOut:0})}),this.each(function(){"static"==e.css(this,"position")&&(this.style.position="relative",e(this).data("blockUI.static",!0)),this.style.zoom=1,t(this,o)})},e.fn.unblock=function(t){return this[0]===window?(e.unblockUI(t),this):this.each(function(){o(this,t)})},e.blockUI.version=2.7,e.blockUI.defaults={message:"

Please wait...

",title:null,draggable:!0,theme:!1,css:{padding:0,margin:0,width:"30%",top:"40%",left:"35%",textAlign:"center",color:"#000",border:"3px solid #aaa",backgroundColor:"#fff",cursor:"wait"},themedCSS:{width:"30%",top:"40%",left:"35%"},overlayCSS:{backgroundColor:"#000",opacity:.6,cursor:"wait"},cursorReset:"default",growlCSS:{width:"350px",top:"10px",left:"",right:"10px",border:"none",padding:"5px",opacity:.6,cursor:"default",color:"#fff",backgroundColor:"#000","-webkit-border-radius":"10px","-moz-border-radius":"10px","border-radius":"10px"},iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank",forceIframe:!1,baseZ:1e3,centerX:!0,centerY:!0,allowBodyStretch:!0,bindEvents:!0,constrainTabKey:!0,fadeIn:200,fadeOut:400,timeout:0,showOverlay:!0,focusInput:!0,focusableElements:":input:enabled:visible",onBlock:null,onUnblock:null,onOverlayClick:null,quirksmodeOffsetHack:4,blockMsgClass:"blockMsg",ignoreIfBlocked:!1};var p=null,b=[]}"function"==typeof define&&define.amd&&define.amd.jQuery?define(["jquery"],e):e(jQuery)}(); \ No newline at end of file +!function(){"use strict";function e(e){function t(t,n){var s,h,k=t==window,y=n&&void 0!==n.message?n.message:void 0;if(n=e.extend({},e.blockUI.defaults,n||{}),!n.ignoreIfBlocked||!e(t).data("blockUI.isBlocked")){if(n.overlayCSS=e.extend({},e.blockUI.defaults.overlayCSS,n.overlayCSS||{}),s=e.extend({},e.blockUI.defaults.css,n.css||{}),n.onOverlayClick&&(n.overlayCSS.cursor="pointer"),h=e.extend({},e.blockUI.defaults.themedCSS,n.themedCSS||{}),y=void 0===y?n.message:y,k&&p&&o(window,{fadeOut:0}),y&&"string"!=typeof y&&(y.parentNode||y.jquery)){var m=y.jquery?y[0]:y,v={};e(t).data("blockUI.history",v),v.el=m,v.parent=m.parentNode,v.display=m.style.display,v.position=m.style.position,v.parent&&v.parent.removeChild(m)}e(t).data("blockUI.onUnblock",n.onUnblock);var g,I,w,U,x=n.baseZ;g=e(r||n.forceIframe?'':''),I=e(n.theme?'':''),n.theme&&k?(U='"):n.theme?(U='"):U=k?'':'',w=e(U),y&&(n.theme?(w.css(h),w.addClass("ui-widget-content")):w.css(s)),n.theme||I.css(n.overlayCSS),I.css("position",k?"fixed":"absolute"),(r||n.forceIframe)&&g.css("opacity",0);var C=[g,I,w],S=e(k?"body":t);e.each(C,function(){this.appendTo(S)}),n.theme&&n.draggable&&e.fn.draggable&&w.draggable({handle:".ui-dialog-titlebar",cancel:"li"});var O=f&&(!e.support.boxModel||e("object,embed",k?null:t).length>0);if(u||O){if(k&&n.allowBodyStretch&&e.support.boxModel&&e("html,body").css("height","100%"),(u||!e.support.boxModel)&&!k)var E=d(t,"borderTopWidth"),T=d(t,"borderLeftWidth"),M=E?"(0 - "+E+")":0,B=T?"(0 - "+T+")":0;e.each(C,function(e,t){var o=t[0].style;if(o.position="absolute",2>e)k?o.setExpression("height","Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.support.boxModel?0:"+n.quirksmodeOffsetHack+') + "px"'):o.setExpression("height",'this.parentNode.offsetHeight + "px"'),k?o.setExpression("width",'jQuery.support.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"'):o.setExpression("width",'this.parentNode.offsetWidth + "px"'),B&&o.setExpression("left",B),M&&o.setExpression("top",M);else if(n.centerY)k&&o.setExpression("top",'(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"'),o.marginTop=0;else if(!n.centerY&&k){var i=n.css&&n.css.top?parseInt(n.css.top,10):0,s="((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "+i+') + "px"';o.setExpression("top",s)}})}if(y&&(n.theme?w.find(".ui-widget-content").append(y):w.append(y),(y.jquery||y.nodeType)&&e(y).show()),(r||n.forceIframe)&&n.showOverlay&&g.show(),n.fadeIn){var j=n.onBlock?n.onBlock:c,H=n.showOverlay&&!y?j:c,z=y?j:c;n.showOverlay&&I._fadeIn(n.fadeIn,H),y&&w._fadeIn(n.fadeIn,z)}else n.showOverlay&&I.show(),y&&w.show(),n.onBlock&&n.onBlock.bind(w)();if(i(1,t,n),k?(p=w[0],b=e(n.focusableElements,p),n.focusInput&&setTimeout(l,20)):a(w[0],n.centerX,n.centerY),n.timeout){var W=setTimeout(function(){k?e.unblockUI(n):e(t).unblock(n)},n.timeout);e(t).data("blockUI.timeout",W)}}}function o(t,o){var s,l=t==window,a=e(t),d=a.data("blockUI.history"),c=a.data("blockUI.timeout");c&&(clearTimeout(c),a.removeData("blockUI.timeout")),o=e.extend({},e.blockUI.defaults,o||{}),i(0,t,o),null===o.onUnblock&&(o.onUnblock=a.data("blockUI.onUnblock"),a.removeData("blockUI.onUnblock"));var r;r=l?e("body").children().filter(".blockUI").add("body > .blockUI"):a.find(">.blockUI"),o.cursorReset&&(r.length>1&&(r[1].style.cursor=o.cursorReset),r.length>2&&(r[2].style.cursor=o.cursorReset)),l&&(p=b=null),o.fadeOut?(s=r.length,r.stop().fadeOut(o.fadeOut,function(){0===--s&&n(r,d,o,t)})):n(r,d,o,t)}function n(t,o,n,i){var s=e(i);if(!s.data("blockUI.isBlocked")){t.each(function(e,t){this.parentNode&&this.parentNode.removeChild(this)}),o&&o.el&&(o.el.style.display=o.display,o.el.style.position=o.position,o.el.style.cursor="default",o.parent&&o.parent.appendChild(o.el),s.removeData("blockUI.history")),s.data("blockUI.static")&&s.css("position","static"),"function"==typeof n.onUnblock&&n.onUnblock(i,n);var l=e(document.body),a=l.width(),d=l[0].style.width;l.width(a-1).width(a),l[0].style.width=d}}function i(t,o,n){var i=o==window,l=e(o);if((t||(!i||p)&&(i||l.data("blockUI.isBlocked")))&&(l.data("blockUI.isBlocked",t),i&&n.bindEvents&&(!t||n.showOverlay))){var a="mousedown mouseup keydown keypress keyup touchstart touchend touchmove";t?e(document).bind(a,n,s):e(document).unbind(a,s)}}function s(t){if("keydown"===t.type&&t.keyCode&&9==t.keyCode&&p&&t.data.constrainTabKey){var o=b,n=!t.shiftKey&&t.target===o[o.length-1],i=t.shiftKey&&t.target===o[0];if(n||i)return setTimeout(function(){l(i)},10),!1}var s=t.data,a=e(t.target);return a.hasClass("blockOverlay")&&s.onOverlayClick&&s.onOverlayClick(t),a.parents("div."+s.blockMsgClass).length>0?!0:0===a.parents().children().filter("div.blockUI").length}function l(e){if(b){var t=b[e===!0?b.length-1:0];t&&t.focus()}}function a(e,t,o){var n=e.parentNode,i=e.style,s=(n.offsetWidth-e.offsetWidth)/2-d(n,"borderLeftWidth"),l=(n.offsetHeight-e.offsetHeight)/2-d(n,"borderTopWidth");t&&(i.left=s>0?s+"px":"0"),o&&(i.top=l>0?l+"px":"0")}function d(t,o){return parseInt(e.css(t,o),10)||0}e.fn._fadeIn=e.fn.fadeIn;var c=e.noop||function(){},r=/MSIE/.test(navigator.userAgent),u=/MSIE 6.0/.test(navigator.userAgent)&&!/MSIE 8.0/.test(navigator.userAgent),f=(document.documentMode||0,e.isFunction(document.createElement("div").style.setExpression));e.blockUI=function(e){t(window,e)},e.unblockUI=function(e){o(window,e)},e.growlUI=function(t,o,n,i){var s=e('
');t&&s.append("

"+t+"

"),o&&s.append("

"+o+"

"),void 0===n&&(n=3e3);var l=function(t){t=t||{},e.blockUI({message:s,fadeIn:"undefined"!=typeof t.fadeIn?t.fadeIn:700,fadeOut:"undefined"!=typeof t.fadeOut?t.fadeOut:1e3,timeout:"undefined"!=typeof t.timeout?t.timeout:n,centerY:!1,showOverlay:!1,onUnblock:i,css:e.blockUI.defaults.growlCSS})};l();s.css("opacity");s.mouseover(function(){l({fadeIn:0,timeout:3e4});var t=e(".blockMsg");t.stop(),t.fadeTo(300,1)}).mouseout(function(){e(".blockMsg").fadeOut(1e3)})},e.fn.block=function(o){if(this[0]===window)return e.blockUI(o),this;var n=e.extend({},e.blockUI.defaults,o||{});return this.each(function(){var t=e(this);n.ignoreIfBlocked&&t.data("blockUI.isBlocked")||t.unblock({fadeOut:0})}),this.each(function(){"static"==e.css(this,"position")&&(this.style.position="relative",e(this).data("blockUI.static",!0)),this.style.zoom=1,t(this,o)})},e.fn.unblock=function(t){return this[0]===window?(e.unblockUI(t),this):this.each(function(){o(this,t)})},e.blockUI.version=2.7,e.blockUI.defaults={message:"

Please wait...

",title:null,draggable:!0,theme:!1,css:{padding:0,margin:0,width:"30%",top:"40%",left:"35%",textAlign:"center",color:"#000",border:"3px solid #aaa",backgroundColor:"#fff",cursor:"wait"},themedCSS:{width:"30%",top:"40%",left:"35%"},overlayCSS:{backgroundColor:"#000",opacity:.6,cursor:"wait"},cursorReset:"default",growlCSS:{width:"350px",top:"10px",left:"",right:"10px",border:"none",padding:"5px",opacity:.6,cursor:"default",color:"#fff",backgroundColor:"#000","-webkit-border-radius":"10px","-moz-border-radius":"10px","border-radius":"10px"},iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank",forceIframe:!1,baseZ:1e3,centerX:!0,centerY:!0,allowBodyStretch:!0,bindEvents:!0,constrainTabKey:!0,fadeIn:200,fadeOut:400,timeout:0,showOverlay:!0,focusInput:!0,focusableElements:":input:enabled:visible",onBlock:null,onUnblock:null,onOverlayClick:null,quirksmodeOffsetHack:4,blockMsgClass:"blockMsg",ignoreIfBlocked:!1};var p=null,b=[]}"function"==typeof define&&define.amd&&define.amd.jQuery?define(["jquery"],e):e(jQuery)}(); +lyr3._fadeIn(opts.fadeIn,cb2);} diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js index 9507d656..c2c4657f 100644 --- a/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js +++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js @@ -137,4 +137,4 @@ $.extend($.ech.notify.instance.prototype, { } }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.min.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.min.js index babc0d1d..402bf1e8 100644 --- a/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.min.js +++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.min.js @@ -13,4 +13,4 @@ * http://www.gnu.org/licenses/gpl.html * */ -(function(d){d.widget("ech.notify",{options:{speed:500,expires:5E3,stack:"below",custom:false},_create:function(){var a=this;this.templates={};this.keys=[];this.element.addClass("ui-notify").children().addClass("ui-notify-message ui-notify-message-style").each(function(b){b=this.id||b;a.keys.push(b);a.templates[b]=d(this).removeAttr("id").wrap("
").parent().html()}).end().empty().show()},create:function(a,b,c){if(typeof a==="object"){c=b;b=a;a=null}a=this.templates[a||this.keys[0]];if(c&&c.custom)a=d(a).removeClass("ui-notify-message-style").wrap("
").parent().html();return(new d.ech.notify.instance(this))._create(b,d.extend({},this.options,c),a)}});d.extend(d.ech.notify,{instance:function(a){this.parent=a;this.isOpen=false}});d.extend(d.ech.notify.instance.prototype,{_create:function(a,b,c){this.options=b;var e=this;c=c.replace(/#(?:\{|%7B)(.*?)(?:\}|%7D)/g,function(f,g){return g in a?a[g]:""});c=this.element=d(c);var h=c.find(".ui-notify-close");typeof this.options.click==="function"&&c.addClass("ui-notify-click").bind("click",function(f){e._trigger("click",f,e)});h.length&&h.bind("click",function(){e.close();return false});this.open();typeof b.expires==="number"&&window.setTimeout(function(){e.close()},b.expires);return this},close:function(){var a=this,b=this.options.speed;this.isOpen=false;this.element.fadeTo(b,0).slideUp(b,function(){a._trigger("close")});return this},open:function(){if(this.isOpen||this._trigger("beforeopen")===false)return this;var a=this;this.isOpen=true;this.element[this.options.stack==="above"?"prependTo":"appendTo"](this.parent.element).css({display:"none",opacity:""}).fadeIn(this.options.speed,function(){a._trigger("open")});return this},widget:function(){return this.element},_trigger:function(a,b,c){return this.parent._trigger.call(this,a,b,c)}})})(jQuery); \ No newline at end of file +(function(d){d.widget("ech.notify",{options:{speed:500,expires:5E3,stack:"below",custom:false},_create:function(){var a=this;this.templates={};this.keys=[];this.element.addClass("ui-notify").children().addClass("ui-notify-message ui-notify-message-style").each(function(b){b=this.id||b;a.keys.push(b);a.templates[b]=d(this).removeAttr("id").wrap("
").parent().html()}).end().empty().show()},create:function(a,b,c){if(typeof a==="object"){c=b;b=a;a=null}a=this.templates[a||this.keys[0]];if(c&&c.custom)a=d(a).removeClass("ui-notify-message-style").wrap("
").parent().html();return(new d.ech.notify.instance(this))._create(b,d.extend({},this.options,c),a)}});d.extend(d.ech.notify,{instance:function(a){this.parent=a;this.isOpen=false}});d.extend(d.ech.notify.instance.prototype,{_create:function(a,b,c){this.options=b;var e=this;c=c.replace(/#(?:\{|%7B)(.*?)(?:\}|%7D)/g,function(f,g){return g in a?a[g]:""});c=this.element=d(c);var h=c.find(".ui-notify-close");typeof this.options.click==="function"&&c.addClass("ui-notify-click").bind("click",function(f){e._trigger("click",f,e)});h.length&&h.bind("click",function(){e.close();return false});this.open();typeof b.expires==="number"&&window.setTimeout(function(){e.close()},b.expires);return this},close:function(){var a=this,b=this.options.speed;this.isOpen=false;this.element.fadeTo(b,0).slideUp(b,function(){a._trigger("close")});return this},open:function(){if(this.isOpen||this._trigger("beforeopen")===false)return this;var a=this;this.isOpen=true;this.element[this.options.stack==="above"?"prependTo":"appendTo"](this.parent.element).css({display:"none",opacity:""}).fadeIn(this.options.speed,function(){a._trigger("open")});return this},widget:function(){return this.element},_trigger:function(a,b,c){return this.parent._trigger.call(this,a,b,c)}})})(jQuery); diff --git a/webapp/src/main/webapp/js/latLongJson.js b/webapp/src/main/webapp/js/latLongJson.js index f0d50cd2..f0499b9b 100644 --- a/webapp/src/main/webapp/js/latLongJson.js +++ b/webapp/src/main/webapp/js/latLongJson.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ // THIS FILE IS USED TO PROVIDE GEOJSON DATA TO THE JAVASCRIPT THAT BUILDS THE MAP ON THE VIVO HOME PAGE. // NOTE THAT THIS DATA IS NOT INTENDED TO BE COMPLETE AND DEFINITIVE; RESEARCHERS AT YOUR INSTITUTION diff --git a/webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js b/webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js index c5b4c6d8..77390497 100755 --- a/webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js +++ b/webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js @@ -8336,4 +8336,4 @@ L.Map.include({ }); -}(this, document)); \ No newline at end of file +}(this, document)); diff --git a/webapp/src/main/webapp/js/leaflet/dist/leaflet.js b/webapp/src/main/webapp/js/leaflet/dist/leaflet.js index bdf0b69e..864e2ada 100755 --- a/webapp/src/main/webapp/js/leaflet/dist/leaflet.js +++ b/webapp/src/main/webapp/js/leaflet/dist/leaflet.js @@ -5,4 +5,4 @@ (function(t,e,i){var n,o;typeof exports!=i+""?n=exports:(o=t.L,n={},n.noConflict=function(){return t.L=o,this},t.L=n),n.version="0.5.1",n.Util={extend:function(t){var e,i,n,o,s=Array.prototype.slice.call(arguments,1);for(i=0,n=s.length;n>i;i++){o=s[i]||{};for(e in o)o.hasOwnProperty(e)&&(t[e]=o[e])}return t},bind:function(t,e){var i=arguments.length>2?Array.prototype.slice.call(arguments,2):null;return function(){return t.apply(e,i||arguments)}},stamp:function(){var t=0,e="_leaflet_id";return function(i){return i[e]=i[e]||++t,i[e]}}(),limitExecByInterval:function(t,e,n){var o,s;return function a(){var r=arguments;return o?(s=!0,i):(o=!0,setTimeout(function(){o=!1,s&&(a.apply(n,r),s=!1)},e),t.apply(n,r),i)}},falseFn:function(){return!1},formatNum:function(t,e){var i=Math.pow(10,e||5);return Math.round(t*i)/i},splitWords:function(t){return t.replace(/^\s+|\s+$/g,"").split(/\s+/)},setOptions:function(t,e){return t.options=n.extend({},t.options,e),t.options},getParamString:function(t,e){var i=[];for(var n in t)t.hasOwnProperty(n)&&i.push(n+"="+t[n]);return(e&&-1!==e.indexOf("?")?"&":"?")+i.join("&")},template:function(t,e){return t.replace(/\{ *([\w_]+) *\}/g,function(t,i){var n=e[i];if(!e.hasOwnProperty(i))throw Error("No value provided for variable "+t);return n})},isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)},emptyImageUrl:"data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="},function(){function e(e){var i,n,o=["webkit","moz","o","ms"];for(i=0;o.length>i&&!n;i++)n=t[o[i]+e];return n}function o(e){var i=+new Date,n=Math.max(0,16-(i-s));return s=i+n,t.setTimeout(e,n)}var s=0,a=t.requestAnimationFrame||e("RequestAnimationFrame")||o,r=t.cancelAnimationFrame||e("CancelAnimationFrame")||e("CancelRequestAnimationFrame")||function(e){t.clearTimeout(e)};n.Util.requestAnimFrame=function(e,s,r,h){return e=n.bind(e,s),r&&a===o?(e(),i):a.call(t,e,h)},n.Util.cancelAnimFrame=function(e){e&&r.call(t,e)}}(),n.extend=n.Util.extend,n.bind=n.Util.bind,n.stamp=n.Util.stamp,n.setOptions=n.Util.setOptions,n.Class=function(){},n.Class.extend=function(t){var e=function(){this.initialize&&this.initialize.apply(this,arguments),this._initHooks&&this.callInitHooks()},i=function(){};i.prototype=this.prototype;var o=new i;o.constructor=e,e.prototype=o;for(var s in this)this.hasOwnProperty(s)&&"prototype"!==s&&(e[s]=this[s]);t.statics&&(n.extend(e,t.statics),delete t.statics),t.includes&&(n.Util.extend.apply(null,[o].concat(t.includes)),delete t.includes),t.options&&o.options&&(t.options=n.extend({},o.options,t.options)),n.extend(o,t),o._initHooks=[];var a=this;return o.callInitHooks=function(){if(!this._initHooksCalled){a.prototype.callInitHooks&&a.prototype.callInitHooks.call(this),this._initHooksCalled=!0;for(var t=0,e=o._initHooks.length;e>t;t++)o._initHooks[t].call(this)}},e},n.Class.include=function(t){n.extend(this.prototype,t)},n.Class.mergeOptions=function(t){n.extend(this.prototype.options,t)},n.Class.addInitHook=function(t){var e=Array.prototype.slice.call(arguments,1),i="function"==typeof t?t:function(){this[t].apply(this,e)};this.prototype._initHooks=this.prototype._initHooks||[],this.prototype._initHooks.push(i)};var s="_leaflet_events";n.Mixin={},n.Mixin.Events={addEventListener:function(t,e,i){var o,a,r,h=this[s]=this[s]||{};if("object"==typeof t){for(o in t)t.hasOwnProperty(o)&&this.addEventListener(o,t[o],e);return this}for(t=n.Util.splitWords(t),a=0,r=t.length;r>a;a++)h[t[a]]=h[t[a]]||[],h[t[a]].push({action:e,context:i||this});return this},hasEventListeners:function(t){return s in this&&t in this[s]&&this[s][t].length>0},removeEventListener:function(t,e,i){var o,a,r,h,l,u=this[s];if("object"==typeof t){for(o in t)t.hasOwnProperty(o)&&this.removeEventListener(o,t[o],e);return this}for(t=n.Util.splitWords(t),a=0,r=t.length;r>a;a++)if(this.hasEventListeners(t[a]))for(h=u[t[a]],l=h.length-1;l>=0;l--)e&&h[l].action!==e||i&&h[l].context!==i||h.splice(l,1);return this},fireEvent:function(t,e){if(!this.hasEventListeners(t))return this;for(var i=n.extend({type:t,target:this},e),o=this[s][t].slice(),a=0,r=o.length;r>a;a++)o[a].action.call(o[a].context||this,i);return this}},n.Mixin.Events.on=n.Mixin.Events.addEventListener,n.Mixin.Events.off=n.Mixin.Events.removeEventListener,n.Mixin.Events.fire=n.Mixin.Events.fireEvent,function(){var o=!!t.ActiveXObject,s=o&&!t.XMLHttpRequest,a=o&&!e.querySelector,r=navigator.userAgent.toLowerCase(),h=-1!==r.indexOf("webkit"),l=-1!==r.indexOf("chrome"),u=-1!==r.indexOf("android"),c=-1!==r.search("android [23]"),_=typeof orientation!=i+"",d=t.navigator&&t.navigator.msPointerEnabled&&t.navigator.msMaxTouchPoints,p="devicePixelRatio"in t&&t.devicePixelRatio>1||"matchMedia"in t&&t.matchMedia("(min-resolution:144dpi)")&&t.matchMedia("(min-resolution:144dpi)").matches,m=e.documentElement,f=o&&"transition"in m.style,g="WebKitCSSMatrix"in t&&"m11"in new t.WebKitCSSMatrix,v="MozPerspective"in m.style,y="OTransition"in m.style,L=!t.L_DISABLE_3D&&(f||g||v||y),P=!t.L_NO_TOUCH&&function(){var t="ontouchstart";if(d||t in m)return!0;var i=e.createElement("div"),n=!1;return i.setAttribute?(i.setAttribute(t,"return;"),"function"==typeof i[t]&&(n=!0),i.removeAttribute(t),i=null,n):!1}();n.Browser={ie:o,ie6:s,ie7:a,webkit:h,android:u,android23:c,chrome:l,ie3d:f,webkit3d:g,gecko3d:v,opera3d:y,any3d:L,mobile:_,mobileWebkit:_&&h,mobileWebkit3d:_&&g,mobileOpera:_&&t.opera,touch:P,msTouch:d,retina:p}}(),n.Point=function(t,e,i){this.x=i?Math.round(t):t,this.y=i?Math.round(e):e},n.Point.prototype={clone:function(){return new n.Point(this.x,this.y)},add:function(t){return this.clone()._add(n.point(t))},_add:function(t){return this.x+=t.x,this.y+=t.y,this},subtract:function(t){return this.clone()._subtract(n.point(t))},_subtract:function(t){return this.x-=t.x,this.y-=t.y,this},divideBy:function(t){return this.clone()._divideBy(t)},_divideBy:function(t){return this.x/=t,this.y/=t,this},multiplyBy:function(t){return this.clone()._multiplyBy(t)},_multiplyBy:function(t){return this.x*=t,this.y*=t,this},round:function(){return this.clone()._round()},_round:function(){return this.x=Math.round(this.x),this.y=Math.round(this.y),this},floor:function(){return this.clone()._floor()},_floor:function(){return this.x=Math.floor(this.x),this.y=Math.floor(this.y),this},distanceTo:function(t){t=n.point(t);var e=t.x-this.x,i=t.y-this.y;return Math.sqrt(e*e+i*i)},equals:function(t){return t.x===this.x&&t.y===this.y},toString:function(){return"Point("+n.Util.formatNum(this.x)+", "+n.Util.formatNum(this.y)+")"}},n.point=function(t,e,i){return t instanceof n.Point?t:n.Util.isArray(t)?new n.Point(t[0],t[1]):isNaN(t)?t:new n.Point(t,e,i)},n.Bounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},n.Bounds.prototype={extend:function(t){return t=n.point(t),this.min||this.max?(this.min.x=Math.min(t.x,this.min.x),this.max.x=Math.max(t.x,this.max.x),this.min.y=Math.min(t.y,this.min.y),this.max.y=Math.max(t.y,this.max.y)):(this.min=t.clone(),this.max=t.clone()),this},getCenter:function(t){return new n.Point((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,t)},getBottomLeft:function(){return new n.Point(this.min.x,this.max.y)},getTopRight:function(){return new n.Point(this.max.x,this.min.y)},getSize:function(){return this.max.subtract(this.min)},contains:function(t){var e,i;return t="number"==typeof t[0]||t instanceof n.Point?n.point(t):n.bounds(t),t instanceof n.Bounds?(e=t.min,i=t.max):e=i=t,e.x>=this.min.x&&i.x<=this.max.x&&e.y>=this.min.y&&i.y<=this.max.y},intersects:function(t){t=n.bounds(t);var e=this.min,i=this.max,o=t.min,s=t.max,a=s.x>=e.x&&o.x<=i.x,r=s.y>=e.y&&o.y<=i.y;return a&&r},isValid:function(){return!(!this.min||!this.max)}},n.bounds=function(t,e){return!t||t instanceof n.Bounds?t:new n.Bounds(t,e)},n.Transformation=function(t,e,i,n){this._a=t,this._b=e,this._c=i,this._d=n},n.Transformation.prototype={transform:function(t,e){return this._transform(t.clone(),e)},_transform:function(t,e){return e=e||1,t.x=e*(this._a*t.x+this._b),t.y=e*(this._c*t.y+this._d),t},untransform:function(t,e){return e=e||1,new n.Point((t.x/e-this._b)/this._a,(t.y/e-this._d)/this._c)}},n.DomUtil={get:function(t){return"string"==typeof t?e.getElementById(t):t},getStyle:function(t,i){var n=t.style[i];if(!n&&t.currentStyle&&(n=t.currentStyle[i]),(!n||"auto"===n)&&e.defaultView){var o=e.defaultView.getComputedStyle(t,null);n=o?o[i]:null}return"auto"===n?null:n},getViewportOffset:function(t){var i,o=0,s=0,a=t,r=e.body,h=n.Browser.ie7;do{if(o+=a.offsetTop||0,s+=a.offsetLeft||0,o+=parseInt(n.DomUtil.getStyle(a,"borderTopWidth"),10)||0,s+=parseInt(n.DomUtil.getStyle(a,"borderLeftWidth"),10)||0,i=n.DomUtil.getStyle(a,"position"),a.offsetParent===r&&"absolute"===i)break;if("fixed"===i){o+=r.scrollTop||0,s+=r.scrollLeft||0;break}a=a.offsetParent}while(a);a=t;do{if(a===r)break;o-=a.scrollTop||0,s-=a.scrollLeft||0,n.DomUtil.documentIsLtr()||!n.Browser.webkit&&!h||(s+=a.scrollWidth-a.clientWidth,h&&"hidden"!==n.DomUtil.getStyle(a,"overflow-y")&&"hidden"!==n.DomUtil.getStyle(a,"overflow")&&(s+=17)),a=a.parentNode}while(a);return new n.Point(s,o)},documentIsLtr:function(){return n.DomUtil._docIsLtrCached||(n.DomUtil._docIsLtrCached=!0,n.DomUtil._docIsLtr="ltr"===n.DomUtil.getStyle(e.body,"direction")),n.DomUtil._docIsLtr},create:function(t,i,n){var o=e.createElement(t);return o.className=i,n&&n.appendChild(o),o},disableTextSelection:function(){e.selection&&e.selection.empty&&e.selection.empty(),this._onselectstart||(this._onselectstart=e.onselectstart||null,e.onselectstart=n.Util.falseFn)},enableTextSelection:function(){e.onselectstart===n.Util.falseFn&&(e.onselectstart=this._onselectstart,this._onselectstart=null)},hasClass:function(t,e){return t.className.length>0&&RegExp("(^|\\s)"+e+"(\\s|$)").test(t.className)},addClass:function(t,e){n.DomUtil.hasClass(t,e)||(t.className+=(t.className?" ":"")+e)},removeClass:function(t,e){function i(t,i){return i===e?"":t}t.className=t.className.replace(/(\S+)\s*/g,i).replace(/(^\s+|\s+$)/,"")},setOpacity:function(t,e){if("opacity"in t.style)t.style.opacity=e;else if("filter"in t.style){var i=!1,n="DXImageTransform.Microsoft.Alpha";try{i=t.filters.item(n)}catch(o){}e=Math.round(100*e),i?(i.Enabled=100!==e,i.Opacity=e):t.style.filter+=" progid:"+n+"(opacity="+e+")"}},testProp:function(t){for(var i=e.documentElement.style,n=0;t.length>n;n++)if(t[n]in i)return t[n];return!1},getTranslateString:function(t){var e=n.Browser.webkit3d,i="translate"+(e?"3d":"")+"(",o=(e?",0":"")+")";return i+t.x+"px,"+t.y+"px"+o},getScaleString:function(t,e){var i=n.DomUtil.getTranslateString(e.add(e.multiplyBy(-1*t))),o=" scale("+t+") ";return i+o},setPosition:function(t,e,i){t._leaflet_pos=e,!i&&n.Browser.any3d?(t.style[n.DomUtil.TRANSFORM]=n.DomUtil.getTranslateString(e),n.Browser.mobileWebkit3d&&(t.style.WebkitBackfaceVisibility="hidden")):(t.style.left=e.x+"px",t.style.top=e.y+"px")},getPosition:function(t){return t._leaflet_pos}},n.DomUtil.TRANSFORM=n.DomUtil.testProp(["transform","WebkitTransform","OTransform","MozTransform","msTransform"]),n.DomUtil.TRANSITION=n.DomUtil.testProp(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),n.DomUtil.TRANSITION_END="webkitTransition"===n.DomUtil.TRANSITION||"OTransition"===n.DomUtil.TRANSITION?n.DomUtil.TRANSITION+"End":"transitionend",n.LatLng=function(t,e){var i=parseFloat(t),n=parseFloat(e);if(isNaN(i)||isNaN(n))throw Error("Invalid LatLng object: ("+t+", "+e+")");this.lat=i,this.lng=n},n.extend(n.LatLng,{DEG_TO_RAD:Math.PI/180,RAD_TO_DEG:180/Math.PI,MAX_MARGIN:1e-9}),n.LatLng.prototype={equals:function(t){if(!t)return!1;t=n.latLng(t);var e=Math.max(Math.abs(this.lat-t.lat),Math.abs(this.lng-t.lng));return n.LatLng.MAX_MARGIN>=e},toString:function(t){return"LatLng("+n.Util.formatNum(this.lat,t)+", "+n.Util.formatNum(this.lng,t)+")"},distanceTo:function(t){t=n.latLng(t);var e=6378137,i=n.LatLng.DEG_TO_RAD,o=(t.lat-this.lat)*i,s=(t.lng-this.lng)*i,a=this.lat*i,r=t.lat*i,h=Math.sin(o/2),l=Math.sin(s/2),u=h*h+l*l*Math.cos(a)*Math.cos(r);return 2*e*Math.atan2(Math.sqrt(u),Math.sqrt(1-u))},wrap:function(t,e){var i=this.lng;return t=t||-180,e=e||180,i=(i+e)%(e-t)+(t>i||i===e?e:t),new n.LatLng(this.lat,i)}},n.latLng=function(t,e){return t instanceof n.LatLng?t:n.Util.isArray(t)?new n.LatLng(t[0],t[1]):isNaN(t)?t:new n.LatLng(t,e)},n.LatLngBounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},n.LatLngBounds.prototype={extend:function(t){return t="number"==typeof t[0]||"string"==typeof t[0]||t instanceof n.LatLng?n.latLng(t):n.latLngBounds(t),t instanceof n.LatLng?this._southWest||this._northEast?(this._southWest.lat=Math.min(t.lat,this._southWest.lat),this._southWest.lng=Math.min(t.lng,this._southWest.lng),this._northEast.lat=Math.max(t.lat,this._northEast.lat),this._northEast.lng=Math.max(t.lng,this._northEast.lng)):(this._southWest=new n.LatLng(t.lat,t.lng),this._northEast=new n.LatLng(t.lat,t.lng)):t instanceof n.LatLngBounds&&(this.extend(t._southWest),this.extend(t._northEast)),this},pad:function(t){var e=this._southWest,i=this._northEast,o=Math.abs(e.lat-i.lat)*t,s=Math.abs(e.lng-i.lng)*t;return new n.LatLngBounds(new n.LatLng(e.lat-o,e.lng-s),new n.LatLng(i.lat+o,i.lng+s))},getCenter:function(){return new n.LatLng((this._southWest.lat+this._northEast.lat)/2,(this._southWest.lng+this._northEast.lng)/2)},getSouthWest:function(){return this._southWest},getNorthEast:function(){return this._northEast},getNorthWest:function(){return new n.LatLng(this._northEast.lat,this._southWest.lng)},getSouthEast:function(){return new n.LatLng(this._southWest.lat,this._northEast.lng)},contains:function(t){t="number"==typeof t[0]||t instanceof n.LatLng?n.latLng(t):n.latLngBounds(t);var e,i,o=this._southWest,s=this._northEast;return t instanceof n.LatLngBounds?(e=t.getSouthWest(),i=t.getNorthEast()):e=i=t,e.lat>=o.lat&&i.lat<=s.lat&&e.lng>=o.lng&&i.lng<=s.lng},intersects:function(t){t=n.latLngBounds(t);var e=this._southWest,i=this._northEast,o=t.getSouthWest(),s=t.getNorthEast(),a=s.lat>=e.lat&&o.lat<=i.lat,r=s.lng>=e.lng&&o.lng<=i.lng;return a&&r},toBBoxString:function(){var t=this._southWest,e=this._northEast;return[t.lng,t.lat,e.lng,e.lat].join(",")},equals:function(t){return t?(t=n.latLngBounds(t),this._southWest.equals(t.getSouthWest())&&this._northEast.equals(t.getNorthEast())):!1},isValid:function(){return!(!this._southWest||!this._northEast)}},n.latLngBounds=function(t,e){return!t||t instanceof n.LatLngBounds?t:new n.LatLngBounds(t,e)},n.Projection={},n.Projection.SphericalMercator={MAX_LATITUDE:85.0511287798,project:function(t){var e=n.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,o=Math.max(Math.min(i,t.lat),-i),s=t.lng*e,a=o*e;return a=Math.log(Math.tan(Math.PI/4+a/2)),new n.Point(s,a)},unproject:function(t){var e=n.LatLng.RAD_TO_DEG,i=t.x*e,o=(2*Math.atan(Math.exp(t.y))-Math.PI/2)*e;return new n.LatLng(o,i)}},n.Projection.LonLat={project:function(t){return new n.Point(t.lng,t.lat)},unproject:function(t){return new n.LatLng(t.y,t.x)}},n.CRS={latLngToPoint:function(t,e){var i=this.projection.project(t),n=this.scale(e);return this.transformation._transform(i,n)},pointToLatLng:function(t,e){var i=this.scale(e),n=this.transformation.untransform(t,i);return this.projection.unproject(n)},project:function(t){return this.projection.project(t)},scale:function(t){return 256*Math.pow(2,t)}},n.CRS.Simple=n.extend({},n.CRS,{projection:n.Projection.LonLat,transformation:new n.Transformation(1,0,-1,0),scale:function(t){return Math.pow(2,t)}}),n.CRS.EPSG3857=n.extend({},n.CRS,{code:"EPSG:3857",projection:n.Projection.SphericalMercator,transformation:new n.Transformation(.5/Math.PI,.5,-.5/Math.PI,.5),project:function(t){var e=this.projection.project(t),i=6378137;return e.multiplyBy(i)}}),n.CRS.EPSG900913=n.extend({},n.CRS.EPSG3857,{code:"EPSG:900913"}),n.CRS.EPSG4326=n.extend({},n.CRS,{code:"EPSG:4326",projection:n.Projection.LonLat,transformation:new n.Transformation(1/360,.5,-1/360,.5)}),n.Map=n.Class.extend({includes:n.Mixin.Events,options:{crs:n.CRS.EPSG3857,fadeAnimation:n.DomUtil.TRANSITION&&!n.Browser.android23,trackResize:!0,markerZoomAnimation:n.DomUtil.TRANSITION&&n.Browser.any3d},initialize:function(t,e){e=n.setOptions(this,e),this._initContainer(t),this._initLayout(),this.callInitHooks(),this._initEvents(),e.maxBounds&&this.setMaxBounds(e.maxBounds),e.center&&e.zoom!==i&&this.setView(n.latLng(e.center),e.zoom,!0),this._initLayers(e.layers)},setView:function(t,e){return this._resetView(n.latLng(t),this._limitZoom(e)),this},setZoom:function(t){return this.setView(this.getCenter(),t)},zoomIn:function(t){return this.setZoom(this._zoom+(t||1))},zoomOut:function(t){return this.setZoom(this._zoom-(t||1))},fitBounds:function(t){var e=this.getBoundsZoom(t);return this.setView(n.latLngBounds(t).getCenter(),e)},fitWorld:function(){var t=new n.LatLng(-60,-170),e=new n.LatLng(85,179);return this.fitBounds(new n.LatLngBounds(t,e))},panTo:function(t){return this.setView(t,this._zoom)},panBy:function(t){return this.fire("movestart"),this._rawPanBy(n.point(t)),this.fire("move"),this.fire("moveend")},setMaxBounds:function(t){if(t=n.latLngBounds(t),this.options.maxBounds=t,!t)return this._boundsMinZoom=null,this;var e=this.getBoundsZoom(t,!0);return this._boundsMinZoom=e,this._loaded&&(e>this._zoom?this.setView(t.getCenter(),e):this.panInsideBounds(t)),this},panInsideBounds:function(t){t=n.latLngBounds(t);var e=this.getBounds(),i=this.project(e.getSouthWest()),o=this.project(e.getNorthEast()),s=this.project(t.getSouthWest()),a=this.project(t.getNorthEast()),r=0,h=0;return o.ya.x&&(r=a.x-o.x),i.y>s.y&&(h=s.y-i.y),i.x=r);return c&&e?null:e?r:r-1},getSize:function(){return(!this._size||this._sizeChanged)&&(this._size=new n.Point(this._container.clientWidth,this._container.clientHeight),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(){var t=this._getTopLeftPoint();return new n.Bounds(t,t.add(this.getSize()))},getPixelOrigin:function(){return this._initialTopLeftPoint},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t){var e=this.options.crs;return e.scale(t)/e.scale(this._zoom)},getScaleZoom:function(t){return this._zoom+Math.log(t)/Math.LN2},project:function(t,e){return e=e===i?this._zoom:e,this.options.crs.latLngToPoint(n.latLng(t),e)},unproject:function(t,e){return e=e===i?this._zoom:e,this.options.crs.pointToLatLng(n.point(t),e)},layerPointToLatLng:function(t){var e=n.point(t).add(this._initialTopLeftPoint);return this.unproject(e)},latLngToLayerPoint:function(t){var e=this.project(n.latLng(t))._round();return e._subtract(this._initialTopLeftPoint)},containerPointToLayerPoint:function(t){return n.point(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return n.point(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){var e=this.containerPointToLayerPoint(n.point(t));return this.layerPointToLatLng(e)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(n.latLng(t)))},mouseEventToContainerPoint:function(t){return n.DomEvent.getMousePosition(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){var e=this._container=n.DomUtil.get(t);if(e._leaflet)throw Error("Map container is already initialized.");e._leaflet=!0},_initLayout:function(){var t=this._container;n.DomUtil.addClass(t,"leaflet-container"),n.Browser.touch&&n.DomUtil.addClass(t,"leaflet-touch"),this.options.fadeAnimation&&n.DomUtil.addClass(t,"leaflet-fade-anim");var e=n.DomUtil.getStyle(t,"position");"absolute"!==e&&"relative"!==e&&"fixed"!==e&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._mapPane=t.mapPane=this._createPane("leaflet-map-pane",this._container),this._tilePane=t.tilePane=this._createPane("leaflet-tile-pane",this._mapPane),t.objectsPane=this._createPane("leaflet-objects-pane",this._mapPane),t.shadowPane=this._createPane("leaflet-shadow-pane"),t.overlayPane=this._createPane("leaflet-overlay-pane"),t.markerPane=this._createPane("leaflet-marker-pane"),t.popupPane=this._createPane("leaflet-popup-pane");var e=" leaflet-zoom-hide";this.options.markerZoomAnimation||(n.DomUtil.addClass(t.markerPane,e),n.DomUtil.addClass(t.shadowPane,e),n.DomUtil.addClass(t.popupPane,e))},_createPane:function(t,e){return n.DomUtil.create("div",t,e||this._panes.objectsPane)},_initLayers:function(t){t=t?n.Util.isArray(t)?t:[t]:[],this._layers={},this._zoomBoundLayers={},this._tileLayersNum=0;var e,i;for(e=0,i=t.length;i>e;e++)this.addLayer(t[e])},_resetView:function(t,e,i,o){var s=this._zoom!==e;o||(this.fire("movestart"),s&&this.fire("zoomstart")),this._zoom=e,this._initialTopLeftPoint=this._getNewTopLeftPoint(t),i?this._initialTopLeftPoint._add(this._getMapPanePos()):n.DomUtil.setPosition(this._mapPane,new n.Point(0,0)),this._tileLayersToLoad=this._tileLayersNum;var a=!this._loaded;this._loaded=!0,this.fire("viewreset",{hard:!i}),this.fire("move"),(s||o)&&this.fire("zoomend"),this.fire("moveend",{hard:!i}),a&&this.fire("load")},_rawPanBy:function(t){n.DomUtil.setPosition(this._mapPane,this._getMapPanePos().subtract(t))},_updateZoomLevels:function(){var t,e=1/0,n=-1/0;for(t in this._zoomBoundLayers)if(this._zoomBoundLayers.hasOwnProperty(t)){var o=this._zoomBoundLayers[t];isNaN(o.options.minZoom)||(e=Math.min(e,o.options.minZoom)),isNaN(o.options.maxZoom)||(n=Math.max(n,o.options.maxZoom))}t===i?this._layersMaxZoom=this._layersMinZoom=i:(this._layersMaxZoom=n,this._layersMinZoom=e)},_initEvents:function(){if(n.DomEvent){n.DomEvent.on(this._container,"click",this._onMouseClick,this);var e,i,o=["dblclick","mousedown","mouseup","mouseenter","mouseleave","mousemove","contextmenu"];for(e=0,i=o.length;i>e;e++)n.DomEvent.on(this._container,o[e],this._fireMouseEvent,this);this.options.trackResize&&n.DomEvent.on(t,"resize",this._onResize,this)}},_onResize:function(){n.Util.cancelAnimFrame(this._resizeRequest),this._resizeRequest=n.Util.requestAnimFrame(this.invalidateSize,this,!1,this._container)},_onMouseClick:function(t){!this._loaded||this.dragging&&this.dragging.moved()||(this.fire("preclick"),this._fireMouseEvent(t))},_fireMouseEvent:function(t){if(this._loaded){var e=t.type;if(e="mouseenter"===e?"mouseover":"mouseleave"===e?"mouseout":e,this.hasEventListeners(e)){"contextmenu"===e&&n.DomEvent.preventDefault(t);var i=this.mouseEventToContainerPoint(t),o=this.containerPointToLayerPoint(i),s=this.layerPointToLatLng(o);this.fire(e,{latlng:s,layerPoint:o,containerPoint:i,originalEvent:t})}}},_onTileLayerLoad:function(){this._tileLayersToLoad--,this._tileLayersNum&&!this._tileLayersToLoad&&this._tileBg&&(clearTimeout(this._clearTileBgTimer),this._clearTileBgTimer=setTimeout(n.bind(this._clearTileBg,this),500))},whenReady:function(t,e){return this._loaded?t.call(e||this,this):this.on("load",t,e),this},_getMapPanePos:function(){return n.DomUtil.getPosition(this._mapPane)},_getTopLeftPoint:function(){if(!this._loaded)throw Error("Set map center and zoom first.");return this._initialTopLeftPoint.subtract(this._getMapPanePos())},_getNewTopLeftPoint:function(t,e){var i=this.getSize()._divideBy(2);return this.project(t,e)._subtract(i)._round()},_latLngToNewLayerPoint:function(t,e,i){var n=this._getNewTopLeftPoint(i,e).add(this._getMapPanePos());return this.project(t,e)._subtract(n)},_getCenterLayerPoint:function(){return this.containerPointToLayerPoint(this.getSize()._divideBy(2))},_getCenterOffset:function(t){return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint())},_limitZoom:function(t){var e=this.getMinZoom(),i=this.getMaxZoom();return Math.max(e,Math.min(i,t))}}),n.map=function(t,e){return new n.Map(t,e)},n.Projection.Mercator={MAX_LATITUDE:85.0840591556,R_MINOR:6356752.3142,R_MAJOR:6378137,project:function(t){var e=n.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,o=Math.max(Math.min(i,t.lat),-i),s=this.R_MAJOR,a=this.R_MINOR,r=t.lng*e*s,h=o*e,l=a/s,u=Math.sqrt(1-l*l),c=u*Math.sin(h);c=Math.pow((1-c)/(1+c),.5*u);var _=Math.tan(.5*(.5*Math.PI-h))/c;return h=-a*Math.log(_),new n.Point(r,h)},unproject:function(t){for(var e,i=n.LatLng.RAD_TO_DEG,o=this.R_MAJOR,s=this.R_MINOR,a=t.x*i/o,r=s/o,h=Math.sqrt(1-r*r),l=Math.exp(-t.y/s),u=Math.PI/2-2*Math.atan(l),c=15,_=1e-7,d=c,p=.1;Math.abs(p)>_&&--d>0;)e=h*Math.sin(u),p=Math.PI/2-2*Math.atan(l*Math.pow((1-e)/(1+e),.5*h))-u,u+=p;return new n.LatLng(u*i,a)}},n.CRS.EPSG3395=n.extend({},n.CRS,{code:"EPSG:3395",projection:n.Projection.Mercator,transformation:function(){var t=n.Projection.Mercator,e=t.R_MAJOR,i=t.R_MINOR;return new n.Transformation(.5/(Math.PI*e),.5,-.5/(Math.PI*i),.5)}()}),n.TileLayer=n.Class.extend({includes:n.Mixin.Events,options:{minZoom:0,maxZoom:18,tileSize:256,subdomains:"abc",errorTileUrl:"",attribution:"",zoomOffset:0,opacity:1,unloadInvisibleTiles:n.Browser.mobile,updateWhenIdle:n.Browser.mobile},initialize:function(t,e){e=n.setOptions(this,e),e.detectRetina&&n.Browser.retina&&e.maxZoom>0&&(e.tileSize=Math.floor(e.tileSize/2),e.zoomOffset++,e.minZoom>0&&e.minZoom--,this.options.maxZoom--),this._url=t;var i=this.options.subdomains;"string"==typeof i&&(this.options.subdomains=i.split(""))},onAdd:function(t){this._map=t,this._initContainer(),this._createTileProto(),t.on({viewreset:this._resetCallback,moveend:this._update},this),this.options.updateWhenIdle||(this._limitedUpdate=n.Util.limitExecByInterval(this._update,150,this),t.on("move",this._limitedUpdate,this)),this._reset(),this._update()},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this._container.parentNode.removeChild(this._container),t.off({viewreset:this._resetCallback,moveend:this._update},this),this.options.updateWhenIdle||t.off("move",this._limitedUpdate,this),this._container=null,this._map=null},bringToFront:function(){var t=this._map._panes.tilePane;return this._container&&(t.appendChild(this._container),this._setAutoZIndex(t,Math.max)),this},bringToBack:function(){var t=this._map._panes.tilePane;return this._container&&(t.insertBefore(this._container,t.firstChild),this._setAutoZIndex(t,Math.min)),this},getAttribution:function(){return this.options.attribution},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},setUrl:function(t,e){return this._url=t,e||this.redraw(),this},redraw:function(){return this._map&&(this._map._panes.tilePane.empty=!1,this._reset(!0),this._update()),this},_updateZIndex:function(){this._container&&this.options.zIndex!==i&&(this._container.style.zIndex=this.options.zIndex)},_setAutoZIndex:function(t,e){var i,n,o,s=t.children,a=-e(1/0,-1/0);for(n=0,o=s.length;o>n;n++)s[n]!==this._container&&(i=parseInt(s[n].style.zIndex,10),isNaN(i)||(a=e(a,i)));this.options.zIndex=this._container.style.zIndex=(isFinite(a)?a:0)+e(1,-1)},_updateOpacity:function(){n.DomUtil.setOpacity(this._container,this.options.opacity);var t,e=this._tiles;if(n.Browser.webkit)for(t in e)e.hasOwnProperty(t)&&(e[t].style.webkitTransform+=" translate(0,0)")},_initContainer:function(){var t=this._map._panes.tilePane;(!this._container||t.empty)&&(this._container=n.DomUtil.create("div","leaflet-layer"),this._updateZIndex(),t.appendChild(this._container),1>this.options.opacity&&this._updateOpacity())},_resetCallback:function(t){this._reset(t.hard)},_reset:function(t){var e=this._tiles;for(var i in e)e.hasOwnProperty(i)&&this.fire("tileunload",{tile:e[i]});this._tiles={},this._tilesToLoad=0,this.options.reuseTiles&&(this._unusedTiles=[]),t&&this._container&&(this._container.innerHTML=""),this._initContainer()},_update:function(){if(this._map){var t=this._map.getPixelBounds(),e=this._map.getZoom(),i=this.options.tileSize;if(!(e>this.options.maxZoom||this.options.minZoom>e)){var o=new n.Point(Math.floor(t.min.x/i),Math.floor(t.min.y/i)),s=new n.Point(Math.floor(t.max.x/i),Math.floor(t.max.y/i)),a=new n.Bounds(o,s);this._addTilesFromCenterOut(a),(this.options.unloadInvisibleTiles||this.options.reuseTiles)&&this._removeOtherTiles(a)}}},_addTilesFromCenterOut:function(t){var i,o,s,a=[],r=t.getCenter();for(i=t.min.y;t.max.y>=i;i++)for(o=t.min.x;t.max.x>=o;o++)s=new n.Point(o,i),this._tileShouldBeLoaded(s)&&a.push(s);var h=a.length;if(0!==h){a.sort(function(t,e){return t.distanceTo(r)-e.distanceTo(r)});var l=e.createDocumentFragment();for(this._tilesToLoad||this.fire("loading"),this._tilesToLoad+=h,o=0;h>o;o++)this._addTile(a[o],l);this._container.appendChild(l)}},_tileShouldBeLoaded:function(t){if(t.x+":"+t.y in this._tiles)return!1;if(!this.options.continuousWorld){var e=this._getWrapTileNum();if(this.options.noWrap&&(0>t.x||t.x>=e)||0>t.y||t.y>=e)return!1}return!0},_removeOtherTiles:function(t){var e,i,n,o;for(o in this._tiles)this._tiles.hasOwnProperty(o)&&(e=o.split(":"),i=parseInt(e[0],10),n=parseInt(e[1],10),(t.min.x>i||i>t.max.x||t.min.y>n||n>t.max.y)&&this._removeTile(o))},_removeTile:function(t){var e=this._tiles[t];this.fire("tileunload",{tile:e,url:e.src}),this.options.reuseTiles?(n.DomUtil.removeClass(e,"leaflet-tile-loaded"),this._unusedTiles.push(e)):e.parentNode===this._container&&this._container.removeChild(e),n.Browser.android||(e.src=n.Util.emptyImageUrl),delete this._tiles[t]},_addTile:function(t,e){var i=this._getTilePos(t),o=this._getTile();n.DomUtil.setPosition(o,i,n.Browser.chrome||n.Browser.android23),this._tiles[t.x+":"+t.y]=o,this._loadTile(o,t),o.parentNode!==this._container&&e.appendChild(o) },_getZoomForUrl:function(){var t=this.options,e=this._map.getZoom();return t.zoomReverse&&(e=t.maxZoom-e),e+t.zoomOffset},_getTilePos:function(t){var e=this._map.getPixelOrigin(),i=this.options.tileSize;return t.multiplyBy(i).subtract(e)},getTileUrl:function(t){return this._adjustTilePoint(t),n.Util.template(this._url,n.extend({s:this._getSubdomain(t),z:this._getZoomForUrl(),x:t.x,y:t.y},this.options))},_getWrapTileNum:function(){return Math.pow(2,this._getZoomForUrl())},_adjustTilePoint:function(t){var e=this._getWrapTileNum();this.options.continuousWorld||this.options.noWrap||(t.x=(t.x%e+e)%e),this.options.tms&&(t.y=e-t.y-1)},_getSubdomain:function(t){var e=(t.x+t.y)%this.options.subdomains.length;return this.options.subdomains[e]},_createTileProto:function(){var t=this._tileImg=n.DomUtil.create("img","leaflet-tile");t.style.width=t.style.height=this.options.tileSize+"px",t.galleryimg="no"},_getTile:function(){if(this.options.reuseTiles&&this._unusedTiles.length>0){var t=this._unusedTiles.pop();return this._resetTile(t),t}return this._createTile()},_resetTile:function(){},_createTile:function(){var t=this._tileImg.cloneNode(!1);return t.onselectstart=t.onmousemove=n.Util.falseFn,t},_loadTile:function(t,e){t._layer=this,t.onload=this._tileOnLoad,t.onerror=this._tileOnError,t.src=this.getTileUrl(e)},_tileLoaded:function(){this._tilesToLoad--,this._tilesToLoad||this.fire("load")},_tileOnLoad:function(){var t=this._layer;this.src!==n.Util.emptyImageUrl&&(n.DomUtil.addClass(this,"leaflet-tile-loaded"),t.fire("tileload",{tile:this,url:this.src})),t._tileLoaded()},_tileOnError:function(){var t=this._layer;t.fire("tileerror",{tile:this,url:this.src});var e=t.options.errorTileUrl;e&&(this.src=e),t._tileLoaded()}}),n.tileLayer=function(t,e){return new n.TileLayer(t,e)},n.TileLayer.WMS=n.TileLayer.extend({defaultWmsParams:{service:"WMS",request:"GetMap",version:"1.1.1",layers:"",styles:"",format:"image/jpeg",transparent:!1},initialize:function(t,e){this._url=t;var i=n.extend({},this.defaultWmsParams);i.width=i.height=e.detectRetina&&n.Browser.retina?2*this.options.tileSize:this.options.tileSize;for(var o in e)this.options.hasOwnProperty(o)||(i[o]=e[o]);this.wmsParams=i,n.setOptions(this,e)},onAdd:function(t){var e=parseFloat(this.wmsParams.version)>=1.3?"crs":"srs";this.wmsParams[e]=t.options.crs.code,n.TileLayer.prototype.onAdd.call(this,t)},getTileUrl:function(t,e){this._adjustTilePoint(t);var i=this._map,o=i.options.crs,s=this.options.tileSize,a=t.multiplyBy(s),r=a.add(new n.Point(s,s)),h=o.project(i.unproject(a,e)),l=o.project(i.unproject(r,e)),u=[h.x,l.y,l.x,h.y].join(","),c=n.Util.template(this._url,{s:this._getSubdomain(t)});return c+n.Util.getParamString(this.wmsParams,c)+"&bbox="+u},setParams:function(t,e){return n.extend(this.wmsParams,t),e||this.redraw(),this}}),n.tileLayer.wms=function(t,e){return new n.TileLayer.WMS(t,e)},n.TileLayer.Canvas=n.TileLayer.extend({options:{async:!1},initialize:function(t){n.setOptions(this,t)},redraw:function(){var t=this._tiles;for(var e in t)t.hasOwnProperty(e)&&this._redrawTile(t[e])},_redrawTile:function(t){this.drawTile(t,t._tilePoint,this._map._zoom)},_createTileProto:function(){var t=this._canvasProto=n.DomUtil.create("canvas","leaflet-tile");t.width=t.height=this.options.tileSize},_createTile:function(){var t=this._canvasProto.cloneNode(!1);return t.onselectstart=t.onmousemove=n.Util.falseFn,t},_loadTile:function(t,e){t._layer=this,t._tilePoint=e,this._redrawTile(t),this.options.async||this.tileDrawn(t)},drawTile:function(){},tileDrawn:function(t){this._tileOnLoad.call(t)}}),n.tileLayer.canvas=function(t){return new n.TileLayer.Canvas(t)},n.ImageOverlay=n.Class.extend({includes:n.Mixin.Events,options:{opacity:1},initialize:function(t,e,i){this._url=t,this._bounds=n.latLngBounds(e),n.setOptions(this,i)},onAdd:function(t){this._map=t,this._image||this._initImage(),t._panes.overlayPane.appendChild(this._image),t.on("viewreset",this._reset,this),t.options.zoomAnimation&&n.Browser.any3d&&t.on("zoomanim",this._animateZoom,this),this._reset()},onRemove:function(t){t.getPanes().overlayPane.removeChild(this._image),t.off("viewreset",this._reset,this),t.options.zoomAnimation&&t.off("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},setOpacity:function(t){return this.options.opacity=t,this._updateOpacity(),this},bringToFront:function(){return this._image&&this._map._panes.overlayPane.appendChild(this._image),this},bringToBack:function(){var t=this._map._panes.overlayPane;return this._image&&t.insertBefore(this._image,t.firstChild),this},_initImage:function(){this._image=n.DomUtil.create("img","leaflet-image-layer"),this._map.options.zoomAnimation&&n.Browser.any3d?n.DomUtil.addClass(this._image,"leaflet-zoom-animated"):n.DomUtil.addClass(this._image,"leaflet-zoom-hide"),this._updateOpacity(),n.extend(this._image,{galleryimg:"no",onselectstart:n.Util.falseFn,onmousemove:n.Util.falseFn,onload:n.bind(this._onImageLoad,this),src:this._url})},_animateZoom:function(t){var e=this._map,i=this._image,o=e.getZoomScale(t.zoom),s=this._bounds.getNorthWest(),a=this._bounds.getSouthEast(),r=e._latLngToNewLayerPoint(s,t.zoom,t.center),h=e._latLngToNewLayerPoint(a,t.zoom,t.center)._subtract(r),l=r._add(h._multiplyBy(.5*(1-1/o)));i.style[n.DomUtil.TRANSFORM]=n.DomUtil.getTranslateString(l)+" scale("+o+") "},_reset:function(){var t=this._image,e=this._map.latLngToLayerPoint(this._bounds.getNorthWest()),i=this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(e);n.DomUtil.setPosition(t,e),t.style.width=i.x+"px",t.style.height=i.y+"px"},_onImageLoad:function(){this.fire("load")},_updateOpacity:function(){n.DomUtil.setOpacity(this._image,this.options.opacity)}}),n.imageOverlay=function(t,e,i){return new n.ImageOverlay(t,e,i)},n.Icon=n.Class.extend({options:{className:""},initialize:function(t){n.setOptions(this,t)},createIcon:function(){return this._createIcon("icon")},createShadow:function(){return this._createIcon("shadow")},_createIcon:function(t){var e=this._getIconUrl(t);if(!e){if("icon"===t)throw Error("iconUrl not set in Icon options (see the docs).");return null}var i=this._createImg(e);return this._setIconStyles(i,t),i},_setIconStyles:function(t,e){var i,o=this.options,s=n.point(o[e+"Size"]);i="shadow"===e?n.point(o.shadowAnchor||o.iconAnchor):n.point(o.iconAnchor),!i&&s&&(i=s.divideBy(2,!0)),t.className="leaflet-marker-"+e+" "+o.className,i&&(t.style.marginLeft=-i.x+"px",t.style.marginTop=-i.y+"px"),s&&(t.style.width=s.x+"px",t.style.height=s.y+"px")},_createImg:function(t){var i;return n.Browser.ie6?(i=e.createElement("div"),i.style.filter='progid:DXImageTransform.Microsoft.AlphaImageLoader(src="'+t+'")'):(i=e.createElement("img"),i.src=t),i},_getIconUrl:function(t){return n.Browser.retina&&this.options[t+"RetinaUrl"]?this.options[t+"RetinaUrl"]:this.options[t+"Url"]}}),n.icon=function(t){return new n.Icon(t)},n.Icon.Default=n.Icon.extend({options:{iconSize:new n.Point(25,41),iconAnchor:new n.Point(12,41),popupAnchor:new n.Point(1,-34),shadowSize:new n.Point(41,41)},_getIconUrl:function(t){var e=t+"Url";if(this.options[e])return this.options[e];n.Browser.retina&&"icon"===t&&(t+="@2x");var i=n.Icon.Default.imagePath;if(!i)throw Error("Couldn't autodetect L.Icon.Default.imagePath, set it manually.");return i+"/marker-"+t+".png"}}),n.Icon.Default.imagePath=function(){var t,i,n,o,s=e.getElementsByTagName("script"),a=/\/?leaflet[\-\._]?([\w\-\._]*)\.js\??/;for(t=0,i=s.length;i>t;t++)if(n=s[t].src,o=n.match(a))return n.split(a)[0]+"/images"}(),n.Marker=n.Class.extend({includes:n.Mixin.Events,options:{icon:new n.Icon.Default,title:"",clickable:!0,draggable:!1,zIndexOffset:0,opacity:1,riseOnHover:!1,riseOffset:250},initialize:function(t,e){n.setOptions(this,e),this._latlng=n.latLng(t)},onAdd:function(t){this._map=t,t.on("viewreset",this.update,this),this._initIcon(),this.update(),t.options.zoomAnimation&&t.options.markerZoomAnimation&&t.on("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this._removeIcon(),this.fire("remove"),t.off({viewreset:this.update,zoomanim:this._animateZoom},this),this._map=null},getLatLng:function(){return this._latlng},setLatLng:function(t){return this._latlng=n.latLng(t),this.update(),this.fire("move",{latlng:this._latlng})},setZIndexOffset:function(t){return this.options.zIndexOffset=t,this.update(),this},setIcon:function(t){return this._map&&this._removeIcon(),this.options.icon=t,this._map&&(this._initIcon(),this.update()),this},update:function(){if(this._icon){var t=this._map.latLngToLayerPoint(this._latlng).round();this._setPos(t)}return this},_initIcon:function(){var t=this.options,e=this._map,i=e.options.zoomAnimation&&e.options.markerZoomAnimation,o=i?"leaflet-zoom-animated":"leaflet-zoom-hide",s=!1;this._icon||(this._icon=t.icon.createIcon(),t.title&&(this._icon.title=t.title),this._initInteraction(),s=1>this.options.opacity,n.DomUtil.addClass(this._icon,o),t.riseOnHover&&n.DomEvent.on(this._icon,"mouseover",this._bringToFront,this).on(this._icon,"mouseout",this._resetZIndex,this)),this._shadow||(this._shadow=t.icon.createShadow(),this._shadow&&(n.DomUtil.addClass(this._shadow,o),s=1>this.options.opacity)),s&&this._updateOpacity();var a=this._map._panes;a.markerPane.appendChild(this._icon),this._shadow&&a.shadowPane.appendChild(this._shadow)},_removeIcon:function(){var t=this._map._panes;this.options.riseOnHover&&n.DomEvent.off(this._icon,"mouseover",this._bringToFront).off(this._icon,"mouseout",this._resetZIndex),t.markerPane.removeChild(this._icon),this._shadow&&t.shadowPane.removeChild(this._shadow),this._icon=this._shadow=null},_setPos:function(t){n.DomUtil.setPosition(this._icon,t),this._shadow&&n.DomUtil.setPosition(this._shadow,t),this._zIndex=t.y+this.options.zIndexOffset,this._resetZIndex()},_updateZIndex:function(t){this._icon.style.zIndex=this._zIndex+t},_animateZoom:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);this._setPos(e)},_initInteraction:function(){if(this.options.clickable){var t=this._icon,e=["dblclick","mousedown","mouseover","mouseout","contextmenu"];n.DomUtil.addClass(t,"leaflet-clickable"),n.DomEvent.on(t,"click",this._onMouseClick,this);for(var i=0;e.length>i;i++)n.DomEvent.on(t,e[i],this._fireMouseEvent,this);n.Handler.MarkerDrag&&(this.dragging=new n.Handler.MarkerDrag(this),this.options.draggable&&this.dragging.enable())}},_onMouseClick:function(t){var e=this.dragging&&this.dragging.moved();(this.hasEventListeners(t.type)||e)&&n.DomEvent.stopPropagation(t),e||(this.dragging&&this.dragging._enabled||!this._map.dragging||!this._map.dragging.moved())&&this.fire(t.type,{originalEvent:t})},_fireMouseEvent:function(t){this.fire(t.type,{originalEvent:t}),"contextmenu"===t.type&&this.hasEventListeners(t.type)&&n.DomEvent.preventDefault(t),"mousedown"!==t.type&&n.DomEvent.stopPropagation(t)},setOpacity:function(t){this.options.opacity=t,this._map&&this._updateOpacity()},_updateOpacity:function(){n.DomUtil.setOpacity(this._icon,this.options.opacity),this._shadow&&n.DomUtil.setOpacity(this._shadow,this.options.opacity)},_bringToFront:function(){this._updateZIndex(this.options.riseOffset)},_resetZIndex:function(){this._updateZIndex(0)}}),n.marker=function(t,e){return new n.Marker(t,e)},n.DivIcon=n.Icon.extend({options:{iconSize:new n.Point(12,12),className:"leaflet-div-icon"},createIcon:function(){var t=e.createElement("div"),i=this.options;return i.html&&(t.innerHTML=i.html),i.bgPos&&(t.style.backgroundPosition=-i.bgPos.x+"px "+-i.bgPos.y+"px"),this._setIconStyles(t,"icon"),t},createShadow:function(){return null}}),n.divIcon=function(t){return new n.DivIcon(t)},n.Map.mergeOptions({closePopupOnClick:!0}),n.Popup=n.Class.extend({includes:n.Mixin.Events,options:{minWidth:50,maxWidth:300,maxHeight:null,autoPan:!0,closeButton:!0,offset:new n.Point(0,6),autoPanPadding:new n.Point(5,5),className:"",zoomAnimation:!0},initialize:function(t,e){n.setOptions(this,t),this._source=e,this._animated=n.Browser.any3d&&this.options.zoomAnimation},onAdd:function(t){this._map=t,this._container||this._initLayout(),this._updateContent();var e=t.options.fadeAnimation;e&&n.DomUtil.setOpacity(this._container,0),t._panes.popupPane.appendChild(this._container),t.on("viewreset",this._updatePosition,this),this._animated&&t.on("zoomanim",this._zoomAnimation,this),t.options.closePopupOnClick&&t.on("preclick",this._close,this),this._update(),e&&n.DomUtil.setOpacity(this._container,1)},addTo:function(t){return t.addLayer(this),this},openOn:function(t){return t.openPopup(this),this},onRemove:function(t){t._panes.popupPane.removeChild(this._container),n.Util.falseFn(this._container.offsetWidth),t.off({viewreset:this._updatePosition,preclick:this._close,zoomanim:this._zoomAnimation},this),t.options.fadeAnimation&&n.DomUtil.setOpacity(this._container,0),this._map=null},setLatLng:function(t){return this._latlng=n.latLng(t),this._update(),this},setContent:function(t){return this._content=t,this._update(),this},_close:function(){var t=this._map;t&&(t._popup=null,t.removeLayer(this).fire("popupclose",{popup:this}))},_initLayout:function(){var t,e="leaflet-popup",i=e+" "+this.options.className+" leaflet-zoom-"+(this._animated?"animated":"hide"),o=this._container=n.DomUtil.create("div",i);this.options.closeButton&&(t=this._closeButton=n.DomUtil.create("a",e+"-close-button",o),t.href="#close",t.innerHTML="×",n.DomEvent.on(t,"click",this._onCloseButtonClick,this));var s=this._wrapper=n.DomUtil.create("div",e+"-content-wrapper",o);n.DomEvent.disableClickPropagation(s),this._contentNode=n.DomUtil.create("div",e+"-content",s),n.DomEvent.on(this._contentNode,"mousewheel",n.DomEvent.stopPropagation),this._tipContainer=n.DomUtil.create("div",e+"-tip-container",o),this._tip=n.DomUtil.create("div",e+"-tip",this._tipContainer)},_update:function(){this._map&&(this._container.style.visibility="hidden",this._updateContent(),this._updateLayout(),this._updatePosition(),this._container.style.visibility="",this._adjustPan())},_updateContent:function(){if(this._content){if("string"==typeof this._content)this._contentNode.innerHTML=this._content;else{for(;this._contentNode.hasChildNodes();)this._contentNode.removeChild(this._contentNode.firstChild);this._contentNode.appendChild(this._content)}this.fire("contentupdate")}},_updateLayout:function(){var t=this._contentNode,e=t.style;e.width="",e.whiteSpace="nowrap";var i=t.offsetWidth;i=Math.min(i,this.options.maxWidth),i=Math.max(i,this.options.minWidth),e.width=i+1+"px",e.whiteSpace="",e.height="";var o=t.offsetHeight,s=this.options.maxHeight,a="leaflet-popup-scrolled";s&&o>s?(e.height=s+"px",n.DomUtil.addClass(t,a)):n.DomUtil.removeClass(t,a),this._containerWidth=this._container.offsetWidth},_updatePosition:function(){if(this._map){var t=this._map.latLngToLayerPoint(this._latlng),e=this._animated,i=this.options.offset;e&&n.DomUtil.setPosition(this._container,t),this._containerBottom=-i.y-(e?0:t.y),this._containerLeft=-Math.round(this._containerWidth/2)+i.x+(e?0:t.x),this._container.style.bottom=this._containerBottom+"px",this._container.style.left=this._containerLeft+"px"}},_zoomAnimation:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);n.DomUtil.setPosition(this._container,e)},_adjustPan:function(){if(this.options.autoPan){var t=this._map,e=this._container.offsetHeight,i=this._containerWidth,o=new n.Point(this._containerLeft,-e-this._containerBottom);this._animated&&o._add(n.DomUtil.getPosition(this._container));var s=t.layerPointToContainerPoint(o),a=this.options.autoPanPadding,r=t.getSize(),h=0,l=0;0>s.x&&(h=s.x-a.x),s.x+i>r.x&&(h=s.x+i-r.x+a.x),0>s.y&&(l=s.y-a.y),s.y+e>r.y&&(l=s.y+e-r.y+a.y),(h||l)&&t.panBy(new n.Point(h,l))}},_onCloseButtonClick:function(t){this._close(),n.DomEvent.stop(t)}}),n.popup=function(t,e){return new n.Popup(t,e)},n.Marker.include({openPopup:function(){return this._popup&&this._map&&(this._popup.setLatLng(this._latlng),this._map.openPopup(this._popup)),this},closePopup:function(){return this._popup&&this._popup._close(),this},bindPopup:function(t,e){var i=n.point(this.options.icon.options.popupAnchor)||new n.Point(0,0);return i=i.add(n.Popup.prototype.options.offset),e&&e.offset&&(i=i.add(e.offset)),e=n.extend({offset:i},e),this._popup||this.on("click",this.openPopup,this).on("remove",this.closePopup,this).on("move",this._movePopup,this),this._popup=new n.Popup(e,this).setContent(t),this},unbindPopup:function(){return this._popup&&(this._popup=null,this.off("click",this.openPopup).off("remove",this.closePopup).off("move",this._movePopup)),this},_movePopup:function(t){this._popup.setLatLng(t.latlng)}}),n.Map.include({openPopup:function(t){return this.closePopup(),this._popup=t,this.addLayer(t).fire("popupopen",{popup:this._popup})},closePopup:function(){return this._popup&&this._popup._close(),this}}),n.LayerGroup=n.Class.extend({initialize:function(t){this._layers={};var e,i;if(t)for(e=0,i=t.length;i>e;e++)this.addLayer(t[e])},addLayer:function(t){var e=n.stamp(t);return this._layers[e]=t,this._map&&this._map.addLayer(t),this},removeLayer:function(t){var e=n.stamp(t);return delete this._layers[e],this._map&&this._map.removeLayer(t),this},clearLayers:function(){return this.eachLayer(this.removeLayer,this),this},invoke:function(t){var e,i,n=Array.prototype.slice.call(arguments,1);for(e in this._layers)this._layers.hasOwnProperty(e)&&(i=this._layers[e],i[t]&&i[t].apply(i,n));return this},onAdd:function(t){this._map=t,this.eachLayer(t.addLayer,t)},onRemove:function(t){this.eachLayer(t.removeLayer,t),this._map=null},addTo:function(t){return t.addLayer(this),this},eachLayer:function(t,e){for(var i in this._layers)this._layers.hasOwnProperty(i)&&t.call(e,this._layers[i])},setZIndex:function(t){return this.invoke("setZIndex",t)}}),n.layerGroup=function(t){return new n.LayerGroup(t)},n.FeatureGroup=n.LayerGroup.extend({includes:n.Mixin.Events,statics:{EVENTS:"click dblclick mouseover mouseout mousemove contextmenu"},addLayer:function(t){return this._layers[n.stamp(t)]?this:(t.on(n.FeatureGroup.EVENTS,this._propagateEvent,this),n.LayerGroup.prototype.addLayer.call(this,t),this._popupContent&&t.bindPopup&&t.bindPopup(this._popupContent,this._popupOptions),this.fire("layeradd",{layer:t}))},removeLayer:function(t){return t.off(n.FeatureGroup.EVENTS,this._propagateEvent,this),n.LayerGroup.prototype.removeLayer.call(this,t),this._popupContent&&this.invoke("unbindPopup"),this.fire("layerremove",{layer:t})},bindPopup:function(t,e){return this._popupContent=t,this._popupOptions=e,this.invoke("bindPopup",t,e)},setStyle:function(t){return this.invoke("setStyle",t)},bringToFront:function(){return this.invoke("bringToFront")},bringToBack:function(){return this.invoke("bringToBack")},getBounds:function(){var t=new n.LatLngBounds;return this.eachLayer(function(e){t.extend(e instanceof n.Marker?e.getLatLng():e.getBounds())}),t},_propagateEvent:function(t){t.layer=t.target,t.target=this,this.fire(t.type,t)}}),n.featureGroup=function(t){return new n.FeatureGroup(t)},n.Path=n.Class.extend({includes:[n.Mixin.Events],statics:{CLIP_PADDING:n.Browser.mobile?Math.max(0,Math.min(.5,(1280/Math.max(t.innerWidth,t.innerHeight)-1)/2)):.5},options:{stroke:!0,color:"#0033ff",dashArray:null,weight:5,opacity:.5,fill:!1,fillColor:null,fillOpacity:.2,clickable:!0},initialize:function(t){n.setOptions(this,t)},onAdd:function(t){this._map=t,this._container||(this._initElements(),this._initEvents()),this.projectLatlngs(),this._updatePath(),this._container&&this._map._pathRoot.appendChild(this._container),this.fire("add"),t.on({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){t._pathRoot.removeChild(this._container),this.fire("remove"),this._map=null,n.Browser.vml&&(this._container=null,this._stroke=null,this._fill=null),t.off({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},projectLatlngs:function(){},setStyle:function(t){return n.setOptions(this,t),this._container&&this._updateStyle(),this},redraw:function(){return this._map&&(this.projectLatlngs(),this._updatePath()),this}}),n.Map.include({_updatePathViewport:function(){var t=n.Path.CLIP_PADDING,e=this.getSize(),i=n.DomUtil.getPosition(this._mapPane),o=i.multiplyBy(-1)._subtract(e.multiplyBy(t)._round()),s=o.add(e.multiplyBy(1+2*t)._round());this._pathViewport=new n.Bounds(o,s)}}),n.Path.SVG_NS="http://www.w3.org/2000/svg",n.Browser.svg=!(!e.createElementNS||!e.createElementNS(n.Path.SVG_NS,"svg").createSVGRect),n.Path=n.Path.extend({statics:{SVG:n.Browser.svg},bringToFront:function(){var t=this._map._pathRoot,e=this._container;return e&&t.lastChild!==e&&t.appendChild(e),this},bringToBack:function(){var t=this._map._pathRoot,e=this._container,i=t.firstChild;return e&&i!==e&&t.insertBefore(e,i),this},getPathString:function(){},_createElement:function(t){return e.createElementNS(n.Path.SVG_NS,t)},_initElements:function(){this._map._initPathRoot(),this._initPath(),this._initStyle()},_initPath:function(){this._container=this._createElement("g"),this._path=this._createElement("path"),this._container.appendChild(this._path)},_initStyle:function(){this.options.stroke&&(this._path.setAttribute("stroke-linejoin","round"),this._path.setAttribute("stroke-linecap","round")),this.options.fill&&this._path.setAttribute("fill-rule","evenodd"),this._updateStyle()},_updateStyle:function(){this.options.stroke?(this._path.setAttribute("stroke",this.options.color),this._path.setAttribute("stroke-opacity",this.options.opacity),this._path.setAttribute("stroke-width",this.options.weight),this.options.dashArray?this._path.setAttribute("stroke-dasharray",this.options.dashArray):this._path.removeAttribute("stroke-dasharray")):this._path.setAttribute("stroke","none"),this.options.fill?(this._path.setAttribute("fill",this.options.fillColor||this.options.color),this._path.setAttribute("fill-opacity",this.options.fillOpacity)):this._path.setAttribute("fill","none")},_updatePath:function(){var t=this.getPathString();t||(t="M0 0"),this._path.setAttribute("d",t)},_initEvents:function(){if(this.options.clickable){(n.Browser.svg||!n.Browser.vml)&&this._path.setAttribute("class","leaflet-clickable"),n.DomEvent.on(this._container,"click",this._onMouseClick,this);for(var t=["dblclick","mousedown","mouseover","mouseout","mousemove","contextmenu"],e=0;t.length>e;e++)n.DomEvent.on(this._container,t[e],this._fireMouseEvent,this)}},_onMouseClick:function(t){this._map.dragging&&this._map.dragging.moved()||this._fireMouseEvent(t)},_fireMouseEvent:function(t){if(this.hasEventListeners(t.type)){var e=this._map,i=e.mouseEventToContainerPoint(t),o=e.containerPointToLayerPoint(i),s=e.layerPointToLatLng(o);this.fire(t.type,{latlng:s,layerPoint:o,containerPoint:i,originalEvent:t}),"contextmenu"===t.type&&n.DomEvent.preventDefault(t),"mousemove"!==t.type&&n.DomEvent.stopPropagation(t)}}}),n.Map.include({_initPathRoot:function(){this._pathRoot||(this._pathRoot=n.Path.prototype._createElement("svg"),this._panes.overlayPane.appendChild(this._pathRoot),this.options.zoomAnimation&&n.Browser.any3d?(this._pathRoot.setAttribute("class"," leaflet-zoom-animated"),this.on({zoomanim:this._animatePathZoom,zoomend:this._endPathZoom})):this._pathRoot.setAttribute("class"," leaflet-zoom-hide"),this.on("moveend",this._updateSvgViewport),this._updateSvgViewport())},_animatePathZoom:function(t){var e=this.getZoomScale(t.zoom),i=this._getCenterOffset(t.center)._multiplyBy(-e)._add(this._pathViewport.min);this._pathRoot.style[n.DomUtil.TRANSFORM]=n.DomUtil.getTranslateString(i)+" scale("+e+") ",this._pathZooming=!0},_endPathZoom:function(){this._pathZooming=!1},_updateSvgViewport:function(){if(!this._pathZooming){this._updatePathViewport();var t=this._pathViewport,e=t.min,i=t.max,o=i.x-e.x,s=i.y-e.y,a=this._pathRoot,r=this._panes.overlayPane;n.Browser.mobileWebkit&&r.removeChild(a),n.DomUtil.setPosition(a,e),a.setAttribute("width",o),a.setAttribute("height",s),a.setAttribute("viewBox",[e.x,e.y,o,s].join(" ")),n.Browser.mobileWebkit&&r.appendChild(a)}}}),n.Path.include({bindPopup:function(t,e){return(!this._popup||e)&&(this._popup=new n.Popup(e,this)),this._popup.setContent(t),this._popupHandlersAdded||(this.on("click",this._openPopup,this).on("remove",this.closePopup,this),this._popupHandlersAdded=!0),this},unbindPopup:function(){return this._popup&&(this._popup=null,this.off("click",this._openPopup).off("remove",this.closePopup),this._popupHandlersAdded=!1),this},openPopup:function(t){return this._popup&&(t=t||this._latlng||this._latlngs[Math.floor(this._latlngs.length/2)],this._openPopup({latlng:t})),this},closePopup:function(){return this._popup&&this._popup._close(),this},_openPopup:function(t){this._popup.setLatLng(t.latlng),this._map.openPopup(this._popup)}}),n.Browser.vml=!n.Browser.svg&&function(){try{var t=e.createElement("div");t.innerHTML='';var i=t.firstChild;return i.style.behavior="url(#default#VML)",i&&"object"==typeof i.adj}catch(n){return!1}}(),n.Path=n.Browser.svg||!n.Browser.vml?n.Path:n.Path.extend({statics:{VML:!0,CLIP_PADDING:.02},_createElement:function(){try{return e.namespaces.add("lvml","urn:schemas-microsoft-com:vml"),function(t){return e.createElement("')}}catch(t){return function(t){return e.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),_initPath:function(){var t=this._container=this._createElement("shape");n.DomUtil.addClass(t,"leaflet-vml-shape"),this.options.clickable&&n.DomUtil.addClass(t,"leaflet-clickable"),t.coordsize="1 1",this._path=this._createElement("path"),t.appendChild(this._path),this._map._pathRoot.appendChild(t)},_initStyle:function(){this._updateStyle()},_updateStyle:function(){var t=this._stroke,e=this._fill,i=this.options,n=this._container;n.stroked=i.stroke,n.filled=i.fill,i.stroke?(t||(t=this._stroke=this._createElement("stroke"),t.endcap="round",n.appendChild(t)),t.weight=i.weight+"px",t.color=i.color,t.opacity=i.opacity,t.dashStyle=i.dashArray?i.dashArray instanceof Array?i.dashArray.join(" "):i.dashArray.replace(/ *, */g," "):""):t&&(n.removeChild(t),this._stroke=null),i.fill?(e||(e=this._fill=this._createElement("fill"),n.appendChild(e)),e.color=i.fillColor||i.color,e.opacity=i.fillOpacity):e&&(n.removeChild(e),this._fill=null)},_updatePath:function(){var t=this._container.style;t.display="none",this._path.v=this.getPathString()+" ",t.display=""}}),n.Map.include(n.Browser.svg||!n.Browser.vml?{}:{_initPathRoot:function(){if(!this._pathRoot){var t=this._pathRoot=e.createElement("div");t.className="leaflet-vml-container",this._panes.overlayPane.appendChild(t),this.on("moveend",this._updatePathViewport),this._updatePathViewport()}}}),n.Browser.canvas=function(){return!!e.createElement("canvas").getContext}(),n.Path=n.Path.SVG&&!t.L_PREFER_CANVAS||!n.Browser.canvas?n.Path:n.Path.extend({statics:{CANVAS:!0,SVG:!1},redraw:function(){return this._map&&(this.projectLatlngs(),this._requestUpdate()),this},setStyle:function(t){return n.setOptions(this,t),this._map&&(this._updateStyle(),this._requestUpdate()),this},onRemove:function(t){t.off("viewreset",this.projectLatlngs,this).off("moveend",this._updatePath,this),this.options.clickable&&this._map.off("click",this._onClick,this),this._requestUpdate(),this._map=null},_requestUpdate:function(){this._map&&!n.Path._updateRequest&&(n.Path._updateRequest=n.Util.requestAnimFrame(this._fireMapMoveEnd,this._map))},_fireMapMoveEnd:function(){n.Path._updateRequest=null,this.fire("moveend")},_initElements:function(){this._map._initPathRoot(),this._ctx=this._map._canvasCtx},_updateStyle:function(){var t=this.options;t.stroke&&(this._ctx.lineWidth=t.weight,this._ctx.strokeStyle=t.color),t.fill&&(this._ctx.fillStyle=t.fillColor||t.color)},_drawPath:function(){var t,e,i,o,s,a;for(this._ctx.beginPath(),t=0,i=this._parts.length;i>t;t++){for(e=0,o=this._parts[t].length;o>e;e++)s=this._parts[t][e],a=(0===e?"move":"line")+"To",this._ctx[a](s.x,s.y);this instanceof n.Polygon&&this._ctx.closePath()}},_checkIfEmpty:function(){return!this._parts.length},_updatePath:function(){if(!this._checkIfEmpty()){var t=this._ctx,e=this.options;this._drawPath(),t.save(),this._updateStyle(),e.fill&&(t.globalAlpha=e.fillOpacity,t.fill()),e.stroke&&(t.globalAlpha=e.opacity,t.stroke()),t.restore()}},_initEvents:function(){this.options.clickable&&this._map.on("click",this._onClick,this)},_onClick:function(t){this._containsPoint(t.layerPoint)&&this.fire("click",{latlng:t.latlng,layerPoint:t.layerPoint,containerPoint:t.containerPoint,originalEvent:t})}}),n.Map.include(n.Path.SVG&&!t.L_PREFER_CANVAS||!n.Browser.canvas?{}:{_initPathRoot:function(){var t,i=this._pathRoot;i||(i=this._pathRoot=e.createElement("canvas"),i.style.position="absolute",t=this._canvasCtx=i.getContext("2d"),t.lineCap="round",t.lineJoin="round",this._panes.overlayPane.appendChild(i),this.options.zoomAnimation&&(this._pathRoot.className="leaflet-zoom-animated",this.on("zoomanim",this._animatePathZoom),this.on("zoomend",this._endPathZoom)),this.on("moveend",this._updateCanvasViewport),this._updateCanvasViewport())},_updateCanvasViewport:function(){if(!this._pathZooming){this._updatePathViewport();var t=this._pathViewport,e=t.min,i=t.max.subtract(e),o=this._pathRoot;n.DomUtil.setPosition(o,e),o.width=i.x,o.height=i.y,o.getContext("2d").translate(-e.x,-e.y)}}}),n.LineUtil={simplify:function(t,e){if(!e||!t.length)return t.slice();var i=e*e;return t=this._reducePoints(t,i),t=this._simplifyDP(t,i)},pointToSegmentDistance:function(t,e,i){return Math.sqrt(this._sqClosestPointOnSegment(t,e,i,!0))},closestPointOnSegment:function(t,e,i){return this._sqClosestPointOnSegment(t,e,i)},_simplifyDP:function(t,e){var n=t.length,o=typeof Uint8Array!=i+""?Uint8Array:Array,s=new o(n);s[0]=s[n-1]=1,this._simplifyDPStep(t,s,e,0,n-1);var a,r=[];for(a=0;n>a;a++)s[a]&&r.push(t[a]);return r},_simplifyDPStep:function(t,e,i,n,o){var s,a,r,h=0;for(a=n+1;o-1>=a;a++)r=this._sqClosestPointOnSegment(t[a],t[n],t[o],!0),r>h&&(s=a,h=r);h>i&&(e[s]=1,this._simplifyDPStep(t,e,i,n,s),this._simplifyDPStep(t,e,i,s,o))},_reducePoints:function(t,e){for(var i=[t[0]],n=1,o=0,s=t.length;s>n;n++)this._sqDist(t[n],t[o])>e&&(i.push(t[n]),o=n);return s-1>o&&i.push(t[s-1]),i},clipSegment:function(t,e,i,n){var o,s,a,r=n?this._lastCode:this._getBitCode(t,i),h=this._getBitCode(e,i);for(this._lastCode=h;;){if(!(r|h))return[t,e];if(r&h)return!1;o=r||h,s=this._getEdgeIntersection(t,e,o,i),a=this._getBitCode(s,i),o===r?(t=s,r=a):(e=s,h=a)}},_getEdgeIntersection:function(t,e,o,s){var a=e.x-t.x,r=e.y-t.y,h=s.min,l=s.max;return 8&o?new n.Point(t.x+a*(l.y-t.y)/r,l.y):4&o?new n.Point(t.x+a*(h.y-t.y)/r,h.y):2&o?new n.Point(l.x,t.y+r*(l.x-t.x)/a):1&o?new n.Point(h.x,t.y+r*(h.x-t.x)/a):i},_getBitCode:function(t,e){var i=0;return t.xe.max.x&&(i|=2),t.ye.max.y&&(i|=8),i},_sqDist:function(t,e){var i=e.x-t.x,n=e.y-t.y;return i*i+n*n},_sqClosestPointOnSegment:function(t,e,i,o){var s,a=e.x,r=e.y,h=i.x-a,l=i.y-r,u=h*h+l*l;return u>0&&(s=((t.x-a)*h+(t.y-r)*l)/u,s>1?(a=i.x,r=i.y):s>0&&(a+=h*s,r+=l*s)),h=t.x-a,l=t.y-r,o?h*h+l*l:new n.Point(a,r)}},n.Polyline=n.Path.extend({initialize:function(t,e){n.Path.prototype.initialize.call(this,e),this._latlngs=this._convertLatLngs(t)},options:{smoothFactor:1,noClip:!1},projectLatlngs:function(){this._originalPoints=[];for(var t=0,e=this._latlngs.length;e>t;t++)this._originalPoints[t]=this._map.latLngToLayerPoint(this._latlngs[t])},getPathString:function(){for(var t=0,e=this._parts.length,i="";e>t;t++)i+=this._getPathPartStr(this._parts[t]);return i},getLatLngs:function(){return this._latlngs},setLatLngs:function(t){return this._latlngs=this._convertLatLngs(t),this.redraw()},addLatLng:function(t){return this._latlngs.push(n.latLng(t)),this.redraw()},spliceLatLngs:function(){var t=[].splice.apply(this._latlngs,arguments);return this._convertLatLngs(this._latlngs),this.redraw(),t},closestLayerPoint:function(t){for(var e,i,o=1/0,s=this._parts,a=null,r=0,h=s.length;h>r;r++)for(var l=s[r],u=1,c=l.length;c>u;u++){e=l[u-1],i=l[u]; var _=n.LineUtil._sqClosestPointOnSegment(t,e,i,!0);o>_&&(o=_,a=n.LineUtil._sqClosestPointOnSegment(t,e,i))}return a&&(a.distance=Math.sqrt(o)),a},getBounds:function(){var t,e,i=new n.LatLngBounds,o=this.getLatLngs();for(t=0,e=o.length;e>t;t++)i.extend(o[t]);return i},_convertLatLngs:function(t){var e,i;for(e=0,i=t.length;i>e;e++){if(n.Util.isArray(t[e])&&"number"!=typeof t[e][0])return;t[e]=n.latLng(t[e])}return t},_initEvents:function(){n.Path.prototype._initEvents.call(this)},_getPathPartStr:function(t){for(var e,i=n.Path.VML,o=0,s=t.length,a="";s>o;o++)e=t[o],i&&e._round(),a+=(o?"L":"M")+e.x+" "+e.y;return a},_clipPoints:function(){var t,e,o,s=this._originalPoints,a=s.length;if(this.options.noClip)return this._parts=[s],i;this._parts=[];var r=this._parts,h=this._map._pathViewport,l=n.LineUtil;for(t=0,e=0;a-1>t;t++)o=l.clipSegment(s[t],s[t+1],h,t),o&&(r[e]=r[e]||[],r[e].push(o[0]),(o[1]!==s[t+1]||t===a-2)&&(r[e].push(o[1]),e++))},_simplifyPoints:function(){for(var t=this._parts,e=n.LineUtil,i=0,o=t.length;o>i;i++)t[i]=e.simplify(t[i],this.options.smoothFactor)},_updatePath:function(){this._map&&(this._clipPoints(),this._simplifyPoints(),n.Path.prototype._updatePath.call(this))}}),n.polyline=function(t,e){return new n.Polyline(t,e)},n.PolyUtil={},n.PolyUtil.clipPolygon=function(t,e){var i,o,s,a,r,h,l,u,c,_=[1,4,2,8],d=n.LineUtil;for(o=0,l=t.length;l>o;o++)t[o]._code=d._getBitCode(t[o],e);for(a=0;4>a;a++){for(u=_[a],i=[],o=0,l=t.length,s=l-1;l>o;s=o++)r=t[o],h=t[s],r._code&u?h._code&u||(c=d._getEdgeIntersection(h,r,u,e),c._code=d._getBitCode(c,e),i.push(c)):(h._code&u&&(c=d._getEdgeIntersection(h,r,u,e),c._code=d._getBitCode(c,e),i.push(c)),i.push(r));t=i}return t},n.Polygon=n.Polyline.extend({options:{fill:!0},initialize:function(t,e){n.Polyline.prototype.initialize.call(this,t,e),t&&n.Util.isArray(t[0])&&"number"!=typeof t[0][0]&&(this._latlngs=this._convertLatLngs(t[0]),this._holes=t.slice(1))},projectLatlngs:function(){if(n.Polyline.prototype.projectLatlngs.call(this),this._holePoints=[],this._holes){var t,e,i,o;for(t=0,i=this._holes.length;i>t;t++)for(this._holePoints[t]=[],e=0,o=this._holes[t].length;o>e;e++)this._holePoints[t][e]=this._map.latLngToLayerPoint(this._holes[t][e])}},_clipPoints:function(){var t=this._originalPoints,e=[];if(this._parts=[t].concat(this._holePoints),!this.options.noClip){for(var i=0,o=this._parts.length;o>i;i++){var s=n.PolyUtil.clipPolygon(this._parts[i],this._map._pathViewport);s.length&&e.push(s)}this._parts=e}},_getPathPartStr:function(t){var e=n.Polyline.prototype._getPathPartStr.call(this,t);return e+(n.Browser.svg?"z":"x")}}),n.polygon=function(t,e){return new n.Polygon(t,e)},function(){function t(t){return n.FeatureGroup.extend({initialize:function(t,e){this._layers={},this._options=e,this.setLatLngs(t)},setLatLngs:function(e){var i=0,n=e.length;for(this.eachLayer(function(t){n>i?t.setLatLngs(e[i++]):this.removeLayer(t)},this);n>i;)this.addLayer(new t(e[i++],this._options));return this}})}n.MultiPolyline=t(n.Polyline),n.MultiPolygon=t(n.Polygon),n.multiPolyline=function(t,e){return new n.MultiPolyline(t,e)},n.multiPolygon=function(t,e){return new n.MultiPolygon(t,e)}}(),n.Rectangle=n.Polygon.extend({initialize:function(t,e){n.Polygon.prototype.initialize.call(this,this._boundsToLatLngs(t),e)},setBounds:function(t){this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return t=n.latLngBounds(t),[t.getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}}),n.rectangle=function(t,e){return new n.Rectangle(t,e)},n.Circle=n.Path.extend({initialize:function(t,e,i){n.Path.prototype.initialize.call(this,i),this._latlng=n.latLng(t),this._mRadius=e},options:{fill:!0},setLatLng:function(t){return this._latlng=n.latLng(t),this.redraw()},setRadius:function(t){return this._mRadius=t,this.redraw()},projectLatlngs:function(){var t=this._getLngRadius(),e=new n.LatLng(this._latlng.lat,this._latlng.lng-t),i=this._map.latLngToLayerPoint(e);this._point=this._map.latLngToLayerPoint(this._latlng),this._radius=Math.max(Math.round(this._point.x-i.x),1)},getBounds:function(){var t=this._getLngRadius(),e=360*(this._mRadius/40075017),i=this._latlng,o=new n.LatLng(i.lat-e,i.lng-t),s=new n.LatLng(i.lat+e,i.lng+t);return new n.LatLngBounds(o,s)},getLatLng:function(){return this._latlng},getPathString:function(){var t=this._point,e=this._radius;return this._checkIfEmpty()?"":n.Browser.svg?"M"+t.x+","+(t.y-e)+"A"+e+","+e+",0,1,1,"+(t.x-.1)+","+(t.y-e)+" z":(t._round(),e=Math.round(e),"AL "+t.x+","+t.y+" "+e+","+e+" 0,"+23592600)},getRadius:function(){return this._mRadius},_getLatRadius:function(){return 360*(this._mRadius/40075017)},_getLngRadius:function(){return this._getLatRadius()/Math.cos(n.LatLng.DEG_TO_RAD*this._latlng.lat)},_checkIfEmpty:function(){if(!this._map)return!1;var t=this._map._pathViewport,e=this._radius,i=this._point;return i.x-e>t.max.x||i.y-e>t.max.y||i.x+ei;i++)for(l=this._parts[i],o=0,r=l.length,s=r-1;r>o;s=o++)if((e||0!==o)&&(h=n.LineUtil.pointToSegmentDistance(t,l[s],l[o]),u>=h))return!0;return!1}}:{}),n.Polygon.include(n.Path.CANVAS?{_containsPoint:function(t){var e,i,o,s,a,r,h,l,u=!1;if(n.Polyline.prototype._containsPoint.call(this,t,!0))return!0;for(s=0,h=this._parts.length;h>s;s++)for(e=this._parts[s],a=0,l=e.length,r=l-1;l>a;r=a++)i=e[a],o=e[r],i.y>t.y!=o.y>t.y&&t.x<(o.x-i.x)*(t.y-i.y)/(o.y-i.y)+i.x&&(u=!u);return u}}:{}),n.Circle.include(n.Path.CANVAS?{_drawPath:function(){var t=this._point;this._ctx.beginPath(),this._ctx.arc(t.x,t.y,this._radius,0,2*Math.PI,!1)},_containsPoint:function(t){var e=this._point,i=this.options.stroke?this.options.weight/2:0;return t.distanceTo(e)<=this._radius+i}}:{}),n.GeoJSON=n.FeatureGroup.extend({initialize:function(t,e){n.setOptions(this,e),this._layers={},t&&this.addData(t)},addData:function(t){var e,i,o=n.Util.isArray(t)?t:t.features;if(o){for(e=0,i=o.length;i>e;e++)(o[e].geometries||o[e].geometry||o[e].features)&&this.addData(o[e]);return this}var s=this.options;if(!s.filter||s.filter(t)){var a=n.GeoJSON.geometryToLayer(t,s.pointToLayer);return a.feature=t,a.defaultOptions=a.options,this.resetStyle(a),s.onEachFeature&&s.onEachFeature(t,a),this.addLayer(a)}},resetStyle:function(t){var e=this.options.style;e&&(n.Util.extend(t.options,t.defaultOptions),this._setLayerStyle(t,e))},setStyle:function(t){this.eachLayer(function(e){this._setLayerStyle(e,t)},this)},_setLayerStyle:function(t,e){"function"==typeof e&&(e=e(t.feature)),t.setStyle&&t.setStyle(e)}}),n.extend(n.GeoJSON,{geometryToLayer:function(t,e){var i,o,s,a,r,h="Feature"===t.type?t.geometry:t,l=h.coordinates,u=[];switch(h.type){case"Point":return i=this.coordsToLatLng(l),e?e(t,i):new n.Marker(i);case"MultiPoint":for(s=0,a=l.length;a>s;s++)i=this.coordsToLatLng(l[s]),r=e?e(t,i):new n.Marker(i),u.push(r);return new n.FeatureGroup(u);case"LineString":return o=this.coordsToLatLngs(l),new n.Polyline(o);case"Polygon":return o=this.coordsToLatLngs(l,1),new n.Polygon(o);case"MultiLineString":return o=this.coordsToLatLngs(l,1),new n.MultiPolyline(o);case"MultiPolygon":return o=this.coordsToLatLngs(l,2),new n.MultiPolygon(o);case"GeometryCollection":for(s=0,a=h.geometries.length;a>s;s++)r=this.geometryToLayer({geometry:h.geometries[s],type:"Feature",properties:t.properties},e),u.push(r);return new n.FeatureGroup(u);default:throw Error("Invalid GeoJSON object.")}},coordsToLatLng:function(t,e){var i=parseFloat(t[e?0:1]),o=parseFloat(t[e?1:0]);return new n.LatLng(i,o)},coordsToLatLngs:function(t,e,i){var n,o,s,a=[];for(o=0,s=t.length;s>o;o++)n=e?this.coordsToLatLngs(t[o],e-1,i):this.coordsToLatLng(t[o],i),a.push(n);return a}}),n.geoJson=function(t,e){return new n.GeoJSON(t,e)},n.DomEvent={addListener:function(t,e,o,s){var a,r,h,l=n.stamp(o),u="_leaflet_"+e+l;return t[u]?this:(a=function(e){return o.call(s||t,e||n.DomEvent._getEvent())},n.Browser.msTouch&&0===e.indexOf("touch")?this.addMsTouchListener(t,e,a,l):(n.Browser.touch&&"dblclick"===e&&this.addDoubleTapListener&&this.addDoubleTapListener(t,a,l),"addEventListener"in t?"mousewheel"===e?(t.addEventListener("DOMMouseScroll",a,!1),t.addEventListener(e,a,!1)):"mouseenter"===e||"mouseleave"===e?(r=a,h="mouseenter"===e?"mouseover":"mouseout",a=function(e){return n.DomEvent._checkMouse(t,e)?r(e):i},t.addEventListener(h,a,!1)):t.addEventListener(e,a,!1):"attachEvent"in t&&t.attachEvent("on"+e,a),t[u]=a,this))},removeListener:function(t,e,i){var o=n.stamp(i),s="_leaflet_"+e+o,a=t[s];if(a)return n.Browser.msTouch&&0===e.indexOf("touch")?this.removeMsTouchListener(t,e,o):n.Browser.touch&&"dblclick"===e&&this.removeDoubleTapListener?this.removeDoubleTapListener(t,o):"removeEventListener"in t?"mousewheel"===e?(t.removeEventListener("DOMMouseScroll",a,!1),t.removeEventListener(e,a,!1)):"mouseenter"===e||"mouseleave"===e?t.removeEventListener("mouseenter"===e?"mouseover":"mouseout",a,!1):t.removeEventListener(e,a,!1):"detachEvent"in t&&t.detachEvent("on"+e,a),t[s]=null,this},stopPropagation:function(t){return t.stopPropagation?t.stopPropagation():t.cancelBubble=!0,this},disableClickPropagation:function(t){for(var e=n.DomEvent.stopPropagation,i=n.Draggable.START.length-1;i>=0;i--)n.DomEvent.addListener(t,n.Draggable.START[i],e);return n.DomEvent.addListener(t,"click",e).addListener(t,"dblclick",e)},preventDefault:function(t){return t.preventDefault?t.preventDefault():t.returnValue=!1,this},stop:function(t){return n.DomEvent.preventDefault(t).stopPropagation(t)},getMousePosition:function(t,i){var o=e.body,s=e.documentElement,a=t.pageX?t.pageX:t.clientX+o.scrollLeft+s.scrollLeft,r=t.pageY?t.pageY:t.clientY+o.scrollTop+s.scrollTop,h=new n.Point(a,r);return i?h._subtract(n.DomUtil.getViewportOffset(i)):h},getWheelDelta:function(t){var e=0;return t.wheelDelta&&(e=t.wheelDelta/120),t.detail&&(e=-t.detail/3),e},_checkMouse:function(t,e){var i=e.relatedTarget;if(!i)return!0;try{for(;i&&i!==t;)i=i.parentNode}catch(n){return!1}return i!==t},_getEvent:function(){var e=t.event;if(!e)for(var i=arguments.callee.caller;i&&(e=i.arguments[0],!e||t.Event!==e.constructor);)i=i.caller;return e}},n.DomEvent.on=n.DomEvent.addListener,n.DomEvent.off=n.DomEvent.removeListener,n.Draggable=n.Class.extend({includes:n.Mixin.Events,statics:{START:n.Browser.touch?["touchstart","mousedown"]:["mousedown"],END:{mousedown:"mouseup",touchstart:"touchend",MSPointerDown:"touchend"},MOVE:{mousedown:"mousemove",touchstart:"touchmove",MSPointerDown:"touchmove"},TAP_TOLERANCE:15},initialize:function(t,e,i){this._element=t,this._dragStartTarget=e||t,this._longPress=i&&!n.Browser.msTouch},enable:function(){if(!this._enabled){for(var t=n.Draggable.START.length-1;t>=0;t--)n.DomEvent.on(this._dragStartTarget,n.Draggable.START[t],this._onDown,this);this._enabled=!0}},disable:function(){if(this._enabled){for(var t=n.Draggable.START.length-1;t>=0;t--)n.DomEvent.off(this._dragStartTarget,n.Draggable.START[t],this._onDown,this);this._enabled=!1,this._moved=!1}},_onDown:function(t){if(!(!n.Browser.touch&&t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||(n.DomEvent.preventDefault(t),n.DomEvent.stopPropagation(t),n.Draggable._disabled))){if(this._simulateClick=!0,t.touches&&t.touches.length>1)return this._simulateClick=!1,clearTimeout(this._longPressTimeout),i;var o=t.touches&&1===t.touches.length?t.touches[0]:t,s=o.target;n.Browser.touch&&"a"===s.tagName.toLowerCase()&&n.DomUtil.addClass(s,"leaflet-active"),this._moved=!1,this._moving||(this._startPoint=new n.Point(o.clientX,o.clientY),this._startPos=this._newPos=n.DomUtil.getPosition(this._element),t.touches&&1===t.touches.length&&n.Browser.touch&&this._longPress&&(this._longPressTimeout=setTimeout(n.bind(function(){var t=this._newPos&&this._newPos.distanceTo(this._startPos)||0;n.Draggable.TAP_TOLERANCE>t&&(this._simulateClick=!1,this._onUp(),this._simulateEvent("contextmenu",o))},this),1e3)),n.DomEvent.on(e,n.Draggable.MOVE[t.type],this._onMove,this),n.DomEvent.on(e,n.Draggable.END[t.type],this._onUp,this))}},_onMove:function(t){if(!(t.touches&&t.touches.length>1)){var e=t.touches&&1===t.touches.length?t.touches[0]:t,i=new n.Point(e.clientX,e.clientY),o=i.subtract(this._startPoint);(o.x||o.y)&&(n.DomEvent.preventDefault(t),this._moved||(this.fire("dragstart"),this._moved=!0,this._startPos=n.DomUtil.getPosition(this._element).subtract(o),n.Browser.touch||(n.DomUtil.disableTextSelection(),this._setMovingCursor())),this._newPos=this._startPos.add(o),this._moving=!0,n.Util.cancelAnimFrame(this._animRequest),this._animRequest=n.Util.requestAnimFrame(this._updatePosition,this,!0,this._dragStartTarget))}},_updatePosition:function(){this.fire("predrag"),n.DomUtil.setPosition(this._element,this._newPos),this.fire("drag")},_onUp:function(t){var i;if(clearTimeout(this._longPressTimeout),this._simulateClick&&t.changedTouches){var o=t.changedTouches[0],s=o.target,a=this._newPos&&this._newPos.distanceTo(this._startPos)||0;"a"===s.tagName.toLowerCase()&&n.DomUtil.removeClass(s,"leaflet-active"),n.Draggable.TAP_TOLERANCE>a&&(i=o)}n.Browser.touch||(n.DomUtil.enableTextSelection(),this._restoreCursor());for(var r in n.Draggable.MOVE)n.Draggable.MOVE.hasOwnProperty(r)&&(n.DomEvent.off(e,n.Draggable.MOVE[r],this._onMove),n.DomEvent.off(e,n.Draggable.END[r],this._onUp));this._moved&&(n.Util.cancelAnimFrame(this._animRequest),this.fire("dragend")),this._moving=!1,i&&(this._moved=!1,this._simulateEvent("click",i))},_setMovingCursor:function(){n.DomUtil.addClass(e.body,"leaflet-dragging")},_restoreCursor:function(){n.DomUtil.removeClass(e.body,"leaflet-dragging")},_simulateEvent:function(i,n){var o=e.createEvent("MouseEvents");o.initMouseEvent(i,!0,!0,t,1,n.screenX,n.screenY,n.clientX,n.clientY,!1,!1,!1,!1,0,null),n.target.dispatchEvent(o)}}),n.Handler=n.Class.extend({initialize:function(t){this._map=t},enable:function(){this._enabled||(this._enabled=!0,this.addHooks())},disable:function(){this._enabled&&(this._enabled=!1,this.removeHooks())},enabled:function(){return!!this._enabled}}),n.Map.mergeOptions({dragging:!0,inertia:!n.Browser.android23,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,inertiaThreshold:n.Browser.touch?32:18,easeLinearity:.25,longPress:!0,worldCopyJump:!1}),n.Map.Drag=n.Handler.extend({addHooks:function(){if(!this._draggable){var t=this._map;this._draggable=new n.Draggable(t._mapPane,t._container,t.options.longPress),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDrag,this),t.on("viewreset",this._onViewReset,this))}this._draggable.enable()},removeHooks:function(){this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){var t=this._map;t._panAnim&&t._panAnim.stop(),t.fire("movestart").fire("dragstart"),t.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(){if(this._map.options.inertia){var t=this._lastTime=+new Date,e=this._lastPos=this._draggable._newPos;this._positions.push(e),this._times.push(t),t-this._times[0]>200&&(this._positions.shift(),this._times.shift())}this._map.fire("move").fire("drag")},_onViewReset:function(){var t=this._map.getSize()._divideBy(2),e=this._map.latLngToLayerPoint(new n.LatLng(0,0));this._initialWorldOffset=e.subtract(t).x,this._worldWidth=this._map.project(new n.LatLng(0,180)).x},_onPreDrag:function(){var t=this._worldWidth,e=Math.round(t/2),i=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-e+i)%t+e-i,s=(n+e+i)%t-e-i,a=Math.abs(o+i)e.inertiaThreshold||!this._positions[0];if(o)t.fire("moveend");else{var s=this._lastPos.subtract(this._positions[0]),a=(this._lastTime+i-this._times[0])/1e3,r=e.easeLinearity,h=s.multiplyBy(r/a),l=h.distanceTo(new n.Point(0,0)),u=Math.min(e.inertiaMaxSpeed,l),c=h.multiplyBy(u/l),_=u/(e.inertiaDeceleration*r),d=c.multiplyBy(-_/2).round();n.Util.requestAnimFrame(function(){t.panBy(d,_,r)})}t.fire("dragend"),e.maxBounds&&n.Util.requestAnimFrame(this._panInsideMaxBounds,t,!0,t._container)},_panInsideMaxBounds:function(){this.panInsideBounds(this.options.maxBounds)}}),n.Map.addInitHook("addHandler","dragging",n.Map.Drag),n.Map.mergeOptions({doubleClickZoom:!0}),n.Map.DoubleClickZoom=n.Handler.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick)},_onDoubleClick:function(t){this.setView(t.latlng,this._zoom+1)}}),n.Map.addInitHook("addHandler","doubleClickZoom",n.Map.DoubleClickZoom),n.Map.mergeOptions({scrollWheelZoom:!0}),n.Map.ScrollWheelZoom=n.Handler.extend({addHooks:function(){n.DomEvent.on(this._map._container,"mousewheel",this._onWheelScroll,this),this._delta=0},removeHooks:function(){n.DomEvent.off(this._map._container,"mousewheel",this._onWheelScroll)},_onWheelScroll:function(t){var e=n.DomEvent.getWheelDelta(t);this._delta+=e,this._lastMousePos=this._map.mouseEventToContainerPoint(t),this._startTime||(this._startTime=+new Date);var i=Math.max(40-(+new Date-this._startTime),0);clearTimeout(this._timer),this._timer=setTimeout(n.bind(this._performZoom,this),i),n.DomEvent.preventDefault(t),n.DomEvent.stopPropagation(t)},_performZoom:function(){var t=this._map,e=this._delta,i=t.getZoom();if(e=e>0?Math.ceil(e):Math.round(e),e=Math.max(Math.min(e,4),-4),e=t._limitZoom(i+e)-i,this._delta=0,this._startTime=null,e){var n=i+e,o=this._getCenterForScrollWheelZoom(n);t.setView(o,n)}},_getCenterForScrollWheelZoom:function(t){var e=this._map,i=e.getZoomScale(t),n=e.getSize()._divideBy(2),o=this._lastMousePos._subtract(n)._multiplyBy(1-1/i),s=e._getTopLeftPoint()._add(n)._add(o);return e.unproject(s)}}),n.Map.addInitHook("addHandler","scrollWheelZoom",n.Map.ScrollWheelZoom),n.extend(n.DomEvent,{_touchstart:n.Browser.msTouch?"MSPointerDown":"touchstart",_touchend:n.Browser.msTouch?"MSPointerUp":"touchend",addDoubleTapListener:function(t,i,o){function s(t){var e;if(n.Browser.msTouch?(p.push(t.pointerId),e=p.length):e=t.touches.length,!(e>1)){var i=Date.now(),o=i-(r||i);h=t.touches?t.touches[0]:t,l=o>0&&u>=o,r=i}}function a(t){if(n.Browser.msTouch){var e=p.indexOf(t.pointerId);if(-1===e)return;p.splice(e,1)}if(l){if(n.Browser.msTouch){var o,s={};for(var a in h)o=h[a],s[a]="function"==typeof o?o.bind(h):o;h=s}h.type="dblclick",i(h),r=null}}var r,h,l=!1,u=250,c="_leaflet_",_=this._touchstart,d=this._touchend,p=[];t[c+_+o]=s,t[c+d+o]=a;var m=n.Browser.msTouch?e.documentElement:t;return t.addEventListener(_,s,!1),m.addEventListener(d,a,!1),n.Browser.msTouch&&m.addEventListener("MSPointerCancel",a,!1),this},removeDoubleTapListener:function(t,i){var o="_leaflet_";return t.removeEventListener(this._touchstart,t[o+this._touchstart+i],!1),(n.Browser.msTouch?e.documentElement:t).removeEventListener(this._touchend,t[o+this._touchend+i],!1),n.Browser.msTouch&&e.documentElement.removeEventListener("MSPointerCancel",t[o+this._touchend+i],!1),this}}),n.extend(n.DomEvent,{_msTouches:[],_msDocumentListener:!1,addMsTouchListener:function(t,e,i,n){switch(e){case"touchstart":return this.addMsTouchListenerStart(t,e,i,n);case"touchend":return this.addMsTouchListenerEnd(t,e,i,n);case"touchmove":return this.addMsTouchListenerMove(t,e,i,n);default:throw"Unknown touch event type"}},addMsTouchListenerStart:function(t,i,n,o){var s="_leaflet_",a=this._msTouches,r=function(t){for(var e=!1,i=0;a.length>i;i++)if(a[i].pointerId===t.pointerId){e=!0;break}e||a.push(t),t.touches=a.slice(),t.changedTouches=[t],n(t)};if(t[s+"touchstart"+o]=r,t.addEventListener("MSPointerDown",r,!1),!this._msDocumentListener){var h=function(t){for(var e=0;a.length>e;e++)if(a[e].pointerId===t.pointerId){a.splice(e,1);break}};e.documentElement.addEventListener("MSPointerUp",h,!1),e.documentElement.addEventListener("MSPointerCancel",h,!1),this._msDocumentListener=!0}return this},addMsTouchListenerMove:function(t,e,i,n){function o(t){if(t.pointerType!==t.MSPOINTER_TYPE_MOUSE||0!==t.buttons){for(var e=0;a.length>e;e++)if(a[e].pointerId===t.pointerId){a[e]=t;break}t.touches=a.slice(),t.changedTouches=[t],i(t)}}var s="_leaflet_",a=this._msTouches;return t[s+"touchmove"+n]=o,t.addEventListener("MSPointerMove",o,!1),this},addMsTouchListenerEnd:function(t,e,i,n){var o="_leaflet_",s=this._msTouches,a=function(t){for(var e=0;s.length>e;e++)if(s[e].pointerId===t.pointerId){s.splice(e,1);break}t.touches=s.slice(),t.changedTouches=[t],i(t)};return t[o+"touchend"+n]=a,t.addEventListener("MSPointerUp",a,!1),t.addEventListener("MSPointerCancel",a,!1),this},removeMsTouchListener:function(t,e,i){var n="_leaflet_",o=t[n+e+i];switch(e){case"touchstart":t.removeEventListener("MSPointerDown",o,!1);break;case"touchmove":t.removeEventListener("MSPointerMove",o,!1);break;case"touchend":t.removeEventListener("MSPointerUp",o,!1),t.removeEventListener("MSPointerCancel",o,!1)}return this}}),n.Map.mergeOptions({touchZoom:n.Browser.touch&&!n.Browser.android23}),n.Map.TouchZoom=n.Handler.extend({addHooks:function(){n.DomEvent.on(this._map._container,"touchstart",this._onTouchStart,this)},removeHooks:function(){n.DomEvent.off(this._map._container,"touchstart",this._onTouchStart,this)},_onTouchStart:function(t){var i=this._map;if(t.touches&&2===t.touches.length&&!i._animatingZoom&&!this._zooming){var o=i.mouseEventToLayerPoint(t.touches[0]),s=i.mouseEventToLayerPoint(t.touches[1]),a=i._getCenterLayerPoint();this._startCenter=o.add(s)._divideBy(2),this._startDist=o.distanceTo(s),this._moved=!1,this._zooming=!0,this._centerOffset=a.subtract(this._startCenter),i._panAnim&&i._panAnim.stop(),n.DomEvent.on(e,"touchmove",this._onTouchMove,this).on(e,"touchend",this._onTouchEnd,this),n.DomEvent.preventDefault(t)}},_onTouchMove:function(t){if(t.touches&&2===t.touches.length){var e=this._map,i=e.mouseEventToLayerPoint(t.touches[0]),o=e.mouseEventToLayerPoint(t.touches[1]);this._scale=i.distanceTo(o)/this._startDist,this._delta=i._add(o)._divideBy(2)._subtract(this._startCenter),1!==this._scale&&(this._moved||(n.DomUtil.addClass(e._mapPane,"leaflet-zoom-anim leaflet-touching"),e.fire("movestart").fire("zoomstart")._prepareTileBg(),this._moved=!0),n.Util.cancelAnimFrame(this._animRequest),this._animRequest=n.Util.requestAnimFrame(this._updateOnMove,this,!0,this._map._container),n.DomEvent.preventDefault(t))}},_updateOnMove:function(){var t=this._map,e=this._getScaleOrigin(),i=t.layerPointToLatLng(e);t.fire("zoomanim",{center:i,zoom:t.getScaleZoom(this._scale)}),t._tileBg.style[n.DomUtil.TRANSFORM]=n.DomUtil.getTranslateString(this._delta)+" "+n.DomUtil.getScaleString(this._scale,this._startCenter)},_onTouchEnd:function(){if(this._moved&&this._zooming){var t=this._map;this._zooming=!1,n.DomUtil.removeClass(t._mapPane,"leaflet-touching"),n.DomEvent.off(e,"touchmove",this._onTouchMove).off(e,"touchend",this._onTouchEnd);var i=this._getScaleOrigin(),o=t.layerPointToLatLng(i),s=t.getZoom(),a=t.getScaleZoom(this._scale)-s,r=a>0?Math.ceil(a):Math.floor(a),h=t._limitZoom(s+r);t.fire("zoomanim",{center:o,zoom:h}),t._runAnimation(o,h,t.getZoomScale(h)/this._scale,i,!0)}},_getScaleOrigin:function(){var t=this._centerOffset.subtract(this._delta).divideBy(this._scale);return this._startCenter.add(t)}}),n.Map.addInitHook("addHandler","touchZoom",n.Map.TouchZoom),n.Map.mergeOptions({boxZoom:!0}),n.Map.BoxZoom=n.Handler.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane},addHooks:function(){n.DomEvent.on(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){n.DomEvent.off(this._container,"mousedown",this._onMouseDown)},_onMouseDown:function(t){return!t.shiftKey||1!==t.which&&1!==t.button?!1:(n.DomUtil.disableTextSelection(),this._startLayerPoint=this._map.mouseEventToLayerPoint(t),this._box=n.DomUtil.create("div","leaflet-zoom-box",this._pane),n.DomUtil.setPosition(this._box,this._startLayerPoint),this._container.style.cursor="crosshair",n.DomEvent.on(e,"mousemove",this._onMouseMove,this).on(e,"mouseup",this._onMouseUp,this).preventDefault(t),this._map.fire("boxzoomstart"),i)},_onMouseMove:function(t){var e=this._startLayerPoint,i=this._box,o=this._map.mouseEventToLayerPoint(t),s=o.subtract(e),a=new n.Point(Math.min(o.x,e.x),Math.min(o.y,e.y));n.DomUtil.setPosition(i,a),i.style.width=Math.max(0,Math.abs(s.x)-4)+"px",i.style.height=Math.max(0,Math.abs(s.y)-4)+"px"},_onMouseUp:function(t){this._pane.removeChild(this._box),this._container.style.cursor="",n.DomUtil.enableTextSelection(),n.DomEvent.off(e,"mousemove",this._onMouseMove).off(e,"mouseup",this._onMouseUp);var i=this._map,o=i.mouseEventToLayerPoint(t);if(!this._startLayerPoint.equals(o)){var s=new n.LatLngBounds(i.layerPointToLatLng(this._startLayerPoint),i.layerPointToLatLng(o));i.fitBounds(s),i.fire("boxzoomend",{boxZoomBounds:s})}}}),n.Map.addInitHook("addHandler","boxZoom",n.Map.BoxZoom),n.Map.mergeOptions({keyboard:!0,keyboardPanOffset:80,keyboardZoomOffset:1}),n.Map.Keyboard=n.Handler.extend({keyCodes:{left:[37],right:[39],down:[40],up:[38],zoomIn:[187,107,61],zoomOut:[189,109,173]},initialize:function(t){this._map=t,this._setPanOffset(t.options.keyboardPanOffset),this._setZoomOffset(t.options.keyboardZoomOffset)},addHooks:function(){var t=this._map._container;-1===t.tabIndex&&(t.tabIndex="0"),n.DomEvent.on(t,"focus",this._onFocus,this).on(t,"blur",this._onBlur,this).on(t,"mousedown",this._onMouseDown,this),this._map.on("focus",this._addHooks,this).on("blur",this._removeHooks,this)},removeHooks:function(){this._removeHooks();var t=this._map._container;n.DomEvent.off(t,"focus",this._onFocus,this).off(t,"blur",this._onBlur,this).off(t,"mousedown",this._onMouseDown,this),this._map.off("focus",this._addHooks,this).off("blur",this._removeHooks,this)},_onMouseDown:function(){this._focused||this._map._container.focus()},_onFocus:function(){this._focused=!0,this._map.fire("focus")},_onBlur:function(){this._focused=!1,this._map.fire("blur")},_setPanOffset:function(t){var e,i,n=this._panKeys={},o=this.keyCodes;for(e=0,i=o.left.length;i>e;e++)n[o.left[e]]=[-1*t,0];for(e=0,i=o.right.length;i>e;e++)n[o.right[e]]=[t,0];for(e=0,i=o.down.length;i>e;e++)n[o.down[e]]=[0,t];for(e=0,i=o.up.length;i>e;e++)n[o.up[e]]=[0,-1*t]},_setZoomOffset:function(t){var e,i,n=this._zoomKeys={},o=this.keyCodes;for(e=0,i=o.zoomIn.length;i>e;e++)n[o.zoomIn[e]]=t;for(e=0,i=o.zoomOut.length;i>e;e++)n[o.zoomOut[e]]=-t},_addHooks:function(){n.DomEvent.on(e,"keydown",this._onKeyDown,this)},_removeHooks:function(){n.DomEvent.off(e,"keydown",this._onKeyDown,this)},_onKeyDown:function(t){var e=t.keyCode,i=this._map;if(this._panKeys.hasOwnProperty(e))i.panBy(this._panKeys[e]),i.options.maxBounds&&i.panInsideBounds(i.options.maxBounds);else{if(!this._zoomKeys.hasOwnProperty(e))return;i.setZoom(i.getZoom()+this._zoomKeys[e])}n.DomEvent.stop(t)}}),n.Map.addInitHook("addHandler","keyboard",n.Map.Keyboard),n.Handler.MarkerDrag=n.Handler.extend({initialize:function(t){this._marker=t},addHooks:function(){var t=this._marker._icon;this._draggable||(this._draggable=new n.Draggable(t,t).on("dragstart",this._onDragStart,this).on("drag",this._onDrag,this).on("dragend",this._onDragEnd,this)),this._draggable.enable()},removeHooks:function(){this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){this._marker.closePopup().fire("movestart").fire("dragstart")},_onDrag:function(){var t=this._marker,e=t._shadow,i=n.DomUtil.getPosition(t._icon),o=t._map.layerPointToLatLng(i);e&&n.DomUtil.setPosition(e,i),t._latlng=o,t.fire("move",{latlng:o}).fire("drag")},_onDragEnd:function(){this._marker.fire("moveend").fire("dragend")}}),n.Handler.PolyEdit=n.Handler.extend({options:{icon:new n.DivIcon({iconSize:new n.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon"})},initialize:function(t,e){this._poly=t,n.setOptions(this,e)},addHooks:function(){this._poly._map&&(this._markerGroup||this._initMarkers(),this._poly._map.addLayer(this._markerGroup))},removeHooks:function(){this._poly._map&&(this._poly._map.removeLayer(this._markerGroup),delete this._markerGroup,delete this._markers)},updateMarkers:function(){this._markerGroup.clearLayers(),this._initMarkers()},_initMarkers:function(){this._markerGroup||(this._markerGroup=new n.LayerGroup),this._markers=[];var t,e,i,o,s=this._poly._latlngs;for(t=0,i=s.length;i>t;t++)o=this._createMarker(s[t],t),o.on("click",this._onMarkerClick,this),this._markers.push(o);var a,r;for(t=0,e=i-1;i>t;e=t++)(0!==t||n.Polygon&&this._poly instanceof n.Polygon)&&(a=this._markers[e],r=this._markers[t],this._createMiddleMarker(a,r),this._updatePrevNext(a,r))},_createMarker:function(t,e){var i=new n.Marker(t,{draggable:!0,icon:this.options.icon});return i._origLatLng=t,i._index=e,i.on("drag",this._onMarkerDrag,this),i.on("dragend",this._fireEdit,this),this._markerGroup.addLayer(i),i},_fireEdit:function(){this._poly.fire("edit")},_onMarkerDrag:function(t){var e=t.target;n.extend(e._origLatLng,e._latlng),e._middleLeft&&e._middleLeft.setLatLng(this._getMiddleLatLng(e._prev,e)),e._middleRight&&e._middleRight.setLatLng(this._getMiddleLatLng(e,e._next)),this._poly.redraw()},_onMarkerClick:function(t){if(!(3>this._poly._latlngs.length)){var e=t.target,i=e._index;this._markerGroup.removeLayer(e),this._markers.splice(i,1),this._poly.spliceLatLngs(i,1),this._updateIndexes(i,-1),this._updatePrevNext(e._prev,e._next),e._middleLeft&&this._markerGroup.removeLayer(e._middleLeft),e._middleRight&&this._markerGroup.removeLayer(e._middleRight),e._prev&&e._next?this._createMiddleMarker(e._prev,e._next):e._prev?e._next||(e._prev._middleRight=null):e._next._middleLeft=null,this._poly.fire("edit")}},_updateIndexes:function(t,e){this._markerGroup.eachLayer(function(i){i._index>t&&(i._index+=e)})},_createMiddleMarker:function(t,e){var i,n,o,s=this._getMiddleLatLng(t,e),a=this._createMarker(s);a.setOpacity(.6),t._middleRight=e._middleLeft=a,n=function(){var n=e._index;a._index=n,a.off("click",i).on("click",this._onMarkerClick,this),s.lat=a.getLatLng().lat,s.lng=a.getLatLng().lng,this._poly.spliceLatLngs(n,0,s),this._markers.splice(n,0,a),a.setOpacity(1),this._updateIndexes(n,1),e._index++,this._updatePrevNext(t,a),this._updatePrevNext(a,e)},o=function(){a.off("dragstart",n,this),a.off("dragend",o,this),this._createMiddleMarker(t,a),this._createMiddleMarker(a,e)},i=function(){n.call(this),o.call(this),this._poly.fire("edit")},a.on("click",i,this).on("dragstart",n,this).on("dragend",o,this),this._markerGroup.addLayer(a)},_updatePrevNext:function(t,e){t&&(t._next=e),e&&(e._prev=t)},_getMiddleLatLng:function(t,e){var i=this._poly._map,n=i.latLngToLayerPoint(t.getLatLng()),o=i.latLngToLayerPoint(e.getLatLng());return i.layerPointToLatLng(n._add(o)._divideBy(2))}}),n.Polyline.addInitHook(function(){n.Handler.PolyEdit&&(this.editing=new n.Handler.PolyEdit(this),this.options.editable&&this.editing.enable()),this.on("add",function(){this.editing&&this.editing.enabled()&&this.editing.addHooks()}),this.on("remove",function(){this.editing&&this.editing.enabled()&&this.editing.removeHooks()})}),n.Control=n.Class.extend({options:{position:"topright"},initialize:function(t){n.setOptions(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var e=this._map;return e&&e.removeControl(this),this.options.position=t,e&&e.addControl(this),this -},addTo:function(t){this._map=t;var e=this._container=this.onAdd(t),i=this.getPosition(),o=t._controlCorners[i];return n.DomUtil.addClass(e,"leaflet-control"),-1!==i.indexOf("bottom")?o.insertBefore(e,o.firstChild):o.appendChild(e),this},removeFrom:function(t){var e=this.getPosition(),i=t._controlCorners[e];return i.removeChild(this._container),this._map=null,this.onRemove&&this.onRemove(t),this}}),n.control=function(t){return new n.Control(t)},n.Map.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.removeFrom(this),this},_initControlPos:function(){function t(t,s){var a=i+t+" "+i+s;e[t+s]=n.DomUtil.create("div",a,o)}var e=this._controlCorners={},i="leaflet-",o=this._controlContainer=n.DomUtil.create("div",i+"control-container",this._container);t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")}}),n.Control.Zoom=n.Control.extend({options:{position:"topleft"},onAdd:function(t){var e="leaflet-control-zoom",i="leaflet-bar",o=i+"-part",s=n.DomUtil.create("div",e+" "+i);return this._map=t,this._zoomInButton=this._createButton("+","Zoom in",e+"-in "+o+" "+o+"-top",s,this._zoomIn,this),this._zoomOutButton=this._createButton("-","Zoom out",e+"-out "+o+" "+o+"-bottom",s,this._zoomOut,this),t.on("zoomend",this._updateDisabled,this),s},onRemove:function(t){t.off("zoomend",this._updateDisabled,this)},_zoomIn:function(t){this._map.zoomIn(t.shiftKey?3:1)},_zoomOut:function(t){this._map.zoomOut(t.shiftKey?3:1)},_createButton:function(t,e,i,o,s,a){var r=n.DomUtil.create("a",i,o);r.innerHTML=t,r.href="#",r.title=e;var h=n.DomEvent.stopPropagation;return n.DomEvent.on(r,"click",h).on(r,"mousedown",h).on(r,"dblclick",h).on(r,"click",n.DomEvent.preventDefault).on(r,"click",s,a),r},_updateDisabled:function(){var t=this._map,e="leaflet-control-zoom-disabled";n.DomUtil.removeClass(this._zoomInButton,e),n.DomUtil.removeClass(this._zoomOutButton,e),t._zoom===t.getMinZoom()&&n.DomUtil.addClass(this._zoomOutButton,e),t._zoom===t.getMaxZoom()&&n.DomUtil.addClass(this._zoomInButton,e)}}),n.Map.mergeOptions({zoomControl:!0}),n.Map.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new n.Control.Zoom,this.addControl(this.zoomControl))}),n.control.zoom=function(t){return new n.Control.Zoom(t)},n.Control.Attribution=n.Control.extend({options:{position:"bottomright",prefix:'Powered by Leaflet'},initialize:function(t){n.setOptions(this,t),this._attributions={}},onAdd:function(t){return this._container=n.DomUtil.create("div","leaflet-control-attribution"),n.DomEvent.disableClickPropagation(this._container),t.on("layeradd",this._onLayerAdd,this).on("layerremove",this._onLayerRemove,this),this._update(),this._container},onRemove:function(t){t.off("layeradd",this._onLayerAdd).off("layerremove",this._onLayerRemove)},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t?(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update(),this):i},removeAttribution:function(t){return t?(this._attributions[t]--,this._update(),this):i},_update:function(){if(this._map){var t=[];for(var e in this._attributions)this._attributions.hasOwnProperty(e)&&this._attributions[e]&&t.push(e);var i=[];this.options.prefix&&i.push(this.options.prefix),t.length&&i.push(t.join(", ")),this._container.innerHTML=i.join(" — ")}},_onLayerAdd:function(t){t.layer.getAttribution&&this.addAttribution(t.layer.getAttribution())},_onLayerRemove:function(t){t.layer.getAttribution&&this.removeAttribution(t.layer.getAttribution())}}),n.Map.mergeOptions({attributionControl:!0}),n.Map.addInitHook(function(){this.options.attributionControl&&(this.attributionControl=(new n.Control.Attribution).addTo(this))}),n.control.attribution=function(t){return new n.Control.Attribution(t)},n.Control.Scale=n.Control.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0,updateWhenIdle:!1},onAdd:function(t){this._map=t;var e="leaflet-control-scale",i=n.DomUtil.create("div",e),o=this.options;return this._addScales(o,e,i),t.on(o.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,e,i){t.metric&&(this._mScale=n.DomUtil.create("div",e+"-line",i)),t.imperial&&(this._iScale=n.DomUtil.create("div",e+"-line",i))},_update:function(){var t=this._map.getBounds(),e=t.getCenter().lat,i=6378137*Math.PI*Math.cos(e*Math.PI/180),n=i*(t.getNorthEast().lng-t.getSouthWest().lng)/180,o=this._map.getSize(),s=this.options,a=0;o.x>0&&(a=n*(s.maxWidth/o.x)),this._updateScales(s,a)},_updateScales:function(t,e){t.metric&&e&&this._updateMetric(e),t.imperial&&e&&this._updateImperial(e)},_updateMetric:function(t){var e=this._getRoundNum(t);this._mScale.style.width=this._getScaleWidth(e/t)+"px",this._mScale.innerHTML=1e3>e?e+" m":e/1e3+" km"},_updateImperial:function(t){var e,i,n,o=3.2808399*t,s=this._iScale;o>5280?(e=o/5280,i=this._getRoundNum(e),s.style.width=this._getScaleWidth(i/e)+"px",s.innerHTML=i+" mi"):(n=this._getRoundNum(o),s.style.width=this._getScaleWidth(n/o)+"px",s.innerHTML=n+" ft")},_getScaleWidth:function(t){return Math.round(this.options.maxWidth*t)-10},_getRoundNum:function(t){var e=Math.pow(10,(Math.floor(t)+"").length-1),i=t/e;return i=i>=10?10:i>=5?5:i>=3?3:i>=2?2:1,e*i}}),n.control.scale=function(t){return new n.Control.Scale(t)},n.Control.Layers=n.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0},initialize:function(t,e,i){n.setOptions(this,i),this._layers={},this._lastZIndex=0,this._handlingClick=!1;for(var o in t)t.hasOwnProperty(o)&&this._addLayer(t[o],o);for(o in e)e.hasOwnProperty(o)&&this._addLayer(e[o],o,!0)},onAdd:function(t){return this._initLayout(),this._update(),t.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},onRemove:function(t){t.off("layeradd",this._onLayerChange).off("layerremove",this._onLayerChange)},addBaseLayer:function(t,e){return this._addLayer(t,e),this._update(),this},addOverlay:function(t,e){return this._addLayer(t,e,!0),this._update(),this},removeLayer:function(t){var e=n.stamp(t);return delete this._layers[e],this._update(),this},_initLayout:function(){var t="leaflet-control-layers",e=this._container=n.DomUtil.create("div",t);n.Browser.touch?n.DomEvent.on(e,"click",n.DomEvent.stopPropagation):(n.DomEvent.disableClickPropagation(e),n.DomEvent.on(e,"mousewheel",n.DomEvent.stopPropagation));var i=this._form=n.DomUtil.create("form",t+"-list");if(this.options.collapsed){n.DomEvent.on(e,"mouseover",this._expand,this).on(e,"mouseout",this._collapse,this);var o=this._layersLink=n.DomUtil.create("a",t+"-toggle",e);o.href="#",o.title="Layers",n.Browser.touch?n.DomEvent.on(o,"click",n.DomEvent.stopPropagation).on(o,"click",n.DomEvent.preventDefault).on(o,"click",this._expand,this):n.DomEvent.on(o,"focus",this._expand,this),this._map.on("movestart",this._collapse,this)}else this._expand();this._baseLayersList=n.DomUtil.create("div",t+"-base",i),this._separator=n.DomUtil.create("div",t+"-separator",i),this._overlaysList=n.DomUtil.create("div",t+"-overlays",i),e.appendChild(i)},_addLayer:function(t,e,i){var o=n.stamp(t);this._layers[o]={layer:t,name:e,overlay:i},this.options.autoZIndex&&t.setZIndex&&(this._lastZIndex++,t.setZIndex(this._lastZIndex))},_update:function(){if(this._container){this._baseLayersList.innerHTML="",this._overlaysList.innerHTML="";var t=!1,e=!1;for(var i in this._layers)if(this._layers.hasOwnProperty(i)){var n=this._layers[i];this._addItem(n),e=e||n.overlay,t=t||!n.overlay}this._separator.style.display=e&&t?"":"none"}},_onLayerChange:function(t){var e=n.stamp(t.layer);this._layers[e]&&!this._handlingClick&&this._update()},_createRadioElement:function(t,i){var n='t;t++)e=o[t],i=this._layers[e.layerId],e.checked&&!this._map.hasLayer(i.layer)?(this._map.addLayer(i.layer),i.overlay||(n=i.layer)):!e.checked&&this._map.hasLayer(i.layer)&&this._map.removeLayer(i.layer);n&&(this._map.setZoom(this._map.getZoom()),this._map.fire("baselayerchange",{layer:n})),this._handlingClick=!1},_expand:function(){n.DomUtil.addClass(this._container,"leaflet-control-layers-expanded")},_collapse:function(){this._container.className=this._container.className.replace(" leaflet-control-layers-expanded","")}}),n.control.layers=function(t,e,i){return new n.Control.Layers(t,e,i)},n.PosAnimation=n.Class.extend({includes:n.Mixin.Events,run:function(t,e,i,o){this.stop(),this._el=t,this._inProgress=!0,this.fire("start"),t.style[n.DomUtil.TRANSITION]="all "+(i||.25)+"s cubic-bezier(0,0,"+(o||.5)+",1)",n.DomEvent.on(t,n.DomUtil.TRANSITION_END,this._onTransitionEnd,this),n.DomUtil.setPosition(t,e),n.Util.falseFn(t.offsetWidth),this._stepTimer=setInterval(n.bind(this.fire,this,"step"),50)},stop:function(){this._inProgress&&(n.DomUtil.setPosition(this._el,this._getPos()),this._onTransitionEnd(),n.Util.falseFn(this._el.offsetWidth))},_transformRe:/(-?[\d\.]+), (-?[\d\.]+)\)/,_getPos:function(){var e,i,o,s=this._el,a=t.getComputedStyle(s);return n.Browser.any3d?(o=a[n.DomUtil.TRANSFORM].match(this._transformRe),e=parseFloat(o[1]),i=parseFloat(o[2])):(e=parseFloat(a.left),i=parseFloat(a.top)),new n.Point(e,i,!0)},_onTransitionEnd:function(){n.DomEvent.off(this._el,n.DomUtil.TRANSITION_END,this._onTransitionEnd,this),this._inProgress&&(this._inProgress=!1,this._el.style[n.DomUtil.TRANSITION]="",clearInterval(this._stepTimer),this.fire("step").fire("end"))}}),n.Map.include({setView:function(t,e,i){e=this._limitZoom(e);var n=this._zoom!==e;if(this._loaded&&!i&&this._layers){this._panAnim&&this._panAnim.stop();var o=n?this._zoomToIfClose&&this._zoomToIfClose(t,e):this._panByIfClose(t);if(o)return clearTimeout(this._sizeTimer),this}return this._resetView(t,e),this},panBy:function(t,e,i){if(t=n.point(t),!t.x&&!t.y)return this;this._panAnim||(this._panAnim=new n.PosAnimation,this._panAnim.on({step:this._onPanTransitionStep,end:this._onPanTransitionEnd},this)),this.fire("movestart"),n.DomUtil.addClass(this._mapPane,"leaflet-pan-anim");var o=n.DomUtil.getPosition(this._mapPane).subtract(t)._round();return this._panAnim.run(this._mapPane,o,e||.25,i),this},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){n.DomUtil.removeClass(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_panByIfClose:function(t){var e=this._getCenterOffset(t)._floor();return this._offsetIsWithinView(e)?(this.panBy(e),!0):!1},_offsetIsWithinView:function(t,e){var i=e||1,n=this.getSize();return Math.abs(t.x)<=n.x*i&&Math.abs(t.y)<=n.y*i}}),n.PosAnimation=n.DomUtil.TRANSITION?n.PosAnimation:n.PosAnimation.extend({run:function(t,e,i,o){this.stop(),this._el=t,this._inProgress=!0,this._duration=i||.25,this._easeOutPower=1/Math.max(o||.5,.2),this._startPos=n.DomUtil.getPosition(t),this._offset=e.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(),this._complete())},_animate:function(){this._animId=n.Util.requestAnimFrame(this._animate,this),this._step()},_step:function(){var t=+new Date-this._startTime,e=1e3*this._duration;e>t?this._runFrame(this._easeOut(t/e)):(this._runFrame(1),this._complete())},_runFrame:function(t){var e=this._startPos.add(this._offset.multiplyBy(t));n.DomUtil.setPosition(this._el,e),this.fire("step")},_complete:function(){n.Util.cancelAnimFrame(this._animId),this._inProgress=!1,this.fire("end")},_easeOut:function(t){return 1-Math.pow(1-t,this._easeOutPower)}}),n.Map.mergeOptions({zoomAnimation:n.DomUtil.TRANSITION&&!n.Browser.android23&&!n.Browser.mobileOpera}),n.DomUtil.TRANSITION&&n.Map.addInitHook(function(){n.DomEvent.on(this._mapPane,n.DomUtil.TRANSITION_END,this._catchTransitionEnd,this)}),n.Map.include(n.DomUtil.TRANSITION?{_zoomToIfClose:function(t,e){if(this._animatingZoom)return!0;if(!this.options.zoomAnimation)return!1;var i=this.getZoomScale(e),o=this._getCenterOffset(t)._divideBy(1-1/i);if(!this._offsetIsWithinView(o,1))return!1;n.DomUtil.addClass(this._mapPane,"leaflet-zoom-anim"),this.fire("movestart").fire("zoomstart"),this.fire("zoomanim",{center:t,zoom:e});var s=this._getCenterLayerPoint().add(o);return this._prepareTileBg(),this._runAnimation(t,e,i,s),!0},_catchTransitionEnd:function(){this._animatingZoom&&this._onZoomTransitionEnd()},_runAnimation:function(t,e,i,o,s){this._animateToCenter=t,this._animateToZoom=e,this._animatingZoom=!0,n.Draggable&&(n.Draggable._disabled=!0);var a=n.DomUtil.TRANSFORM,r=this._tileBg;clearTimeout(this._clearTileBgTimer),n.Util.falseFn(r.offsetWidth);var h=n.DomUtil.getScaleString(i,o),l=r.style[a];r.style[a]=s?l+" "+h:h+" "+l},_prepareTileBg:function(){var t=this._tilePane,e=this._tileBg;if(e&&this._getLoadedTilesPercentage(e)>.5&&.5>this._getLoadedTilesPercentage(t))return t.style.visibility="hidden",t.empty=!0,this._stopLoadingImages(t),i;e||(e=this._tileBg=this._createPane("leaflet-tile-pane",this._mapPane),e.style.zIndex=1),e.style[n.DomUtil.TRANSFORM]="",e.style.visibility="hidden",e.empty=!0,t.empty=!1,this._tilePane=this._panes.tilePane=e;var o=this._tileBg=t;n.DomUtil.addClass(o,"leaflet-zoom-animated"),this._stopLoadingImages(o)},_getLoadedTilesPercentage:function(t){var e,i,n=t.getElementsByTagName("img"),o=0;for(e=0,i=n.length;i>e;e++)n[e].complete&&o++;return o/i},_stopLoadingImages:function(t){var e,i,o,s=Array.prototype.slice.call(t.getElementsByTagName("img"));for(e=0,i=s.length;i>e;e++)o=s[e],o.complete||(o.onload=n.Util.falseFn,o.onerror=n.Util.falseFn,o.src=n.Util.emptyImageUrl,o.parentNode.removeChild(o))},_onZoomTransitionEnd:function(){this._restoreTileFront(),n.DomUtil.removeClass(this._mapPane,"leaflet-zoom-anim"),n.Util.falseFn(this._tileBg.offsetWidth),this._animatingZoom=!1,this._resetView(this._animateToCenter,this._animateToZoom,!0,!0),n.Draggable&&(n.Draggable._disabled=!1)},_restoreTileFront:function(){this._tilePane.innerHTML="",this._tilePane.style.visibility="",this._tilePane.style.zIndex=2,this._tileBg.style.zIndex=1},_clearTileBg:function(){this._animatingZoom||this.touchZoom._zooming||(this._tileBg.innerHTML="")}}:{}),n.Map.include({_defaultLocateOptions:{watch:!1,setView:!1,maxZoom:1/0,timeout:1e4,maximumAge:0,enableHighAccuracy:!1},locate:function(t){if(t=this._locationOptions=n.extend(this._defaultLocateOptions,t),!navigator.geolocation)return this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this;var e=n.bind(this._handleGeolocationResponse,this),i=n.bind(this._handleGeolocationError,this);return t.watch?this._locationWatchId=navigator.geolocation.watchPosition(e,i,t):navigator.geolocation.getCurrentPosition(e,i,t),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch(this._locationWatchId),this},_handleGeolocationError:function(t){var e=t.code,i=t.message||(1===e?"permission denied":2===e?"position unavailable":"timeout");this._locationOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:e,message:"Geolocation error: "+i+"."})},_handleGeolocationResponse:function(t){var e=180*t.coords.accuracy/4e7,i=2*e,o=t.coords.latitude,s=t.coords.longitude,a=new n.LatLng(o,s),r=new n.LatLng(o-e,s-i),h=new n.LatLng(o+e,s+i),l=new n.LatLngBounds(r,h),u=this._locationOptions;if(u.setView){var c=Math.min(this.getBoundsZoom(l),u.maxZoom);this.setView(a,c)}this.fire("locationfound",{latlng:a,bounds:l,accuracy:t.coords.accuracy})}})})(this,document); \ No newline at end of file +},addTo:function(t){this._map=t;var e=this._container=this.onAdd(t),i=this.getPosition(),o=t._controlCorners[i];return n.DomUtil.addClass(e,"leaflet-control"),-1!==i.indexOf("bottom")?o.insertBefore(e,o.firstChild):o.appendChild(e),this},removeFrom:function(t){var e=this.getPosition(),i=t._controlCorners[e];return i.removeChild(this._container),this._map=null,this.onRemove&&this.onRemove(t),this}}),n.control=function(t){return new n.Control(t)},n.Map.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.removeFrom(this),this},_initControlPos:function(){function t(t,s){var a=i+t+" "+i+s;e[t+s]=n.DomUtil.create("div",a,o)}var e=this._controlCorners={},i="leaflet-",o=this._controlContainer=n.DomUtil.create("div",i+"control-container",this._container);t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")}}),n.Control.Zoom=n.Control.extend({options:{position:"topleft"},onAdd:function(t){var e="leaflet-control-zoom",i="leaflet-bar",o=i+"-part",s=n.DomUtil.create("div",e+" "+i);return this._map=t,this._zoomInButton=this._createButton("+","Zoom in",e+"-in "+o+" "+o+"-top",s,this._zoomIn,this),this._zoomOutButton=this._createButton("-","Zoom out",e+"-out "+o+" "+o+"-bottom",s,this._zoomOut,this),t.on("zoomend",this._updateDisabled,this),s},onRemove:function(t){t.off("zoomend",this._updateDisabled,this)},_zoomIn:function(t){this._map.zoomIn(t.shiftKey?3:1)},_zoomOut:function(t){this._map.zoomOut(t.shiftKey?3:1)},_createButton:function(t,e,i,o,s,a){var r=n.DomUtil.create("a",i,o);r.innerHTML=t,r.href="#",r.title=e;var h=n.DomEvent.stopPropagation;return n.DomEvent.on(r,"click",h).on(r,"mousedown",h).on(r,"dblclick",h).on(r,"click",n.DomEvent.preventDefault).on(r,"click",s,a),r},_updateDisabled:function(){var t=this._map,e="leaflet-control-zoom-disabled";n.DomUtil.removeClass(this._zoomInButton,e),n.DomUtil.removeClass(this._zoomOutButton,e),t._zoom===t.getMinZoom()&&n.DomUtil.addClass(this._zoomOutButton,e),t._zoom===t.getMaxZoom()&&n.DomUtil.addClass(this._zoomInButton,e)}}),n.Map.mergeOptions({zoomControl:!0}),n.Map.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new n.Control.Zoom,this.addControl(this.zoomControl))}),n.control.zoom=function(t){return new n.Control.Zoom(t)},n.Control.Attribution=n.Control.extend({options:{position:"bottomright",prefix:'Powered by Leaflet'},initialize:function(t){n.setOptions(this,t),this._attributions={}},onAdd:function(t){return this._container=n.DomUtil.create("div","leaflet-control-attribution"),n.DomEvent.disableClickPropagation(this._container),t.on("layeradd",this._onLayerAdd,this).on("layerremove",this._onLayerRemove,this),this._update(),this._container},onRemove:function(t){t.off("layeradd",this._onLayerAdd).off("layerremove",this._onLayerRemove)},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t?(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update(),this):i},removeAttribution:function(t){return t?(this._attributions[t]--,this._update(),this):i},_update:function(){if(this._map){var t=[];for(var e in this._attributions)this._attributions.hasOwnProperty(e)&&this._attributions[e]&&t.push(e);var i=[];this.options.prefix&&i.push(this.options.prefix),t.length&&i.push(t.join(", ")),this._container.innerHTML=i.join(" — ")}},_onLayerAdd:function(t){t.layer.getAttribution&&this.addAttribution(t.layer.getAttribution())},_onLayerRemove:function(t){t.layer.getAttribution&&this.removeAttribution(t.layer.getAttribution())}}),n.Map.mergeOptions({attributionControl:!0}),n.Map.addInitHook(function(){this.options.attributionControl&&(this.attributionControl=(new n.Control.Attribution).addTo(this))}),n.control.attribution=function(t){return new n.Control.Attribution(t)},n.Control.Scale=n.Control.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0,updateWhenIdle:!1},onAdd:function(t){this._map=t;var e="leaflet-control-scale",i=n.DomUtil.create("div",e),o=this.options;return this._addScales(o,e,i),t.on(o.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,e,i){t.metric&&(this._mScale=n.DomUtil.create("div",e+"-line",i)),t.imperial&&(this._iScale=n.DomUtil.create("div",e+"-line",i))},_update:function(){var t=this._map.getBounds(),e=t.getCenter().lat,i=6378137*Math.PI*Math.cos(e*Math.PI/180),n=i*(t.getNorthEast().lng-t.getSouthWest().lng)/180,o=this._map.getSize(),s=this.options,a=0;o.x>0&&(a=n*(s.maxWidth/o.x)),this._updateScales(s,a)},_updateScales:function(t,e){t.metric&&e&&this._updateMetric(e),t.imperial&&e&&this._updateImperial(e)},_updateMetric:function(t){var e=this._getRoundNum(t);this._mScale.style.width=this._getScaleWidth(e/t)+"px",this._mScale.innerHTML=1e3>e?e+" m":e/1e3+" km"},_updateImperial:function(t){var e,i,n,o=3.2808399*t,s=this._iScale;o>5280?(e=o/5280,i=this._getRoundNum(e),s.style.width=this._getScaleWidth(i/e)+"px",s.innerHTML=i+" mi"):(n=this._getRoundNum(o),s.style.width=this._getScaleWidth(n/o)+"px",s.innerHTML=n+" ft")},_getScaleWidth:function(t){return Math.round(this.options.maxWidth*t)-10},_getRoundNum:function(t){var e=Math.pow(10,(Math.floor(t)+"").length-1),i=t/e;return i=i>=10?10:i>=5?5:i>=3?3:i>=2?2:1,e*i}}),n.control.scale=function(t){return new n.Control.Scale(t)},n.Control.Layers=n.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0},initialize:function(t,e,i){n.setOptions(this,i),this._layers={},this._lastZIndex=0,this._handlingClick=!1;for(var o in t)t.hasOwnProperty(o)&&this._addLayer(t[o],o);for(o in e)e.hasOwnProperty(o)&&this._addLayer(e[o],o,!0)},onAdd:function(t){return this._initLayout(),this._update(),t.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},onRemove:function(t){t.off("layeradd",this._onLayerChange).off("layerremove",this._onLayerChange)},addBaseLayer:function(t,e){return this._addLayer(t,e),this._update(),this},addOverlay:function(t,e){return this._addLayer(t,e,!0),this._update(),this},removeLayer:function(t){var e=n.stamp(t);return delete this._layers[e],this._update(),this},_initLayout:function(){var t="leaflet-control-layers",e=this._container=n.DomUtil.create("div",t);n.Browser.touch?n.DomEvent.on(e,"click",n.DomEvent.stopPropagation):(n.DomEvent.disableClickPropagation(e),n.DomEvent.on(e,"mousewheel",n.DomEvent.stopPropagation));var i=this._form=n.DomUtil.create("form",t+"-list");if(this.options.collapsed){n.DomEvent.on(e,"mouseover",this._expand,this).on(e,"mouseout",this._collapse,this);var o=this._layersLink=n.DomUtil.create("a",t+"-toggle",e);o.href="#",o.title="Layers",n.Browser.touch?n.DomEvent.on(o,"click",n.DomEvent.stopPropagation).on(o,"click",n.DomEvent.preventDefault).on(o,"click",this._expand,this):n.DomEvent.on(o,"focus",this._expand,this),this._map.on("movestart",this._collapse,this)}else this._expand();this._baseLayersList=n.DomUtil.create("div",t+"-base",i),this._separator=n.DomUtil.create("div",t+"-separator",i),this._overlaysList=n.DomUtil.create("div",t+"-overlays",i),e.appendChild(i)},_addLayer:function(t,e,i){var o=n.stamp(t);this._layers[o]={layer:t,name:e,overlay:i},this.options.autoZIndex&&t.setZIndex&&(this._lastZIndex++,t.setZIndex(this._lastZIndex))},_update:function(){if(this._container){this._baseLayersList.innerHTML="",this._overlaysList.innerHTML="";var t=!1,e=!1;for(var i in this._layers)if(this._layers.hasOwnProperty(i)){var n=this._layers[i];this._addItem(n),e=e||n.overlay,t=t||!n.overlay}this._separator.style.display=e&&t?"":"none"}},_onLayerChange:function(t){var e=n.stamp(t.layer);this._layers[e]&&!this._handlingClick&&this._update()},_createRadioElement:function(t,i){var n='t;t++)e=o[t],i=this._layers[e.layerId],e.checked&&!this._map.hasLayer(i.layer)?(this._map.addLayer(i.layer),i.overlay||(n=i.layer)):!e.checked&&this._map.hasLayer(i.layer)&&this._map.removeLayer(i.layer);n&&(this._map.setZoom(this._map.getZoom()),this._map.fire("baselayerchange",{layer:n})),this._handlingClick=!1},_expand:function(){n.DomUtil.addClass(this._container,"leaflet-control-layers-expanded")},_collapse:function(){this._container.className=this._container.className.replace(" leaflet-control-layers-expanded","")}}),n.control.layers=function(t,e,i){return new n.Control.Layers(t,e,i)},n.PosAnimation=n.Class.extend({includes:n.Mixin.Events,run:function(t,e,i,o){this.stop(),this._el=t,this._inProgress=!0,this.fire("start"),t.style[n.DomUtil.TRANSITION]="all "+(i||.25)+"s cubic-bezier(0,0,"+(o||.5)+",1)",n.DomEvent.on(t,n.DomUtil.TRANSITION_END,this._onTransitionEnd,this),n.DomUtil.setPosition(t,e),n.Util.falseFn(t.offsetWidth),this._stepTimer=setInterval(n.bind(this.fire,this,"step"),50)},stop:function(){this._inProgress&&(n.DomUtil.setPosition(this._el,this._getPos()),this._onTransitionEnd(),n.Util.falseFn(this._el.offsetWidth))},_transformRe:/(-?[\d\.]+), (-?[\d\.]+)\)/,_getPos:function(){var e,i,o,s=this._el,a=t.getComputedStyle(s);return n.Browser.any3d?(o=a[n.DomUtil.TRANSFORM].match(this._transformRe),e=parseFloat(o[1]),i=parseFloat(o[2])):(e=parseFloat(a.left),i=parseFloat(a.top)),new n.Point(e,i,!0)},_onTransitionEnd:function(){n.DomEvent.off(this._el,n.DomUtil.TRANSITION_END,this._onTransitionEnd,this),this._inProgress&&(this._inProgress=!1,this._el.style[n.DomUtil.TRANSITION]="",clearInterval(this._stepTimer),this.fire("step").fire("end"))}}),n.Map.include({setView:function(t,e,i){e=this._limitZoom(e);var n=this._zoom!==e;if(this._loaded&&!i&&this._layers){this._panAnim&&this._panAnim.stop();var o=n?this._zoomToIfClose&&this._zoomToIfClose(t,e):this._panByIfClose(t);if(o)return clearTimeout(this._sizeTimer),this}return this._resetView(t,e),this},panBy:function(t,e,i){if(t=n.point(t),!t.x&&!t.y)return this;this._panAnim||(this._panAnim=new n.PosAnimation,this._panAnim.on({step:this._onPanTransitionStep,end:this._onPanTransitionEnd},this)),this.fire("movestart"),n.DomUtil.addClass(this._mapPane,"leaflet-pan-anim");var o=n.DomUtil.getPosition(this._mapPane).subtract(t)._round();return this._panAnim.run(this._mapPane,o,e||.25,i),this},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){n.DomUtil.removeClass(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_panByIfClose:function(t){var e=this._getCenterOffset(t)._floor();return this._offsetIsWithinView(e)?(this.panBy(e),!0):!1},_offsetIsWithinView:function(t,e){var i=e||1,n=this.getSize();return Math.abs(t.x)<=n.x*i&&Math.abs(t.y)<=n.y*i}}),n.PosAnimation=n.DomUtil.TRANSITION?n.PosAnimation:n.PosAnimation.extend({run:function(t,e,i,o){this.stop(),this._el=t,this._inProgress=!0,this._duration=i||.25,this._easeOutPower=1/Math.max(o||.5,.2),this._startPos=n.DomUtil.getPosition(t),this._offset=e.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(),this._complete())},_animate:function(){this._animId=n.Util.requestAnimFrame(this._animate,this),this._step()},_step:function(){var t=+new Date-this._startTime,e=1e3*this._duration;e>t?this._runFrame(this._easeOut(t/e)):(this._runFrame(1),this._complete())},_runFrame:function(t){var e=this._startPos.add(this._offset.multiplyBy(t));n.DomUtil.setPosition(this._el,e),this.fire("step")},_complete:function(){n.Util.cancelAnimFrame(this._animId),this._inProgress=!1,this.fire("end")},_easeOut:function(t){return 1-Math.pow(1-t,this._easeOutPower)}}),n.Map.mergeOptions({zoomAnimation:n.DomUtil.TRANSITION&&!n.Browser.android23&&!n.Browser.mobileOpera}),n.DomUtil.TRANSITION&&n.Map.addInitHook(function(){n.DomEvent.on(this._mapPane,n.DomUtil.TRANSITION_END,this._catchTransitionEnd,this)}),n.Map.include(n.DomUtil.TRANSITION?{_zoomToIfClose:function(t,e){if(this._animatingZoom)return!0;if(!this.options.zoomAnimation)return!1;var i=this.getZoomScale(e),o=this._getCenterOffset(t)._divideBy(1-1/i);if(!this._offsetIsWithinView(o,1))return!1;n.DomUtil.addClass(this._mapPane,"leaflet-zoom-anim"),this.fire("movestart").fire("zoomstart"),this.fire("zoomanim",{center:t,zoom:e});var s=this._getCenterLayerPoint().add(o);return this._prepareTileBg(),this._runAnimation(t,e,i,s),!0},_catchTransitionEnd:function(){this._animatingZoom&&this._onZoomTransitionEnd()},_runAnimation:function(t,e,i,o,s){this._animateToCenter=t,this._animateToZoom=e,this._animatingZoom=!0,n.Draggable&&(n.Draggable._disabled=!0);var a=n.DomUtil.TRANSFORM,r=this._tileBg;clearTimeout(this._clearTileBgTimer),n.Util.falseFn(r.offsetWidth);var h=n.DomUtil.getScaleString(i,o),l=r.style[a];r.style[a]=s?l+" "+h:h+" "+l},_prepareTileBg:function(){var t=this._tilePane,e=this._tileBg;if(e&&this._getLoadedTilesPercentage(e)>.5&&.5>this._getLoadedTilesPercentage(t))return t.style.visibility="hidden",t.empty=!0,this._stopLoadingImages(t),i;e||(e=this._tileBg=this._createPane("leaflet-tile-pane",this._mapPane),e.style.zIndex=1),e.style[n.DomUtil.TRANSFORM]="",e.style.visibility="hidden",e.empty=!0,t.empty=!1,this._tilePane=this._panes.tilePane=e;var o=this._tileBg=t;n.DomUtil.addClass(o,"leaflet-zoom-animated"),this._stopLoadingImages(o)},_getLoadedTilesPercentage:function(t){var e,i,n=t.getElementsByTagName("img"),o=0;for(e=0,i=n.length;i>e;e++)n[e].complete&&o++;return o/i},_stopLoadingImages:function(t){var e,i,o,s=Array.prototype.slice.call(t.getElementsByTagName("img"));for(e=0,i=s.length;i>e;e++)o=s[e],o.complete||(o.onload=n.Util.falseFn,o.onerror=n.Util.falseFn,o.src=n.Util.emptyImageUrl,o.parentNode.removeChild(o))},_onZoomTransitionEnd:function(){this._restoreTileFront(),n.DomUtil.removeClass(this._mapPane,"leaflet-zoom-anim"),n.Util.falseFn(this._tileBg.offsetWidth),this._animatingZoom=!1,this._resetView(this._animateToCenter,this._animateToZoom,!0,!0),n.Draggable&&(n.Draggable._disabled=!1)},_restoreTileFront:function(){this._tilePane.innerHTML="",this._tilePane.style.visibility="",this._tilePane.style.zIndex=2,this._tileBg.style.zIndex=1},_clearTileBg:function(){this._animatingZoom||this.touchZoom._zooming||(this._tileBg.innerHTML="")}}:{}),n.Map.include({_defaultLocateOptions:{watch:!1,setView:!1,maxZoom:1/0,timeout:1e4,maximumAge:0,enableHighAccuracy:!1},locate:function(t){if(t=this._locationOptions=n.extend(this._defaultLocateOptions,t),!navigator.geolocation)return this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this;var e=n.bind(this._handleGeolocationResponse,this),i=n.bind(this._handleGeolocationError,this);return t.watch?this._locationWatchId=navigator.geolocation.watchPosition(e,i,t):navigator.geolocation.getCurrentPosition(e,i,t),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch(this._locationWatchId),this},_handleGeolocationError:function(t){var e=t.code,i=t.message||(1===e?"permission denied":2===e?"position unavailable":"timeout");this._locationOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:e,message:"Geolocation error: "+i+"."})},_handleGeolocationResponse:function(t){var e=180*t.coords.accuracy/4e7,i=2*e,o=t.coords.latitude,s=t.coords.longitude,a=new n.LatLng(o,s),r=new n.LatLng(o-e,s-i),h=new n.LatLng(o+e,s+i),l=new n.LatLngBounds(r,h),u=this._locationOptions;if(u.setView){var c=Math.min(this.getBoundsZoom(l),u.maxZoom);this.setView(a,c)}this.fire("locationfound",{latlng:a,bounds:l,accuracy:t.coords.accuracy})}})})(this,document); diff --git a/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js b/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js index b5e37834..91fe2e7e 100644 --- a/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js +++ b/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ //This class is responsible for the product-specific form processing/content selection that might be possible //Overrides the usual behavior of selecting the specific JavaScript class needed to convert the form inputs @@ -38,4 +38,4 @@ var processDataGetterUtils = { } return contentType; } -}; \ No newline at end of file +}; diff --git a/webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js b/webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js index bc502bb4..463af726 100644 --- a/webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js +++ b/webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var processInternalClassDataGetterContent = { dataGetterClass:null, @@ -80,4 +80,4 @@ var processInternalClassDataGetterContent = { return processClassGroupDataGetterContent.validateFormSubmission(pageContentSection, pageContentSectionLabel); } -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js b/webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js index 0ca311b8..1aac31bc 100644 --- a/webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js +++ b/webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStringsCoPi); var collaboratorTableMetadata = { @@ -96,4 +96,4 @@ function renderStatsOnNodeClicked(json){ $("#lastGrant").empty().append(latest_work); (latest_work)?$("#lGrant").attr("style","visibility:visible"):$("#lGrant").attr("style","visibility:hidden"); -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js b/webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js index e1f3d55c..eec6ae67 100644 --- a/webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js +++ b/webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ // Flash Player Version Detection - Rev 1.6 // Detect Client Browser type diff --git a/webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js b/webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js index 574f25d0..34886448 100644 --- a/webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js +++ b/webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStringsCoauthorship); var collaboratorTableMetadata = { @@ -92,4 +92,4 @@ function renderStatsOnNodeClicked(json){ $("#lastPublication").empty().append(latest_work); (latest_work)?$("#lPub").attr("style","visibility:visible"):$("#lPub").attr("style","visibility:hidden"); -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/dataTables.helper.js b/webapp/src/main/webapp/js/visualization/dataTables.helper.js index 47a538cd..668cda19 100644 --- a/webapp/src/main/webapp/js/visualization/dataTables.helper.js +++ b/webapp/src/main/webapp/js/visualization/dataTables.helper.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStrings); var disciplineOrSubdisciplineDataTableFilter = function(oSettings, aData, iDataIndex, rawData) { @@ -177,4 +177,4 @@ $.fn.dataTableExt.oPagination.gmail_style = { $("." + GMAIL_STYLE_PAGINATION_CONTAINER_CLASS).show(); } } - }; \ No newline at end of file + }; diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/constants.js b/webapp/src/main/webapp/js/visualization/entitycomparison/constants.js index f35f5743..ee5071c1 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/constants.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/constants.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ //Hard coded color constants var TURQUOISE = "#8DD3C7"; @@ -109,4 +109,4 @@ function initConstants() { } }; FlotOptions.colors = colorConstantQueue; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js b/webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js index bf5c727f..e49b3c82 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $(document).ready(function() { diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css index 51d1fec7..5cf068b2 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css @@ -110,4 +110,4 @@ tr.odd { tr.even { background-color: white; } -*/ \ No newline at end of file +*/ diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.min.js index 12c74f7b..988f934a 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.min.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.min.js @@ -1 +1 @@ -if(!document.createElement("canvas").getContext){(function(){var z=Math;var K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var F=D/2;function T(){return this.context_||(this.context_=new W(this))}var O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return String(Z).replace(/&/g,"&").replace(/"/g,""")}function r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML")}if(!i.namespaces.g_o_){i.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML")}if(!i.styleSheets.ex_canvas_){var Z=i.createStyleSheet();Z.owningElement.id="ex_canvas_";Z.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}r(document);var E={init:function(Z){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var i=Z||document;i.createElement("canvas");i.attachEvent("onreadystatechange",G(this.init_,this,i))}},init_:function(m){var j=m.getElementsByTagName("canvas");for(var Z=0;Z1){j--}if(6*j<1){return i+(Z-i)*6*j}else{if(2*j<1){return Z}else{if(3*j<2){return i+(Z-i)*(2/3-j)*6}else{return i}}}}function Y(Z){var AE,p=1;Z=String(Z);if(Z.charAt(0)=="#"){AE=Z}else{if(/^rgb/.test(Z)){var m=g(Z);var AE="#",AF;for(var j=0;j<3;j++){if(m[j].indexOf("%")!=-1){AF=Math.floor(C(m[j])*255)}else{AF=Number(m[j])}AE+=I[N(AF,0,255)]}p=m[3]}else{if(/^hsl/.test(Z)){var m=g(Z);AE=c(m);p=m[3]}else{AE=B[Z]||Z}}}return{color:AE,alpha:p}}var L={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var f={};function X(Z){if(f[Z]){return f[Z]}var m=document.createElement("div");var j=m.style;try{j.font=Z}catch(i){}return f[Z]={style:j.fontStyle||L.style,variant:j.fontVariant||L.variant,weight:j.fontWeight||L.weight,size:j.fontSize||L.size,family:j.fontFamily||L.family}}function P(j,i){var Z={};for(var AF in j){Z[AF]=j[AF]}var AE=parseFloat(i.currentStyle.fontSize),m=parseFloat(j.size);if(typeof j.size=="number"){Z.size=j.size}else{if(j.size.indexOf("px")!=-1){Z.size=m}else{if(j.size.indexOf("em")!=-1){Z.size=AE*m}else{if(j.size.indexOf("%")!=-1){Z.size=(AE/100)*m}else{if(j.size.indexOf("pt")!=-1){Z.size=m/0.75}else{Z.size=AE}}}}}Z.size*=0.981;return Z}function AA(Z){return Z.style+" "+Z.variant+" "+Z.weight+" "+Z.size+"px "+Z.family}function t(Z){switch(Z){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function W(i){this.m_=V();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=D*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var Z=i.ownerDocument.createElement("div");Z.style.width=i.clientWidth+"px";Z.style.height=i.clientHeight+"px";Z.style.overflow="hidden";Z.style.position="absolute";i.appendChild(Z);this.element_=Z;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var M=W.prototype;M.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};M.beginPath=function(){this.currentPath_=[]};M.moveTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"moveTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.lineTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"lineTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.bezierCurveTo=function(j,i,AI,AH,AG,AE){var Z=this.getCoords_(AG,AE);var AF=this.getCoords_(j,i);var m=this.getCoords_(AI,AH);e(this,AF,m,Z)};function e(Z,m,j,i){Z.currentPath_.push({type:"bezierCurveTo",cp1x:m.x,cp1y:m.y,cp2x:j.x,cp2y:j.y,x:i.x,y:i.y});Z.currentX_=i.x;Z.currentY_=i.y}M.quadraticCurveTo=function(AG,j,i,Z){var AF=this.getCoords_(AG,j);var AE=this.getCoords_(i,Z);var AH={x:this.currentX_+2/3*(AF.x-this.currentX_),y:this.currentY_+2/3*(AF.y-this.currentY_)};var m={x:AH.x+(AE.x-this.currentX_)/3,y:AH.y+(AE.y-this.currentY_)/3};e(this,AH,m,AE)};M.arc=function(AJ,AH,AI,AE,i,j){AI*=D;var AN=j?"at":"wa";var AK=AJ+U(AE)*AI-F;var AM=AH+J(AE)*AI-F;var Z=AJ+U(i)*AI-F;var AL=AH+J(i)*AI-F;if(AK==Z&&!j){AK+=0.125}var m=this.getCoords_(AJ,AH);var AG=this.getCoords_(AK,AM);var AF=this.getCoords_(Z,AL);this.currentPath_.push({type:AN,x:m.x,y:m.y,radius:AI,xStart:AG.x,yStart:AG.y,xEnd:AF.x,yEnd:AF.y})};M.rect=function(j,i,Z,m){this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath()};M.strokeRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.stroke();this.currentPath_=p};M.fillRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.fill();this.currentPath_=p};M.createLinearGradient=function(i,m,Z,j){var p=new v("gradient");p.x0_=i;p.y0_=m;p.x1_=Z;p.y1_=j;return p};M.createRadialGradient=function(m,AE,j,i,p,Z){var AF=new v("gradientradial");AF.x0_=m;AF.y0_=AE;AF.r0_=j;AF.x1_=i;AF.y1_=p;AF.r1_=Z;return AF};M.drawImage=function(AO,j){var AH,AF,AJ,AV,AM,AK,AQ,AX;var AI=AO.runtimeStyle.width;var AN=AO.runtimeStyle.height;AO.runtimeStyle.width="auto";AO.runtimeStyle.height="auto";var AG=AO.width;var AT=AO.height;AO.runtimeStyle.width=AI;AO.runtimeStyle.height=AN;if(arguments.length==3){AH=arguments[1];AF=arguments[2];AM=AK=0;AQ=AJ=AG;AX=AV=AT}else{if(arguments.length==5){AH=arguments[1];AF=arguments[2];AJ=arguments[3];AV=arguments[4];AM=AK=0;AQ=AG;AX=AT}else{if(arguments.length==9){AM=arguments[1];AK=arguments[2];AQ=arguments[3];AX=arguments[4];AH=arguments[5];AF=arguments[6];AJ=arguments[7];AV=arguments[8]}else{throw Error("Invalid number of arguments")}}}var AW=this.getCoords_(AH,AF);var m=AQ/2;var i=AX/2;var AU=[];var Z=10;var AE=10;AU.push(" ','","");this.element_.insertAdjacentHTML("BeforeEnd",AU.join(""))};M.stroke=function(AM){var m=10;var AN=10;var AE=5000;var AG={x:null,y:null};var AL={x:null,y:null};for(var AH=0;AHAL.x){AL.x=Z.x}if(AG.y==null||Z.yAL.y){AL.y=Z.y}}}AK.push(' ">');if(!AM){R(this,AK)}else{a(this,AK,AG,AL)}AK.push("");this.element_.insertAdjacentHTML("beforeEnd",AK.join(""))}};function R(j,AE){var i=Y(j.strokeStyle);var m=i.color;var p=i.alpha*j.globalAlpha;var Z=j.lineScale_*j.lineWidth;if(Z<1){p*=Z}AE.push("')}function a(AO,AG,Ah,AP){var AH=AO.fillStyle;var AY=AO.arcScaleX_;var AX=AO.arcScaleY_;var Z=AP.x-Ah.x;var m=AP.y-Ah.y;if(AH instanceof v){var AL=0;var Ac={x:0,y:0};var AU=0;var AK=1;if(AH.type_=="gradient"){var AJ=AH.x0_/AY;var j=AH.y0_/AX;var AI=AH.x1_/AY;var Aj=AH.y1_/AX;var Ag=AO.getCoords_(AJ,j);var Af=AO.getCoords_(AI,Aj);var AE=Af.x-Ag.x;var p=Af.y-Ag.y;AL=Math.atan2(AE,p)*180/Math.PI;if(AL<0){AL+=360}if(AL<0.000001){AL=0}}else{var Ag=AO.getCoords_(AH.x0_,AH.y0_);Ac={x:(Ag.x-Ah.x)/Z,y:(Ag.y-Ah.y)/m};Z/=AY*D;m/=AX*D;var Aa=z.max(Z,m);AU=2*AH.r0_/Aa;AK=2*AH.r1_/Aa-AU}var AS=AH.colors_;AS.sort(function(Ak,i){return Ak.offset-i.offset});var AN=AS.length;var AR=AS[0].color;var AQ=AS[AN-1].color;var AW=AS[0].alpha*AO.globalAlpha;var AV=AS[AN-1].alpha*AO.globalAlpha;var Ab=[];for(var Ae=0;Ae')}else{if(AH instanceof u){if(Z&&m){var AF=-Ah.x;var AZ=-Ah.y;AG.push("')}}else{var Ai=Y(AO.fillStyle);var AT=Ai.color;var Ad=Ai.alpha*AO.globalAlpha;AG.push('')}}}M.fill=function(){this.stroke(true)};M.closePath=function(){this.currentPath_.push({type:"close"})};M.getCoords_=function(j,i){var Z=this.m_;return{x:D*(j*Z[0][0]+i*Z[1][0]+Z[2][0])-F,y:D*(j*Z[0][1]+i*Z[1][1]+Z[2][1])-F}};M.save=function(){var Z={};Q(this,Z);this.aStack_.push(Z);this.mStack_.push(this.m_);this.m_=d(V(),this.m_)};M.restore=function(){if(this.aStack_.length){Q(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function H(Z){return isFinite(Z[0][0])&&isFinite(Z[0][1])&&isFinite(Z[1][0])&&isFinite(Z[1][1])&&isFinite(Z[2][0])&&isFinite(Z[2][1])}function y(i,Z,j){if(!H(Z)){return }i.m_=Z;if(j){var p=Z[0][0]*Z[1][1]-Z[0][1]*Z[1][0];i.lineScale_=k(b(p))}}M.translate=function(j,i){var Z=[[1,0,0],[0,1,0],[j,i,1]];y(this,d(Z,this.m_),false)};M.rotate=function(i){var m=U(i);var j=J(i);var Z=[[m,j,0],[-j,m,0],[0,0,1]];y(this,d(Z,this.m_),false)};M.scale=function(j,i){this.arcScaleX_*=j;this.arcScaleY_*=i;var Z=[[j,0,0],[0,i,0],[0,0,1]];y(this,d(Z,this.m_),true)};M.transform=function(p,m,AF,AE,i,Z){var j=[[p,m,0],[AF,AE,0],[i,Z,1]];y(this,d(j,this.m_),true)};M.setTransform=function(AE,p,AG,AF,j,i){var Z=[[AE,p,0],[AG,AF,0],[j,i,1]];y(this,Z,true)};M.drawText_=function(AK,AI,AH,AN,AG){var AM=this.m_,AQ=1000,i=0,AP=AQ,AF={x:0,y:0},AE=[];var Z=P(X(this.font),this.element_);var j=AA(Z);var AR=this.element_.currentStyle;var p=this.textAlign.toLowerCase();switch(p){case"left":case"center":case"right":break;case"end":p=AR.direction=="ltr"?"right":"left";break;case"start":p=AR.direction=="rtl"?"right":"left";break;default:p="left"}switch(this.textBaseline){case"hanging":case"top":AF.y=Z.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":AF.y=-Z.size/2.25;break}switch(p){case"right":i=AQ;AP=0.05;break;case"center":i=AP=AQ/2;break}var AO=this.getCoords_(AI+AF.x,AH+AF.y);AE.push('');if(AG){R(this,AE)}else{a(this,AE,{x:-i,y:0},{x:AP,y:Z.size})}var AL=AM[0][0].toFixed(3)+","+AM[1][0].toFixed(3)+","+AM[0][1].toFixed(3)+","+AM[1][1].toFixed(3)+",0,0";var AJ=K(AO.x/D)+","+K(AO.y/D);AE.push('','','');this.element_.insertAdjacentHTML("beforeEnd",AE.join(""))};M.fillText=function(j,Z,m,i){this.drawText_(j,Z,m,i,false)};M.strokeText=function(j,Z,m,i){this.drawText_(j,Z,m,i,true)};M.measureText=function(j){if(!this.textMeasureEl_){var Z='';this.element_.insertAdjacentHTML("beforeEnd",Z);this.textMeasureEl_=this.element_.lastChild}var i=this.element_.ownerDocument;this.textMeasureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(i.createTextNode(j));return{width:this.textMeasureEl_.offsetWidth}};M.clip=function(){};M.arcTo=function(){};M.createPattern=function(i,Z){return new u(i,Z)};function v(Z){this.type_=Z;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}v.prototype.addColorStop=function(i,Z){Z=Y(Z);this.colors_.push({offset:i,color:Z.color,alpha:Z.alpha})};function u(i,Z){q(i);switch(Z){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=Z;break;default:n("SYNTAX_ERR")}this.src_=i.src;this.width_=i.width;this.height_=i.height}function n(Z){throw new o(Z)}function q(Z){if(!Z||Z.nodeType!=1||Z.tagName!="IMG"){n("TYPE_MISMATCH_ERR")}if(Z.readyState!="complete"){n("INVALID_STATE_ERR")}}function o(Z){this.code=this[Z];this.message=Z+": DOM Exception "+this.code}var x=o.prototype=new Error;x.INDEX_SIZE_ERR=1;x.DOMSTRING_SIZE_ERR=2;x.HIERARCHY_REQUEST_ERR=3;x.WRONG_DOCUMENT_ERR=4;x.INVALID_CHARACTER_ERR=5;x.NO_DATA_ALLOWED_ERR=6;x.NO_MODIFICATION_ALLOWED_ERR=7;x.NOT_FOUND_ERR=8;x.NOT_SUPPORTED_ERR=9;x.INUSE_ATTRIBUTE_ERR=10;x.INVALID_STATE_ERR=11;x.SYNTAX_ERR=12;x.INVALID_MODIFICATION_ERR=13;x.NAMESPACE_ERR=14;x.INVALID_ACCESS_ERR=15;x.VALIDATION_ERR=16;x.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=E;CanvasRenderingContext2D=W;CanvasGradient=v;CanvasPattern=u;DOMException=o})()}; \ No newline at end of file +if(!document.createElement("canvas").getContext){(function(){var z=Math;var K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var F=D/2;function T(){return this.context_||(this.context_=new W(this))}var O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return String(Z).replace(/&/g,"&").replace(/"/g,""")}function r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML")}if(!i.namespaces.g_o_){i.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML")}if(!i.styleSheets.ex_canvas_){var Z=i.createStyleSheet();Z.owningElement.id="ex_canvas_";Z.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}r(document);var E={init:function(Z){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var i=Z||document;i.createElement("canvas");i.attachEvent("onreadystatechange",G(this.init_,this,i))}},init_:function(m){var j=m.getElementsByTagName("canvas");for(var Z=0;Z1){j--}if(6*j<1){return i+(Z-i)*6*j}else{if(2*j<1){return Z}else{if(3*j<2){return i+(Z-i)*(2/3-j)*6}else{return i}}}}function Y(Z){var AE,p=1;Z=String(Z);if(Z.charAt(0)=="#"){AE=Z}else{if(/^rgb/.test(Z)){var m=g(Z);var AE="#",AF;for(var j=0;j<3;j++){if(m[j].indexOf("%")!=-1){AF=Math.floor(C(m[j])*255)}else{AF=Number(m[j])}AE+=I[N(AF,0,255)]}p=m[3]}else{if(/^hsl/.test(Z)){var m=g(Z);AE=c(m);p=m[3]}else{AE=B[Z]||Z}}}return{color:AE,alpha:p}}var L={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var f={};function X(Z){if(f[Z]){return f[Z]}var m=document.createElement("div");var j=m.style;try{j.font=Z}catch(i){}return f[Z]={style:j.fontStyle||L.style,variant:j.fontVariant||L.variant,weight:j.fontWeight||L.weight,size:j.fontSize||L.size,family:j.fontFamily||L.family}}function P(j,i){var Z={};for(var AF in j){Z[AF]=j[AF]}var AE=parseFloat(i.currentStyle.fontSize),m=parseFloat(j.size);if(typeof j.size=="number"){Z.size=j.size}else{if(j.size.indexOf("px")!=-1){Z.size=m}else{if(j.size.indexOf("em")!=-1){Z.size=AE*m}else{if(j.size.indexOf("%")!=-1){Z.size=(AE/100)*m}else{if(j.size.indexOf("pt")!=-1){Z.size=m/0.75}else{Z.size=AE}}}}}Z.size*=0.981;return Z}function AA(Z){return Z.style+" "+Z.variant+" "+Z.weight+" "+Z.size+"px "+Z.family}function t(Z){switch(Z){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function W(i){this.m_=V();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=D*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var Z=i.ownerDocument.createElement("div");Z.style.width=i.clientWidth+"px";Z.style.height=i.clientHeight+"px";Z.style.overflow="hidden";Z.style.position="absolute";i.appendChild(Z);this.element_=Z;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var M=W.prototype;M.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};M.beginPath=function(){this.currentPath_=[]};M.moveTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"moveTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.lineTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"lineTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.bezierCurveTo=function(j,i,AI,AH,AG,AE){var Z=this.getCoords_(AG,AE);var AF=this.getCoords_(j,i);var m=this.getCoords_(AI,AH);e(this,AF,m,Z)};function e(Z,m,j,i){Z.currentPath_.push({type:"bezierCurveTo",cp1x:m.x,cp1y:m.y,cp2x:j.x,cp2y:j.y,x:i.x,y:i.y});Z.currentX_=i.x;Z.currentY_=i.y}M.quadraticCurveTo=function(AG,j,i,Z){var AF=this.getCoords_(AG,j);var AE=this.getCoords_(i,Z);var AH={x:this.currentX_+2/3*(AF.x-this.currentX_),y:this.currentY_+2/3*(AF.y-this.currentY_)};var m={x:AH.x+(AE.x-this.currentX_)/3,y:AH.y+(AE.y-this.currentY_)/3};e(this,AH,m,AE)};M.arc=function(AJ,AH,AI,AE,i,j){AI*=D;var AN=j?"at":"wa";var AK=AJ+U(AE)*AI-F;var AM=AH+J(AE)*AI-F;var Z=AJ+U(i)*AI-F;var AL=AH+J(i)*AI-F;if(AK==Z&&!j){AK+=0.125}var m=this.getCoords_(AJ,AH);var AG=this.getCoords_(AK,AM);var AF=this.getCoords_(Z,AL);this.currentPath_.push({type:AN,x:m.x,y:m.y,radius:AI,xStart:AG.x,yStart:AG.y,xEnd:AF.x,yEnd:AF.y})};M.rect=function(j,i,Z,m){this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath()};M.strokeRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.stroke();this.currentPath_=p};M.fillRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.fill();this.currentPath_=p};M.createLinearGradient=function(i,m,Z,j){var p=new v("gradient");p.x0_=i;p.y0_=m;p.x1_=Z;p.y1_=j;return p};M.createRadialGradient=function(m,AE,j,i,p,Z){var AF=new v("gradientradial");AF.x0_=m;AF.y0_=AE;AF.r0_=j;AF.x1_=i;AF.y1_=p;AF.r1_=Z;return AF};M.drawImage=function(AO,j){var AH,AF,AJ,AV,AM,AK,AQ,AX;var AI=AO.runtimeStyle.width;var AN=AO.runtimeStyle.height;AO.runtimeStyle.width="auto";AO.runtimeStyle.height="auto";var AG=AO.width;var AT=AO.height;AO.runtimeStyle.width=AI;AO.runtimeStyle.height=AN;if(arguments.length==3){AH=arguments[1];AF=arguments[2];AM=AK=0;AQ=AJ=AG;AX=AV=AT}else{if(arguments.length==5){AH=arguments[1];AF=arguments[2];AJ=arguments[3];AV=arguments[4];AM=AK=0;AQ=AG;AX=AT}else{if(arguments.length==9){AM=arguments[1];AK=arguments[2];AQ=arguments[3];AX=arguments[4];AH=arguments[5];AF=arguments[6];AJ=arguments[7];AV=arguments[8]}else{throw Error("Invalid number of arguments")}}}var AW=this.getCoords_(AH,AF);var m=AQ/2;var i=AX/2;var AU=[];var Z=10;var AE=10;AU.push(" ','","");this.element_.insertAdjacentHTML("BeforeEnd",AU.join(""))};M.stroke=function(AM){var m=10;var AN=10;var AE=5000;var AG={x:null,y:null};var AL={x:null,y:null};for(var AH=0;AHAL.x){AL.x=Z.x}if(AG.y==null||Z.yAL.y){AL.y=Z.y}}}AK.push(' ">');if(!AM){R(this,AK)}else{a(this,AK,AG,AL)}AK.push("");this.element_.insertAdjacentHTML("beforeEnd",AK.join(""))}};function R(j,AE){var i=Y(j.strokeStyle);var m=i.color;var p=i.alpha*j.globalAlpha;var Z=j.lineScale_*j.lineWidth;if(Z<1){p*=Z}AE.push("')}function a(AO,AG,Ah,AP){var AH=AO.fillStyle;var AY=AO.arcScaleX_;var AX=AO.arcScaleY_;var Z=AP.x-Ah.x;var m=AP.y-Ah.y;if(AH instanceof v){var AL=0;var Ac={x:0,y:0};var AU=0;var AK=1;if(AH.type_=="gradient"){var AJ=AH.x0_/AY;var j=AH.y0_/AX;var AI=AH.x1_/AY;var Aj=AH.y1_/AX;var Ag=AO.getCoords_(AJ,j);var Af=AO.getCoords_(AI,Aj);var AE=Af.x-Ag.x;var p=Af.y-Ag.y;AL=Math.atan2(AE,p)*180/Math.PI;if(AL<0){AL+=360}if(AL<0.000001){AL=0}}else{var Ag=AO.getCoords_(AH.x0_,AH.y0_);Ac={x:(Ag.x-Ah.x)/Z,y:(Ag.y-Ah.y)/m};Z/=AY*D;m/=AX*D;var Aa=z.max(Z,m);AU=2*AH.r0_/Aa;AK=2*AH.r1_/Aa-AU}var AS=AH.colors_;AS.sort(function(Ak,i){return Ak.offset-i.offset});var AN=AS.length;var AR=AS[0].color;var AQ=AS[AN-1].color;var AW=AS[0].alpha*AO.globalAlpha;var AV=AS[AN-1].alpha*AO.globalAlpha;var Ab=[];for(var Ae=0;Ae')}else{if(AH instanceof u){if(Z&&m){var AF=-Ah.x;var AZ=-Ah.y;AG.push("')}}else{var Ai=Y(AO.fillStyle);var AT=Ai.color;var Ad=Ai.alpha*AO.globalAlpha;AG.push('')}}}M.fill=function(){this.stroke(true)};M.closePath=function(){this.currentPath_.push({type:"close"})};M.getCoords_=function(j,i){var Z=this.m_;return{x:D*(j*Z[0][0]+i*Z[1][0]+Z[2][0])-F,y:D*(j*Z[0][1]+i*Z[1][1]+Z[2][1])-F}};M.save=function(){var Z={};Q(this,Z);this.aStack_.push(Z);this.mStack_.push(this.m_);this.m_=d(V(),this.m_)};M.restore=function(){if(this.aStack_.length){Q(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function H(Z){return isFinite(Z[0][0])&&isFinite(Z[0][1])&&isFinite(Z[1][0])&&isFinite(Z[1][1])&&isFinite(Z[2][0])&&isFinite(Z[2][1])}function y(i,Z,j){if(!H(Z)){return }i.m_=Z;if(j){var p=Z[0][0]*Z[1][1]-Z[0][1]*Z[1][0];i.lineScale_=k(b(p))}}M.translate=function(j,i){var Z=[[1,0,0],[0,1,0],[j,i,1]];y(this,d(Z,this.m_),false)};M.rotate=function(i){var m=U(i);var j=J(i);var Z=[[m,j,0],[-j,m,0],[0,0,1]];y(this,d(Z,this.m_),false)};M.scale=function(j,i){this.arcScaleX_*=j;this.arcScaleY_*=i;var Z=[[j,0,0],[0,i,0],[0,0,1]];y(this,d(Z,this.m_),true)};M.transform=function(p,m,AF,AE,i,Z){var j=[[p,m,0],[AF,AE,0],[i,Z,1]];y(this,d(j,this.m_),true)};M.setTransform=function(AE,p,AG,AF,j,i){var Z=[[AE,p,0],[AG,AF,0],[j,i,1]];y(this,Z,true)};M.drawText_=function(AK,AI,AH,AN,AG){var AM=this.m_,AQ=1000,i=0,AP=AQ,AF={x:0,y:0},AE=[];var Z=P(X(this.font),this.element_);var j=AA(Z);var AR=this.element_.currentStyle;var p=this.textAlign.toLowerCase();switch(p){case"left":case"center":case"right":break;case"end":p=AR.direction=="ltr"?"right":"left";break;case"start":p=AR.direction=="rtl"?"right":"left";break;default:p="left"}switch(this.textBaseline){case"hanging":case"top":AF.y=Z.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":AF.y=-Z.size/2.25;break}switch(p){case"right":i=AQ;AP=0.05;break;case"center":i=AP=AQ/2;break}var AO=this.getCoords_(AI+AF.x,AH+AF.y);AE.push('');if(AG){R(this,AE)}else{a(this,AE,{x:-i,y:0},{x:AP,y:Z.size})}var AL=AM[0][0].toFixed(3)+","+AM[1][0].toFixed(3)+","+AM[0][1].toFixed(3)+","+AM[1][1].toFixed(3)+",0,0";var AJ=K(AO.x/D)+","+K(AO.y/D);AE.push('','','');this.element_.insertAdjacentHTML("beforeEnd",AE.join(""))};M.fillText=function(j,Z,m,i){this.drawText_(j,Z,m,i,false)};M.strokeText=function(j,Z,m,i){this.drawText_(j,Z,m,i,true)};M.measureText=function(j){if(!this.textMeasureEl_){var Z='';this.element_.insertAdjacentHTML("beforeEnd",Z);this.textMeasureEl_=this.element_.lastChild}var i=this.element_.ownerDocument;this.textMeasureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(i.createTextNode(j));return{width:this.textMeasureEl_.offsetWidth}};M.clip=function(){};M.arcTo=function(){};M.createPattern=function(i,Z){return new u(i,Z)};function v(Z){this.type_=Z;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}v.prototype.addColorStop=function(i,Z){Z=Y(Z);this.colors_.push({offset:i,color:Z.color,alpha:Z.alpha})};function u(i,Z){q(i);switch(Z){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=Z;break;default:n("SYNTAX_ERR")}this.src_=i.src;this.width_=i.width;this.height_=i.height}function n(Z){throw new o(Z)}function q(Z){if(!Z||Z.nodeType!=1||Z.tagName!="IMG"){n("TYPE_MISMATCH_ERR")}if(Z.readyState!="complete"){n("INVALID_STATE_ERR")}}function o(Z){this.code=this[Z];this.message=Z+": DOM Exception "+this.code}var x=o.prototype=new Error;x.INDEX_SIZE_ERR=1;x.DOMSTRING_SIZE_ERR=2;x.HIERARCHY_REQUEST_ERR=3;x.WRONG_DOCUMENT_ERR=4;x.INVALID_CHARACTER_ERR=5;x.NO_DATA_ALLOWED_ERR=6;x.NO_MODIFICATION_ALLOWED_ERR=7;x.NOT_FOUND_ERR=8;x.NOT_SUPPORTED_ERR=9;x.INUSE_ATTRIBUTE_ERR=10;x.INVALID_STATE_ERR=11;x.SYNTAX_ERR=12;x.INVALID_MODIFICATION_ERR=13;x.NAMESPACE_ERR=14;x.INVALID_ACCESS_ERR=15;x.VALIDATION_ERR=16;x.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=E;CanvasRenderingContext2D=W;CanvasGradient=v;CanvasPattern=u;DOMException=o})()}; diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.min.js index fafe905c..4e10ef54 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.min.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.min.js @@ -1 +1 @@ -(function(){jQuery.color={};jQuery.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return JH?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return jQuery.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};jQuery.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!jQuery.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return jQuery.color.parse(D)};jQuery.color.parse=function(E){var D,B=jQuery.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3],16))}var C=jQuery.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(); \ No newline at end of file +(function(){jQuery.color={};jQuery.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return JH?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return jQuery.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};jQuery.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!jQuery.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return jQuery.color.parse(D)};jQuery.color.parse=function(E){var D,B=jQuery.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3],16))}var C=jQuery.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(); diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.min.js index ce689b19..18dcb96d 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.min.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.min.js @@ -1 +1 @@ -(function(B){var A={crosshair:{mode:null,color:"rgba(170, 0, 0, 0.80)",lineWidth:1}};function C(G){var H={x:-1,y:-1,locked:false};G.setCrosshair=function D(J){if(!J){H.x=-1}else{var I=G.getAxes();H.x=Math.max(0,Math.min(J.x!=null?I.xaxis.p2c(J.x):I.x2axis.p2c(J.x2),G.width()));H.y=Math.max(0,Math.min(J.y!=null?I.yaxis.p2c(J.y):I.y2axis.p2c(J.y2),G.height()))}G.triggerRedrawOverlay()};G.clearCrosshair=G.setCrosshair;G.lockCrosshair=function E(I){if(I){G.setCrosshair(I)}H.locked=true};G.unlockCrosshair=function F(){H.locked=false};G.hooks.bindEvents.push(function(J,I){if(!J.getOptions().crosshair.mode){return }I.mouseout(function(){if(H.x!=-1){H.x=-1;J.triggerRedrawOverlay()}});I.mousemove(function(K){if(J.getSelection&&J.getSelection()){H.x=-1;return }if(H.locked){return }var L=J.offset();H.x=Math.max(0,Math.min(K.pageX-L.left,J.width()));H.y=Math.max(0,Math.min(K.pageY-L.top,J.height()));J.triggerRedrawOverlay()})});G.hooks.drawOverlay.push(function(K,I){var L=K.getOptions().crosshair;if(!L.mode){return }var J=K.getPlotOffset();I.save();I.translate(J.left,J.top);if(H.x!=-1){I.strokeStyle=L.color;I.lineWidth=L.lineWidth;I.lineJoin="round";I.beginPath();if(L.mode.indexOf("x")!=-1){I.moveTo(H.x,0);I.lineTo(H.x,K.height())}if(L.mode.indexOf("y")!=-1){I.moveTo(0,H.y);I.lineTo(K.width(),H.y)}I.stroke()}I.restore()})}B.plot.plugins.push({init:C,options:A,name:"crosshair",version:"1.0"})})(jQuery); \ No newline at end of file +(function(B){var A={crosshair:{mode:null,color:"rgba(170, 0, 0, 0.80)",lineWidth:1}};function C(G){var H={x:-1,y:-1,locked:false};G.setCrosshair=function D(J){if(!J){H.x=-1}else{var I=G.getAxes();H.x=Math.max(0,Math.min(J.x!=null?I.xaxis.p2c(J.x):I.x2axis.p2c(J.x2),G.width()));H.y=Math.max(0,Math.min(J.y!=null?I.yaxis.p2c(J.y):I.y2axis.p2c(J.y2),G.height()))}G.triggerRedrawOverlay()};G.clearCrosshair=G.setCrosshair;G.lockCrosshair=function E(I){if(I){G.setCrosshair(I)}H.locked=true};G.unlockCrosshair=function F(){H.locked=false};G.hooks.bindEvents.push(function(J,I){if(!J.getOptions().crosshair.mode){return }I.mouseout(function(){if(H.x!=-1){H.x=-1;J.triggerRedrawOverlay()}});I.mousemove(function(K){if(J.getSelection&&J.getSelection()){H.x=-1;return }if(H.locked){return }var L=J.offset();H.x=Math.max(0,Math.min(K.pageX-L.left,J.width()));H.y=Math.max(0,Math.min(K.pageY-L.top,J.height()));J.triggerRedrawOverlay()})});G.hooks.drawOverlay.push(function(K,I){var L=K.getOptions().crosshair;if(!L.mode){return }var J=K.getPlotOffset();I.save();I.translate(J.left,J.top);if(H.x!=-1){I.strokeStyle=L.color;I.lineWidth=L.lineWidth;I.lineJoin="round";I.beginPath();if(L.mode.indexOf("x")!=-1){I.moveTo(H.x,0);I.lineTo(H.x,K.height())}if(L.mode.indexOf("y")!=-1){I.moveTo(0,H.y);I.lineTo(K.width(),H.y)}I.stroke()}I.restore()})}B.plot.plugins.push({init:C,options:A,name:"crosshair",version:"1.0"})})(jQuery); diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.min.js index eb16cb1a..1cf2da7a 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.min.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.min.js @@ -1 +1 @@ -(function(D){var B={series:{images:{show:false,alpha:1,anchor:"corner"}}};D.plot.image={};D.plot.image.loadDataImages=function(G,F,K){var J=[],H=[];var I=F.series.images.show;D.each(G,function(L,M){if(!(I||M.images.show)){return }if(M.data){M=M.data}D.each(M,function(N,O){if(typeof O[0]=="string"){J.push(O[0]);H.push(O)}})});D.plot.image.load(J,function(L){D.each(H,function(N,O){var M=O[0];if(L[M]){O[0]=L[M]}});K()})};D.plot.image.load=function(H,I){var G=H.length,F={};if(G==0){I({})}D.each(H,function(K,J){var L=function(){--G;F[J]=this;if(G==0){I(F)}};D("").load(L).error(L).attr("src",J)})};function A(H,F){var G=H.getPlotOffset();D.each(H.getData(),function(O,P){var X=P.datapoints.points,I=P.datapoints.pointsize;for(var O=0;OK){N=K;K=M;M=N}if(V>T){N=T;T=V;V=N}if(P.images.anchor=="center"){N=0.5*(K-M)/(Q.width-1);M-=N;K+=N;N=0.5*(T-V)/(Q.height-1);V-=N;T+=N}if(M==K||V==T||M>=W.max||K<=W.min||V>=S.max||T<=S.min){continue}var L=0,U=0,J=Q.width,R=Q.height;if(MW.max){J+=(J-L)*(W.max-K)/(K-M);K=W.max}if(VS.max){U+=(U-R)*(S.max-T)/(T-V);T=S.max}M=W.p2c(M);K=W.p2c(K);V=S.p2c(V);T=S.p2c(T);if(M>K){N=K;K=M;M=N}if(V>T){N=T;T=V;V=N}N=F.globalAlpha;F.globalAlpha*=P.images.alpha;F.drawImage(Q,L,U,J-L,R-U,M+G.left,V+G.top,K-M,T-V);F.globalAlpha=N}})}function C(I,F,G,H){if(!F.images.show){return }H.format=[{required:true},{x:true,number:true,required:true},{y:true,number:true,required:true},{x:true,number:true,required:true},{y:true,number:true,required:true}]}function E(F){F.hooks.processRawData.push(C);F.hooks.draw.push(A)}D.plot.plugins.push({init:E,options:B,name:"image",version:"1.1"})})(jQuery); \ No newline at end of file +(function(D){var B={series:{images:{show:false,alpha:1,anchor:"corner"}}};D.plot.image={};D.plot.image.loadDataImages=function(G,F,K){var J=[],H=[];var I=F.series.images.show;D.each(G,function(L,M){if(!(I||M.images.show)){return }if(M.data){M=M.data}D.each(M,function(N,O){if(typeof O[0]=="string"){J.push(O[0]);H.push(O)}})});D.plot.image.load(J,function(L){D.each(H,function(N,O){var M=O[0];if(L[M]){O[0]=L[M]}});K()})};D.plot.image.load=function(H,I){var G=H.length,F={};if(G==0){I({})}D.each(H,function(K,J){var L=function(){--G;F[J]=this;if(G==0){I(F)}};D("").load(L).error(L).attr("src",J)})};function A(H,F){var G=H.getPlotOffset();D.each(H.getData(),function(O,P){var X=P.datapoints.points,I=P.datapoints.pointsize;for(var O=0;OK){N=K;K=M;M=N}if(V>T){N=T;T=V;V=N}if(P.images.anchor=="center"){N=0.5*(K-M)/(Q.width-1);M-=N;K+=N;N=0.5*(T-V)/(Q.height-1);V-=N;T+=N}if(M==K||V==T||M>=W.max||K<=W.min||V>=S.max||T<=S.min){continue}var L=0,U=0,J=Q.width,R=Q.height;if(MW.max){J+=(J-L)*(W.max-K)/(K-M);K=W.max}if(VS.max){U+=(U-R)*(S.max-T)/(T-V);T=S.max}M=W.p2c(M);K=W.p2c(K);V=S.p2c(V);T=S.p2c(T);if(M>K){N=K;K=M;M=N}if(V>T){N=T;T=V;V=N}N=F.globalAlpha;F.globalAlpha*=P.images.alpha;F.drawImage(Q,L,U,J-L,R-U,M+G.left,V+G.top,K-M,T-V);F.globalAlpha=N}})}function C(I,F,G,H){if(!F.images.show){return }H.format=[{required:true},{x:true,number:true,required:true},{y:true,number:true,required:true},{x:true,number:true,required:true},{y:true,number:true,required:true}]}function E(F){F.hooks.processRawData.push(C);F.hooks.draw.push(A)}D.plot.plugins.push({init:E,options:B,name:"image",version:"1.1"})})(jQuery); diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.min.js index 31f465b8..9b913dab 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.min.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.min.js @@ -1 +1 @@ -(function(){jQuery.color={};jQuery.color.make=function(G,H,J,I){var A={};A.r=G||0;A.g=H||0;A.b=J||0;A.a=I!=null?I:1;A.add=function(C,D){for(var E=0;E=1){return"rgb("+[A.r,A.g,A.b].join(",")+")"}else{return"rgba("+[A.r,A.g,A.b,A.a].join(",")+")"}};A.normalize=function(){function C(E,D,F){return DF?F:D)}A.r=C(0,parseInt(A.r),255);A.g=C(0,parseInt(A.g),255);A.b=C(0,parseInt(A.b),255);A.a=C(0,A.a,1);return A};A.clone=function(){return jQuery.color.make(A.r,A.b,A.g,A.a)};return A.normalize()};jQuery.color.extract=function(E,F){var A;do{A=E.css(F).toLowerCase();if(A!=""&&A!="transparent"){break}E=E.parent()}while(!jQuery.nodeName(E.get(0),"body"));if(A=="rgba(0, 0, 0, 0)"){A="transparent"}return jQuery.color.parse(A)};jQuery.color.parse=function(A){var F,H=jQuery.color.make;if(F=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(A)){return H(parseInt(F[1],10),parseInt(F[2],10),parseInt(F[3],10))}if(F=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(A)){return H(parseInt(F[1],10),parseInt(F[2],10),parseInt(F[3],10),parseFloat(F[4]))}if(F=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(A)){return H(parseFloat(F[1])*2.55,parseFloat(F[2])*2.55,parseFloat(F[3])*2.55)}if(F=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(A)){return H(parseFloat(F[1])*2.55,parseFloat(F[2])*2.55,parseFloat(F[3])*2.55,parseFloat(F[4]))}if(F=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(A)){return H(parseInt(F[1],16),parseInt(F[2],16),parseInt(F[3],16))}if(F=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(A)){return H(parseInt(F[1]+F[1],16),parseInt(F[2]+F[2],16),parseInt(F[3]+F[3],16))}var G=jQuery.trim(A).toLowerCase();if(G=="transparent"){return H(255,255,255,0)}else{F=B[G];return H(F[0],F[1],F[2])}};var B={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})();(function(C){function B(l,W,X,E){var O=[],g={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:0.85},xaxis:{mode:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,tickDecimals:null,tickSize:null,minTickSize:null,monthNames:null,timeformat:null,twelveHourClock:false},yaxis:{autoscaleMargin:0.02},x2axis:{autoscaleMargin:null},y2axis:{autoscaleMargin:0.02},series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false},shadowSize:3},grid:{show:true,aboveData:false,color:"#545454",backgroundColor:null,tickColor:"rgba(0,0,0,0.15)",labelMargin:5,borderWidth:2,borderColor:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},hooks:{}},P=null,AC=null,AD=null,Y=null,AJ=null,s={xaxis:{},yaxis:{},x2axis:{},y2axis:{}},e={left:0,right:0,top:0,bottom:0},y=0,Q=0,I=0,t=0,L={processOptions:[],processRawData:[],processDatapoints:[],draw:[],bindEvents:[],drawOverlay:[]},G=this;G.setData=f;G.setupGrid=k;G.draw=AH;G.getPlaceholder=function(){return l};G.getCanvas=function(){return P};G.getPlotOffset=function(){return e};G.width=function(){return I};G.height=function(){return t};G.offset=function(){var AK=AD.offset();AK.left+=e.left;AK.top+=e.top;return AK};G.getData=function(){return O};G.getAxes=function(){return s};G.getOptions=function(){return g};G.highlight=AE;G.unhighlight=x;G.triggerRedrawOverlay=q;G.pointOffset=function(AK){return{left:parseInt(T(AK,"xaxis").p2c(+AK.x)+e.left),top:parseInt(T(AK,"yaxis").p2c(+AK.y)+e.top)}};G.hooks=L;b(G);r(X);c();f(W);k();AH();AG();function Z(AM,AK){AK=[G].concat(AK);for(var AL=0;AL=g.colors.length){AP=0;++AO}}var AQ=0,AW;for(AP=0;APAl.datamax){Al.datamax=Aj}}for(Ac=0;Ac0&&Ab[AZ-AX]!=null&&Ab[AZ-AX]!=Ab[AZ]&&Ab[AZ-AX+1]!=Ab[AZ+1]){for(AV=0;AVAU){AU=Ai}}if(Af.y){if(AiAd){Ad=Ai}}}}if(AR.bars.show){var Ag=AR.bars.align=="left"?0:-AR.bars.barWidth/2;if(AR.bars.horizontal){AY+=Ag;Ad+=Ag+AR.bars.barWidth}else{AS+=Ag;AU+=Ag+AR.bars.barWidth}}AN(AR.xaxis,AS,AU);AN(AR.yaxis,AY,Ad)}for(AK in s){if(s[AK].datamin==AW){s[AK].datamin=null}if(s[AK].datamax==AQ){s[AK].datamax=null}}}function c(){function AK(AM,AL){var AN=document.createElement("canvas");AN.width=AM;AN.height=AL;if(C.browser.msie){AN=window.G_vmlCanvasManager.initElement(AN)}return AN}y=l.width();Q=l.height();l.html("");if(l.css("position")=="static"){l.css("position","relative")}if(y<=0||Q<=0){throw"Invalid dimensions for plot, width = "+y+", height = "+Q}if(C.browser.msie){window.G_vmlCanvasManager.init_(document)}P=C(AK(y,Q)).appendTo(l).get(0);Y=P.getContext("2d");AC=C(AK(y,Q)).css({position:"absolute",left:0,top:0}).appendTo(l).get(0);AJ=AC.getContext("2d");AJ.stroke()}function AG(){AD=C([AC,P]);if(g.grid.hoverable){AD.mousemove(D)}if(g.grid.clickable){AD.click(d)}Z(L.bindEvents,[AD])}function k(){function AL(AT,AU){function AP(AV){return AV}var AS,AO,AQ=AU.transform||AP,AR=AU.inverseTransform;if(AT==s.xaxis||AT==s.x2axis){AS=AT.scale=I/(AQ(AT.max)-AQ(AT.min));AO=AQ(AT.min);if(AQ==AP){AT.p2c=function(AV){return(AV-AO)*AS}}else{AT.p2c=function(AV){return(AQ(AV)-AO)*AS}}if(!AR){AT.c2p=function(AV){return AO+AV/AS}}else{AT.c2p=function(AV){return AR(AO+AV/AS)}}}else{AS=AT.scale=t/(AQ(AT.max)-AQ(AT.min));AO=AQ(AT.max);if(AQ==AP){AT.p2c=function(AV){return(AO-AV)*AS}}else{AT.p2c=function(AV){return(AO-AQ(AV))*AS}}if(!AR){AT.c2p=function(AV){return AO-AV/AS}}else{AT.c2p=function(AV){return AR(AO-AV/AS)}}}}function AN(AR,AT){var AQ,AS=[],AP;AR.labelWidth=AT.labelWidth;AR.labelHeight=AT.labelHeight;if(AR==s.xaxis||AR==s.x2axis){if(AR.labelWidth==null){AR.labelWidth=y/(AR.ticks.length>0?AR.ticks.length:1)}if(AR.labelHeight==null){AS=[];for(AQ=0;AQ'+AP+"")}}if(AS.length>0){var AO=C('
'+AS.join("")+'
').appendTo(l);AR.labelHeight=AO.height();AO.remove()}}}else{if(AR.labelWidth==null||AR.labelHeight==null){for(AQ=0;AQ'+AP+"")}}if(AS.length>0){var AO=C('
'+AS.join("")+"
").appendTo(l);if(AR.labelWidth==null){AR.labelWidth=AO.width()}if(AR.labelHeight==null){AR.labelHeight=AO.find("div").height()}AO.remove()}}}if(AR.labelWidth==null){AR.labelWidth=0}if(AR.labelHeight==null){AR.labelHeight=0}}function AM(){var AP=g.grid.borderWidth;for(i=0;i0){e.bottom=Math.max(AP,s.xaxis.labelHeight+AO)}if(s.yaxis.labelWidth>0){e.left=Math.max(AP,s.yaxis.labelWidth+AO)}if(s.x2axis.labelHeight>0){e.top=Math.max(AP,s.x2axis.labelHeight+AO)}if(s.y2axis.labelWidth>0){e.right=Math.max(AP,s.y2axis.labelWidth+AO)}I=y-e.left-e.right;t=Q-e.bottom-e.top}var AK;for(AK in s){K(s[AK],g[AK])}if(g.grid.show){for(AK in s){F(s[AK],g[AK]);p(s[AK],g[AK]);AN(s[AK],g[AK])}AM()}else{e.left=e.right=e.top=e.bottom=0;I=y;t=Q}for(AK in s){AL(s[AK],g[AK])}if(g.grid.show){h()}AI()}function K(AN,AQ){var AM=+(AQ.min!=null?AQ.min:AN.datamin),AK=+(AQ.max!=null?AQ.max:AN.datamax),AP=AK-AM;if(AP==0){var AL=AK==0?1:0.01;if(AQ.min==null){AM-=AL}if(AQ.max==null||AQ.min!=null){AK+=AL}}else{var AO=AQ.autoscaleMargin;if(AO!=null){if(AQ.min==null){AM-=AP*AO;if(AM<0&&AN.datamin!=null&&AN.datamin>=0){AM=0}}if(AQ.max==null){AK+=AP*AO;if(AK>0&&AN.datamax!=null&&AN.datamax<=0){AK=0}}}}AN.min=AM;AN.max=AK}function F(AP,AS){var AO;if(typeof AS.ticks=="number"&&AS.ticks>0){AO=AS.ticks}else{if(AP==s.xaxis||AP==s.x2axis){AO=0.3*Math.sqrt(y)}else{AO=0.3*Math.sqrt(Q)}}var AX=(AP.max-AP.min)/AO,AZ,AT,AV,AW,AR,AM,AL;if(AS.mode=="time"){var AU={second:1000,minute:60*1000,hour:60*60*1000,day:24*60*60*1000,month:30*24*60*60*1000,year:365.2425*24*60*60*1000};var AY=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[0.25,"month"],[0.5,"month"],[1,"month"],[2,"month"],[3,"month"],[6,"month"],[1,"year"]];var AN=0;if(AS.minTickSize!=null){if(typeof AS.tickSize=="number"){AN=AS.tickSize}else{AN=AS.minTickSize[0]*AU[AS.minTickSize[1]]}}for(AR=0;AR=AN){break}}AZ=AY[AR][0];AV=AY[AR][1];if(AV=="year"){AM=Math.pow(10,Math.floor(Math.log(AX/AU.year)/Math.LN10));AL=(AX/AU.year)/AM;if(AL<1.5){AZ=1}else{if(AL<3){AZ=2}else{if(AL<7.5){AZ=5}else{AZ=10}}}AZ*=AM}if(AS.tickSize){AZ=AS.tickSize[0];AV=AS.tickSize[1]}AT=function(Ac){var Ah=[],Af=Ac.tickSize[0],Ai=Ac.tickSize[1],Ag=new Date(Ac.min);var Ab=Af*AU[Ai];if(Ai=="second"){Ag.setUTCSeconds(A(Ag.getUTCSeconds(),Af))}if(Ai=="minute"){Ag.setUTCMinutes(A(Ag.getUTCMinutes(),Af))}if(Ai=="hour"){Ag.setUTCHours(A(Ag.getUTCHours(),Af))}if(Ai=="month"){Ag.setUTCMonth(A(Ag.getUTCMonth(),Af))}if(Ai=="year"){Ag.setUTCFullYear(A(Ag.getUTCFullYear(),Af))}Ag.setUTCMilliseconds(0);if(Ab>=AU.minute){Ag.setUTCSeconds(0)}if(Ab>=AU.hour){Ag.setUTCMinutes(0)}if(Ab>=AU.day){Ag.setUTCHours(0)}if(Ab>=AU.day*4){Ag.setUTCDate(1)}if(Ab>=AU.year){Ag.setUTCMonth(0)}var Ak=0,Aj=Number.NaN,Ad;do{Ad=Aj;Aj=Ag.getTime();Ah.push({v:Aj,label:Ac.tickFormatter(Aj,Ac)});if(Ai=="month"){if(Af<1){Ag.setUTCDate(1);var Aa=Ag.getTime();Ag.setUTCMonth(Ag.getUTCMonth()+1);var Ae=Ag.getTime();Ag.setTime(Aj+Ak*AU.hour+(Ae-Aa)*Af);Ak=Ag.getUTCHours();Ag.setUTCHours(0)}else{Ag.setUTCMonth(Ag.getUTCMonth()+Af)}}else{if(Ai=="year"){Ag.setUTCFullYear(Ag.getUTCFullYear()+Af)}else{Ag.setTime(Aj+Ab)}}}while(AjAK){AQ=AK}AM=Math.pow(10,-AQ);AL=AX/AM;if(AL<1.5){AZ=1}else{if(AL<3){AZ=2;if(AL>2.25&&(AK==null||AQ+1<=AK)){AZ=2.5;++AQ}}else{if(AL<7.5){AZ=5}else{AZ=10}}}AZ*=AM;if(AS.minTickSize!=null&&AZ0){AO.ticks=AO.tickGenerator(AO)}}else{if(AQ.ticks){var AP=AQ.ticks;if(C.isFunction(AP)){AP=AP({min:AO.min,max:AO.max})}var AN,AK;for(AN=0;AN1){AL=AM[1]}}else{AK=AM}if(AL==null){AL=AO.tickFormatter(AK,AO)}AO.ticks[AN]={v:AK,label:AL}}}}}if(AQ.autoscaleMargin!=null&&AO.ticks.length>0){if(AQ.min==null){AO.min=Math.min(AO.min,AO.ticks[0].v)}if(AQ.max==null&&AO.ticks.length>1){AO.max=Math.max(AO.max,AO.ticks[AO.ticks.length-1].v)}}}function AH(){Y.clearRect(0,0,y,Q);var AL=g.grid;if(AL.show&&!AL.aboveData){S()}for(var AK=0;AKAP){return{from:AP,to:AQ,axis:AN}}return{from:AQ,to:AP,axis:AN}}function S(){var AO;Y.save();Y.translate(e.left,e.top);if(g.grid.backgroundColor){Y.fillStyle=R(g.grid.backgroundColor,t,0,"rgba(255, 255, 255, 0)");Y.fillRect(0,0,I,t)}var AL=g.grid.markings;if(AL){if(C.isFunction(AL)){AL=AL({xmin:s.xaxis.min,xmax:s.xaxis.max,ymin:s.yaxis.min,ymax:s.yaxis.max,xaxis:s.xaxis,yaxis:s.yaxis,x2axis:s.x2axis,y2axis:s.y2axis})}for(AO=0;AOAQ.axis.max||AN.toAN.axis.max){continue}AQ.from=Math.max(AQ.from,AQ.axis.min);AQ.to=Math.min(AQ.to,AQ.axis.max);AN.from=Math.max(AN.from,AN.axis.min);AN.to=Math.min(AN.to,AN.axis.max);if(AQ.from==AQ.to&&AN.from==AN.to){continue}AQ.from=AQ.axis.p2c(AQ.from);AQ.to=AQ.axis.p2c(AQ.to);AN.from=AN.axis.p2c(AN.from);AN.to=AN.axis.p2c(AN.to);if(AQ.from==AQ.to||AN.from==AN.to){Y.beginPath();Y.strokeStyle=AK.color||g.grid.markingsColor;Y.lineWidth=AK.lineWidth||g.grid.markingsLineWidth;Y.moveTo(AQ.from,AN.from);Y.lineTo(AQ.to,AN.to);Y.stroke()}else{Y.fillStyle=AK.color||g.grid.markingsColor;Y.fillRect(AQ.from,AN.to,AQ.to-AQ.from,AN.from-AN.to)}}}Y.lineWidth=1;Y.strokeStyle=g.grid.tickColor;Y.beginPath();var AM,AP=s.xaxis;for(AO=0;AO=s.xaxis.max){continue}Y.moveTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,0);Y.lineTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,t)}AP=s.yaxis;for(AO=0;AO=AP.max){continue}Y.moveTo(0,Math.floor(AP.p2c(AM))+Y.lineWidth/2);Y.lineTo(I,Math.floor(AP.p2c(AM))+Y.lineWidth/2)}AP=s.x2axis;for(AO=0;AO=AP.max){continue}Y.moveTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,-5);Y.lineTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,5)}AP=s.y2axis;for(AO=0;AO=AP.max){continue}Y.moveTo(I-5,Math.floor(AP.p2c(AM))+Y.lineWidth/2);Y.lineTo(I+5,Math.floor(AP.p2c(AM))+Y.lineWidth/2)}Y.stroke();if(g.grid.borderWidth){var AR=g.grid.borderWidth;Y.lineWidth=AR;Y.strokeStyle=g.grid.borderColor;Y.strokeRect(-AR/2,-AR/2,I+AR,t+AR)}Y.restore()}function h(){l.find(".tickLabels").remove();var AK=['
'];function AM(AP,AQ){for(var AO=0;AOAP.max){continue}AK.push(AQ(AN,AP))}}var AL=g.grid.labelMargin+g.grid.borderWidth;AM(s.xaxis,function(AN,AO){return'
'+AN.label+"
"});AM(s.yaxis,function(AN,AO){return'
'+AN.label+"
"});AM(s.x2axis,function(AN,AO){return'
'+AN.label+"
"});AM(s.y2axis,function(AN,AO){return'
'+AN.label+"
"});AK.push("
");l.append(AK.join(""))}function AA(AK){if(AK.lines.show){a(AK)}if(AK.bars.show){n(AK)}if(AK.points.show){o(AK)}}function a(AN){function AM(AY,AZ,AR,Ad,Ac){var Ae=AY.points,AS=AY.pointsize,AW=null,AV=null;Y.beginPath();for(var AX=AS;AX=Aa&&Ab>Ac.max){if(Aa>Ac.max){continue}AU=(Ac.max-Ab)/(Aa-Ab)*(AT-AU)+AU;Ab=Ac.max}else{if(Aa>=Ab&&Aa>Ac.max){if(Ab>Ac.max){continue}AT=(Ac.max-Ab)/(Aa-Ab)*(AT-AU)+AU;Aa=Ac.max}}if(AU<=AT&&AU=AT&&AU>Ad.max){if(AT>Ad.max){continue}Ab=(Ad.max-AU)/(AT-AU)*(Aa-Ab)+Ab;AU=Ad.max}else{if(AT>=AU&&AT>Ad.max){if(AU>Ad.max){continue}Aa=(Ad.max-AU)/(AT-AU)*(Aa-Ab)+Ab;AT=Ad.max}}if(AU!=AW||Ab!=AV){Y.moveTo(Ad.p2c(AU)+AZ,Ac.p2c(Ab)+AR)}AW=AT;AV=Aa;Y.lineTo(Ad.p2c(AT)+AZ,Ac.p2c(Aa)+AR)}Y.stroke()}function AO(AX,Ae,Ac){var Af=AX.points,AR=AX.pointsize,AS=Math.min(Math.max(0,Ac.min),Ac.max),Aa,AV=0,Ad=false;for(var AW=AR;AW=AT&&AU>Ae.max){if(AT>Ae.max){continue}Ab=(Ae.max-AU)/(AT-AU)*(AZ-Ab)+Ab;AU=Ae.max}else{if(AT>=AU&&AT>Ae.max){if(AU>Ae.max){continue}AZ=(Ae.max-AU)/(AT-AU)*(AZ-Ab)+Ab;AT=Ae.max}}if(!Ad){Y.beginPath();Y.moveTo(Ae.p2c(AU),Ac.p2c(AS));Ad=true}if(Ab>=Ac.max&&AZ>=Ac.max){Y.lineTo(Ae.p2c(AU),Ac.p2c(Ac.max));Y.lineTo(Ae.p2c(AT),Ac.p2c(Ac.max));AV=AT;continue}else{if(Ab<=Ac.min&&AZ<=Ac.min){Y.lineTo(Ae.p2c(AU),Ac.p2c(Ac.min));Y.lineTo(Ae.p2c(AT),Ac.p2c(Ac.min));AV=AT;continue}}var Ag=AU,AY=AT;if(Ab<=AZ&&Ab=Ac.min){AU=(Ac.min-Ab)/(AZ-Ab)*(AT-AU)+AU;Ab=Ac.min}else{if(AZ<=Ab&&AZ=Ac.min){AT=(Ac.min-Ab)/(AZ-Ab)*(AT-AU)+AU;AZ=Ac.min}}if(Ab>=AZ&&Ab>Ac.max&&AZ<=Ac.max){AU=(Ac.max-Ab)/(AZ-Ab)*(AT-AU)+AU;Ab=Ac.max}else{if(AZ>=Ab&&AZ>Ac.max&&Ab<=Ac.max){AT=(Ac.max-Ab)/(AZ-Ab)*(AT-AU)+AU;AZ=Ac.max}}if(AU!=Ag){if(Ab<=Ac.min){Aa=Ac.min}else{Aa=Ac.max}Y.lineTo(Ae.p2c(Ag),Ac.p2c(Aa));Y.lineTo(Ae.p2c(AU),Ac.p2c(Aa))}Y.lineTo(Ae.p2c(AU),Ac.p2c(Ab));Y.lineTo(Ae.p2c(AT),Ac.p2c(AZ));if(AT!=AY){if(AZ<=Ac.min){Aa=Ac.min}else{Aa=Ac.max}Y.lineTo(Ae.p2c(AT),Ac.p2c(Aa));Y.lineTo(Ae.p2c(AY),Ac.p2c(Aa))}AV=Math.max(AT,AY)}if(Ad){Y.lineTo(Ae.p2c(AV),Ac.p2c(AS));Y.fill()}}Y.save();Y.translate(e.left,e.top);Y.lineJoin="round";var AP=AN.lines.lineWidth,AK=AN.shadowSize;if(AP>0&&AK>0){Y.lineWidth=AK;Y.strokeStyle="rgba(0,0,0,0.1)";var AQ=Math.PI/18;AM(AN.datapoints,Math.sin(AQ)*(AP/2+AK/2),Math.cos(AQ)*(AP/2+AK/2),AN.xaxis,AN.yaxis);Y.lineWidth=AK/2;AM(AN.datapoints,Math.sin(AQ)*(AP/2+AK/4),Math.cos(AQ)*(AP/2+AK/4),AN.xaxis,AN.yaxis)}Y.lineWidth=AP;Y.strokeStyle=AN.color;var AL=V(AN.lines,AN.color,0,t);if(AL){Y.fillStyle=AL;AO(AN.datapoints,AN.xaxis,AN.yaxis)}if(AP>0){AM(AN.datapoints,0,0,AN.xaxis,AN.yaxis)}Y.restore()}function o(AN){function AP(AU,AT,Ab,AR,AV,AZ,AY){var Aa=AU.points,AQ=AU.pointsize;for(var AS=0;ASAZ.max||AWAY.max){continue}Y.beginPath();Y.arc(AZ.p2c(AX),AY.p2c(AW)+AR,AT,0,AV,false);if(Ab){Y.fillStyle=Ab;Y.fill()}Y.stroke()}}Y.save();Y.translate(e.left,e.top);var AO=AN.lines.lineWidth,AL=AN.shadowSize,AK=AN.points.radius;if(AO>0&&AL>0){var AM=AL/2;Y.lineWidth=AM;Y.strokeStyle="rgba(0,0,0,0.1)";AP(AN.datapoints,AK,null,AM+AM/2,Math.PI,AN.xaxis,AN.yaxis);Y.strokeStyle="rgba(0,0,0,0.2)";AP(AN.datapoints,AK,null,AM/2,Math.PI,AN.xaxis,AN.yaxis)}Y.lineWidth=AO;Y.strokeStyle=AN.color;AP(AN.datapoints,AK,V(AN.points,AN.color),0,2*Math.PI,AN.xaxis,AN.yaxis);Y.restore()}function AB(AV,AU,Ad,AQ,AY,AN,AL,AT,AS,Ac,AZ){var AM,Ab,AR,AX,AO,AK,AW,AP,Aa;if(AZ){AP=AK=AW=true;AO=false;AM=Ad;Ab=AV;AX=AU+AQ;AR=AU+AY;if(AbAT.max||AXAS.max){return }if(AMAT.max){Ab=AT.max;AK=false}if(ARAS.max){AX=AS.max;AW=false}AM=AT.p2c(AM);AR=AS.p2c(AR);Ab=AT.p2c(Ab);AX=AS.p2c(AX);if(AL){Ac.beginPath();Ac.moveTo(AM,AR);Ac.lineTo(AM,AX);Ac.lineTo(Ab,AX);Ac.lineTo(Ab,AR);Ac.fillStyle=AL(AR,AX);Ac.fill()}if(AO||AK||AW||AP){Ac.beginPath();Ac.moveTo(AM,AR+AN);if(AO){Ac.lineTo(AM,AX+AN)}else{Ac.moveTo(AM,AX+AN)}if(AW){Ac.lineTo(Ab,AX+AN)}else{Ac.moveTo(Ab,AX+AN)}if(AK){Ac.lineTo(Ab,AR+AN)}else{Ac.moveTo(Ab,AR+AN)}if(AP){Ac.lineTo(AM,AR+AN)}else{Ac.moveTo(AM,AR+AN)}Ac.stroke()}}function n(AM){function AL(AS,AR,AU,AP,AT,AW,AV){var AX=AS.points,AO=AS.pointsize;for(var AQ=0;AQ")}AP.push("");AN=true}if(AV){AR=AV(AR,AU)}AP.push('
'+AR+"")}if(AN){AP.push("")}if(AP.length==0){return }var AT=''+AP.join("")+"
";if(g.legend.container!=null){C(g.legend.container).html(AT)}else{var AQ="",AL=g.legend.position,AM=g.legend.margin;if(AM[0]==null){AM=[AM,AM]}if(AL.charAt(0)=="n"){AQ+="top:"+(AM[1]+e.top)+"px;"}else{if(AL.charAt(0)=="s"){AQ+="bottom:"+(AM[1]+e.bottom)+"px;"}}if(AL.charAt(1)=="e"){AQ+="right:"+(AM[0]+e.right)+"px;"}else{if(AL.charAt(1)=="w"){AQ+="left:"+(AM[0]+e.left)+"px;"}}var AS=C('
'+AT.replace('style="','style="position:absolute;'+AQ+";")+"
").appendTo(l);if(g.legend.backgroundOpacity!=0){var AO=g.legend.backgroundColor;if(AO==null){AO=g.grid.backgroundColor;if(AO&&typeof AO=="string"){AO=C.color.parse(AO)}else{AO=C.color.extract(AS,"background-color")}AO.a=1;AO=AO.toString()}var AK=AS.children();C('
').prependTo(AS).css("opacity",g.legend.backgroundOpacity)}}}var w=[],J=null;function AF(AR,AP,AM){var AX=g.grid.mouseActiveRadius,Aj=AX*AX+1,Ah=null,Aa=false,Af,Ad;for(Af=0;AfAL||AT-AZ<-AL||AS-AW>AK||AS-AW<-AK){continue}var AV=Math.abs(AQ.p2c(AT)-AR),AU=Math.abs(AO.p2c(AS)-AP),Ab=AV*AV+AU*AU;if(Ab<=Aj){Aj=Ab;Ah=[Af,Ad/Ac]}}}if(AY.bars.show&&!Ah){var AN=AY.bars.align=="left"?0:-AY.bars.barWidth/2,Ag=AN+AY.bars.barWidth;for(Ad=0;Ad=Math.min(Ai,AT)&&AW>=AS+AN&&AW<=AS+Ag):(AZ>=AT+AN&&AZ<=AT+Ag&&AW>=Math.min(Ai,AS)&&AW<=Math.max(Ai,AS))){Ah=[Af,Ad/Ac]}}}}if(Ah){Af=Ah[0];Ad=Ah[1];Ac=O[Af].datapoints.pointsize;return{datapoint:O[Af].datapoints.points.slice(Ad*Ac,(Ad+1)*Ac),dataIndex:Ad,series:O[Af],seriesIndex:Af}}return null}function D(AK){if(g.grid.hoverable){H("plothover",AK,function(AL){return AL.hoverable!=false})}}function d(AK){H("plotclick",AK,function(AL){return AL.clickable!=false})}function H(AL,AK,AM){var AN=AD.offset(),AS={pageX:AK.pageX,pageY:AK.pageY},AQ=AK.pageX-AN.left-e.left,AO=AK.pageY-AN.top-e.top;if(s.xaxis.used){AS.x=s.xaxis.c2p(AQ)}if(s.yaxis.used){AS.y=s.yaxis.c2p(AO)}if(s.x2axis.used){AS.x2=s.x2axis.c2p(AQ)}if(s.y2axis.used){AS.y2=s.y2axis.c2p(AO)}var AT=AF(AQ,AO,AM);if(AT){AT.pageX=parseInt(AT.series.xaxis.p2c(AT.datapoint[0])+AN.left+e.left);AT.pageY=parseInt(AT.series.yaxis.p2c(AT.datapoint[1])+AN.top+e.top)}if(g.grid.autoHighlight){for(var AP=0;APAQ.max||ARAP.max){return }var AO=AN.points.radius+AN.points.lineWidth/2;AJ.lineWidth=AO;AJ.strokeStyle=C.color.parse(AN.color).scale("a",0.5).toString();var AK=1.5*AO;AJ.beginPath();AJ.arc(AQ.p2c(AL),AP.p2c(AR),AK,0,2*Math.PI,false);AJ.stroke()}function z(AN,AK){AJ.lineWidth=AN.bars.lineWidth;AJ.strokeStyle=C.color.parse(AN.color).scale("a",0.5).toString();var AM=C.color.parse(AN.color).scale("a",0.5).toString();var AL=AN.bars.align=="left"?0:-AN.bars.barWidth/2;AB(AK[0],AK[1],AK[2]||0,AL,AL+AN.bars.barWidth,0,function(){return AM},AN.xaxis,AN.yaxis,AJ,AN.bars.horizontal)}function R(AM,AL,AQ,AO){if(typeof AM=="string"){return AM}else{var AP=Y.createLinearGradient(0,AQ,0,AL);for(var AN=0,AK=AM.colors.length;AN12){K=K-12}else{if(K==0){K=12}}}for(var F=0;F=1){return"rgb("+[A.r,A.g,A.b].join(",")+")"}else{return"rgba("+[A.r,A.g,A.b,A.a].join(",")+")"}};A.normalize=function(){function C(E,D,F){return DF?F:D)}A.r=C(0,parseInt(A.r),255);A.g=C(0,parseInt(A.g),255);A.b=C(0,parseInt(A.b),255);A.a=C(0,A.a,1);return A};A.clone=function(){return jQuery.color.make(A.r,A.b,A.g,A.a)};return A.normalize()};jQuery.color.extract=function(E,F){var A;do{A=E.css(F).toLowerCase();if(A!=""&&A!="transparent"){break}E=E.parent()}while(!jQuery.nodeName(E.get(0),"body"));if(A=="rgba(0, 0, 0, 0)"){A="transparent"}return jQuery.color.parse(A)};jQuery.color.parse=function(A){var F,H=jQuery.color.make;if(F=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(A)){return H(parseInt(F[1],10),parseInt(F[2],10),parseInt(F[3],10))}if(F=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(A)){return H(parseInt(F[1],10),parseInt(F[2],10),parseInt(F[3],10),parseFloat(F[4]))}if(F=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(A)){return H(parseFloat(F[1])*2.55,parseFloat(F[2])*2.55,parseFloat(F[3])*2.55)}if(F=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(A)){return H(parseFloat(F[1])*2.55,parseFloat(F[2])*2.55,parseFloat(F[3])*2.55,parseFloat(F[4]))}if(F=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(A)){return H(parseInt(F[1],16),parseInt(F[2],16),parseInt(F[3],16))}if(F=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(A)){return H(parseInt(F[1]+F[1],16),parseInt(F[2]+F[2],16),parseInt(F[3]+F[3],16))}var G=jQuery.trim(A).toLowerCase();if(G=="transparent"){return H(255,255,255,0)}else{F=B[G];return H(F[0],F[1],F[2])}};var B={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})();(function(C){function B(l,W,X,E){var O=[],g={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:0.85},xaxis:{mode:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,tickDecimals:null,tickSize:null,minTickSize:null,monthNames:null,timeformat:null,twelveHourClock:false},yaxis:{autoscaleMargin:0.02},x2axis:{autoscaleMargin:null},y2axis:{autoscaleMargin:0.02},series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false},shadowSize:3},grid:{show:true,aboveData:false,color:"#545454",backgroundColor:null,tickColor:"rgba(0,0,0,0.15)",labelMargin:5,borderWidth:2,borderColor:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},hooks:{}},P=null,AC=null,AD=null,Y=null,AJ=null,s={xaxis:{},yaxis:{},x2axis:{},y2axis:{}},e={left:0,right:0,top:0,bottom:0},y=0,Q=0,I=0,t=0,L={processOptions:[],processRawData:[],processDatapoints:[],draw:[],bindEvents:[],drawOverlay:[]},G=this;G.setData=f;G.setupGrid=k;G.draw=AH;G.getPlaceholder=function(){return l};G.getCanvas=function(){return P};G.getPlotOffset=function(){return e};G.width=function(){return I};G.height=function(){return t};G.offset=function(){var AK=AD.offset();AK.left+=e.left;AK.top+=e.top;return AK};G.getData=function(){return O};G.getAxes=function(){return s};G.getOptions=function(){return g};G.highlight=AE;G.unhighlight=x;G.triggerRedrawOverlay=q;G.pointOffset=function(AK){return{left:parseInt(T(AK,"xaxis").p2c(+AK.x)+e.left),top:parseInt(T(AK,"yaxis").p2c(+AK.y)+e.top)}};G.hooks=L;b(G);r(X);c();f(W);k();AH();AG();function Z(AM,AK){AK=[G].concat(AK);for(var AL=0;AL=g.colors.length){AP=0;++AO}}var AQ=0,AW;for(AP=0;APAl.datamax){Al.datamax=Aj}}for(Ac=0;Ac0&&Ab[AZ-AX]!=null&&Ab[AZ-AX]!=Ab[AZ]&&Ab[AZ-AX+1]!=Ab[AZ+1]){for(AV=0;AVAU){AU=Ai}}if(Af.y){if(AiAd){Ad=Ai}}}}if(AR.bars.show){var Ag=AR.bars.align=="left"?0:-AR.bars.barWidth/2;if(AR.bars.horizontal){AY+=Ag;Ad+=Ag+AR.bars.barWidth}else{AS+=Ag;AU+=Ag+AR.bars.barWidth}}AN(AR.xaxis,AS,AU);AN(AR.yaxis,AY,Ad)}for(AK in s){if(s[AK].datamin==AW){s[AK].datamin=null}if(s[AK].datamax==AQ){s[AK].datamax=null}}}function c(){function AK(AM,AL){var AN=document.createElement("canvas");AN.width=AM;AN.height=AL;if(C.browser.msie){AN=window.G_vmlCanvasManager.initElement(AN)}return AN}y=l.width();Q=l.height();l.html("");if(l.css("position")=="static"){l.css("position","relative")}if(y<=0||Q<=0){throw"Invalid dimensions for plot, width = "+y+", height = "+Q}if(C.browser.msie){window.G_vmlCanvasManager.init_(document)}P=C(AK(y,Q)).appendTo(l).get(0);Y=P.getContext("2d");AC=C(AK(y,Q)).css({position:"absolute",left:0,top:0}).appendTo(l).get(0);AJ=AC.getContext("2d");AJ.stroke()}function AG(){AD=C([AC,P]);if(g.grid.hoverable){AD.mousemove(D)}if(g.grid.clickable){AD.click(d)}Z(L.bindEvents,[AD])}function k(){function AL(AT,AU){function AP(AV){return AV}var AS,AO,AQ=AU.transform||AP,AR=AU.inverseTransform;if(AT==s.xaxis||AT==s.x2axis){AS=AT.scale=I/(AQ(AT.max)-AQ(AT.min));AO=AQ(AT.min);if(AQ==AP){AT.p2c=function(AV){return(AV-AO)*AS}}else{AT.p2c=function(AV){return(AQ(AV)-AO)*AS}}if(!AR){AT.c2p=function(AV){return AO+AV/AS}}else{AT.c2p=function(AV){return AR(AO+AV/AS)}}}else{AS=AT.scale=t/(AQ(AT.max)-AQ(AT.min));AO=AQ(AT.max);if(AQ==AP){AT.p2c=function(AV){return(AO-AV)*AS}}else{AT.p2c=function(AV){return(AO-AQ(AV))*AS}}if(!AR){AT.c2p=function(AV){return AO-AV/AS}}else{AT.c2p=function(AV){return AR(AO-AV/AS)}}}}function AN(AR,AT){var AQ,AS=[],AP;AR.labelWidth=AT.labelWidth;AR.labelHeight=AT.labelHeight;if(AR==s.xaxis||AR==s.x2axis){if(AR.labelWidth==null){AR.labelWidth=y/(AR.ticks.length>0?AR.ticks.length:1)}if(AR.labelHeight==null){AS=[];for(AQ=0;AQ'+AP+"")}}if(AS.length>0){var AO=C('
'+AS.join("")+'
').appendTo(l);AR.labelHeight=AO.height();AO.remove()}}}else{if(AR.labelWidth==null||AR.labelHeight==null){for(AQ=0;AQ'+AP+"")}}if(AS.length>0){var AO=C('
'+AS.join("")+"
").appendTo(l);if(AR.labelWidth==null){AR.labelWidth=AO.width()}if(AR.labelHeight==null){AR.labelHeight=AO.find("div").height()}AO.remove()}}}if(AR.labelWidth==null){AR.labelWidth=0}if(AR.labelHeight==null){AR.labelHeight=0}}function AM(){var AP=g.grid.borderWidth;for(i=0;i0){e.bottom=Math.max(AP,s.xaxis.labelHeight+AO)}if(s.yaxis.labelWidth>0){e.left=Math.max(AP,s.yaxis.labelWidth+AO)}if(s.x2axis.labelHeight>0){e.top=Math.max(AP,s.x2axis.labelHeight+AO)}if(s.y2axis.labelWidth>0){e.right=Math.max(AP,s.y2axis.labelWidth+AO)}I=y-e.left-e.right;t=Q-e.bottom-e.top}var AK;for(AK in s){K(s[AK],g[AK])}if(g.grid.show){for(AK in s){F(s[AK],g[AK]);p(s[AK],g[AK]);AN(s[AK],g[AK])}AM()}else{e.left=e.right=e.top=e.bottom=0;I=y;t=Q}for(AK in s){AL(s[AK],g[AK])}if(g.grid.show){h()}AI()}function K(AN,AQ){var AM=+(AQ.min!=null?AQ.min:AN.datamin),AK=+(AQ.max!=null?AQ.max:AN.datamax),AP=AK-AM;if(AP==0){var AL=AK==0?1:0.01;if(AQ.min==null){AM-=AL}if(AQ.max==null||AQ.min!=null){AK+=AL}}else{var AO=AQ.autoscaleMargin;if(AO!=null){if(AQ.min==null){AM-=AP*AO;if(AM<0&&AN.datamin!=null&&AN.datamin>=0){AM=0}}if(AQ.max==null){AK+=AP*AO;if(AK>0&&AN.datamax!=null&&AN.datamax<=0){AK=0}}}}AN.min=AM;AN.max=AK}function F(AP,AS){var AO;if(typeof AS.ticks=="number"&&AS.ticks>0){AO=AS.ticks}else{if(AP==s.xaxis||AP==s.x2axis){AO=0.3*Math.sqrt(y)}else{AO=0.3*Math.sqrt(Q)}}var AX=(AP.max-AP.min)/AO,AZ,AT,AV,AW,AR,AM,AL;if(AS.mode=="time"){var AU={second:1000,minute:60*1000,hour:60*60*1000,day:24*60*60*1000,month:30*24*60*60*1000,year:365.2425*24*60*60*1000};var AY=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[0.25,"month"],[0.5,"month"],[1,"month"],[2,"month"],[3,"month"],[6,"month"],[1,"year"]];var AN=0;if(AS.minTickSize!=null){if(typeof AS.tickSize=="number"){AN=AS.tickSize}else{AN=AS.minTickSize[0]*AU[AS.minTickSize[1]]}}for(AR=0;AR=AN){break}}AZ=AY[AR][0];AV=AY[AR][1];if(AV=="year"){AM=Math.pow(10,Math.floor(Math.log(AX/AU.year)/Math.LN10));AL=(AX/AU.year)/AM;if(AL<1.5){AZ=1}else{if(AL<3){AZ=2}else{if(AL<7.5){AZ=5}else{AZ=10}}}AZ*=AM}if(AS.tickSize){AZ=AS.tickSize[0];AV=AS.tickSize[1]}AT=function(Ac){var Ah=[],Af=Ac.tickSize[0],Ai=Ac.tickSize[1],Ag=new Date(Ac.min);var Ab=Af*AU[Ai];if(Ai=="second"){Ag.setUTCSeconds(A(Ag.getUTCSeconds(),Af))}if(Ai=="minute"){Ag.setUTCMinutes(A(Ag.getUTCMinutes(),Af))}if(Ai=="hour"){Ag.setUTCHours(A(Ag.getUTCHours(),Af))}if(Ai=="month"){Ag.setUTCMonth(A(Ag.getUTCMonth(),Af))}if(Ai=="year"){Ag.setUTCFullYear(A(Ag.getUTCFullYear(),Af))}Ag.setUTCMilliseconds(0);if(Ab>=AU.minute){Ag.setUTCSeconds(0)}if(Ab>=AU.hour){Ag.setUTCMinutes(0)}if(Ab>=AU.day){Ag.setUTCHours(0)}if(Ab>=AU.day*4){Ag.setUTCDate(1)}if(Ab>=AU.year){Ag.setUTCMonth(0)}var Ak=0,Aj=Number.NaN,Ad;do{Ad=Aj;Aj=Ag.getTime();Ah.push({v:Aj,label:Ac.tickFormatter(Aj,Ac)});if(Ai=="month"){if(Af<1){Ag.setUTCDate(1);var Aa=Ag.getTime();Ag.setUTCMonth(Ag.getUTCMonth()+1);var Ae=Ag.getTime();Ag.setTime(Aj+Ak*AU.hour+(Ae-Aa)*Af);Ak=Ag.getUTCHours();Ag.setUTCHours(0)}else{Ag.setUTCMonth(Ag.getUTCMonth()+Af)}}else{if(Ai=="year"){Ag.setUTCFullYear(Ag.getUTCFullYear()+Af)}else{Ag.setTime(Aj+Ab)}}}while(AjAK){AQ=AK}AM=Math.pow(10,-AQ);AL=AX/AM;if(AL<1.5){AZ=1}else{if(AL<3){AZ=2;if(AL>2.25&&(AK==null||AQ+1<=AK)){AZ=2.5;++AQ}}else{if(AL<7.5){AZ=5}else{AZ=10}}}AZ*=AM;if(AS.minTickSize!=null&&AZ0){AO.ticks=AO.tickGenerator(AO)}}else{if(AQ.ticks){var AP=AQ.ticks;if(C.isFunction(AP)){AP=AP({min:AO.min,max:AO.max})}var AN,AK;for(AN=0;AN1){AL=AM[1]}}else{AK=AM}if(AL==null){AL=AO.tickFormatter(AK,AO)}AO.ticks[AN]={v:AK,label:AL}}}}}if(AQ.autoscaleMargin!=null&&AO.ticks.length>0){if(AQ.min==null){AO.min=Math.min(AO.min,AO.ticks[0].v)}if(AQ.max==null&&AO.ticks.length>1){AO.max=Math.max(AO.max,AO.ticks[AO.ticks.length-1].v)}}}function AH(){Y.clearRect(0,0,y,Q);var AL=g.grid;if(AL.show&&!AL.aboveData){S()}for(var AK=0;AKAP){return{from:AP,to:AQ,axis:AN}}return{from:AQ,to:AP,axis:AN}}function S(){var AO;Y.save();Y.translate(e.left,e.top);if(g.grid.backgroundColor){Y.fillStyle=R(g.grid.backgroundColor,t,0,"rgba(255, 255, 255, 0)");Y.fillRect(0,0,I,t)}var AL=g.grid.markings;if(AL){if(C.isFunction(AL)){AL=AL({xmin:s.xaxis.min,xmax:s.xaxis.max,ymin:s.yaxis.min,ymax:s.yaxis.max,xaxis:s.xaxis,yaxis:s.yaxis,x2axis:s.x2axis,y2axis:s.y2axis})}for(AO=0;AOAQ.axis.max||AN.toAN.axis.max){continue}AQ.from=Math.max(AQ.from,AQ.axis.min);AQ.to=Math.min(AQ.to,AQ.axis.max);AN.from=Math.max(AN.from,AN.axis.min);AN.to=Math.min(AN.to,AN.axis.max);if(AQ.from==AQ.to&&AN.from==AN.to){continue}AQ.from=AQ.axis.p2c(AQ.from);AQ.to=AQ.axis.p2c(AQ.to);AN.from=AN.axis.p2c(AN.from);AN.to=AN.axis.p2c(AN.to);if(AQ.from==AQ.to||AN.from==AN.to){Y.beginPath();Y.strokeStyle=AK.color||g.grid.markingsColor;Y.lineWidth=AK.lineWidth||g.grid.markingsLineWidth;Y.moveTo(AQ.from,AN.from);Y.lineTo(AQ.to,AN.to);Y.stroke()}else{Y.fillStyle=AK.color||g.grid.markingsColor;Y.fillRect(AQ.from,AN.to,AQ.to-AQ.from,AN.from-AN.to)}}}Y.lineWidth=1;Y.strokeStyle=g.grid.tickColor;Y.beginPath();var AM,AP=s.xaxis;for(AO=0;AO=s.xaxis.max){continue}Y.moveTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,0);Y.lineTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,t)}AP=s.yaxis;for(AO=0;AO=AP.max){continue}Y.moveTo(0,Math.floor(AP.p2c(AM))+Y.lineWidth/2);Y.lineTo(I,Math.floor(AP.p2c(AM))+Y.lineWidth/2)}AP=s.x2axis;for(AO=0;AO=AP.max){continue}Y.moveTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,-5);Y.lineTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,5)}AP=s.y2axis;for(AO=0;AO=AP.max){continue}Y.moveTo(I-5,Math.floor(AP.p2c(AM))+Y.lineWidth/2);Y.lineTo(I+5,Math.floor(AP.p2c(AM))+Y.lineWidth/2)}Y.stroke();if(g.grid.borderWidth){var AR=g.grid.borderWidth;Y.lineWidth=AR;Y.strokeStyle=g.grid.borderColor;Y.strokeRect(-AR/2,-AR/2,I+AR,t+AR)}Y.restore()}function h(){l.find(".tickLabels").remove();var AK=['
'];function AM(AP,AQ){for(var AO=0;AOAP.max){continue}AK.push(AQ(AN,AP))}}var AL=g.grid.labelMargin+g.grid.borderWidth;AM(s.xaxis,function(AN,AO){return'
'+AN.label+"
"});AM(s.yaxis,function(AN,AO){return'
'+AN.label+"
"});AM(s.x2axis,function(AN,AO){return'
'+AN.label+"
"});AM(s.y2axis,function(AN,AO){return'
'+AN.label+"
"});AK.push("
");l.append(AK.join(""))}function AA(AK){if(AK.lines.show){a(AK)}if(AK.bars.show){n(AK)}if(AK.points.show){o(AK)}}function a(AN){function AM(AY,AZ,AR,Ad,Ac){var Ae=AY.points,AS=AY.pointsize,AW=null,AV=null;Y.beginPath();for(var AX=AS;AX=Aa&&Ab>Ac.max){if(Aa>Ac.max){continue}AU=(Ac.max-Ab)/(Aa-Ab)*(AT-AU)+AU;Ab=Ac.max}else{if(Aa>=Ab&&Aa>Ac.max){if(Ab>Ac.max){continue}AT=(Ac.max-Ab)/(Aa-Ab)*(AT-AU)+AU;Aa=Ac.max}}if(AU<=AT&&AU=AT&&AU>Ad.max){if(AT>Ad.max){continue}Ab=(Ad.max-AU)/(AT-AU)*(Aa-Ab)+Ab;AU=Ad.max}else{if(AT>=AU&&AT>Ad.max){if(AU>Ad.max){continue}Aa=(Ad.max-AU)/(AT-AU)*(Aa-Ab)+Ab;AT=Ad.max}}if(AU!=AW||Ab!=AV){Y.moveTo(Ad.p2c(AU)+AZ,Ac.p2c(Ab)+AR)}AW=AT;AV=Aa;Y.lineTo(Ad.p2c(AT)+AZ,Ac.p2c(Aa)+AR)}Y.stroke()}function AO(AX,Ae,Ac){var Af=AX.points,AR=AX.pointsize,AS=Math.min(Math.max(0,Ac.min),Ac.max),Aa,AV=0,Ad=false;for(var AW=AR;AW=AT&&AU>Ae.max){if(AT>Ae.max){continue}Ab=(Ae.max-AU)/(AT-AU)*(AZ-Ab)+Ab;AU=Ae.max}else{if(AT>=AU&&AT>Ae.max){if(AU>Ae.max){continue}AZ=(Ae.max-AU)/(AT-AU)*(AZ-Ab)+Ab;AT=Ae.max}}if(!Ad){Y.beginPath();Y.moveTo(Ae.p2c(AU),Ac.p2c(AS));Ad=true}if(Ab>=Ac.max&&AZ>=Ac.max){Y.lineTo(Ae.p2c(AU),Ac.p2c(Ac.max));Y.lineTo(Ae.p2c(AT),Ac.p2c(Ac.max));AV=AT;continue}else{if(Ab<=Ac.min&&AZ<=Ac.min){Y.lineTo(Ae.p2c(AU),Ac.p2c(Ac.min));Y.lineTo(Ae.p2c(AT),Ac.p2c(Ac.min));AV=AT;continue}}var Ag=AU,AY=AT;if(Ab<=AZ&&Ab=Ac.min){AU=(Ac.min-Ab)/(AZ-Ab)*(AT-AU)+AU;Ab=Ac.min}else{if(AZ<=Ab&&AZ=Ac.min){AT=(Ac.min-Ab)/(AZ-Ab)*(AT-AU)+AU;AZ=Ac.min}}if(Ab>=AZ&&Ab>Ac.max&&AZ<=Ac.max){AU=(Ac.max-Ab)/(AZ-Ab)*(AT-AU)+AU;Ab=Ac.max}else{if(AZ>=Ab&&AZ>Ac.max&&Ab<=Ac.max){AT=(Ac.max-Ab)/(AZ-Ab)*(AT-AU)+AU;AZ=Ac.max}}if(AU!=Ag){if(Ab<=Ac.min){Aa=Ac.min}else{Aa=Ac.max}Y.lineTo(Ae.p2c(Ag),Ac.p2c(Aa));Y.lineTo(Ae.p2c(AU),Ac.p2c(Aa))}Y.lineTo(Ae.p2c(AU),Ac.p2c(Ab));Y.lineTo(Ae.p2c(AT),Ac.p2c(AZ));if(AT!=AY){if(AZ<=Ac.min){Aa=Ac.min}else{Aa=Ac.max}Y.lineTo(Ae.p2c(AT),Ac.p2c(Aa));Y.lineTo(Ae.p2c(AY),Ac.p2c(Aa))}AV=Math.max(AT,AY)}if(Ad){Y.lineTo(Ae.p2c(AV),Ac.p2c(AS));Y.fill()}}Y.save();Y.translate(e.left,e.top);Y.lineJoin="round";var AP=AN.lines.lineWidth,AK=AN.shadowSize;if(AP>0&&AK>0){Y.lineWidth=AK;Y.strokeStyle="rgba(0,0,0,0.1)";var AQ=Math.PI/18;AM(AN.datapoints,Math.sin(AQ)*(AP/2+AK/2),Math.cos(AQ)*(AP/2+AK/2),AN.xaxis,AN.yaxis);Y.lineWidth=AK/2;AM(AN.datapoints,Math.sin(AQ)*(AP/2+AK/4),Math.cos(AQ)*(AP/2+AK/4),AN.xaxis,AN.yaxis)}Y.lineWidth=AP;Y.strokeStyle=AN.color;var AL=V(AN.lines,AN.color,0,t);if(AL){Y.fillStyle=AL;AO(AN.datapoints,AN.xaxis,AN.yaxis)}if(AP>0){AM(AN.datapoints,0,0,AN.xaxis,AN.yaxis)}Y.restore()}function o(AN){function AP(AU,AT,Ab,AR,AV,AZ,AY){var Aa=AU.points,AQ=AU.pointsize;for(var AS=0;ASAZ.max||AWAY.max){continue}Y.beginPath();Y.arc(AZ.p2c(AX),AY.p2c(AW)+AR,AT,0,AV,false);if(Ab){Y.fillStyle=Ab;Y.fill()}Y.stroke()}}Y.save();Y.translate(e.left,e.top);var AO=AN.lines.lineWidth,AL=AN.shadowSize,AK=AN.points.radius;if(AO>0&&AL>0){var AM=AL/2;Y.lineWidth=AM;Y.strokeStyle="rgba(0,0,0,0.1)";AP(AN.datapoints,AK,null,AM+AM/2,Math.PI,AN.xaxis,AN.yaxis);Y.strokeStyle="rgba(0,0,0,0.2)";AP(AN.datapoints,AK,null,AM/2,Math.PI,AN.xaxis,AN.yaxis)}Y.lineWidth=AO;Y.strokeStyle=AN.color;AP(AN.datapoints,AK,V(AN.points,AN.color),0,2*Math.PI,AN.xaxis,AN.yaxis);Y.restore()}function AB(AV,AU,Ad,AQ,AY,AN,AL,AT,AS,Ac,AZ){var AM,Ab,AR,AX,AO,AK,AW,AP,Aa;if(AZ){AP=AK=AW=true;AO=false;AM=Ad;Ab=AV;AX=AU+AQ;AR=AU+AY;if(AbAT.max||AXAS.max){return }if(AMAT.max){Ab=AT.max;AK=false}if(ARAS.max){AX=AS.max;AW=false}AM=AT.p2c(AM);AR=AS.p2c(AR);Ab=AT.p2c(Ab);AX=AS.p2c(AX);if(AL){Ac.beginPath();Ac.moveTo(AM,AR);Ac.lineTo(AM,AX);Ac.lineTo(Ab,AX);Ac.lineTo(Ab,AR);Ac.fillStyle=AL(AR,AX);Ac.fill()}if(AO||AK||AW||AP){Ac.beginPath();Ac.moveTo(AM,AR+AN);if(AO){Ac.lineTo(AM,AX+AN)}else{Ac.moveTo(AM,AX+AN)}if(AW){Ac.lineTo(Ab,AX+AN)}else{Ac.moveTo(Ab,AX+AN)}if(AK){Ac.lineTo(Ab,AR+AN)}else{Ac.moveTo(Ab,AR+AN)}if(AP){Ac.lineTo(AM,AR+AN)}else{Ac.moveTo(AM,AR+AN)}Ac.stroke()}}function n(AM){function AL(AS,AR,AU,AP,AT,AW,AV){var AX=AS.points,AO=AS.pointsize;for(var AQ=0;AQ")}AP.push("");AN=true}if(AV){AR=AV(AR,AU)}AP.push('
'+AR+"")}if(AN){AP.push("")}if(AP.length==0){return }var AT=''+AP.join("")+"
";if(g.legend.container!=null){C(g.legend.container).html(AT)}else{var AQ="",AL=g.legend.position,AM=g.legend.margin;if(AM[0]==null){AM=[AM,AM]}if(AL.charAt(0)=="n"){AQ+="top:"+(AM[1]+e.top)+"px;"}else{if(AL.charAt(0)=="s"){AQ+="bottom:"+(AM[1]+e.bottom)+"px;"}}if(AL.charAt(1)=="e"){AQ+="right:"+(AM[0]+e.right)+"px;"}else{if(AL.charAt(1)=="w"){AQ+="left:"+(AM[0]+e.left)+"px;"}}var AS=C('
'+AT.replace('style="','style="position:absolute;'+AQ+";")+"
").appendTo(l);if(g.legend.backgroundOpacity!=0){var AO=g.legend.backgroundColor;if(AO==null){AO=g.grid.backgroundColor;if(AO&&typeof AO=="string"){AO=C.color.parse(AO)}else{AO=C.color.extract(AS,"background-color")}AO.a=1;AO=AO.toString()}var AK=AS.children();C('
').prependTo(AS).css("opacity",g.legend.backgroundOpacity)}}}var w=[],J=null;function AF(AR,AP,AM){var AX=g.grid.mouseActiveRadius,Aj=AX*AX+1,Ah=null,Aa=false,Af,Ad;for(Af=0;AfAL||AT-AZ<-AL||AS-AW>AK||AS-AW<-AK){continue}var AV=Math.abs(AQ.p2c(AT)-AR),AU=Math.abs(AO.p2c(AS)-AP),Ab=AV*AV+AU*AU;if(Ab<=Aj){Aj=Ab;Ah=[Af,Ad/Ac]}}}if(AY.bars.show&&!Ah){var AN=AY.bars.align=="left"?0:-AY.bars.barWidth/2,Ag=AN+AY.bars.barWidth;for(Ad=0;Ad=Math.min(Ai,AT)&&AW>=AS+AN&&AW<=AS+Ag):(AZ>=AT+AN&&AZ<=AT+Ag&&AW>=Math.min(Ai,AS)&&AW<=Math.max(Ai,AS))){Ah=[Af,Ad/Ac]}}}}if(Ah){Af=Ah[0];Ad=Ah[1];Ac=O[Af].datapoints.pointsize;return{datapoint:O[Af].datapoints.points.slice(Ad*Ac,(Ad+1)*Ac),dataIndex:Ad,series:O[Af],seriesIndex:Af}}return null}function D(AK){if(g.grid.hoverable){H("plothover",AK,function(AL){return AL.hoverable!=false})}}function d(AK){H("plotclick",AK,function(AL){return AL.clickable!=false})}function H(AL,AK,AM){var AN=AD.offset(),AS={pageX:AK.pageX,pageY:AK.pageY},AQ=AK.pageX-AN.left-e.left,AO=AK.pageY-AN.top-e.top;if(s.xaxis.used){AS.x=s.xaxis.c2p(AQ)}if(s.yaxis.used){AS.y=s.yaxis.c2p(AO)}if(s.x2axis.used){AS.x2=s.x2axis.c2p(AQ)}if(s.y2axis.used){AS.y2=s.y2axis.c2p(AO)}var AT=AF(AQ,AO,AM);if(AT){AT.pageX=parseInt(AT.series.xaxis.p2c(AT.datapoint[0])+AN.left+e.left);AT.pageY=parseInt(AT.series.yaxis.p2c(AT.datapoint[1])+AN.top+e.top)}if(g.grid.autoHighlight){for(var AP=0;APAQ.max||ARAP.max){return }var AO=AN.points.radius+AN.points.lineWidth/2;AJ.lineWidth=AO;AJ.strokeStyle=C.color.parse(AN.color).scale("a",0.5).toString();var AK=1.5*AO;AJ.beginPath();AJ.arc(AQ.p2c(AL),AP.p2c(AR),AK,0,2*Math.PI,false);AJ.stroke()}function z(AN,AK){AJ.lineWidth=AN.bars.lineWidth;AJ.strokeStyle=C.color.parse(AN.color).scale("a",0.5).toString();var AM=C.color.parse(AN.color).scale("a",0.5).toString();var AL=AN.bars.align=="left"?0:-AN.bars.barWidth/2;AB(AK[0],AK[1],AK[2]||0,AL,AL+AN.bars.barWidth,0,function(){return AM},AN.xaxis,AN.yaxis,AJ,AN.bars.horizontal)}function R(AM,AL,AQ,AO){if(typeof AM=="string"){return AM}else{var AP=Y.createLinearGradient(0,AQ,0,AL);for(var AN=0,AK=AM.colors.length;AN12){K=K-12}else{if(K==0){K=12}}}for(var F=0;F0&&A.which!=D.which)||R(A.target).is(D.not)){return }}switch(A.type){case"mousedown":R.extend(D,R(B).offset(),{elem:B,target:A.target,pageX:A.pageX,pageY:A.pageY});M.add(document,"mousemove mouseup",O,D);P(B,false);Q.dragging=null;return false;case !Q.dragging&&"mousemove":if(N(A.pageX-D.pageX)+N(A.pageY-D.pageY)Z[1]))){return }a.min=X;a.max=T}K(G,F,"xaxis");K(G,F,"x2axis");K(P,O,"yaxis");K(P,O,"y2axis");D.setupGrid();D.draw();if(!M.preventEvent){D.getPlaceholder().trigger("plotzoom",[D])}};D.pan=function(I){var F=+I.left,J=+I.top,K=D.getAxes(),H=D.getOptions();if(isNaN(F)){F=0}if(isNaN(J)){J=0}function G(R,M){var O=K[M],Q=H[M],N,L;if(!O.used){return }N=O.c2p(O.p2c(O.min)+R),L=O.c2p(O.p2c(O.max)+R);var P=Q.panRange;if(P){if(P[0]!=null&&P[0]>N){R=P[0]-N;N+=R;L+=R}if(P[1]!=null&&P[1]0&&A.which!=D.which)||R(A.target).is(D.not)){return }}switch(A.type){case"mousedown":R.extend(D,R(B).offset(),{elem:B,target:A.target,pageX:A.pageX,pageY:A.pageY});M.add(document,"mousemove mouseup",O,D);P(B,false);Q.dragging=null;return false;case !Q.dragging&&"mousemove":if(N(A.pageX-D.pageX)+N(A.pageY-D.pageY)Z[1]))){return }a.min=X;a.max=T}K(G,F,"xaxis");K(G,F,"x2axis");K(P,O,"yaxis");K(P,O,"y2axis");D.setupGrid();D.draw();if(!M.preventEvent){D.getPlaceholder().trigger("plotzoom",[D])}};D.pan=function(I){var F=+I.left,J=+I.top,K=D.getAxes(),H=D.getOptions();if(isNaN(F)){F=0}if(isNaN(J)){J=0}function G(R,M){var O=K[M],Q=H[M],N,L;if(!O.used){return }N=O.c2p(O.p2c(O.min)+R),L=O.c2p(O.p2c(O.max)+R);var P=Q.panRange;if(P){if(P[0]!=null&&P[0]>N){R=P[0]-N;N+=R;L+=R}if(P[1]!=null&&P[1]Q?Q:S)}function C(U,R){var T=J.getOptions();var S=J.getPlaceholder().offset();var Q=J.getPlotOffset();U.x=G(0,R.pageX-S.left-Q.left,J.width());U.y=G(0,R.pageY-S.top-Q.top,J.height());if(T.selection.mode=="y"){U.x=U==O.first?0:J.width()}if(T.selection.mode=="x"){U.y=U==O.first?0:J.height()}}function K(Q){if(Q.pageX==null){return }C(O.second,Q);if(E()){O.show=true;J.triggerRedrawOverlay()}else{P(true)}}function P(Q){if(O.show){O.show=false;J.triggerRedrawOverlay();if(!Q){J.getPlaceholder().trigger("plotunselected",[])}}}function N(R,Q){var T,S,U=J.getAxes();var V=J.getOptions();if(V.selection.mode=="y"){O.first.x=0;O.second.x=J.width()}else{T=R.xaxis?U.xaxis:(R.x2axis?U.x2axis:U.xaxis);S=R.xaxis||R.x2axis||{from:R.x1,to:R.x2};O.first.x=T.p2c(Math.min(S.from,S.to));O.second.x=T.p2c(Math.max(S.from,S.to))}if(V.selection.mode=="x"){O.first.y=0;O.second.y=J.height()}else{T=R.yaxis?U.yaxis:(R.y2axis?U.y2axis:U.yaxis);S=R.yaxis||R.y2axis||{from:R.y1,to:R.y2};O.first.y=T.p2c(Math.min(S.from,S.to));O.second.y=T.p2c(Math.max(S.from,S.to))}O.show=true;J.triggerRedrawOverlay();if(!Q){H()}}function E(){var Q=5;return Math.abs(O.second.x-O.first.x)>=Q&&Math.abs(O.second.y-O.first.y)>=Q}J.clearSelection=P;J.setSelection=N;J.getSelection=F;J.hooks.bindEvents.push(function(R,Q){var S=R.getOptions();if(S.selection.mode!=null){Q.mousemove(D)}if(S.selection.mode!=null){Q.mousedown(M)}});J.hooks.drawOverlay.push(function(T,Y){if(O.show&&E()){var R=T.getPlotOffset();var Q=T.getOptions();Y.save();Y.translate(R.left,R.top);var U=A.color.parse(Q.selection.color);Y.strokeStyle=U.scale("a",0.8).toString();Y.lineWidth=1;Y.lineJoin="round";Y.fillStyle=U.scale("a",0.4).toString();var W=Math.min(O.first.x,O.second.x),V=Math.min(O.first.y,O.second.y),X=Math.abs(O.second.x-O.first.x),S=Math.abs(O.second.y-O.first.y);Y.fillRect(W,V,X,S);Y.strokeRect(W,V,X,S);Y.restore()}})}A.plot.plugins.push({init:B,options:{selection:{mode:null,color:"#e8cfac"}},name:"selection",version:"1.0"})})(jQuery); \ No newline at end of file +(function(A){function B(J){var O={first:{x:-1,y:-1},second:{x:-1,y:-1},show:false,active:false};var L={};function D(Q){if(O.active){J.getPlaceholder().trigger("plotselecting",[F()]);K(Q)}}function M(Q){if(Q.which!=1){return }document.body.focus();if(document.onselectstart!==undefined&&L.onselectstart==null){L.onselectstart=document.onselectstart;document.onselectstart=function(){return false}}if(document.ondrag!==undefined&&L.ondrag==null){L.ondrag=document.ondrag;document.ondrag=function(){return false}}C(O.first,Q);O.active=true;A(document).one("mouseup",I)}function I(Q){if(document.onselectstart!==undefined){document.onselectstart=L.onselectstart}if(document.ondrag!==undefined){document.ondrag=L.ondrag}O.active=false;K(Q);if(E()){H()}else{J.getPlaceholder().trigger("plotunselected",[]);J.getPlaceholder().trigger("plotselecting",[null])}return false}function F(){if(!E()){return null}var R=Math.min(O.first.x,O.second.x),Q=Math.max(O.first.x,O.second.x),T=Math.max(O.first.y,O.second.y),S=Math.min(O.first.y,O.second.y);var U={};var V=J.getAxes();if(V.xaxis.used){U.xaxis={from:V.xaxis.c2p(R),to:V.xaxis.c2p(Q)}}if(V.x2axis.used){U.x2axis={from:V.x2axis.c2p(R),to:V.x2axis.c2p(Q)}}if(V.yaxis.used){U.yaxis={from:V.yaxis.c2p(T),to:V.yaxis.c2p(S)}}if(V.y2axis.used){U.y2axis={from:V.y2axis.c2p(T),to:V.y2axis.c2p(S)}}return U}function H(){var Q=F();J.getPlaceholder().trigger("plotselected",[Q]);var R=J.getAxes();if(R.xaxis.used&&R.yaxis.used){J.getPlaceholder().trigger("selected",[{x1:Q.xaxis.from,y1:Q.yaxis.from,x2:Q.xaxis.to,y2:Q.yaxis.to}])}}function G(R,S,Q){return SQ?Q:S)}function C(U,R){var T=J.getOptions();var S=J.getPlaceholder().offset();var Q=J.getPlotOffset();U.x=G(0,R.pageX-S.left-Q.left,J.width());U.y=G(0,R.pageY-S.top-Q.top,J.height());if(T.selection.mode=="y"){U.x=U==O.first?0:J.width()}if(T.selection.mode=="x"){U.y=U==O.first?0:J.height()}}function K(Q){if(Q.pageX==null){return }C(O.second,Q);if(E()){O.show=true;J.triggerRedrawOverlay()}else{P(true)}}function P(Q){if(O.show){O.show=false;J.triggerRedrawOverlay();if(!Q){J.getPlaceholder().trigger("plotunselected",[])}}}function N(R,Q){var T,S,U=J.getAxes();var V=J.getOptions();if(V.selection.mode=="y"){O.first.x=0;O.second.x=J.width()}else{T=R.xaxis?U.xaxis:(R.x2axis?U.x2axis:U.xaxis);S=R.xaxis||R.x2axis||{from:R.x1,to:R.x2};O.first.x=T.p2c(Math.min(S.from,S.to));O.second.x=T.p2c(Math.max(S.from,S.to))}if(V.selection.mode=="x"){O.first.y=0;O.second.y=J.height()}else{T=R.yaxis?U.yaxis:(R.y2axis?U.y2axis:U.yaxis);S=R.yaxis||R.y2axis||{from:R.y1,to:R.y2};O.first.y=T.p2c(Math.min(S.from,S.to));O.second.y=T.p2c(Math.max(S.from,S.to))}O.show=true;J.triggerRedrawOverlay();if(!Q){H()}}function E(){var Q=5;return Math.abs(O.second.x-O.first.x)>=Q&&Math.abs(O.second.y-O.first.y)>=Q}J.clearSelection=P;J.setSelection=N;J.getSelection=F;J.hooks.bindEvents.push(function(R,Q){var S=R.getOptions();if(S.selection.mode!=null){Q.mousemove(D)}if(S.selection.mode!=null){Q.mousedown(M)}});J.hooks.drawOverlay.push(function(T,Y){if(O.show&&E()){var R=T.getPlotOffset();var Q=T.getOptions();Y.save();Y.translate(R.left,R.top);var U=A.color.parse(Q.selection.color);Y.strokeStyle=U.scale("a",0.8).toString();Y.lineWidth=1;Y.lineJoin="round";Y.fillStyle=U.scale("a",0.4).toString();var W=Math.min(O.first.x,O.second.x),V=Math.min(O.first.y,O.second.y),X=Math.abs(O.second.x-O.first.x),S=Math.abs(O.second.y-O.first.y);Y.fillRect(W,V,X,S);Y.strokeRect(W,V,X,S);Y.restore()}})}A.plot.plugins.push({init:B,options:{selection:{mode:null,color:"#e8cfac"}},name:"selection",version:"1.0"})})(jQuery); diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.min.js index b5b8943b..41fef5af 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.min.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.min.js @@ -1 +1 @@ -(function(B){var A={series:{stack:null}};function C(F){function D(J,I){var H=null;for(var G=0;G=Y.length){break}U=N.length;if(V>=S.length||S[V]==null||Y[X]==null){for(m=0;ma){if(O&&X>0&&Y[X-T]!=null){I=Q+(Y[X-T+1]-Q)*(a-R)/(Y[X-T]-R);N.push(a);N.push(I+Z);for(m=2;m0&&S[V-T]!=null){M=Z+(S[V-T+1]-Z)*(R-a)/(S[V-T]-a)}N[U+1]+=M;X+=T}}if(U!=N.length&&K){N[U+2]+=M}}if(J&&U!=N.length&&U>0&&N[U]!=null&&N[U]!=N[U-T]&&N[U+1]!=N[U-T+1]){for(m=0;m=Y.length){break}U=N.length;if(V>=S.length||S[V]==null||Y[X]==null){for(m=0;ma){if(O&&X>0&&Y[X-T]!=null){I=Q+(Y[X-T+1]-Q)*(a-R)/(Y[X-T]-R);N.push(a);N.push(I+Z);for(m=2;m0&&S[V-T]!=null){M=Z+(S[V-T+1]-Z)*(R-a)/(S[V-T]-a)}N[U+1]+=M;X+=T}}if(U!=N.length&&K){N[U+2]+=M}}if(J&&U!=N.length&&U>0&&N[U]!=null&&N[U]!=N[U-T]&&N[U+1]!=N[U-T+1]){for(m=0;m0&&Q[I-F]!=null){var J=(O-Q[I-F])/(N-Q[I-F+1])*(P-N)+O;K.push(J);K.push(P);for(m=2;m0){L.getData().push(H)}}D.hooks.processDatapoints.push(E)}B.plot.plugins.push({init:C,options:A,name:"threshold",version:"1.0"})})(jQuery); \ No newline at end of file +(function(B){var A={series:{threshold:null}};function C(D){function E(L,S,M){if(!S.threshold){return }var F=M.pointsize,I,O,N,G,K,H=B.extend({},S);H.datapoints={points:[],pointsize:F};H.label=null;H.color=S.threshold.color;H.threshold=null;H.originSeries=S;H.data=[];var P=S.threshold.below,Q=M.points,R=S.lines.show;threspoints=[];newpoints=[];for(I=0;I0&&Q[I-F]!=null){var J=(O-Q[I-F])/(N-Q[I-F+1])*(P-N)+O;K.push(J);K.push(P);for(m=2;m0){L.getData().push(H)}}D.hooks.processDatapoints.push(E)}B.plot.plugins.push({init:C,options:A,name:"threshold",version:"1.0"})})(jQuery); diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js index 12c74f7b..988f934a 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js @@ -1 +1 @@ -if(!document.createElement("canvas").getContext){(function(){var z=Math;var K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var F=D/2;function T(){return this.context_||(this.context_=new W(this))}var O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return String(Z).replace(/&/g,"&").replace(/"/g,""")}function r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML")}if(!i.namespaces.g_o_){i.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML")}if(!i.styleSheets.ex_canvas_){var Z=i.createStyleSheet();Z.owningElement.id="ex_canvas_";Z.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}r(document);var E={init:function(Z){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var i=Z||document;i.createElement("canvas");i.attachEvent("onreadystatechange",G(this.init_,this,i))}},init_:function(m){var j=m.getElementsByTagName("canvas");for(var Z=0;Z1){j--}if(6*j<1){return i+(Z-i)*6*j}else{if(2*j<1){return Z}else{if(3*j<2){return i+(Z-i)*(2/3-j)*6}else{return i}}}}function Y(Z){var AE,p=1;Z=String(Z);if(Z.charAt(0)=="#"){AE=Z}else{if(/^rgb/.test(Z)){var m=g(Z);var AE="#",AF;for(var j=0;j<3;j++){if(m[j].indexOf("%")!=-1){AF=Math.floor(C(m[j])*255)}else{AF=Number(m[j])}AE+=I[N(AF,0,255)]}p=m[3]}else{if(/^hsl/.test(Z)){var m=g(Z);AE=c(m);p=m[3]}else{AE=B[Z]||Z}}}return{color:AE,alpha:p}}var L={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var f={};function X(Z){if(f[Z]){return f[Z]}var m=document.createElement("div");var j=m.style;try{j.font=Z}catch(i){}return f[Z]={style:j.fontStyle||L.style,variant:j.fontVariant||L.variant,weight:j.fontWeight||L.weight,size:j.fontSize||L.size,family:j.fontFamily||L.family}}function P(j,i){var Z={};for(var AF in j){Z[AF]=j[AF]}var AE=parseFloat(i.currentStyle.fontSize),m=parseFloat(j.size);if(typeof j.size=="number"){Z.size=j.size}else{if(j.size.indexOf("px")!=-1){Z.size=m}else{if(j.size.indexOf("em")!=-1){Z.size=AE*m}else{if(j.size.indexOf("%")!=-1){Z.size=(AE/100)*m}else{if(j.size.indexOf("pt")!=-1){Z.size=m/0.75}else{Z.size=AE}}}}}Z.size*=0.981;return Z}function AA(Z){return Z.style+" "+Z.variant+" "+Z.weight+" "+Z.size+"px "+Z.family}function t(Z){switch(Z){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function W(i){this.m_=V();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=D*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var Z=i.ownerDocument.createElement("div");Z.style.width=i.clientWidth+"px";Z.style.height=i.clientHeight+"px";Z.style.overflow="hidden";Z.style.position="absolute";i.appendChild(Z);this.element_=Z;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var M=W.prototype;M.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};M.beginPath=function(){this.currentPath_=[]};M.moveTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"moveTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.lineTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"lineTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.bezierCurveTo=function(j,i,AI,AH,AG,AE){var Z=this.getCoords_(AG,AE);var AF=this.getCoords_(j,i);var m=this.getCoords_(AI,AH);e(this,AF,m,Z)};function e(Z,m,j,i){Z.currentPath_.push({type:"bezierCurveTo",cp1x:m.x,cp1y:m.y,cp2x:j.x,cp2y:j.y,x:i.x,y:i.y});Z.currentX_=i.x;Z.currentY_=i.y}M.quadraticCurveTo=function(AG,j,i,Z){var AF=this.getCoords_(AG,j);var AE=this.getCoords_(i,Z);var AH={x:this.currentX_+2/3*(AF.x-this.currentX_),y:this.currentY_+2/3*(AF.y-this.currentY_)};var m={x:AH.x+(AE.x-this.currentX_)/3,y:AH.y+(AE.y-this.currentY_)/3};e(this,AH,m,AE)};M.arc=function(AJ,AH,AI,AE,i,j){AI*=D;var AN=j?"at":"wa";var AK=AJ+U(AE)*AI-F;var AM=AH+J(AE)*AI-F;var Z=AJ+U(i)*AI-F;var AL=AH+J(i)*AI-F;if(AK==Z&&!j){AK+=0.125}var m=this.getCoords_(AJ,AH);var AG=this.getCoords_(AK,AM);var AF=this.getCoords_(Z,AL);this.currentPath_.push({type:AN,x:m.x,y:m.y,radius:AI,xStart:AG.x,yStart:AG.y,xEnd:AF.x,yEnd:AF.y})};M.rect=function(j,i,Z,m){this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath()};M.strokeRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.stroke();this.currentPath_=p};M.fillRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.fill();this.currentPath_=p};M.createLinearGradient=function(i,m,Z,j){var p=new v("gradient");p.x0_=i;p.y0_=m;p.x1_=Z;p.y1_=j;return p};M.createRadialGradient=function(m,AE,j,i,p,Z){var AF=new v("gradientradial");AF.x0_=m;AF.y0_=AE;AF.r0_=j;AF.x1_=i;AF.y1_=p;AF.r1_=Z;return AF};M.drawImage=function(AO,j){var AH,AF,AJ,AV,AM,AK,AQ,AX;var AI=AO.runtimeStyle.width;var AN=AO.runtimeStyle.height;AO.runtimeStyle.width="auto";AO.runtimeStyle.height="auto";var AG=AO.width;var AT=AO.height;AO.runtimeStyle.width=AI;AO.runtimeStyle.height=AN;if(arguments.length==3){AH=arguments[1];AF=arguments[2];AM=AK=0;AQ=AJ=AG;AX=AV=AT}else{if(arguments.length==5){AH=arguments[1];AF=arguments[2];AJ=arguments[3];AV=arguments[4];AM=AK=0;AQ=AG;AX=AT}else{if(arguments.length==9){AM=arguments[1];AK=arguments[2];AQ=arguments[3];AX=arguments[4];AH=arguments[5];AF=arguments[6];AJ=arguments[7];AV=arguments[8]}else{throw Error("Invalid number of arguments")}}}var AW=this.getCoords_(AH,AF);var m=AQ/2;var i=AX/2;var AU=[];var Z=10;var AE=10;AU.push(" ','","");this.element_.insertAdjacentHTML("BeforeEnd",AU.join(""))};M.stroke=function(AM){var m=10;var AN=10;var AE=5000;var AG={x:null,y:null};var AL={x:null,y:null};for(var AH=0;AHAL.x){AL.x=Z.x}if(AG.y==null||Z.yAL.y){AL.y=Z.y}}}AK.push(' ">');if(!AM){R(this,AK)}else{a(this,AK,AG,AL)}AK.push("");this.element_.insertAdjacentHTML("beforeEnd",AK.join(""))}};function R(j,AE){var i=Y(j.strokeStyle);var m=i.color;var p=i.alpha*j.globalAlpha;var Z=j.lineScale_*j.lineWidth;if(Z<1){p*=Z}AE.push("')}function a(AO,AG,Ah,AP){var AH=AO.fillStyle;var AY=AO.arcScaleX_;var AX=AO.arcScaleY_;var Z=AP.x-Ah.x;var m=AP.y-Ah.y;if(AH instanceof v){var AL=0;var Ac={x:0,y:0};var AU=0;var AK=1;if(AH.type_=="gradient"){var AJ=AH.x0_/AY;var j=AH.y0_/AX;var AI=AH.x1_/AY;var Aj=AH.y1_/AX;var Ag=AO.getCoords_(AJ,j);var Af=AO.getCoords_(AI,Aj);var AE=Af.x-Ag.x;var p=Af.y-Ag.y;AL=Math.atan2(AE,p)*180/Math.PI;if(AL<0){AL+=360}if(AL<0.000001){AL=0}}else{var Ag=AO.getCoords_(AH.x0_,AH.y0_);Ac={x:(Ag.x-Ah.x)/Z,y:(Ag.y-Ah.y)/m};Z/=AY*D;m/=AX*D;var Aa=z.max(Z,m);AU=2*AH.r0_/Aa;AK=2*AH.r1_/Aa-AU}var AS=AH.colors_;AS.sort(function(Ak,i){return Ak.offset-i.offset});var AN=AS.length;var AR=AS[0].color;var AQ=AS[AN-1].color;var AW=AS[0].alpha*AO.globalAlpha;var AV=AS[AN-1].alpha*AO.globalAlpha;var Ab=[];for(var Ae=0;Ae')}else{if(AH instanceof u){if(Z&&m){var AF=-Ah.x;var AZ=-Ah.y;AG.push("')}}else{var Ai=Y(AO.fillStyle);var AT=Ai.color;var Ad=Ai.alpha*AO.globalAlpha;AG.push('')}}}M.fill=function(){this.stroke(true)};M.closePath=function(){this.currentPath_.push({type:"close"})};M.getCoords_=function(j,i){var Z=this.m_;return{x:D*(j*Z[0][0]+i*Z[1][0]+Z[2][0])-F,y:D*(j*Z[0][1]+i*Z[1][1]+Z[2][1])-F}};M.save=function(){var Z={};Q(this,Z);this.aStack_.push(Z);this.mStack_.push(this.m_);this.m_=d(V(),this.m_)};M.restore=function(){if(this.aStack_.length){Q(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function H(Z){return isFinite(Z[0][0])&&isFinite(Z[0][1])&&isFinite(Z[1][0])&&isFinite(Z[1][1])&&isFinite(Z[2][0])&&isFinite(Z[2][1])}function y(i,Z,j){if(!H(Z)){return }i.m_=Z;if(j){var p=Z[0][0]*Z[1][1]-Z[0][1]*Z[1][0];i.lineScale_=k(b(p))}}M.translate=function(j,i){var Z=[[1,0,0],[0,1,0],[j,i,1]];y(this,d(Z,this.m_),false)};M.rotate=function(i){var m=U(i);var j=J(i);var Z=[[m,j,0],[-j,m,0],[0,0,1]];y(this,d(Z,this.m_),false)};M.scale=function(j,i){this.arcScaleX_*=j;this.arcScaleY_*=i;var Z=[[j,0,0],[0,i,0],[0,0,1]];y(this,d(Z,this.m_),true)};M.transform=function(p,m,AF,AE,i,Z){var j=[[p,m,0],[AF,AE,0],[i,Z,1]];y(this,d(j,this.m_),true)};M.setTransform=function(AE,p,AG,AF,j,i){var Z=[[AE,p,0],[AG,AF,0],[j,i,1]];y(this,Z,true)};M.drawText_=function(AK,AI,AH,AN,AG){var AM=this.m_,AQ=1000,i=0,AP=AQ,AF={x:0,y:0},AE=[];var Z=P(X(this.font),this.element_);var j=AA(Z);var AR=this.element_.currentStyle;var p=this.textAlign.toLowerCase();switch(p){case"left":case"center":case"right":break;case"end":p=AR.direction=="ltr"?"right":"left";break;case"start":p=AR.direction=="rtl"?"right":"left";break;default:p="left"}switch(this.textBaseline){case"hanging":case"top":AF.y=Z.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":AF.y=-Z.size/2.25;break}switch(p){case"right":i=AQ;AP=0.05;break;case"center":i=AP=AQ/2;break}var AO=this.getCoords_(AI+AF.x,AH+AF.y);AE.push('');if(AG){R(this,AE)}else{a(this,AE,{x:-i,y:0},{x:AP,y:Z.size})}var AL=AM[0][0].toFixed(3)+","+AM[1][0].toFixed(3)+","+AM[0][1].toFixed(3)+","+AM[1][1].toFixed(3)+",0,0";var AJ=K(AO.x/D)+","+K(AO.y/D);AE.push('','','');this.element_.insertAdjacentHTML("beforeEnd",AE.join(""))};M.fillText=function(j,Z,m,i){this.drawText_(j,Z,m,i,false)};M.strokeText=function(j,Z,m,i){this.drawText_(j,Z,m,i,true)};M.measureText=function(j){if(!this.textMeasureEl_){var Z='';this.element_.insertAdjacentHTML("beforeEnd",Z);this.textMeasureEl_=this.element_.lastChild}var i=this.element_.ownerDocument;this.textMeasureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(i.createTextNode(j));return{width:this.textMeasureEl_.offsetWidth}};M.clip=function(){};M.arcTo=function(){};M.createPattern=function(i,Z){return new u(i,Z)};function v(Z){this.type_=Z;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}v.prototype.addColorStop=function(i,Z){Z=Y(Z);this.colors_.push({offset:i,color:Z.color,alpha:Z.alpha})};function u(i,Z){q(i);switch(Z){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=Z;break;default:n("SYNTAX_ERR")}this.src_=i.src;this.width_=i.width;this.height_=i.height}function n(Z){throw new o(Z)}function q(Z){if(!Z||Z.nodeType!=1||Z.tagName!="IMG"){n("TYPE_MISMATCH_ERR")}if(Z.readyState!="complete"){n("INVALID_STATE_ERR")}}function o(Z){this.code=this[Z];this.message=Z+": DOM Exception "+this.code}var x=o.prototype=new Error;x.INDEX_SIZE_ERR=1;x.DOMSTRING_SIZE_ERR=2;x.HIERARCHY_REQUEST_ERR=3;x.WRONG_DOCUMENT_ERR=4;x.INVALID_CHARACTER_ERR=5;x.NO_DATA_ALLOWED_ERR=6;x.NO_MODIFICATION_ALLOWED_ERR=7;x.NOT_FOUND_ERR=8;x.NOT_SUPPORTED_ERR=9;x.INUSE_ATTRIBUTE_ERR=10;x.INVALID_STATE_ERR=11;x.SYNTAX_ERR=12;x.INVALID_MODIFICATION_ERR=13;x.NAMESPACE_ERR=14;x.INVALID_ACCESS_ERR=15;x.VALIDATION_ERR=16;x.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=E;CanvasRenderingContext2D=W;CanvasGradient=v;CanvasPattern=u;DOMException=o})()}; \ No newline at end of file +if(!document.createElement("canvas").getContext){(function(){var z=Math;var K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var F=D/2;function T(){return this.context_||(this.context_=new W(this))}var O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return String(Z).replace(/&/g,"&").replace(/"/g,""")}function r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML")}if(!i.namespaces.g_o_){i.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML")}if(!i.styleSheets.ex_canvas_){var Z=i.createStyleSheet();Z.owningElement.id="ex_canvas_";Z.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}r(document);var E={init:function(Z){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var i=Z||document;i.createElement("canvas");i.attachEvent("onreadystatechange",G(this.init_,this,i))}},init_:function(m){var j=m.getElementsByTagName("canvas");for(var Z=0;Z1){j--}if(6*j<1){return i+(Z-i)*6*j}else{if(2*j<1){return Z}else{if(3*j<2){return i+(Z-i)*(2/3-j)*6}else{return i}}}}function Y(Z){var AE,p=1;Z=String(Z);if(Z.charAt(0)=="#"){AE=Z}else{if(/^rgb/.test(Z)){var m=g(Z);var AE="#",AF;for(var j=0;j<3;j++){if(m[j].indexOf("%")!=-1){AF=Math.floor(C(m[j])*255)}else{AF=Number(m[j])}AE+=I[N(AF,0,255)]}p=m[3]}else{if(/^hsl/.test(Z)){var m=g(Z);AE=c(m);p=m[3]}else{AE=B[Z]||Z}}}return{color:AE,alpha:p}}var L={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var f={};function X(Z){if(f[Z]){return f[Z]}var m=document.createElement("div");var j=m.style;try{j.font=Z}catch(i){}return f[Z]={style:j.fontStyle||L.style,variant:j.fontVariant||L.variant,weight:j.fontWeight||L.weight,size:j.fontSize||L.size,family:j.fontFamily||L.family}}function P(j,i){var Z={};for(var AF in j){Z[AF]=j[AF]}var AE=parseFloat(i.currentStyle.fontSize),m=parseFloat(j.size);if(typeof j.size=="number"){Z.size=j.size}else{if(j.size.indexOf("px")!=-1){Z.size=m}else{if(j.size.indexOf("em")!=-1){Z.size=AE*m}else{if(j.size.indexOf("%")!=-1){Z.size=(AE/100)*m}else{if(j.size.indexOf("pt")!=-1){Z.size=m/0.75}else{Z.size=AE}}}}}Z.size*=0.981;return Z}function AA(Z){return Z.style+" "+Z.variant+" "+Z.weight+" "+Z.size+"px "+Z.family}function t(Z){switch(Z){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function W(i){this.m_=V();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=D*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var Z=i.ownerDocument.createElement("div");Z.style.width=i.clientWidth+"px";Z.style.height=i.clientHeight+"px";Z.style.overflow="hidden";Z.style.position="absolute";i.appendChild(Z);this.element_=Z;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var M=W.prototype;M.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};M.beginPath=function(){this.currentPath_=[]};M.moveTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"moveTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.lineTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"lineTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.bezierCurveTo=function(j,i,AI,AH,AG,AE){var Z=this.getCoords_(AG,AE);var AF=this.getCoords_(j,i);var m=this.getCoords_(AI,AH);e(this,AF,m,Z)};function e(Z,m,j,i){Z.currentPath_.push({type:"bezierCurveTo",cp1x:m.x,cp1y:m.y,cp2x:j.x,cp2y:j.y,x:i.x,y:i.y});Z.currentX_=i.x;Z.currentY_=i.y}M.quadraticCurveTo=function(AG,j,i,Z){var AF=this.getCoords_(AG,j);var AE=this.getCoords_(i,Z);var AH={x:this.currentX_+2/3*(AF.x-this.currentX_),y:this.currentY_+2/3*(AF.y-this.currentY_)};var m={x:AH.x+(AE.x-this.currentX_)/3,y:AH.y+(AE.y-this.currentY_)/3};e(this,AH,m,AE)};M.arc=function(AJ,AH,AI,AE,i,j){AI*=D;var AN=j?"at":"wa";var AK=AJ+U(AE)*AI-F;var AM=AH+J(AE)*AI-F;var Z=AJ+U(i)*AI-F;var AL=AH+J(i)*AI-F;if(AK==Z&&!j){AK+=0.125}var m=this.getCoords_(AJ,AH);var AG=this.getCoords_(AK,AM);var AF=this.getCoords_(Z,AL);this.currentPath_.push({type:AN,x:m.x,y:m.y,radius:AI,xStart:AG.x,yStart:AG.y,xEnd:AF.x,yEnd:AF.y})};M.rect=function(j,i,Z,m){this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath()};M.strokeRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.stroke();this.currentPath_=p};M.fillRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.fill();this.currentPath_=p};M.createLinearGradient=function(i,m,Z,j){var p=new v("gradient");p.x0_=i;p.y0_=m;p.x1_=Z;p.y1_=j;return p};M.createRadialGradient=function(m,AE,j,i,p,Z){var AF=new v("gradientradial");AF.x0_=m;AF.y0_=AE;AF.r0_=j;AF.x1_=i;AF.y1_=p;AF.r1_=Z;return AF};M.drawImage=function(AO,j){var AH,AF,AJ,AV,AM,AK,AQ,AX;var AI=AO.runtimeStyle.width;var AN=AO.runtimeStyle.height;AO.runtimeStyle.width="auto";AO.runtimeStyle.height="auto";var AG=AO.width;var AT=AO.height;AO.runtimeStyle.width=AI;AO.runtimeStyle.height=AN;if(arguments.length==3){AH=arguments[1];AF=arguments[2];AM=AK=0;AQ=AJ=AG;AX=AV=AT}else{if(arguments.length==5){AH=arguments[1];AF=arguments[2];AJ=arguments[3];AV=arguments[4];AM=AK=0;AQ=AG;AX=AT}else{if(arguments.length==9){AM=arguments[1];AK=arguments[2];AQ=arguments[3];AX=arguments[4];AH=arguments[5];AF=arguments[6];AJ=arguments[7];AV=arguments[8]}else{throw Error("Invalid number of arguments")}}}var AW=this.getCoords_(AH,AF);var m=AQ/2;var i=AX/2;var AU=[];var Z=10;var AE=10;AU.push(" ','","");this.element_.insertAdjacentHTML("BeforeEnd",AU.join(""))};M.stroke=function(AM){var m=10;var AN=10;var AE=5000;var AG={x:null,y:null};var AL={x:null,y:null};for(var AH=0;AHAL.x){AL.x=Z.x}if(AG.y==null||Z.yAL.y){AL.y=Z.y}}}AK.push(' ">');if(!AM){R(this,AK)}else{a(this,AK,AG,AL)}AK.push("");this.element_.insertAdjacentHTML("beforeEnd",AK.join(""))}};function R(j,AE){var i=Y(j.strokeStyle);var m=i.color;var p=i.alpha*j.globalAlpha;var Z=j.lineScale_*j.lineWidth;if(Z<1){p*=Z}AE.push("')}function a(AO,AG,Ah,AP){var AH=AO.fillStyle;var AY=AO.arcScaleX_;var AX=AO.arcScaleY_;var Z=AP.x-Ah.x;var m=AP.y-Ah.y;if(AH instanceof v){var AL=0;var Ac={x:0,y:0};var AU=0;var AK=1;if(AH.type_=="gradient"){var AJ=AH.x0_/AY;var j=AH.y0_/AX;var AI=AH.x1_/AY;var Aj=AH.y1_/AX;var Ag=AO.getCoords_(AJ,j);var Af=AO.getCoords_(AI,Aj);var AE=Af.x-Ag.x;var p=Af.y-Ag.y;AL=Math.atan2(AE,p)*180/Math.PI;if(AL<0){AL+=360}if(AL<0.000001){AL=0}}else{var Ag=AO.getCoords_(AH.x0_,AH.y0_);Ac={x:(Ag.x-Ah.x)/Z,y:(Ag.y-Ah.y)/m};Z/=AY*D;m/=AX*D;var Aa=z.max(Z,m);AU=2*AH.r0_/Aa;AK=2*AH.r1_/Aa-AU}var AS=AH.colors_;AS.sort(function(Ak,i){return Ak.offset-i.offset});var AN=AS.length;var AR=AS[0].color;var AQ=AS[AN-1].color;var AW=AS[0].alpha*AO.globalAlpha;var AV=AS[AN-1].alpha*AO.globalAlpha;var Ab=[];for(var Ae=0;Ae')}else{if(AH instanceof u){if(Z&&m){var AF=-Ah.x;var AZ=-Ah.y;AG.push("')}}else{var Ai=Y(AO.fillStyle);var AT=Ai.color;var Ad=Ai.alpha*AO.globalAlpha;AG.push('')}}}M.fill=function(){this.stroke(true)};M.closePath=function(){this.currentPath_.push({type:"close"})};M.getCoords_=function(j,i){var Z=this.m_;return{x:D*(j*Z[0][0]+i*Z[1][0]+Z[2][0])-F,y:D*(j*Z[0][1]+i*Z[1][1]+Z[2][1])-F}};M.save=function(){var Z={};Q(this,Z);this.aStack_.push(Z);this.mStack_.push(this.m_);this.m_=d(V(),this.m_)};M.restore=function(){if(this.aStack_.length){Q(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function H(Z){return isFinite(Z[0][0])&&isFinite(Z[0][1])&&isFinite(Z[1][0])&&isFinite(Z[1][1])&&isFinite(Z[2][0])&&isFinite(Z[2][1])}function y(i,Z,j){if(!H(Z)){return }i.m_=Z;if(j){var p=Z[0][0]*Z[1][1]-Z[0][1]*Z[1][0];i.lineScale_=k(b(p))}}M.translate=function(j,i){var Z=[[1,0,0],[0,1,0],[j,i,1]];y(this,d(Z,this.m_),false)};M.rotate=function(i){var m=U(i);var j=J(i);var Z=[[m,j,0],[-j,m,0],[0,0,1]];y(this,d(Z,this.m_),false)};M.scale=function(j,i){this.arcScaleX_*=j;this.arcScaleY_*=i;var Z=[[j,0,0],[0,i,0],[0,0,1]];y(this,d(Z,this.m_),true)};M.transform=function(p,m,AF,AE,i,Z){var j=[[p,m,0],[AF,AE,0],[i,Z,1]];y(this,d(j,this.m_),true)};M.setTransform=function(AE,p,AG,AF,j,i){var Z=[[AE,p,0],[AG,AF,0],[j,i,1]];y(this,Z,true)};M.drawText_=function(AK,AI,AH,AN,AG){var AM=this.m_,AQ=1000,i=0,AP=AQ,AF={x:0,y:0},AE=[];var Z=P(X(this.font),this.element_);var j=AA(Z);var AR=this.element_.currentStyle;var p=this.textAlign.toLowerCase();switch(p){case"left":case"center":case"right":break;case"end":p=AR.direction=="ltr"?"right":"left";break;case"start":p=AR.direction=="rtl"?"right":"left";break;default:p="left"}switch(this.textBaseline){case"hanging":case"top":AF.y=Z.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":AF.y=-Z.size/2.25;break}switch(p){case"right":i=AQ;AP=0.05;break;case"center":i=AP=AQ/2;break}var AO=this.getCoords_(AI+AF.x,AH+AF.y);AE.push('');if(AG){R(this,AE)}else{a(this,AE,{x:-i,y:0},{x:AP,y:Z.size})}var AL=AM[0][0].toFixed(3)+","+AM[1][0].toFixed(3)+","+AM[0][1].toFixed(3)+","+AM[1][1].toFixed(3)+",0,0";var AJ=K(AO.x/D)+","+K(AO.y/D);AE.push('','','');this.element_.insertAdjacentHTML("beforeEnd",AE.join(""))};M.fillText=function(j,Z,m,i){this.drawText_(j,Z,m,i,false)};M.strokeText=function(j,Z,m,i){this.drawText_(j,Z,m,i,true)};M.measureText=function(j){if(!this.textMeasureEl_){var Z='';this.element_.insertAdjacentHTML("beforeEnd",Z);this.textMeasureEl_=this.element_.lastChild}var i=this.element_.ownerDocument;this.textMeasureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(i.createTextNode(j));return{width:this.textMeasureEl_.offsetWidth}};M.clip=function(){};M.arcTo=function(){};M.createPattern=function(i,Z){return new u(i,Z)};function v(Z){this.type_=Z;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}v.prototype.addColorStop=function(i,Z){Z=Y(Z);this.colors_.push({offset:i,color:Z.color,alpha:Z.alpha})};function u(i,Z){q(i);switch(Z){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=Z;break;default:n("SYNTAX_ERR")}this.src_=i.src;this.width_=i.width;this.height_=i.height}function n(Z){throw new o(Z)}function q(Z){if(!Z||Z.nodeType!=1||Z.tagName!="IMG"){n("TYPE_MISMATCH_ERR")}if(Z.readyState!="complete"){n("INVALID_STATE_ERR")}}function o(Z){this.code=this[Z];this.message=Z+": DOM Exception "+this.code}var x=o.prototype=new Error;x.INDEX_SIZE_ERR=1;x.DOMSTRING_SIZE_ERR=2;x.HIERARCHY_REQUEST_ERR=3;x.WRONG_DOCUMENT_ERR=4;x.INVALID_CHARACTER_ERR=5;x.NO_DATA_ALLOWED_ERR=6;x.NO_MODIFICATION_ALLOWED_ERR=7;x.NOT_FOUND_ERR=8;x.NOT_SUPPORTED_ERR=9;x.INUSE_ATTRIBUTE_ERR=10;x.INVALID_STATE_ERR=11;x.SYNTAX_ERR=12;x.INVALID_MODIFICATION_ERR=13;x.NAMESPACE_ERR=14;x.INVALID_ACCESS_ERR=15;x.VALIDATION_ERR=16;x.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=E;CanvasRenderingContext2D=W;CanvasGradient=v;CanvasPattern=u;DOMException=o})()}; diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js index fe56e589..dfc31dc2 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js @@ -459,4 +459,4 @@ escape=false;} else{if(c=="%") escape=true;else r.push(c);}} -return r.join("");};function floorInBase(n,base){return base*Math.floor(n/base);}})(jQuery); \ No newline at end of file +return r.join("");};function floorInBase(n,base){return base*Math.floor(n/base);}})(jQuery); diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css index 32bafff2..3aeecc78 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css @@ -125,4 +125,4 @@ div.jGrowl div.jGrowl-closer { div.jGrowl { display: none; } -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js index 97d8d052..b901df8d 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js @@ -304,4 +304,4 @@ /** Reference the Defaults Object for compatibility with older versions of jGrowl **/ $.jGrowl.defaults = $.fn.jGrowl.prototype.defaults; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js index 23e0077f..729f65ac 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js @@ -95,4 +95,4 @@ jQuery.fn.autoEllipsis = function(options) { StringEllipsesByMaxLetters(element, origText, maxLettersAllowed + (r + 1)); }); -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js index b7f7b4d0..9825e159 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStringsUtil); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js b/webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js index f501f0e0..1f6ec8e3 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* * Simple JavaScript Inheritance * By John Resig http://ejohn.org/ @@ -62,4 +62,4 @@ return Class; }; -})(); \ No newline at end of file +})(); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js b/webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js index 22848bb9..6a8b2ad7 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var ColorStrategy = Class.extend ({ getColor: function(key) { } diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js index e600f244..2c51e415 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStrings); @@ -265,4 +265,4 @@ var ComparisonDataTableWidget = Class.extend({ // This is ugly, need fix!!! $("#comparisonTbody > tr[id=" + index + "]").css("color", "grey"); } -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js index bd4e6e07..8b36d597 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStrings); COMPARISON = { diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js b/webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js index c628a97d..03260527 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var ControlPanel = Class.extend({ init: function(options) { diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js b/webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js index 41be8769..0096ffe6 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var ScinodePolygon = CirclePolygon.extend({ init: function(options) { this._super(options); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js b/webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js index 24898763..7e9bc576 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var DISCIPLINES = {"11": {"labelLongitude": -154.60900000000001, "color": "#A819FA", "image": "mathphys.png", "longitude": -129.375, "label": "Math & Physics", "labelLatitude": 82.645889999999994, "latitude": 81.850399999999993}, "10": {"labelLongitude": 30.34375, "color": "#B8150B", "image": "infect.png", "longitude": 47.109375, "label": "Infectious Diseases", "labelLatitude": 49.801349999999999, "latitude": 55.881900000000002}, "13": {"labelLongitude": 120.0, "color": "#FFFF00", "image": "socsci.png", "longitude": 164.53125, "label": "Social Sciences", "labelLatitude": 46.0, "latitude": 61.695430000000002}, "12": {"labelLongitude": 101.5, "color": "#FF804D", "image": "health.png", "longitude": 76.641000000000005, "label": "Health Professionals", "labelLatitude": 84.591988000000001, "latitude": 83.217100000000002}, "1": {"labelLongitude": 10.4375, "color": "#379908", "image": "bio.png", "longitude": -19.6875, "label": "Biology", "labelLatitude": -20.576339999999998, "latitude": 1.593542}, "3": {"labelLongitude": 30.914000000000001, "color": "#FF0000", "image": "medspec.png", "longitude": 44.296875, "label": "Medical Specialties", "labelLatitude": 78.219527999999997, "latitude": 71.360810000000001}, "2": {"labelLongitude": -35.375, "color": "#00FF80", "image": "biotech.png", "longitude": 0.0, "label": "Biotechnology", "labelLatitude": 64.093400000000003, "latitude": 48.582349999999998}, "5": {"labelLongitude": -42.890000000000001, "color": "#0000FF", "image": "chem.png", "longitude": -45.703099999999999, "label": "Chemistry", "labelLatitude": 85.499639999999999, "latitude": 81.648629999999997}, "4": {"labelLongitude": -63.719999999999999, "color": "#61FFFF", "image": "chemeng.png", "longitude": -74.53125, "label": "Chemical, Mechanical, & Civil Engineering", "labelLatitude": 37.326900000000002, "latitude": 57.804189999999998}, "7": {"labelLongitude": -102.3125, "color": "#FF85FF", "image": "eecs.png", "longitude": -144.140625, "label": "Electrical Engineering & Computer Science", "labelLatitude": 71.558999999999997, "latitude": 75.890950000000004}, "6": {"labelLongitude": -75.078000000000003, "color": "#A71916", "image": "earthsci.png", "longitude": -52.734375, "label": "Earth Sciences", "labelLatitude": -37.3093, "latitude": -19.797000000000001}, "9": {"labelLongitude": 130.17099999999999, "color": "#FFFF80", "image": "human.png", "longitude": 163.125, "label": "Humanities", "labelLatitude": -20.454179, "latitude": -14.42333}, "8": {"labelLongitude": 75.078000000000003, "color": "#FFB529", "image": "brain.png", "longitude": 99.84375, "label": "Brain Research", "labelLatitude": 64.4636, "latitude": 68.724699999999999}}; var SUBDISCIPLINES = {"344": {"latitude": 75.320025000000001, "discipline": "4", "longitude": -92.109375, "label": "Printing"}, "345": {"latitude": 12.554563999999999, "discipline": "1", "longitude": -16.875, "label": "Genetics"}, "346": {"latitude": 74.402163000000002, "discipline": "4", "longitude": -94.21875, "label": "Industrial Chemistry"}, "347": {"latitude": 77.617709000000005, "discipline": "12", "longitude": 56.25, "label": "Obesity"}, "340": {"latitude": 11.178402, "discipline": "1", "longitude": 8.4375, "label": "Parasitology"}, "341": {"latitude": 54.162433999999998, "discipline": "10", "longitude": -1.40625, "label": "Dairy Science"}, "342": {"latitude": 42.553080000000001, "discipline": "4", "longitude": -65.390625, "label": "Water Policy"}, "343": {"latitude": -7.013668, "discipline": "1", "longitude": -38.671875, "label": "Fish Research"}, "348": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "Literary Criticism"}, "349": {"latitude": 31.952162000000001, "discipline": "3", "longitude": 40.78125, "label": "Hepatology"}, "298": {"latitude": 84.865781999999996, "discipline": "12", "longitude": 89.296875, "label": "AIDS Treatment"}, "299": {"latitude": 77.312520000000006, "discipline": "7", "longitude": -140.625, "label": "Wireless Communication"}, "296": {"latitude": 67.609221000000005, "discipline": "4", "longitude": -99.84375, "label": "Vehicle System Design"}, "297": {"latitude": 59.888936999999999, "discipline": "3", "longitude": 35.859375, "label": "Transfusion"}, "294": {"latitude": 27.683527999999999, "discipline": "1", "longitude": -21.09375, "label": "Crop Science"}, "295": {"latitude": 74.775842999999995, "discipline": "7", "longitude": -148.359375, "label": "Fuzzy Sets"}, "292": {"latitude": 79.560546000000002, "discipline": "12", "longitude": 74.53125, "label": "Hospice Care"}, "293": {"latitude": -2.8113709999999998, "discipline": "6", "longitude": -54.140625, "label": "Climatology"}, "290": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 157.5, "label": "Science Education"}, "291": {"latitude": 74.775842999999995, "discipline": "11", "longitude": -156.09375, "label": "Design & Analysis of Algorithms"}, "199": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -68.203125, "label": "Catalysis"}, "198": {"latitude": 49.382373000000001, "discipline": "13", "longitude": 168.046875, "label": "Political Geography"}, "195": {"latitude": 81.723187999999993, "discipline": "5", "longitude": -23.203125, "label": "Atomic Spectrometry"}, "194": {"latitude": 80.647035000000002, "discipline": "12", "longitude": 62.578125, "label": "Dental Research"}, "197": {"latitude": 84.865781999999996, "discipline": "12", "longitude": 63.984375, "label": "Public Health Service"}, "196": {"latitude": 16.636192000000001, "discipline": "1", "longitude": -22.5, "label": "Botany"}, "191": {"latitude": 80.872827000000001, "discipline": "12", "longitude": 63.984375, "label": "Prosthetic Dentistry"}, "190": {"latitude": 57.704146999999999, "discipline": "3", "longitude": 33.046875, "label": "Clinical Infectious Disease"}, "193": {"latitude": 74.959391999999994, "discipline": "7", "longitude": -139.921875, "label": "Robotic Systems"}, "192": {"latitude": 79.812302000000003, "discipline": "12", "longitude": 60.46875, "label": "Orthodontics"}, "270": {"latitude": 53.330872999999997, "discipline": "13", "longitude": -179.296875, "label": "Agricultural Economics"}, "271": {"latitude": 65.366837000000004, "discipline": "13", "longitude": 143.4375, "label": "Social Work"}, "272": {"latitude": 83.753911000000002, "discipline": "12", "longitude": 80.15625, "label": "Medical Insurance"}, "273": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -76.640625, "label": "Fluid Phase Equilibrium"}, "274": {"latitude": 52.052489999999999, "discipline": "2", "longitude": 7.734375, "label": "Biotechnology Trends"}, "275": {"latitude": -15.961328999999999, "discipline": "6", "longitude": -58.359375, "label": "Air Quality"}, "276": {"latitude": 68.911005000000003, "discipline": "7", "longitude": -168.046875, "label": "Search Engines; Web Crawling"}, "277": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -78.75, "label": "Colloid"}, "278": {"latitude": 76.351895999999996, "discipline": "12", "longitude": 61.875, "label": "Applied Physiology; Muscle"}, "279": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 164.53125, "label": "Biblical Literature"}, "524": {"latitude": -6.3152990000000004, "discipline": "1", "longitude": -23.90625, "label": "Mammals"}, "525": {"latitude": 30.751277999999999, "discipline": "3", "longitude": 54.84375, "label": "Impotence"}, "526": {"latitude": 76.840816000000004, "discipline": "7", "longitude": -144.140625, "label": "Fuzzy Logic"}, "527": {"latitude": 58.813741999999998, "discipline": "13", "longitude": 168.75, "label": "Tourism"}, "520": {"latitude": 2.8113709999999998, "discipline": "1", "longitude": -35.859375, "label": "Rangeland Ecology"}, "521": {"latitude": 81.518271999999996, "discipline": "4", "longitude": -100.546875, "label": "Welding"}, "522": {"latitude": 74.402163000000002, "discipline": "13", "longitude": -168.75, "label": "Reliability Engineering"}, "523": {"latitude": 48.458351999999998, "discipline": "10", "longitude": 18.984375, "label": "Molecular Biology Methods"}, "528": {"latitude": -14.604846999999999, "discipline": "1", "longitude": -19.6875, "label": "Aquatic Disease"}, "529": {"latitude": -23.885838, "discipline": "6", "longitude": -63.28125, "label": "Geographic Information Science"}, "449": {"latitude": 38.822591000000003, "discipline": "2", "longitude": 1.40625, "label": "Systematics & Evolutionary Microbiology"}, "448": {"latitude": 78.490551999999994, "discipline": "4", "longitude": -97.03125, "label": "Sensors & Actuators"}, "443": {"latitude": 55.776572999999999, "discipline": "10", "longitude": 23.90625, "label": "Sexually Transmitted Diseases"}, "442": {"latitude": 38.822591000000003, "discipline": "4", "longitude": -75.9375, "label": "Applied Geophysics"}, "441": {"latitude": 59.534317999999999, "discipline": "10", "longitude": 9.84375, "label": "Peptides"}, "440": {"latitude": 76.679784999999995, "discipline": "4", "longitude": -88.59375, "label": "Digital Printing"}, "447": {"latitude": 83.277704999999997, "discipline": "12", "longitude": 88.59375, "label": "Geratric Nursing"}, "446": {"latitude": 71.965388000000004, "discipline": "7", "longitude": -157.5, "label": "Machine Learning"}, "445": {"latitude": 65.946472, "discipline": "8", "longitude": 81.5625, "label": "NeuroImmunology"}, "444": {"latitude": 58.813741999999998, "discipline": "13", "longitude": 156.796875, "label": "Engineering Education"}, "108": {"latitude": 82.586106000000001, "discipline": "11", "longitude": -127.265625, "label": "Chaos Fractals & Complexity"}, "109": {"latitude": 12.554563999999999, "discipline": "1", "longitude": -21.09375, "label": "Environmental Contamination"}, "102": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -101.953125, "label": "Alloys"}, "103": {"latitude": 80.647035000000002, "discipline": "11", "longitude": -116.015625, "label": "Astronomy & Astrophysics"}, "100": {"latitude": 84.673513, "discipline": "12", "longitude": 85.78125, "label": "Employee Health Benefit Plans"}, "101": {"latitude": 63.548552000000001, "discipline": "3", "longitude": 51.328125, "label": "Transplantation"}, "106": {"latitude": 83.676942999999994, "discipline": "12", "longitude": 59.0625, "label": "Drug Discovery"}, "107": {"latitude": 39.909736000000002, "discipline": "10", "longitude": -2.109375, "label": "Animal Science"}, "104": {"latitude": 72.816074, "discipline": "12", "longitude": 112.5, "label": "Substance-abuse Treatment"}, "105": {"latitude": 64.472793999999993, "discipline": "13", "longitude": 174.375, "label": "Research Policy; Technology Management"}, "39": {"latitude": 78.903929000000005, "discipline": "3", "longitude": 45.0, "label": "Diabetes Care"}, "38": {"latitude": 82.308892999999998, "discipline": "11", "longitude": -106.875, "label": "Semiconducting Materials"}, "33": {"latitude": 64.168107000000006, "discipline": "3", "longitude": 30.234375, "label": "Toxicology Applied Pharmacology"}, "32": {"latitude": 21.943045999999999, "discipline": "3", "longitude": 50.625, "label": "Digestion"}, "31": {"latitude": 62.267923000000003, "discipline": "3", "longitude": 45.0, "label": "Developmental Biology"}, "30": {"latitude": -7.013668, "discipline": "1", "longitude": -38.671875, "label": "Marine Biology"}, "37": {"latitude": 81.823794000000007, "discipline": "5", "longitude": 5.625, "label": "Pharmaceutical Research"}, "36": {"latitude": 76.184995000000001, "discipline": "4", "longitude": -84.375, "label": "Chemical Engineering"}, "35": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -49.921875, "label": "Inorganic Chemistry"}, "34": {"latitude": 63.548552000000001, "discipline": "4", "longitude": -93.515625, "label": "Transportation Research"}, "438": {"latitude": 52.052489999999999, "discipline": "13", "longitude": 171.5625, "label": "Regional Studies"}, "439": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -102.65625, "label": "Electrochemical Development"}, "436": {"latitude": 68.399180000000001, "discipline": "4", "longitude": -88.59375, "label": "Construction"}, "437": {"latitude": 56.944974000000002, "discipline": "4", "longitude": -82.265625, "label": "Dams & Tunnels"}, "434": {"latitude": 51.179343000000003, "discipline": "13", "longitude": 169.453125, "label": "Environmental Policy"}, "435": {"latitude": 80.532071000000002, "discipline": "11", "longitude": -145.546875, "label": "Topology"}, "432": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -47.109375, "label": "Liquid Crystals"}, "433": {"latitude": 76.840816000000004, "discipline": "7", "longitude": -144.140625, "label": "Control Systems"}, "430": {"latitude": 71.965388000000004, "discipline": "7", "longitude": -146.953125, "label": "User Interface Design"}, "431": {"latitude": 47.040182000000001, "discipline": "13", "longitude": 168.046875, "label": "Public Policy"}, "339": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -32.34375, "label": "Environmental Chemistry"}, "338": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -62.578125, "label": "Geology (International)"}, "335": {"latitude": 44.087584999999997, "discipline": "4", "longitude": -67.5, "label": "Hydrology Soil Contamination"}, "334": {"latitude": -31.952162000000001, "discipline": "9", "longitude": 172.96875, "label": "Contemporary Philosophy"}, "337": {"latitude": 81.823794000000007, "discipline": "11", "longitude": -144.84375, "label": "Mathematics Research"}, "336": {"latitude": 67.339860999999999, "discipline": "13", "longitude": 132.1875, "label": "Child Abuse"}, "331": {"latitude": 77.617709000000005, "discipline": "7", "longitude": -153.984375, "label": "Logic"}, "330": {"latitude": 78.767792, "discipline": "7", "longitude": -131.484375, "label": "Test Equipment"}, "333": {"latitude": 77.157162999999997, "discipline": "4", "longitude": -82.265625, "label": "Textiles"}, "332": {"latitude": 78.903929000000005, "discipline": "4", "longitude": -82.265625, "label": "Pulp Paper Science"}, "6": {"latitude": 65.366837000000004, "discipline": "8", "longitude": 72.421875, "label": "Neuroscience; Molecular & Cellular"}, "99": {"latitude": 75.320025000000001, "discipline": "13", "longitude": 177.890625, "label": "BioStatistics"}, "98": {"latitude": 72.607119999999995, "discipline": "4", "longitude": -108.28125, "label": "Automotive Engineering"}, "91": {"latitude": 59.534317999999999, "discipline": "3", "longitude": 30.9375, "label": "AIDS Research"}, "90": {"latitude": 81.518271999999996, "discipline": "4", "longitude": -97.734375, "label": "Ceramics"}, "93": {"latitude": 84.474064999999996, "discipline": "12", "longitude": 87.890625, "label": "Medical Records"}, "92": {"latitude": 68.138852, "discipline": "4", "longitude": -109.6875, "label": "Military Aviation"}, "95": {"latitude": 52.482779999999998, "discipline": "13", "longitude": 179.296875, "label": "Applied Economics"}, "94": {"latitude": 74.211983000000004, "discipline": "13", "longitude": -174.375, "label": "Statistics"}, "97": {"latitude": -4.2149429999999999, "discipline": "6", "longitude": -55.546875, "label": "Atmospheric Science"}, "96": {"latitude": 75.497157000000001, "discipline": "7", "longitude": -136.40625, "label": "Automatic Control"}, "554": {"latitude": 55.379109999999997, "discipline": "10", "longitude": 23.203125, "label": "Agricultural Environmental Medicine"}, "551": {"latitude": -9.1020970000000005, "discipline": "1", "longitude": -33.75, "label": "Wetlands"}, "550": {"latitude": 54.162433999999998, "discipline": "4", "longitude": -82.265625, "label": "Bulk Solid Handling"}, "553": {"latitude": 72.607119999999995, "discipline": "7", "longitude": -124.453125, "label": "Hydraulics"}, "552": {"latitude": -21.943045999999999, "discipline": "6", "longitude": -59.0625, "label": "GIS (non English)"}, "238": {"latitude": 77.312520000000006, "discipline": "3", "longitude": 47.109375, "label": "Diabetes Metabolism"}, "239": {"latitude": 59.534317999999999, "discipline": "4", "longitude": -79.453125, "label": "Geotechnical Engineering"}, "234": {"latitude": 59.888936999999999, "discipline": "13", "longitude": 158.203125, "label": "Symbolic Interaction"}, "235": {"latitude": 69.411242000000001, "discipline": "8", "longitude": 124.453125, "label": "Child & Adolescent Psychiatry"}, "236": {"latitude": 83.277704999999997, "discipline": "12", "longitude": 83.671875, "label": "General Practice"}, "237": {"latitude": 50.736454999999999, "discipline": "13", "longitude": 175.078125, "label": "Environmental Management"}, "230": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "Hispanic Studies"}, "231": {"latitude": 7.013668, "discipline": "1", "longitude": -33.046875, "label": "Forest Science"}, "232": {"latitude": 82.214217000000005, "discipline": "11", "longitude": -118.125, "label": "Plasma Physics"}, "233": {"latitude": 65.072130000000001, "discipline": "2", "longitude": 4.921875, "label": "Proteomics"}, "1": {"latitude": 59.888936999999999, "discipline": "3", "longitude": 35.859375, "label": "Clinical Cancer Research"}, "146": {"latitude": 54.162433999999998, "discipline": "2", "longitude": 4.921875, "label": "BioInformatics"}, "147": {"latitude": 76.184995000000001, "discipline": "4", "longitude": -104.765625, "label": "Mechanics of Solids & Structures"}, "144": {"latitude": 71.524908999999994, "discipline": "8", "longitude": 94.21875, "label": "Vision"}, "145": {"latitude": 59.888936999999999, "discipline": "13", "longitude": 168.046875, "label": "Communication Research"}, "142": {"latitude": -39.909736000000002, "discipline": "9", "longitude": 163.828125, "label": "Music & Theatre"}, "143": {"latitude": 66.791909000000004, "discipline": "8", "longitude": 113.203125, "label": "Memory & Cognition"}, "140": {"latitude": 74.775842999999995, "discipline": "12", "longitude": 64.6875, "label": "Alternative Complementary Medicine"}, "141": {"latitude": 54.572062000000003, "discipline": "4", "longitude": -82.265625, "label": "Petroleum Engineering"}, "148": {"latitude": 76.679784999999995, "discipline": "3", "longitude": 48.515625, "label": "Pharmacy"}, "149": {"latitude": -7.013668, "discipline": "6", "longitude": -58.359375, "label": "Geomorphology"}, "133": {"latitude": 43.068888000000001, "discipline": "10", "longitude": 9.140625, "label": "Veterinary Science"}, "132": {"latitude": 83.520161999999999, "discipline": "4", "longitude": -82.96875, "label": "Corrosion"}, "131": {"latitude": 8.4071680000000004, "discipline": "1", "longitude": -9.84375, "label": "Pest Management Science"}, "130": {"latitude": 58.813741999999998, "discipline": "3", "longitude": 45.0, "label": "Pathology"}, "137": {"latitude": 74.402163000000002, "discipline": "7", "longitude": -149.765625, "label": "Neural Networks"}, "136": {"latitude": 76.840816000000004, "discipline": "7", "longitude": -146.953125, "label": "Image Processing"}, "135": {"latitude": 69.411242000000001, "discipline": "3", "longitude": 32.34375, "label": "Stem Cells"}, "134": {"latitude": 63.233626999999998, "discipline": "13", "longitude": 158.203125, "label": "Teacher Education; Evaluation"}, "494": {"latitude": 84.541360999999995, "discipline": "12", "longitude": 81.5625, "label": "Medical Libraries"}, "495": {"latitude": -31.952162000000001, "discipline": "9", "longitude": 164.53125, "label": "Opera"}, "139": {"latitude": 68.399180000000001, "discipline": "3", "longitude": 59.0625, "label": "Intensive Care"}, "138": {"latitude": 83.520161999999999, "discipline": "12", "longitude": 99.84375, "label": "Nursing Education"}, "490": {"latitude": 73.428424000000007, "discipline": "3", "longitude": 41.484375, "label": "Menopause"}, "491": {"latitude": 82.765372999999997, "discipline": "5", "longitude": -44.296875, "label": "Chemistry (Russia)"}, "492": {"latitude": 49.837981999999997, "discipline": "13", "longitude": 166.640625, "label": "GeoPolitics"}, "493": {"latitude": -10.487812, "discipline": "6", "longitude": -57.65625, "label": "Glaciology"}, "24": {"latitude": 76.351895999999996, "discipline": "3", "longitude": 47.8125, "label": "Dermatology"}, "25": {"latitude": 66.791909000000004, "discipline": "3", "longitude": 54.84375, "label": "Kidney"}, "26": {"latitude": 62.267923000000003, "discipline": "3", "longitude": 56.953125, "label": "Pharmacology Science"}, "27": {"latitude": 38.822591000000003, "discipline": "13", "longitude": 167.34375, "label": "Law"}, "20": {"latitude": 49.837981999999997, "discipline": "10", "longitude": 25.3125, "label": "Virology"}, "21": {"latitude": 31.952162000000001, "discipline": "1", "longitude": -7.734375, "label": "Plant Physiology"}, "22": {"latitude": 62.593341000000002, "discipline": "3", "longitude": 47.8125, "label": "Allergy & Clinical Immunology"}, "23": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -102.65625, "label": "Material Science"}, "28": {"latitude": 63.233626999999998, "discipline": "8", "longitude": 64.6875, "label": "Medical Imaging"}, "29": {"latitude": 52.052489999999999, "discipline": "10", "longitude": 10.546875, "label": "Bacteriology"}, "407": {"latitude": -15.961328999999999, "discipline": "9", "longitude": 165.234375, "label": "Ethics"}, "406": {"latitude": 79.171334999999999, "discipline": "4", "longitude": -99.140625, "label": "Metallurgy"}, "405": {"latitude": 65.072130000000001, "discipline": "3", "longitude": 56.25, "label": "Clinical Rehabilitation"}, "404": {"latitude": 3.5134210000000001, "discipline": "1", "longitude": -33.75, "label": "Ecological Modeling"}, "403": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 167.34375, "label": "Human Resource Management"}, "402": {"latitude": 82.214217000000005, "discipline": "12", "longitude": 26.015625, "label": "Molecular Medicine"}, "401": {"latitude": 2.8113709999999998, "discipline": "1", "longitude": -16.875, "label": "Sociobiology"}, "400": {"latitude": 73.428424000000007, "discipline": "7", "longitude": -139.21875, "label": "Chip Design & Manufacturing"}, "409": {"latitude": 74.402163000000002, "discipline": "4", "longitude": -121.640625, "label": "Aerospace"}, "408": {"latitude": 66.791909000000004, "discipline": "13", "longitude": 133.59375, "label": "Marital & Family Therapy"}, "379": {"latitude": -14.604846999999999, "discipline": "9", "longitude": 167.34375, "label": "German Studies"}, "378": {"latitude": 50.736454999999999, "discipline": "3", "longitude": 63.984375, "label": "Radiology"}, "371": {"latitude": 71.074055999999999, "discipline": "7", "longitude": -153.984375, "label": "Functional Programing"}, "370": {"latitude": 78.349411000000003, "discipline": "7", "longitude": -146.25, "label": "Electronic Imaging"}, "373": {"latitude": 14.604846999999999, "discipline": "1", "longitude": -15.46875, "label": "Plant Disease"}, "372": {"latitude": 18.646245, "discipline": "1", "longitude": -9.84375, "label": "Applied Genetics"}, "375": {"latitude": 53.330872999999997, "discipline": "13", "longitude": -179.296875, "label": "Developmental Economics"}, "374": {"latitude": 23.885838, "discipline": "6", "longitude": -59.0625, "label": "Water Resource"}, "377": {"latitude": 53.330872999999997, "discipline": "13", "longitude": -179.296875, "label": "International Economics"}, "376": {"latitude": 81.723187999999993, "discipline": "11", "longitude": -108.28125, "label": "Nuclear Physics"}, "393": {"latitude": 80.532071000000002, "discipline": "11", "longitude": -145.546875, "label": "Mathematical Science (Russia)"}, "392": {"latitude": 81.201419999999999, "discipline": "11", "longitude": -145.546875, "label": "Optimization Theory"}, "88": {"latitude": 84.267172000000002, "discipline": "5", "longitude": -77.34375, "label": "Computational Chemistry"}, "89": {"latitude": 58.813741999999998, "discipline": "3", "longitude": 58.359375, "label": "Surgery"}, "397": {"latitude": 83.753911000000002, "discipline": "12", "longitude": 83.671875, "label": "Rural Health Care"}, "396": {"latitude": 81.518271999999996, "discipline": "4", "longitude": -100.546875, "label": "Materials Processing"}, "395": {"latitude": 73.226699999999994, "discipline": "7", "longitude": -146.953125, "label": "Security; Cryptography"}, "394": {"latitude": 55.776572999999999, "discipline": "10", "longitude": 37.265625, "label": "Gene Therapy"}, "82": {"latitude": 75.497157000000001, "discipline": "3", "longitude": 40.78125, "label": "Clinical Endocrinology"}, "83": {"latitude": 78.767792, "discipline": "3", "longitude": 42.1875, "label": "Dietetics"}, "80": {"latitude": 76.840816000000004, "discipline": "12", "longitude": 57.65625, "label": "Hypertension"}, "81": {"latitude": 55.776572999999999, "discipline": "3", "longitude": 53.4375, "label": "Human Molecular Genetics"}, "86": {"latitude": 73.428424000000007, "discipline": "4", "longitude": -98.4375, "label": "Gas Turbines"}, "87": {"latitude": -12.554563999999999, "discipline": "6", "longitude": -53.4375, "label": "Remote Sensing"}, "84": {"latitude": 54.162433999999998, "discipline": "10", "longitude": 18.28125, "label": "Clinical Microbiology"}, "85": {"latitude": 81.518271999999996, "discipline": "12", "longitude": 63.984375, "label": "Hospital Pharmacy"}, "7": {"latitude": 70.140364000000005, "discipline": "3", "longitude": 61.171875, "label": "Anesthetics & Analgesics"}, "245": {"latitude": 43.068888000000001, "discipline": "4", "longitude": -64.6875, "label": "Water Quality & Resource Management"}, "244": {"latitude": 68.911005000000003, "discipline": "13", "longitude": 141.328125, "label": "Eating Disorders; Sex Roles"}, "247": {"latitude": 68.911005000000003, "discipline": "8", "longitude": 104.0625, "label": "Geriatric Psychiatry"}, "246": {"latitude": 46.073231, "discipline": "13", "longitude": 168.046875, "label": "Ethnic Migration"}, "241": {"latitude": 68.911005000000003, "discipline": "3", "longitude": 47.8125, "label": "Clinical Chemistry"}, "240": {"latitude": 81.201419999999999, "discipline": "7", "longitude": -125.15625, "label": "Instrumentation"}, "243": {"latitude": 71.074055999999999, "discipline": "12", "longitude": 71.015625, "label": "Arthroscopy"}, "242": {"latitude": 71.074055999999999, "discipline": "4", "longitude": -94.921875, "label": "Fluid Engineering"}, "249": {"latitude": 72.607119999999995, "discipline": "4", "longitude": -90.703125, "label": "Ore Processing"}, "248": {"latitude": 71.965388000000004, "discipline": "4", "longitude": -107.578125, "label": "Sound & Vibration"}, "519": {"latitude": 73.226699999999994, "discipline": "8", "longitude": 99.140625, "label": "Forensic Science"}, "518": {"latitude": 82.494823999999994, "discipline": "4", "longitude": -101.25, "label": "Defects & Diffusion in Materials"}, "511": {"latitude": 47.040182000000001, "discipline": "13", "longitude": 165.9375, "label": "Human Rights"}, "510": {"latitude": 62.593341000000002, "discipline": "8", "longitude": 77.34375, "label": "Hearing Research"}, "513": {"latitude": 53.330872999999997, "discipline": "13", "longitude": 178.59375, "label": "Social Economics"}, "512": {"latitude": 59.534317999999999, "discipline": "3", "longitude": 54.140625, "label": "Lung Cancer"}, "515": {"latitude": 55.379109999999997, "discipline": "2", "longitude": 2.109375, "label": "Biotechnology Bioengineering"}, "514": {"latitude": 65.946472, "discipline": "5", "longitude": -20.390625, "label": "Carbohydrate Research"}, "517": {"latitude": 81.413933, "discipline": "7", "longitude": -125.15625, "label": "Electronics"}, "516": {"latitude": 43.068888000000001, "discipline": "13", "longitude": 168.75, "label": "Rural Studies"}, "458": {"latitude": 72.181804, "discipline": "7", "longitude": -150.46875, "label": "Computer Systems Theory"}, "459": {"latitude": 69.657086000000007, "discipline": "4", "longitude": -94.21875, "label": "Combustion"}, "450": {"latitude": 78.903929000000005, "discipline": "7", "longitude": -140.625, "label": "Medical Image Processing"}, "451": {"latitude": 81.823794000000007, "discipline": "12", "longitude": 70.3125, "label": "Medical Education"}, "452": {"latitude": 62.593341000000002, "discipline": "8", "longitude": 70.3125, "label": "Magnetic Resonance Imagery"}, "453": {"latitude": 84.865781999999996, "discipline": "12", "longitude": 78.046875, "label": "Hospital Management"}, "454": {"latitude": 0.70310700000000004, "discipline": "1", "longitude": -6.328125, "label": "Insect Physiology"}, "455": {"latitude": 78.061988999999997, "discipline": "7", "longitude": -134.296875, "label": "Power Transmission"}, "456": {"latitude": 55.776572999999999, "discipline": "2", "longitude": -7.734375, "label": "Food Engineering"}, "457": {"latitude": 77.617709000000005, "discipline": "12", "longitude": 67.5, "label": "Oral Surgery"}, "179": {"latitude": 84.124972999999997, "discipline": "5", "longitude": -91.40625, "label": "Molecular Physics"}, "178": {"latitude": 74.775842999999995, "discipline": "12", "longitude": 68.90625, "label": "Biomechanics"}, "177": {"latitude": 77.157162999999997, "discipline": "4", "longitude": -82.265625, "label": "Wool"}, "176": {"latitude": 82.765372999999997, "discipline": "11", "longitude": -117.421875, "label": "Optics & Lasers"}, "175": {"latitude": 80.872827000000001, "discipline": "7", "longitude": -122.34375, "label": "Solid State Electronics"}, "174": {"latitude": 68.911005000000003, "discipline": "8", "longitude": 107.578125, "label": "Geriatrics"}, "173": {"latitude": 70.140364000000005, "discipline": "13", "longitude": -166.640625, "label": "Computer-Aided Process Planning"}, "172": {"latitude": 31.952162000000001, "discipline": "4", "longitude": -42.1875, "label": "Agricultural Engineering"}, "171": {"latitude": 65.072130000000001, "discipline": "13", "longitude": 172.96875, "label": "Leadership & Organizational Behavior"}, "170": {"latitude": -2.8113709999999998, "discipline": "9", "longitude": 165.9375, "label": "American History"}, "253": {"latitude": 80.297927000000001, "discipline": "7", "longitude": -126.5625, "label": "Dielectrics"}, "182": {"latitude": -17.978732999999998, "discipline": "9", "longitude": 168.75, "label": "Science History"}, "183": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.9375, "label": "Poetry"}, "180": {"latitude": -4.2149429999999999, "discipline": "1", "longitude": -20.390625, "label": "Comparative Animal Physiology"}, "181": {"latitude": 49.382373000000001, "discipline": "13", "longitude": 165.9375, "label": "Political Science"}, "186": {"latitude": 77.157162999999997, "discipline": "7", "longitude": -143.4375, "label": "Speech Recognition"}, "187": {"latitude": 76.184995000000001, "discipline": "4", "longitude": -103.359375, "label": "Fluid Mechanics"}, "184": {"latitude": 51.179343000000003, "discipline": "3", "longitude": 63.28125, "label": "Nuclear Medicine"}, "185": {"latitude": 82.765372999999997, "discipline": "5", "longitude": -92.109375, "label": "Nanotechnology"}, "188": {"latitude": 76.184995000000001, "discipline": "7", "longitude": -149.0625, "label": "Computer Graphics"}, "189": {"latitude": 77.312520000000006, "discipline": "4", "longitude": -73.125, "label": "Filtration Membrane"}, "11": {"latitude": 70.844673, "discipline": "8", "longitude": 109.6875, "label": "Affective Disorders"}, "10": {"latitude": 79.812302000000003, "discipline": "5", "longitude": -54.140625, "label": "Macromolecules & Polymers"}, "13": {"latitude": 83.026218999999998, "discipline": "11", "longitude": -106.171875, "label": "Surface Science"}, "12": {"latitude": 58.447732999999999, "discipline": "3", "longitude": 52.03125, "label": "Oncology"}, "15": {"latitude": 84.124972999999997, "discipline": "12", "longitude": 85.78125, "label": "Hospital Financial Management"}, "14": {"latitude": 79.935918000000001, "discipline": "11", "longitude": -149.0625, "label": "Nonlinear Analysis"}, "17": {"latitude": 81.518271999999996, "discipline": "12", "longitude": 32.34375, "label": "Occupational Health"}, "16": {"latitude": 67.339860999999999, "discipline": "3", "longitude": 47.8125, "label": "Rheumatology"}, "19": {"latitude": 61.606395999999997, "discipline": "3", "longitude": 38.671875, "label": "Leukemia"}, "18": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -44.296875, "label": "Organic Chemistry"}, "62": {"latitude": 72.816074, "discipline": "12", "longitude": 69.609375, "label": "Bone Joint Surgery"}, "322": {"latitude": 79.171334999999999, "discipline": "11", "longitude": -122.34375, "label": "Space Research"}, "323": {"latitude": -7.013668, "discipline": "1", "longitude": -15.46875, "label": "Entomology"}, "320": {"latitude": 53.330872999999997, "discipline": "10", "longitude": 28.828125, "label": "Mutation; DNA Repair"}, "321": {"latitude": -12.554563999999999, "discipline": "1", "longitude": -24.609375, "label": "Human Evolution"}, "326": {"latitude": 83.676942999999994, "discipline": "5", "longitude": -35.859375, "label": "Computer Aided Molecular Design"}, "327": {"latitude": 60.586967000000001, "discipline": "13", "longitude": 144.84375, "label": "Criminology"}, "324": {"latitude": 65.946472, "discipline": "8", "longitude": 92.8125, "label": "Epilepsy"}, "325": {"latitude": 0.70310700000000004, "discipline": "1", "longitude": -29.53125, "label": "Plant Ecology"}, "328": {"latitude": 70.844673, "discipline": "8", "longitude": 122.34375, "label": "Forensic Psychiatry"}, "329": {"latitude": 70.844673, "discipline": "13", "longitude": 139.921875, "label": "Personality"}, "201": {"latitude": 80.647035000000002, "discipline": "4", "longitude": -108.984375, "label": "Machine Tools"}, "200": {"latitude": 40.446947000000002, "discipline": "3", "longitude": 68.203125, "label": "Radiation Protection"}, "203": {"latitude": 80.178713999999999, "discipline": "12", "longitude": 59.765625, "label": "Periodontology"}, "202": {"latitude": 44.590466999999997, "discipline": "10", "longitude": 6.328125, "label": "Veterinary Medicine"}, "205": {"latitude": 71.074055999999999, "discipline": "3", "longitude": 52.03125, "label": "Thrombosis"}, "204": {"latitude": 70.140364000000005, "discipline": "3", "longitude": 52.03125, "label": "Birth Defects"}, "207": {"latitude": 82.494823999999994, "discipline": "12", "longitude": 104.0625, "label": "Mental Health Nursing"}, "206": {"latitude": -7.013668, "discipline": "1", "longitude": -35.859375, "label": "Freshwater Biology"}, "209": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "English Literature"}, "208": {"latitude": 72.607119999999995, "discipline": "7", "longitude": -157.5, "label": "Artificial Evolution"}, "77": {"latitude": 71.965388000000004, "discipline": "3", "longitude": 54.140625, "label": "Cardiovascular"}, "76": {"latitude": 68.399180000000001, "discipline": "3", "longitude": 45.0, "label": "Pediatrics"}, "75": {"latitude": 80.532071000000002, "discipline": "5", "longitude": -20.390625, "label": "Chromatography; Electrophoresis"}, "74": {"latitude": 70.844673, "discipline": "13", "longitude": -167.34375, "label": "Operations Research"}, "73": {"latitude": 76.184995000000001, "discipline": "12", "longitude": 75.9375, "label": "Sports Medicine"}, "72": {"latitude": 3.5134210000000001, "discipline": "6", "longitude": -58.359375, "label": "Oceanography"}, "71": {"latitude": 72.181804, "discipline": "12", "longitude": 127.265625, "label": "Psychoanalysis"}, "70": {"latitude": 75.320025000000001, "discipline": "4", "longitude": -108.984375, "label": "Aeronautics & Astronautics"}, "79": {"latitude": 50.736454999999999, "discipline": "13", "longitude": 177.890625, "label": "Economics"}, "78": {"latitude": -15.961328999999999, "discipline": "6", "longitude": -51.328125, "label": "Paleobiology"}, "2": {"latitude": 73.428424000000007, "discipline": "3", "longitude": 59.765625, "label": "Circulation"}, "542": {"latitude": 76.184995000000001, "discipline": "12", "longitude": 87.1875, "label": "Perception Motor Skills"}, "543": {"latitude": 40.446947000000002, "discipline": "13", "longitude": 167.34375, "label": "World Trade; Law"}, "540": {"latitude": 77.617709000000005, "discipline": "4", "longitude": -74.53125, "label": "Textile Art"}, "541": {"latitude": -23.885838, "discipline": "9", "longitude": 165.234375, "label": "Italian Studies"}, "546": {"latitude": 83.026218999999998, "discipline": "5", "longitude": -64.6875, "label": "Paints & Coatings"}, "547": {"latitude": 83.979259999999996, "discipline": "12", "longitude": 100.546875, "label": "Nursing Theory"}, "544": {"latitude": -7.013668, "discipline": "1", "longitude": -20.390625, "label": "Insects"}, "545": {"latitude": -6.3152990000000004, "discipline": "1", "longitude": -28.828125, "label": "Australian Ecology"}, "8": {"latitude": 52.482779999999998, "discipline": "3", "longitude": 51.328125, "label": "Urology"}, "548": {"latitude": -12.554563999999999, "discipline": "1", "longitude": -32.34375, "label": "Crustaceans"}, "549": {"latitude": 79.560546000000002, "discipline": "12", "longitude": 52.03125, "label": "Laser Surgery"}, "68": {"latitude": 75.497157000000001, "discipline": "12", "longitude": 60.46875, "label": "Retinal Surgery"}, "120": {"latitude": 18.646245, "discipline": "4", "longitude": -44.296875, "label": "Soil Quality"}, "121": {"latitude": 76.351895999999996, "discipline": "7", "longitude": -139.21875, "label": "Integrated Circuit Design"}, "122": {"latitude": -39.909736000000002, "discipline": "9", "longitude": 179.296875, "label": "Philosophy Psychology"}, "123": {"latitude": 65.946472, "discipline": "13", "longitude": 178.59375, "label": "Construction & Project Management"}, "124": {"latitude": 67.609221000000005, "discipline": "13", "longitude": 144.84375, "label": "Social Psychology"}, "125": {"latitude": 82.765372999999997, "discipline": "11", "longitude": -117.421875, "label": "High Energy Physics"}, "126": {"latitude": 63.548552000000001, "discipline": "13", "longitude": 171.5625, "label": "Strategic Management"}, "127": {"latitude": 38.822591000000003, "discipline": "2", "longitude": 14.0625, "label": "Genomics & Nucleic Acids"}, "128": {"latitude": 76.351895999999996, "discipline": "4", "longitude": -97.03125, "label": "Heat Transfer"}, "129": {"latitude": 69.411242000000001, "discipline": "4", "longitude": -82.96875, "label": "Cement & Concrete"}, "414": {"latitude": 72.607119999999995, "discipline": "12", "longitude": 75.9375, "label": "Trauma"}, "415": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -34.453125, "label": "Thermal Analysis"}, "416": {"latitude": 77.312520000000006, "discipline": "4", "longitude": -98.4375, "label": "Solar & Wind Power"}, "417": {"latitude": 49.837981999999997, "discipline": "4", "longitude": -82.265625, "label": "Ocean Engineering"}, "410": {"latitude": -14.604846999999999, "discipline": "9", "longitude": 165.234375, "label": "Critical Studies"}, "411": {"latitude": 56.944974000000002, "discipline": "13", "longitude": 177.890625, "label": "Econometrics"}, "412": {"latitude": 67.609221000000005, "discipline": "8", "longitude": 103.359375, "label": "Neuroscience Methods"}, "413": {"latitude": -2.8113709999999998, "discipline": "6", "longitude": -65.390625, "label": "Mineralogy"}, "498": {"latitude": 11.178402, "discipline": "13", "longitude": 159.609375, "label": "Pragmatics & Discourse"}, "418": {"latitude": 61.606395999999997, "discipline": "13", "longitude": 146.953125, "label": "Educational Psychology"}, "419": {"latitude": 7.013668, "discipline": "1", "longitude": -23.90625, "label": "Mycology"}, "499": {"latitude": 54.572062000000003, "discipline": "10", "longitude": 17.578125, "label": "Reproduction Veterinary"}, "319": {"latitude": 57.704146999999999, "discipline": "3", "longitude": 55.546875, "label": "Clinical Medicine (translated)"}, "318": {"latitude": 71.524908999999994, "discipline": "12", "longitude": 118.125, "label": "Mental Health Assessment"}, "313": {"latitude": 72.607119999999995, "discipline": "12", "longitude": 74.53125, "label": "Pain"}, "312": {"latitude": 67.339860999999999, "discipline": "13", "longitude": 131.484375, "label": "Child Development"}, "311": {"latitude": 81.723187999999993, "discipline": "12", "longitude": 47.109375, "label": "Medical Screening & Epidemiology"}, "310": {"latitude": 83.676942999999994, "discipline": "5", "longitude": -82.265625, "label": "Chemistry & Material Science"}, "317": {"latitude": 76.351895999999996, "discipline": "7", "longitude": -143.4375, "label": "Pattern Recognition"}, "316": {"latitude": 58.813741999999998, "discipline": "4", "longitude": -82.265625, "label": "Safety Management"}, "315": {"latitude": 17.978732999999998, "discipline": "1", "longitude": -31.640625, "label": "Soil Analysis"}, "314": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 168.75, "label": "Public Administration"}, "496": {"latitude": 57.704146999999999, "discipline": "13", "longitude": 156.09375, "label": "Education"}, "497": {"latitude": 73.428424000000007, "discipline": "4", "longitude": -103.359375, "label": "Acoustics"}, "3": {"latitude": 74.211983000000004, "discipline": "7", "longitude": -152.578125, "label": "Data Mining"}, "368": {"latitude": 58.447732999999999, "discipline": "4", "longitude": -108.984375, "label": "Naval Architecture"}, "369": {"latitude": -0.70310700000000004, "discipline": "1", "longitude": -42.890625, "label": "Environmental Microbiology"}, "366": {"latitude": 74.959391999999994, "discipline": "3", "longitude": 42.890625, "label": "Eye"}, "367": {"latitude": 74.959391999999994, "discipline": "12", "longitude": 116.015625, "label": "Addictive Behavior"}, "364": {"latitude": -12.554563999999999, "discipline": "6", "longitude": -61.875, "label": "Geodesy"}, "365": {"latitude": 84.474064999999996, "discipline": "5", "longitude": -77.34375, "label": "Surfactants"}, "362": {"latitude": 52.482779999999998, "discipline": "4", "longitude": -73.125, "label": "Water Utilities"}, "363": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -62.578125, "label": "Sedimentary Geology"}, "360": {"latitude": 52.052489999999999, "discipline": "13", "longitude": 174.375, "label": "Financial Accounting"}, "361": {"latitude": 49.382373000000001, "discipline": "2", "longitude": -8.4375, "label": "Microbiology Biotechnology"}, "380": {"latitude": -19.973348999999999, "discipline": "9", "longitude": 163.828125, "label": "Medieval History"}, "381": {"latitude": -39.909736000000002, "discipline": "9", "longitude": 179.296875, "label": "Philosophy of Education"}, "382": {"latitude": 61.606395999999997, "discipline": "4", "longitude": -104.765625, "label": "Oceanographic Instrumentation"}, "383": {"latitude": 46.073231, "discipline": "13", "longitude": 168.75, "label": "Foreign Policy"}, "384": {"latitude": 21.943045999999999, "discipline": "3", "longitude": 50.625, "label": "Gut"}, "385": {"latitude": 81.723187999999993, "discipline": "7", "longitude": -126.5625, "label": "Microwaves; Radio Frequencies"}, "386": {"latitude": 67.339860999999999, "discipline": "13", "longitude": 134.296875, "label": "School Psychology"}, "387": {"latitude": 54.572062000000003, "discipline": "10", "longitude": 29.53125, "label": "Vaccines"}, "388": {"latitude": 47.040182000000001, "discipline": "13", "longitude": 171.5625, "label": "Environmental Law"}, "389": {"latitude": 78.903929000000005, "discipline": "5", "longitude": -15.46875, "label": "Mass Spectrometry"}, "60": {"latitude": 76.679784999999995, "discipline": "4", "longitude": -88.59375, "label": "Pulp & Paper"}, "61": {"latitude": -12.554563999999999, "discipline": "6", "longitude": -62.578125, "label": "Seismology"}, "258": {"latitude": 72.607119999999995, "discipline": "3", "longitude": 56.25, "label": "Electrocardiography"}, "259": {"latitude": 49.837981999999997, "discipline": "13", "longitude": 176.484375, "label": "International Development"}, "64": {"latitude": 80.297927000000001, "discipline": "11", "longitude": -146.953125, "label": "Algebra"}, "65": {"latitude": 80.872827000000001, "discipline": "7", "longitude": -127.96875, "label": "Antenna"}, "66": {"latitude": 78.767792, "discipline": "7", "longitude": -134.296875, "label": "Circuit Systems"}, "67": {"latitude": 83.676942999999994, "discipline": "12", "longitude": 95.625, "label": "Nursing Specialists"}, "252": {"latitude": 56.559482000000003, "discipline": "3", "longitude": 60.46875, "label": "Cancer (translated)"}, "69": {"latitude": 65.946472, "discipline": "8", "longitude": 94.21875, "label": "Psychopharmacology"}, "250": {"latitude": 31.952162000000001, "discipline": "13", "longitude": 165.9375, "label": "Ethnology"}, "251": {"latitude": 67.339860999999999, "discipline": "3", "longitude": 49.21875, "label": "Prenatal Diagnostics"}, "256": {"latitude": 76.351895999999996, "discipline": "4", "longitude": -107.578125, "label": "Numerical Methods in Engineering"}, "257": {"latitude": 80.872827000000001, "discipline": "5", "longitude": 2.109375, "label": "EthnoPharmacology"}, "254": {"latitude": -10.487812, "discipline": "6", "longitude": -54.140625, "label": "Atmospheric GeoPhysics"}, "255": {"latitude": 80.872827000000001, "discipline": "5", "longitude": -14.0625, "label": "Flavors & Fragrance"}, "508": {"latitude": -0.70310700000000004, "discipline": "1", "longitude": -44.296875, "label": "Marine Pollution"}, "509": {"latitude": 75.320025000000001, "discipline": "5", "longitude": -2.8125, "label": "Toxins"}, "506": {"latitude": 65.072130000000001, "discipline": "3", "longitude": 45.0, "label": "Pulmonary"}, "507": {"latitude": 65.366837000000004, "discipline": "4", "longitude": -100.546875, "label": "Waste Management"}, "504": {"latitude": 70.844673, "discipline": "12", "longitude": 59.0625, "label": "Artifical Organs"}, "505": {"latitude": 73.824820000000003, "discipline": "12", "longitude": 72.421875, "label": "Physical Therapy; Orthopedic"}, "502": {"latitude": -12.554563999999999, "discipline": "9", "longitude": 167.34375, "label": "Socio-Cultural Anthropology"}, "503": {"latitude": 33.724339999999998, "discipline": "10", "longitude": 1.40625, "label": "Poultry Science"}, "500": {"latitude": 82.765372999999997, "discipline": "5", "longitude": -44.296875, "label": "Crystallography"}, "501": {"latitude": 79.560546000000002, "discipline": "11", "longitude": -135.0, "label": "Applied Math"}, "469": {"latitude": 82.214217000000005, "discipline": "12", "longitude": 79.453125, "label": "Preventive Medicine"}, "468": {"latitude": -19.973348999999999, "discipline": "6", "longitude": -45.0, "label": "Archeological Science"}, "465": {"latitude": 79.171334999999999, "discipline": "4", "longitude": -99.84375, "label": "Fractures & Fatigue"}, "464": {"latitude": 65.946472, "discipline": "13", "longitude": 129.375, "label": "Pychiatric & Behavioral Genetics"}, "467": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 164.53125, "label": "Cross Disciplinary Studies"}, "466": {"latitude": 76.679784999999995, "discipline": "12", "longitude": 75.9375, "label": "Emergency Medicine"}, "461": {"latitude": -6.3152990000000004, "discipline": "1", "longitude": -25.3125, "label": "Wildlife Research"}, "460": {"latitude": 73.226699999999994, "discipline": "3", "longitude": 42.890625, "label": "Dermatological Surgery"}, "463": {"latitude": 83.026218999999998, "discipline": "11", "longitude": -116.015625, "label": "Physics; Current Developments"}, "462": {"latitude": 83.979259999999996, "discipline": "12", "longitude": 97.734375, "label": "Midwifery"}, "168": {"latitude": 77.157162999999997, "discipline": "4", "longitude": -94.21875, "label": "Composites"}, "169": {"latitude": 41.508577000000002, "discipline": "13", "longitude": 154.6875, "label": "Language Learning"}, "164": {"latitude": 68.399180000000001, "discipline": "7", "longitude": -171.5625, "label": "Library Science; Infomation Retrieval"}, "165": {"latitude": 77.767582000000004, "discipline": "12", "longitude": 63.28125, "label": "Biomaterials"}, "166": {"latitude": -15.961328999999999, "discipline": "6", "longitude": -60.46875, "label": "Quaternary Research"}, "167": {"latitude": 42.553080000000001, "discipline": "3", "longitude": 56.25, "label": "Endoscopic Surgery"}, "160": {"latitude": 73.226699999999994, "discipline": "7", "longitude": -151.875, "label": "Artificial Intelligence"}, "161": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -45.0, "label": "Electro Analytical Chemistry"}, "162": {"latitude": 82.214217000000005, "discipline": "12", "longitude": 68.90625, "label": "Dental Education"}, "163": {"latitude": 58.447732999999999, "discipline": "2", "longitude": -4.21875, "label": "Enzyme Microbiological Techniques"}, "9": {"latitude": 59.534317999999999, "discipline": "10", "longitude": 29.53125, "label": "Immunology"}, "357": {"latitude": -4.2149429999999999, "discipline": "1", "longitude": -26.015625, "label": "Wildlife Management"}, "356": {"latitude": 70.844673, "discipline": "7", "longitude": -152.578125, "label": "Software Design and Development"}, "355": {"latitude": 71.074055999999999, "discipline": "12", "longitude": 123.046875, "label": "Psychiatric Services"}, "354": {"latitude": 71.965388000000004, "discipline": "12", "longitude": 112.5, "label": "Forensic Medicine"}, "353": {"latitude": 80.297927000000001, "discipline": "11", "longitude": -116.71875, "label": "Geophysical Science"}, "352": {"latitude": 42.553080000000001, "discipline": "10", "longitude": 23.203125, "label": "World Health Organization"}, "351": {"latitude": 79.935918000000001, "discipline": "11", "longitude": -134.296875, "label": "Computational Math"}, "350": {"latitude": 72.607119999999995, "discipline": "8", "longitude": 92.109375, "label": "Physical Therapy; Brain Injury"}, "359": {"latitude": 72.181804, "discipline": "7", "longitude": -157.5, "label": "Database Design & Management"}, "358": {"latitude": 14.604846999999999, "discipline": "4", "longitude": -72.421875, "label": "Ocean Coastal Management"}, "216": {"latitude": 63.233626999999998, "discipline": "4", "longitude": -85.78125, "label": "Mining"}, "217": {"latitude": 0.70310700000000004, "discipline": "1", "longitude": -18.28125, "label": "Aquaculture"}, "214": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "Modern Language"}, "215": {"latitude": 66.513260000000002, "discipline": "8", "longitude": 82.96875, "label": "Neurophsyiology & Neuroscience"}, "212": {"latitude": 64.168107000000006, "discipline": "13", "longitude": 167.34375, "label": "Higher Education"}, "213": {"latitude": -2.8113709999999998, "discipline": "1", "longitude": -26.015625, "label": "Ecology"}, "210": {"latitude": 74.211983000000004, "discipline": "12", "longitude": 63.984375, "label": "Plastic Surgery"}, "211": {"latitude": 84.124972999999997, "discipline": "12", "longitude": 96.328125, "label": "Nursing Administration"}, "218": {"latitude": 2.8113709999999998, "discipline": "1", "longitude": -11.25, "label": "Molecular Biological Evolution"}, "219": {"latitude": 82.765372999999997, "discipline": "11", "longitude": -118.828125, "label": "Photonics"}, "289": {"latitude": 68.138852, "discipline": "12", "longitude": 127.96875, "label": "Behavioral Research Therapy"}, "288": {"latitude": 72.816074, "discipline": "7", "longitude": -144.140625, "label": "Spyware; Malware"}, "4": {"latitude": 64.472793999999993, "discipline": "2", "longitude": 14.765625, "label": "Protein Science"}, "281": {"latitude": 49.837981999999997, "discipline": "13", "longitude": 166.640625, "label": "Third World Political Economics"}, "280": {"latitude": 75.497157000000001, "discipline": "7", "longitude": -140.625, "label": "Fault Tolerant Computing"}, "283": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 164.53125, "label": "Sociology"}, "282": {"latitude": 84.541360999999995, "discipline": "12", "longitude": 87.1875, "label": "Public Hospitals"}, "285": {"latitude": 74.775842999999995, "discipline": "3", "longitude": 54.140625, "label": "Bone & Osteoporosis"}, "284": {"latitude": 21.943045999999999, "discipline": "1", "longitude": -28.125, "label": "Horticulture"}, "287": {"latitude": 55.379109999999997, "discipline": "4", "longitude": -66.796875, "label": "Water Treatment"}, "286": {"latitude": 55.379109999999997, "discipline": "3", "longitude": 61.171875, "label": "Radiation Therapy"}, "263": {"latitude": 81.723187999999993, "discipline": "11", "longitude": -104.765625, "label": "Surface Coating Technology"}, "262": {"latitude": 72.607119999999995, "discipline": "3", "longitude": 40.078125, "label": "Molecular Endocrinology"}, "261": {"latitude": 51.179343000000003, "discipline": "13", "longitude": 165.9375, "label": "Political Studies"}, "260": {"latitude": 82.494823999999994, "discipline": "4", "longitude": -83.671875, "label": "Electrochemistry"}, "267": {"latitude": 46.073231, "discipline": "13", "longitude": 165.234375, "label": "International Conflict"}, "266": {"latitude": 54.572062000000003, "discipline": "4", "longitude": -82.265625, "label": "Oil & Natural Gas"}, "265": {"latitude": 65.072130000000001, "discipline": "13", "longitude": 151.875, "label": "Vocational Counseling"}, "264": {"latitude": 23.241346, "discipline": "1", "longitude": 9.140625, "label": "Molecular Biochemical Parasitology"}, "269": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -66.09375, "label": "Applied Catalysis"}, "268": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 164.53125, "label": "Art History"}, "59": {"latitude": 62.593341000000002, "discipline": "3", "longitude": 61.875, "label": "Vascular Surgery"}, "58": {"latitude": 63.548552000000001, "discipline": "13", "longitude": 171.5625, "label": "Business Ethics"}, "55": {"latitude": 59.534317999999999, "discipline": "10", "longitude": 26.015625, "label": "AntiMicrobial Agents"}, "54": {"latitude": 77.617709000000005, "discipline": "5", "longitude": 1.40625, "label": "Pharmaceutical Design"}, "57": {"latitude": 66.513260000000002, "discipline": "13", "longitude": -179.296875, "label": "Decision Support Systems"}, "56": {"latitude": 71.965388000000004, "discipline": "7", "longitude": -157.5, "label": "Systems Software"}, "51": {"latitude": 65.366837000000004, "discipline": "3", "longitude": 49.21875, "label": "Chest & Respiratory"}, "50": {"latitude": 70.140364000000005, "discipline": "3", "longitude": 42.890625, "label": "Obstetrics"}, "53": {"latitude": -15.961328999999999, "discipline": "1", "longitude": -26.015625, "label": "Zoology"}, "52": {"latitude": 72.181804, "discipline": "4", "longitude": -82.265625, "label": "Earthquake Engineering"}, "537": {"latitude": 59.888936999999999, "discipline": "3", "longitude": 63.28125, "label": "Clinical Medicine (Romania)"}, "536": {"latitude": 64.168107000000006, "discipline": "13", "longitude": 168.046875, "label": "Marketing"}, "535": {"latitude": 72.181804, "discipline": "13", "longitude": 162.421875, "label": "Education Psychological Measures"}, "63": {"latitude": 65.366837000000004, "discipline": "8", "longitude": 90.0, "label": "Neurology"}, "533": {"latitude": 69.411242000000001, "discipline": "8", "longitude": 88.59375, "label": "Neurotoxicology"}, "532": {"latitude": 66.513260000000002, "discipline": "8", "longitude": 92.8125, "label": "Sleep"}, "531": {"latitude": 83.111070999999995, "discipline": "12", "longitude": 59.0625, "label": "Public Health"}, "530": {"latitude": 76.184995000000001, "discipline": "3", "longitude": 43.59375, "label": "Hormone Research"}, "539": {"latitude": 78.349411000000003, "discipline": "12", "longitude": 54.140625, "label": "Optometry"}, "538": {"latitude": 82.586106000000001, "discipline": "5", "longitude": -44.296875, "label": "Green Chemistry"}, "115": {"latitude": 80.647035000000002, "discipline": "5", "longitude": -4.921875, "label": "Phytochemistry"}, "114": {"latitude": 66.513260000000002, "discipline": "3", "longitude": 58.359375, "label": "Thoracic Surgery"}, "117": {"latitude": 56.944974000000002, "discipline": "2", "longitude": 5.625, "label": "Food Protection"}, "116": {"latitude": 31.952162000000001, "discipline": "10", "longitude": 16.875, "label": "Tropical Medicine"}, "111": {"latitude": 74.959391999999994, "discipline": "4", "longitude": -116.015625, "label": "Mechanical Design Engineering"}, "110": {"latitude": 67.609221000000005, "discipline": "8", "longitude": 67.5, "label": "Otolaryngology; Laryngoscope"}, "113": {"latitude": -2.8113709999999998, "discipline": "1", "longitude": -33.046875, "label": "Biological Conservation"}, "112": {"latitude": -19.973348999999999, "discipline": "9", "longitude": 165.234375, "label": "Classics"}, "119": {"latitude": 69.411242000000001, "discipline": "4", "longitude": -85.078125, "label": "Energy Fuel"}, "118": {"latitude": 75.320025000000001, "discipline": "7", "longitude": -141.328125, "label": "Broadband Communication"}, "429": {"latitude": 23.885838, "discipline": "1", "longitude": -40.78125, "label": "Weed Management"}, "428": {"latitude": 73.824820000000003, "discipline": "7", "longitude": -147.65625, "label": "Computer Networks"}, "534": {"latitude": 70.377853999999999, "discipline": "3", "longitude": 47.109375, "label": "Pediatric Research"}, "421": {"latitude": 75.320025000000001, "discipline": "4", "longitude": -71.71875, "label": "Dyes & Pigments"}, "420": {"latitude": -14.604846999999999, "discipline": "9", "longitude": 164.53125, "label": "Semiotics"}, "423": {"latitude": -4.2149429999999999, "discipline": "1", "longitude": -25.3125, "label": "Molecular Ecology"}, "422": {"latitude": 73.428424000000007, "discipline": "3", "longitude": 52.03125, "label": "Drug Safety"}, "425": {"latitude": 70.140364000000005, "discipline": "12", "longitude": 125.15625, "label": "Clinical Psychiatry"}, "424": {"latitude": 56.559482000000003, "discipline": "10", "longitude": 38.671875, "label": "Cytogentics & Genome Mapping"}, "427": {"latitude": 38.272689, "discipline": "4", "longitude": -61.875, "label": "Water Waste"}, "426": {"latitude": -9.1020970000000005, "discipline": "6", "longitude": -55.546875, "label": "Paleogeography"}, "308": {"latitude": 78.490551999999994, "discipline": "7", "longitude": -134.296875, "label": "Electrical Networks"}, "309": {"latitude": 21.943045999999999, "discipline": "3", "longitude": 50.625, "label": "Endoscopy"}, "300": {"latitude": 71.524908999999994, "discipline": "3", "longitude": 49.21875, "label": "Atherosclerosis"}, "301": {"latitude": 84.267172000000002, "discipline": "12", "longitude": 82.96875, "label": "Region & Medical Ethics"}, "302": {"latitude": 65.072130000000001, "discipline": "8", "longitude": 115.3125, "label": "Speech Language & Hearing"}, "303": {"latitude": 61.606395999999997, "discipline": "3", "longitude": 38.671875, "label": "Thoracic & Respiratory"}, "304": {"latitude": 47.040182000000001, "discipline": "10", "longitude": 8.4375, "label": "Veterinary Microbiology"}, "305": {"latitude": 32.546813, "discipline": "4", "longitude": -45.0, "label": "Environmental Protection"}, "306": {"latitude": 72.181804, "discipline": "7", "longitude": -150.46875, "label": "Computer Systems Design"}, "307": {"latitude": 25.165172999999999, "discipline": "4", "longitude": -46.40625, "label": "Environmental Pollution"}, "229": {"latitude": 82.586106000000001, "discipline": "11", "longitude": -116.015625, "label": "Nuclear Instrumentation"}, "228": {"latitude": 80.178713999999999, "discipline": "11", "longitude": -130.78125, "label": "Simulation"}, "227": {"latitude": 12.554563999999999, "discipline": "4", "longitude": -45.0, "label": "Soil Science"}, "226": {"latitude": 65.366837000000004, "discipline": "12", "longitude": 84.375, "label": "Audiology"}, "225": {"latitude": 74.775842999999995, "discipline": "7", "longitude": -131.484375, "label": "Robotics"}, "224": {"latitude": 70.377853999999999, "discipline": "12", "longitude": 69.609375, "label": "Spine"}, "223": {"latitude": 81.518271999999996, "discipline": "7", "longitude": -120.9375, "label": "Photo-Optics"}, "222": {"latitude": -7.013668, "discipline": "9", "longitude": 161.71875, "label": "Linguistics"}, "221": {"latitude": 80.178713999999999, "discipline": "11", "longitude": -148.359375, "label": "Functional Analysis"}, "220": {"latitude": 52.482779999999998, "discipline": "13", "longitude": 168.75, "label": "Urban Studies"}, "391": {"latitude": -0.70310700000000004, "discipline": "9", "longitude": 165.234375, "label": "Asian Studies"}, "390": {"latitude": 78.490551999999994, "discipline": "12", "longitude": 112.5, "label": "Psychiatric Nursing"}, "151": {"latitude": 84.267172000000002, "discipline": "12", "longitude": 82.265625, "label": "BioEthics"}, "150": {"latitude": 69.657086000000007, "discipline": "8", "longitude": 104.0625, "label": "Psychosis; Schizophrenia"}, "153": {"latitude": 77.617709000000005, "discipline": "7", "longitude": -134.296875, "label": "Power Distribution"}, "152": {"latitude": 72.181804, "discipline": "7", "longitude": -144.140625, "label": "Parellel Computing"}, "155": {"latitude": 76.351895999999996, "discipline": "4", "longitude": -83.671875, "label": "Wood"}, "154": {"latitude": 74.402163000000002, "discipline": "12", "longitude": 121.640625, "label": "Gerontology"}, "157": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -62.578125, "label": "Geology & Tectonics"}, "156": {"latitude": 78.490551999999994, "discipline": "11", "longitude": -152.578125, "label": "Discrete Applied Mathematics"}, "159": {"latitude": 74.402163000000002, "discipline": "7", "longitude": -146.953125, "label": "Mobile Networks"}, "158": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -63.984375, "label": "GeoChemistry"}, "399": {"latitude": 56.559482000000003, "discipline": "3", "longitude": 54.140625, "label": "Surgical Oncology"}, "398": {"latitude": 77.767582000000004, "discipline": "7", "longitude": -138.515625, "label": "Power Systems"}, "48": {"latitude": 58.813741999999998, "discipline": "10", "longitude": 23.203125, "label": "Molecular Cell Biology"}, "49": {"latitude": 69.411242000000001, "discipline": "5", "longitude": 4.21875, "label": "Food Chemistry"}, "46": {"latitude": 82.214217000000005, "discipline": "7", "longitude": -122.34375, "label": "Applied Optics"}, "47": {"latitude": 73.226699999999994, "discipline": "4", "longitude": -94.21875, "label": "Nuclear Engineering"}, "44": {"latitude": 63.548552000000001, "discipline": "8", "longitude": 74.53125, "label": "Neurosurgery"}, "45": {"latitude": 67.609221000000005, "discipline": "3", "longitude": 38.671875, "label": "Fertility"}, "42": {"latitude": 73.824820000000003, "discipline": "12", "longitude": 30.9375, "label": "Nutrition"}, "43": {"latitude": 59.534317999999999, "discipline": "13", "longitude": -177.890625, "label": "Finance"}, "40": {"latitude": 65.946472, "discipline": "8", "longitude": 99.84375, "label": "Clinical Neurophysiology"}, "41": {"latitude": 75.497157000000001, "discipline": "3", "longitude": 54.140625, "label": "Opthamology"}, "5": {"latitude": 76.679784999999995, "discipline": "7", "longitude": -140.625, "label": "Signal Processing"}, "489": {"latitude": 75.497157000000001, "discipline": "7", "longitude": -143.4375, "label": "Consumer Electronics"}, "488": {"latitude": -12.554563999999999, "discipline": "9", "longitude": 166.640625, "label": "Social History"}, "487": {"latitude": -10.487812, "discipline": "1", "longitude": -28.125, "label": "Fish Biology"}, "486": {"latitude": 65.946472, "discipline": "13", "longitude": 178.59375, "label": "Operations Management"}, "485": {"latitude": 70.140364000000005, "discipline": "8", "longitude": 81.5625, "label": "Headache"}, "484": {"latitude": 78.767792, "discipline": "7", "longitude": -134.296875, "label": "Antennae; Mobile Radio"}, "483": {"latitude": 81.201419999999999, "discipline": "11", "longitude": -116.015625, "label": "Superconductor Science"}, "482": {"latitude": 81.413933, "discipline": "4", "longitude": -101.953125, "label": "Friction Lubrication & Wear"}, "481": {"latitude": 76.679784999999995, "discipline": "7", "longitude": -140.625, "label": "Circuits"}, "480": {"latitude": 77.312520000000006, "discipline": "4", "longitude": -78.75, "label": "Wood Components"}, "472": {"latitude": 70.377853999999999, "discipline": "13", "longitude": 130.78125, "label": "Psychosomatic Medicine"}, "473": {"latitude": 80.647035000000002, "discipline": "12", "longitude": 66.09375, "label": "Pharmaco Economics"}, "470": {"latitude": 80.872827000000001, "discipline": "5", "longitude": -70.3125, "label": "Carbon"}, "471": {"latitude": 60.930432000000003, "discipline": "3", "longitude": 46.40625, "label": "Gynecology Oncology"}, "476": {"latitude": 75.320025000000001, "discipline": "11", "longitude": -161.71875, "label": "Cancer Statistics"}, "477": {"latitude": 67.339860999999999, "discipline": "8", "longitude": 118.125, "label": "Consciousness"}, "474": {"latitude": 78.061988999999997, "discipline": "7", "longitude": -149.765625, "label": "Computer Modeling and Animation"}, "475": {"latitude": 84.267172000000002, "discipline": "12", "longitude": 78.75, "label": "Medical Practice"}, "478": {"latitude": 67.339860999999999, "discipline": "12", "longitude": 68.203125, "label": "Otolyngology; Head Neck"}, "479": {"latitude": 70.844673, "discipline": "3", "longitude": 59.0625, "label": "Heart Failure; Catheters"}}; var SCIMAP_TYPE = { @@ -79,4 +79,4 @@ function customTileRange(zoom) { } else if (zoom == 4) { return 9; } -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js index 80852d1f..ce6d8596 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStrings); @@ -276,4 +276,4 @@ var DataTableWidget = Class.extend({ me.widget.fnDraw(); } } -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js b/webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js index 9a0195cf..dc504810 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /** * Manage async download contents and make sure don't have the same * download request in the same time. Provide ability to abort download. @@ -47,4 +47,4 @@ var DownloadManager = Class.extend({ isDone: function(url) { return !this.hasKey(url); } -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js index 5976a146..5a238e38 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var EntityTablesWidget = Class.extend({ init: function(sciMapWidget) { @@ -47,4 +47,4 @@ var EntityTablesWidget = Class.extend({ this.keyToDataTable[key] = dataTable; return dataTable; } -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js index 09dea796..49a2bf05 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStrings); @@ -101,4 +101,4 @@ var ErrorDisplayWidget = Class.extend({ this.container.hide(); } -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js b/webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js index d81cf1df..2a1fc9de 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /** * This is the Google MAP API utilities file to make sure all calls to * Google API is correct. Please add all common utilities at here. diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js b/webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js index dbdd664b..ec66b9ff 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStrings); @@ -92,4 +92,4 @@ $(window).bind("load",function() { setupLoadingScreen(); initMap(); initVisModeController(); -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/Marker.js b/webapp/src/main/webapp/js/visualization/mapofscience/Marker.js index d40e0acf..8b95663a 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/Marker.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/Marker.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /** * Marker Object for that hold external information - data. Please refer to the * Google.map.MakerOptions for options' details diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js b/webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js index 1ba220cd..3e51a615 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /** * The MarkerManager is more like a composite class of Marker. It manages * markers by grouping the markers by keys. diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js b/webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js index 347ad4cc..bd64925b 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ // Adapted from http://www.mredkj.com/javascript/numberFormat.html // format number to a better human readable text function addCommasToNumber(nStr) { @@ -13,4 +13,4 @@ function addCommasToNumber(nStr) { } return x1 + x2; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js b/webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js index cc1c5e8c..110a0f99 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var INFO_WINDOW = createInfoWindow("", "300"); var Polygon = Class.extend({ @@ -149,4 +149,4 @@ var CirclePolygon = Polygon.extend({ TOOLTIP.hide(); })); } -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js index 54350e35..ce295d33 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStrings); @@ -218,4 +218,4 @@ var ScimapWidget = Class.extend({ changeFilter: function(filterType) { this.show(filterType); } -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js index c7eebff6..c56e6be8 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStrings); @@ -164,4 +164,4 @@ function truncateText(text, len) { } return trunc; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js b/webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js index 12cc5d6a..4f18c9e6 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /** * The scaler is used for scaling based on the predefined minimum value and * maximum value. You also can control the returned maximum scale and minimum diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js b/webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js index 0d05c5a7..cc618fa2 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /** * This tooltip source is modified based on the example of Google map V3. The demo html * is at http://philmap.000space.com/gmap-api/poly-hov.html @@ -98,4 +98,4 @@ var Tooltip = function(o) { tt.style.left = y + 'px'; } }; -}; \ No newline at end of file +}; diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js b/webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js index 7289ec40..98173adf 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ function switchMarkerManager(id) { markerManager = getMarkerManager(id); @@ -116,4 +116,4 @@ function createToolTip(target, tipText, tipLocation) { width: 500, } }); -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js b/webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js index 930bbdfb..819ac1fc 100644 --- a/webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js +++ b/webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var ENTITY_VIS_MODE = "ENTITY"; var COMPARISON_VIS_MODE = "COMPARISON"; @@ -126,4 +126,4 @@ var ComparisonVisModeController = VisModeController.extend({ this.widgets = widgets; } -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/personlevel/person-level.js b/webapp/src/main/webapp/js/visualization/personlevel/person-level.js index 3771f709..d5de95a4 100644 --- a/webapp/src/main/webapp/js/visualization/personlevel/person-level.js +++ b/webapp/src/main/webapp/js/visualization/personlevel/person-level.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ $.extend(this, i18nStringsPersonLvl); diff --git a/webapp/src/main/webapp/js/visualization/sparkline.js b/webapp/src/main/webapp/js/visualization/sparkline.js index 36abc5f2..4e8ebd58 100644 --- a/webapp/src/main/webapp/js/visualization/sparkline.js +++ b/webapp/src/main/webapp/js/visualization/sparkline.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* Javascript for sparkline visualization on person profile page */ @@ -30,4 +30,4 @@ var visualization = { $(document).ready(function() { visualization.renderCoAuthor(visualizationUrl); -}); \ No newline at end of file +}); diff --git a/webapp/src/main/webapp/js/visualization/visualization-helper-functions.js b/webapp/src/main/webapp/js/visualization/visualization-helper-functions.js index d58cb497..dcd2ef93 100644 --- a/webapp/src/main/webapp/js/visualization/visualization-helper-functions.js +++ b/webapp/src/main/webapp/js/visualization/visualization-helper-functions.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /** * For rendering images dynamically. @@ -109,4 +109,4 @@ function toTitleCase(str) { return str.replace(/\w\S*/g, function(txt) { return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase(); }); -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/templates/freemarker/body/aboutQrCodes.ftl b/webapp/src/main/webapp/templates/freemarker/body/aboutQrCodes.ftl index 41ec0c81..d16acf6b 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/aboutQrCodes.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/aboutQrCodes.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Page providing details on how QR codes work --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/foaf-person--exportQrCode.ftl b/webapp/src/main/webapp/templates/freemarker/body/foaf-person--exportQrCode.ftl index bfce4e4c..e5402470 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/foaf-person--exportQrCode.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/foaf-person--exportQrCode.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Page providing options for disseminating QR codes --> <#assign qrCodeWidth = "150"> @@ -28,4 +28,4 @@ <#t> -${stylesheets.add('')} \ No newline at end of file +${stylesheets.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl b/webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl index c697577e..123ea9a4 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if !(user.loggedIn && user.hasSiteAdminAccess)> @@ -279,4 +279,4 @@ <#-- if user is logged-in with site admin access --> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl index 8120bc46..5bc00b52 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Individual profile page template for foaf:Organization individuals (extends individual.ftl in vivo)--> diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl index edd2bb0a..37012404 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Individual profile page template for foaf:Person individuals --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- The "quick view" individual profile page template for foaf:Person individuals --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--skos-concept.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--skos-concept.ftl index 628b1780..88c8f76e 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--skos-concept.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--skos-concept.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Individual profile page template for skos:Concept individuals (extends individual.ftl in vivo)--> diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl index 1b81659e..9f56f4c8 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Open Social Gadgets --> <#-- VIVO OpenSocial Extension by UCSF --> @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl index 79a900b4..e1e26cce 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Default VIVO individual profile page template (extends individual.ftl in vitro) --> @@ -43,4 +43,4 @@ ${stylesheets.add('')} ${scripts.add('')} -${scripts.add('')} \ No newline at end of file +${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl index cd41d130..60f5a749 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom form for managing labels for individuals - specific to VIVO which handles people as well --> <#assign isPersonType = "false"/> <#if editConfiguration.pageData.isPersonType?has_content> @@ -46,4 +46,4 @@ ${i18n().cancel_link}

* ${i18n().required_fields}

- \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl index cd22dfed..1e48c02a 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--VIVO specific errors for person--> <#import "lib-vivo-form.ftl" as lvf> @@ -26,4 +26,4 @@

- \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl index cca1dcb6..c02cd043 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Some values for labels etc. may be different between vitro and other systems --> -<#assign returnText = "${i18n().return_to_profile}" /> \ No newline at end of file +<#assign returnText = "${i18n().return_to_profile}" /> diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl index a1cf1fe7..738d4d99 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ -->

${i18n().publications_text_one}

@@ -15,4 +15,4 @@ display:About

${i18n().publications_text_three}

- \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl b/webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl index 5009f9e0..e4ec72a1 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- The body map contains the orcidInfo structure, which is set up like this: @@ -145,4 +145,4 @@ span.completed { - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl index 7370afdc..b2b8c030 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if departmentsResults?has_content> <#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept. --> <#assign urlForDetailsPage = "affiliatedDepartments" /> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl index cff1400b..2c5c3dd1 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if deptResearchAreas?has_content>
<#list deptResearchAreas as firstRow> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl index c4fed45b..9c8411c2 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if affiliatedResearchAreas?has_content>
<#list affiliatedResearchAreas as firstRow> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl index 324076e6..fce8af74 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if researchAreaResults?has_content> <#-- If the organization is an Academic Department, we use a different datagetter and detail page. This --> <#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept. --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-altmetric.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-altmetric.ftl index f16adf19..f0a9091b 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-altmetric.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-altmetric.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Overview on individual profile page --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl index 8745c0cc..7f74e873 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Contact info on individual profile page --> <#assign phone = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Telephone")!> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl index 4399ea5c..ad0ce7a1 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Contact info on individual profile page --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl index a0f9d591..971aba16 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-datetime.ftl" as dt> <#if deptGrants?has_content> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl index 7e4b60d6..3b2aea05 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if deptResearchAreas?has_content>
<#list deptResearchAreas as firstRow> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl index 043bfe78..87e9656d 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- List of research areas for the individual --> <#assign geographicFoci = propertyGroups.pullProperty("${core}geographicFocus")!> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl index 9dc2bf56..1ed6e72c 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Icon controls displayed in upper-right corner --> @@ -25,4 +25,4 @@ that directory. The tag below shows an example using Cornell University's di ---> \ No newline at end of file +--> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl index 8e69ed0a..64808e00 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- If authorized to confirm ORCID IDs, add the function that will replace the add link. @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl index ae3d0136..19dcc74f 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Overview on individual profile page --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl index db5a7745..0d80ebb3 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- List of positions for the individual --> <#assign positions = propertyGroups.pullProperty("${core}relatedBy", "${core}Position")!> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-profilePageTypes.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-profilePageTypes.ftl index addd10c0..aff15042 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-profilePageTypes.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-profilePageTypes.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- profile page type select element on individual 2-column profile page --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl index 5268da11..a75adaee 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- QR code --> @@ -143,4 +143,4 @@ <#return validVCard> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl index bf5edf7a..8c8f30b5 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- List of research areas for the individual --> <#assign researchAreas = propertyGroups.pullProperty("${core}hasResearchArea")!> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-setup.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-setup.ftl index fb2a2fc2..b17ec8d0 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-setup.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-setup.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Setup needed by all individual templates --> @@ -9,4 +9,4 @@ <#assign propertyGroups = individual.propertyList> -<#assign core = "http://vivoweb.org/ontology/core#"> \ No newline at end of file +<#assign core = "http://vivoweb.org/ontology/core#"> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl index aefa6c28..7e4a5de7 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for sparkline visualization on individual profile page --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl index cf03da9a..b0a212ac 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl @@ -1,7 +1,7 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Map Of Science visualization --> \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl index 7690af66..249b2765 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for sparkline visualization on individual profile page --> @@ -45,4 +45,4 @@ var infoIconSrc = '${urls.images}/iconInfo.png'; - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl index 0eb38519..5476a815 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl @@ -1,7 +1,7 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Temporal graph visualization --> \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl index 5fff092e..3c7f7169 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if vocabularyService?has_content> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl index e6bbac81..2127803d 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl index 653ffe98..30366587 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "advisee of". See the PropertyConfig.n3 file for details. @@ -30,4 +30,4 @@ ${linkedIndividual} <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl index 1e62752f..0a8764da 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "advisees". See the PropertyConfig.n3 file for details. @@ -30,4 +30,4 @@ ${linkedIndividual} <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl index f22757df..3e3c332d 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "selected publications". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl index 9f86f23b..aff0edef 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "awards and honors". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl index d3628dbb..f172872a 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "awards and honors". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl index ec1540b1..9806cb28 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- VIVO-specific default data property statement template. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl index f9586f33..282ead27 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for http://vivoweb.org/ontology/core#dateTimeInterval. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl index d56cca3c..ee09cd7c 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for http://vivoweb.org/ontology/core#dateTimeValue. @@ -15,4 +15,4 @@ <#else> ${dt.formatXsdDateTimeLong(statement.dateTime, statement.precision!)} <@lmt.addCitationMetaTag uri="http://vivoweb.org/ontology/core#dateTimeValue" content=dt.formatXsdDateTimeLong(statement.dateTime, statement.precision!) /> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl index 4488a96c..792c8dca 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- VIVO-specific default object property statement template. @@ -18,4 +18,4 @@ ${statement.label!statement.localName!}  ${statement.title!statement.type!} <@lmt.addCitationMetaTag uri=(statement.specificObjectType) content=(statement.label!) /> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl index 3954c215..6bcc821e 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "education and training". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl index 6a9d91aa..fba5531f 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- VIVO-specific default data property statement template. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl index 666b48ad..e347be99 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "editor of". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl index e01bdc4d..bbdbf8be 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "education and training". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl index 05799c7e..84706bde 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- This template must be self-contained and not rely on other variables set for the individual page, because it @@ -14,4 +14,4 @@ ${statement.emailAddress} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl index 229f54b7..df666f6d 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- This template must be self-contained and not rely on other variables set for the individual page, because it diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl index 08cd3d98..ca5c9af0 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl index 93051819..a06adb10 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for http://vivoweb.org/ontology/core#hasAssociatedConcept. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl index 27af1f13..79e19be0 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "attended". See the PropertyConfig.n3 file for details.. @@ -36,4 +36,4 @@ <@s.join [ linkedIndividual, attendedEvent! ] /> ${dateTime!} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl index 4a56ca9c..addf027c 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "reviewer of". See the PropertyConfig.n3 file for details. @@ -25,4 +25,4 @@ <#-- If property is collated, then subclass label is redundant information --> ${linkedIndividual} <#if (! property.collatedBySubclass) && statement.subclassLabel?has_content> (${statement.subclassLabel!}) ${dateTime!} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl index 74c78610..2d00554e 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "investigator on," "principal investigator on" and "co-principal investigator on." See the PropertyConfig.n3 file for details. @@ -50,4 +50,4 @@ ${linkedIndividual} ${awardOrAdminBy} ${dateTime!} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl index 6ef1fdab..25a4f7c1 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "presentations". See the PropertyConfig.n3 file for details. @@ -37,4 +37,4 @@ <@s.join [ linkedIndividual, statement.roleLabel!, conference! ] /> ${dateTime!} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl index 7be93554..445bf19c 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for the roleRealizedIn, roleContributesTo, researchActivities, hasRole and hasClinicalActivities custom list views. See those list view and the PropertyConfig.n3 file for details. @@ -38,4 +38,4 @@ ${linkedIndividual} ${statement.roleLabel!} ${dateTime!} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl index 426da3a5..170a72d0 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "authors". See the PropertyConfig.n3 file for details. @@ -29,4 +29,4 @@ <#-- This shouldn't happen, but we must provide for it --> ${i18n().missing_author} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl index f0587a67..15f2b921 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "editors". See the PropertyConfig.n3 file for details. @@ -18,4 +18,4 @@ <#-- This shouldn't happen, but we must provide for it --> ${i18n().missing_editor} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl index 0f3c9398..92c6151a 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for http://vivoweb.org/ontology/core#credentialOrHonor. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl index c4ab8514..730c51c5 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "mailing address". See the PropertyConfig.n3 file for details. @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl index 1b8c265f..6b4f57bd 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- VIVO-specific default data property statement template. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl index 61fbe996..a6f1a86a 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl index ea43f9a9..7c624563 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl index 5aef336f..811f9fb9 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "people". See the PropertyConfig.n3 file for details. @@ -34,4 +34,4 @@ <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl index 42fc298c..b543f61b 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "organization for training". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl index bcfcb75e..0fc864d4 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "positions". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl index 2e97990b..653e4acd 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- This template must be self-contained and not rely on other variables set for the individual page, because it @@ -14,4 +14,4 @@ ${statement.number} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl index c68e5053..420e9108 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- This template must be self-contained and not rely on other variables set for the individual page, because it @@ -12,4 +12,4 @@ ${statement.preferredTitle!} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl index a8c9ac4f..ee701d63 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "editor of". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl index 8d91d5ed..f2cebe2a 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom object property statement view for faux property "editor of". See the PropertyConfig.n3 file for details. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl index 1907a90b..820345cd 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- This template must be self-contained and not rely on other variables set for the individual page, because it diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl index 8dc33bcc..1e012ef7 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- This template must be self-contained and not rely on other variables set for the individual page, because it diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl index 9ac91778..b2654c18 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- VIVO-specific default data property statement template. diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl index cbbf6236..c1132d09 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- "Quick view" template for core:webpage @@ -75,4 +75,4 @@ $('img#img-${identifier}').on("load", function(){ $('img#img-${identifier}').fadeIn(); $('img#icon-${identifier}').fadeIn(); }); - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl index 2c2fde31..caced2b2 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for core:webpage. @@ -17,4 +17,4 @@ ${linkText} <#else> ${statement.linkName} (${i18n().no_url_provided}) - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-browse-people.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-browse-people.ftl index 729462ff..c7aa6955 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-browse-people.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-browse-people.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Default individual browse view --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl index 277fd6fd..0834fe92 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Display of an individual in a list (on /individuallist and menu pages). --> @@ -8,4 +8,4 @@ <@p.displayTitle individual /> -<#-- add display of web pages? --> \ No newline at end of file +<#-- add display of web pages? --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl index fbcf3cce..be693ca2 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Default individual search view --> @@ -8,4 +8,4 @@ <@p.displayTitle individual /> -

${individual.snippet}

\ No newline at end of file +

${individual.snippet}

diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl index 688d37ca..fdb717bb 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign today = .now > <#assign todayDate = today?date> Results from ${siteName} for ${querytext} on ${todayDate} diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl index 5a47d369..95993fb1 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl index 34d224cf..495fa259 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-form.ftl" as lvf> <#include "addAssociatedConceptVocabSpecificDisplay.ftl" > <#assign existingConcepts = editConfiguration.pageData.existingConcepts/> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl index 43ab963e..9316cbf2 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--The original concept javascript is service independent, i.e. all vocabulary service information is returned from the servlet and the template itself generates the same display for all the services. Right now we would like to show a different label diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl index 95b04879..66c57af3 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for service provider role--> <#-- @@ -25,4 +25,4 @@ roleExamples--> <#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}" /> <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl index 27082ae9..077cda46 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom form for adding authors to information resources --> @@ -205,4 +205,4 @@ ${stylesheets.add('')} ${scripts.add('')} ${scripts.add('')} -${scripts.add('')} \ No newline at end of file +${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl index 0599c096..fb3e0bee 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for clinical role--> <#-- @@ -32,4 +32,4 @@ RoleToActivityPredicate <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl index d602401b..59efe227 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Assign variables from editConfig--> <#assign rangeOptions = editConfiguration.pageData.objectVar /> <#-- diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl index 9efc361b..f85fa193 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Overriding default form here to allow just concepts to show in the list--> <#if rangeOptionsExist = true > @@ -32,4 +32,4 @@ ${i18n().or} ${i18n().cancel_link} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl index 89b5ddc4..1443f1f5 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Assign variables from editConfig--> <#assign rangeOptions = editConfiguration.pageData.objectVar /> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl index 40434117..2c5c6942 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for adding/editing core:webpages --> <#import "lib-vivo-form.ftl" as lvf> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl index 4e5a2e0f..9ac29cd8 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for service provider role--> <#-- @@ -25,4 +25,4 @@ roleExamples--> <#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Collection'}" /> <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl index 7a39833c..344242b9 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom form for adding editors to information resources --> @@ -175,4 +175,4 @@ ${stylesheets.add('')} ${scripts.add('')} ${scripts.add('')} -${scripts.add('')} \ No newline at end of file +${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl index 567062c8..88c9ac76 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl index c6e554d7..459ed483 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl index 9f7204a7..8245ce41 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-form.ftl" as lvf> <#-- Template for adding a grant role, such as principal investigator, to a foaf:Persons --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl index d9c3b932..d1575822 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for service provider role--> <#-- @@ -25,4 +25,4 @@ roleExamples--> <#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization'}" /> <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl index 5101843c..e4f18ecc 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for service provider role--> <#-- @@ -25,4 +25,4 @@ roleExamples--> <#assign acMultipleTypes = "'true'" /> <#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization,http://xmlns.com/foaf/0.1/Group,http://purl.obolibrary.org/obo/OBI_0000835'}" /> <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl index 7f01f49b..f9833e99 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl index 241b3c2a..ae938994 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for service provider role--> <#-- @@ -25,4 +25,4 @@ roleExamples--> <#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}"> <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl index f9362afb..eaaf197c 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for service provider role--> <#-- @@ -27,4 +27,4 @@ roleExamples--> <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl index 41457a70..47fed204 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl index 9094face..69340cfb 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for adding a publication to a foaf:Persons --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl index 6d76adc0..0b3bd28f 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for service provider role--> <#-- @@ -26,4 +26,4 @@ roleExamples--> <#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#Project,http://vivoweb.org/ontology/core#Grant'}" /> <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl index afdaeabd..f74b214a 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for service provider role--> <#-- diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl index ec6433ae..aa52fa0c 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-form.ftl" as lvf> <#--Retrieve certain edit configuration information--> @@ -241,4 +241,4 @@ ${scripts.add('')} ${scripts.add('')} -
\ No newline at end of file +
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl index 61f73913..bef54b9c 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for service provider role--> <#-- @@ -27,4 +27,4 @@ roleExamples--> <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl index 4a44a04d..42bc4487 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Two stage form for teacher role--> <#-- @@ -28,4 +28,4 @@ roleExamples--> <#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Conference,http://vivoweb.org/ontology/core#Course,http://purl.org/ontology/bibo/Workshop'}" /> <#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> \ No newline at end of file +<#include "addRoleToPersonTwoStage.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl index 1092738f..3b1fdf0a 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-form.ftl" as lvf> <#--If edit submission exists, then retrieve validation errors if they exist--> <#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> @@ -76,4 +76,4 @@ ${stylesheets.add('', '', '', - '')} \ No newline at end of file + '')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl index 40f3f4b3..0243a36f 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--If edit submission exists, then retrieve validation errors if they exist--> <#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css index e2674a3e..4c43e117 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ .conceptsListContainer { overflow:hidden; @@ -85,4 +85,4 @@ a.more-less { a:hover.more-less { color: #fff; background: #888; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css index eba09eb3..aaf63b8e 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* Styles for autocomplete and autocomplete selections using jQuery UI. This is separated out so that forms that don't load customFormWithAutocomplete.css still have access to these styles. */ @@ -21,4 +21,4 @@ li.ui-menu-item a.ui-corner-all { .acSelectorWithHelpText{ font-style: italic; color: #555; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/institutionalInternalClass.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/institutionalInternalClass.css index 8b68760d..0a3f1cae 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/institutionalInternalClass.css +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/institutionalInternalClass.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ #localClassName { margin-bottom: 0; @@ -17,4 +17,4 @@ padding: .5em; background: #ffc; display: inline-block; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css index 7a8e7de6..d34c8be0 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ #dragDropList { margin: 0 0 1.5em 0; @@ -50,4 +50,4 @@ class, in case we want to re-enable DD without a page reload. */ } form#addAuthorForm { display: none; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl index 0eb25388..5d9791c3 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for adding/editing time values --> @@ -54,4 +54,4 @@ ${stylesheets.add('')} ${scripts.add('', - '')} \ No newline at end of file + '')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl index 5e16e93e..9fbf2c19 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-form.ftl" as lvf> @@ -80,4 +80,4 @@ ${stylesheets.add('')} -${scripts.add('')} \ No newline at end of file +${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl index 85fe5dbf..61325ba3 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl index 60f0788b..33ac4695 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl index 23d6da9f..c2023b4a 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Institutional Internal Class Form @@ -85,4 +85,4 @@ edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.Institu
${stylesheets.add('')} -${stylesheets.add('')} \ No newline at end of file +${stylesheets.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js index 4e9d9390..81f3bb98 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var addAuthorForm = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js index 42b918b8..e8f24207 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var addConceptForm = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js index 5afddf7f..dca31b4f 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var addEditorForm = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js index 17464953..99fa9fb0 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var addOrcidIdToPersonUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js index 88cba06f..477e851f 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var adviseeRelUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js index ab991c22..22b89933 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var advisorRelUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js index f8183a18..125089db 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var awardReceiptUtils = { @@ -111,4 +111,4 @@ var awardReceiptUtils = { this.yearAwarded.val(this.displayedYear.val()); } -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js index f2761f78..91862aca 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var customForm = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js index b89dbb63..b2646370 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var missingIndividualFormUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js index 85e6dc8d..a85ca6bd 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var educationalTrainingUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js index 23d1630b..1062bea0 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var grantHasContributorUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js index 285ab333..b26cb45c 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var issuedCredentialUtils = { @@ -42,4 +42,4 @@ var issuedCredentialUtils = { this.issuedType.val(credentials[val]); } -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js index 43648028..79f32d1f 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var mailingAddressUtils = { @@ -57,4 +57,4 @@ var mailingAddressUtils = { this.street2.val(lineTwo); } -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js index 9f35fd34..e28487a4 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var manageHideShowStatus = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js index dd30e5ad..db969b36 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var manageWebpages = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js index 0f404f85..7b918b6f 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var newIndividualFormUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js index 42e3f48b..a09a2dee 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var orgHasPositionUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js index 963ffd14..b0e894bc 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var orgForTrainingUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js index 60d0d39b..e8c55ca9 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var projectHasParticipantUtils = { diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js index 94deb69d..573fa7c7 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ var publicationToPersonUtils = { @@ -430,4 +430,4 @@ var publicationToPersonUtils = { } } -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl index b22f5d10..61e58735 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-form.ftl" as lvf> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl index 60ca067f..903e4765 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-form.ftl" as lvf> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl index 1cb34186..66fd39c3 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-vivo-form.ftl" as lvf> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl index b1990376..07172009 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Custom form for managing web pages for individuals --> <#if (editConfiguration.pageData.webpages?size > 1) > diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl index d719a7fc..9d72766b 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ -->
<#if internalClass?has_content> @@ -13,4 +13,4 @@ ${enableInternalClass} -
\ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl index ad452e4d..9caab032 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for adding a new individual from the Site Admin page: VIVO version --> @@ -84,4 +84,4 @@ ${stylesheets.add('')} -${scripts.add('')} \ No newline at end of file +${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl index bb98727f..4be00752 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl index e32354ec..7c5389c5 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl index 019aeba4..cb576513 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this template is for adding a person's position to an organization --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl index 51b361c1..690cd2ea 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Scripts for class group browsing --> <#--Replaces Vitro's processing for individuals for classes with VIVO's processing internal classes--> ${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl index a596a133..4deff695 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign internalClassUri = editConfiguration.pageData.internalClassUri />
@@ -14,4 +14,4 @@ ${enableInternalClass} -
\ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl index 01b83356..dea8cc8d 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Sets up script for custom form data. Including here instead of as separate javascript file to ensure this script is always loaded first. Can also make sure placed first in scripts list.--> @@ -18,4 +18,4 @@ scripts list.--> "searchIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter" } }; - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl index a4ba45a1..4ce5a5b6 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--The blank sentinel indicates what value should be put in a URI when no autocomplete result has been selected. If the blank value is non-null or non-empty, n3 editing for an existing object will remove the original relationship if nothing is selected for that object--> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl index ea987f34..cd83bc63 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--The blank sentinel indicates what value should be put in a URI when no autocomplete result has been selected. If the blank value is non-null or non-empty, n3 editing for an existing object will remove the original relationship if nothing is selected for that object--> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl index b06737c2..9789386c 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl index 3bce05ad..3185832c 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl index b5928b0b..3a3d73ec 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl index 9ed10cdc..1078aa9a 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl index c3c90211..8d35ccbc 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for adding a position history--> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl index a2b5bad0..60a38290 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl index 1fbb8b96..6d25ece8 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl index fe6f5aed..7fe03675 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl index 32995090..1a710af2 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- this is in request.subject.name --> diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-generator-classes.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-generator-classes.ftl index 8a492ceb..f4acf527 100644 --- a/webapp/src/main/webapp/templates/freemarker/lib/lib-generator-classes.ftl +++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-generator-classes.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign ManageLabelsGenerator = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVOManageLabelsGenerator" /> <#assign NewIndividualFormGenerator = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVONewIndividualFormGenerator" /> diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl index 3d9aef0f..d0eb4f22 100644 --- a/webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl +++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Macros used to build the statistical information on the home page --> diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-meta-tags.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-meta-tags.ftl index c1ac3085..526e6d2d 100644 --- a/webapp/src/main/webapp/templates/freemarker/lib/lib-meta-tags.ftl +++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-meta-tags.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#macro addCitationMetaTag uri="" content=""> <#if metaTags?? && uri?? && content??> @@ -45,4 +45,4 @@ http://purl.org/ontology/bibo/volume http://purl.org/ontology/bibo/issue -http://purl.org/ontology/bibo/pageStar \ No newline at end of file +http://purl.org/ontology/bibo/pageStar diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl index 91994de6..f1e48c39 100644 --- a/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl +++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Macros used to insert microformats into non-foaf person profiles via the individual-vitro.ftl template. --> <#macro sectionSchema individual> @@ -72,4 +72,4 @@ <#-- don't return anything if the info content entity has no matching subclass --> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl index b4426d21..33aff022 100644 --- a/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl +++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Macros and functions for form controls --> diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl index eb4e630a..e324e2f4 100644 --- a/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl +++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Macros related to the display of vivo ontology properties --> diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl index 9b657529..ce8bed22 100644 --- a/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl +++ b/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for scripts and css relating to the geographic focus maps on the home page. --> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl index 31b4fca9..1a15c23a 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if shouldVIVOrenderVis> <#include "coAuthorshipSparklineContent.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl index 87a3dd92..ec48efdf 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign visContainerID = '${sparklineVO.visContainerDivID}'> <#if sparklineVO.shortVisMode> @@ -304,4 +304,4 @@ - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl index d6f10275..fe1d8173 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl @@ -1,8 +1,8 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> ${headScripts.add('')} ${scripts.add('')} -<#include "coAuthorshipSparklineContent.ftl"> \ No newline at end of file +<#include "coAuthorshipSparklineContent.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/collaboratorToActivityCountTable.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/collaboratorToActivityCountTable.ftl index 24538d94..ce6309de 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/collaboratorToActivityCountTable.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/collaboratorToActivityCountTable.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ -->
@@ -30,4 +30,4 @@ -
\ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl index 445ced9c..b065ba7a 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if shouldVIVOrenderVis> <#include "coInvestigationSparklineContent.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl index 44379c2d..c725ade8 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign visContainerID = '${sparklineVO.visContainerDivID}'> <#if sparklineVO.shortVisMode> @@ -305,4 +305,4 @@ - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl index 48cfafb7..7d439417 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl @@ -1,8 +1,8 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> ${headScripts.add('')} ${scripts.add('')} -<#include "coInvestigationSparklineContent.ftl"> \ No newline at end of file +<#include "coInvestigationSparklineContent.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/dummyVisClient.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/dummyVisClient.ftl index dfc99bfd..360a50f6 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/dummyVisClient.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/dummyVisClient.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> ${headScripts.add('', '')} @@ -91,4 +91,4 @@ $(document).ready(function() { vis query for person -> "Crane, Brian" -
iioio
\ No newline at end of file +
iioio
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl index d11ad33f..f98b9c74 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ -->
<#if (builtFromCacheTime??) > diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl index 111df210..4c888a01 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign standardVisualizationURLRoot ="/visualization"> <#assign shortVisualizationURLRoot ="/vis"> @@ -24,4 +24,4 @@ ${i18n().entity_comp_error_text3} ${organizationLabel} ${i18n().profile_page} ${i18n().entity_comp_error_text4}

- \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl index 216fad0c..350feb46 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- The Order of each element in this file is very important. Do not make any changes to it unless making corresponding changes in the included Templates. --> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl index da47d15b..7cba3b32 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- The Order of each element in this file is very important. Do not make any changes to it unless making corresponding changes in the included Templates. --> @@ -56,4 +56,4 @@ via JavaScript. --> <#include "entityPublicationComparisonError.ftl"> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl index 3dd2e59d..a57ee8ae 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign standardVisualizationURLRoot ="/visualization"> <#assign ajaxVisualizationURLRoot ="/visualizationAjax"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl index 35490ac2..daa78a8e 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl @@ -1,7 +1,7 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign otherVisType = "publication-graph"> <#assign textForOtherEntityComparisonType = "publications"> <#assign textForCurrentEntityComparisonType = "grants"> -<#include "entityComparisonErrorCommonBody.ftl"> \ No newline at end of file +<#include "entityComparisonErrorCommonBody.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl index 1a6a661c..61cc0f9b 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl @@ -1,7 +1,7 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign otherVisType = "grant-graph"> <#assign textForOtherEntityComparisonType = "grants"> <#assign textForCurrentEntityComparisonType = "publications"> -<#include "entityComparisonErrorCommonBody.ftl"> \ No newline at end of file +<#include "entityComparisonErrorCommonBody.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl index 2e542736..6d5f175c 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if shouldVIVOrenderVis> <#include "personGrantSparklineContent.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl index c1f06a87..72974e52 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl @@ -1,8 +1,8 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> ${headScripts.add('')} ${scripts.add('')} -<#include "personGrantSparklineContent.ftl"> \ No newline at end of file +<#include "personGrantSparklineContent.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl index 4377b0bb..033b5049 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign visContainerID = '${sparklineVO.visContainerDivID}'> <#if sparklineVO.shortVisMode> @@ -299,4 +299,4 @@ - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl index 596582b2..eb7a7d7a 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign aboutImagesRoot = '${urls.images}/visualization/mapofscience/about/'> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl index bdc6b580..84d03c8d 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign standardVisualizationURLRoot ="/visualization"> <#assign ajaxVisualizationURLRoot ="/visualizationAjax"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl index f6845e0d..ecb88ce7 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- The Order of each element in this file is very important. Do not make any changes to it unless making corresponding changes in the included Templates. --> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl index 9c10bfff..25864ce5 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- START TOOLTIP TEXT --> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl index 597dd3e5..1de93200 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#if (currentModels?size > 0)> @@ -53,4 +53,4 @@ $(document).ready(function() { }); - \ No newline at end of file + diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl index 7024f052..31251c20 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign standardVisualizationURLRoot ="/visualization"> <#assign shortVisualizationURLRoot ="/vis"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl index f29f0c8e..7ea3bab4 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign standardVisualizationURLRoot ="/visualization"> <#assign shortVisualizationURLRoot ="/vis"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl index 8f1a53dd..be7ce8ea 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- There are two templates for displaying publication information on foaf person pages. diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl index d09375f0..1223f002 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign visContainerID = '${sparklineVO.visContainerDivID}'> <#if sparklineVO.shortVisMode> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl index 7a863dad..c9c772c2 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl @@ -1,8 +1,8 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> ${headScripts.add(googleJSAPI)} ${scripts.add('')} -<#include "personPublicationSparklineContent.ftl"> \ No newline at end of file +<#include "personPublicationSparklineContent.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl index d73b1e1d..f5758609 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign visContainerID = '${sparklineVO.visContainerDivID}'> <#if sparklineVO.shortVisMode> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl index 3555885e..9d63153b 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#assign shortVisualizationURLRoot ="/vis"> <#assign refreshCacheURL = "${urls.base}${shortVisualizationURLRoot}/refresh-cache"> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/utilities.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/utilities.ftl index ce299794..9ce62119 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/utilities.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/utilities.ftl @@ -1,3 +1,3 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> ${utilityResopnse} diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl index 06476959..8160b4df 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ -->
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/yearToActivityCountTable.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/yearToActivityCountTable.ftl index 957af77b..0d58523b 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/yearToActivityCountTable.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/yearToActivityCountTable.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ -->
@@ -28,4 +28,4 @@ -
\ No newline at end of file + diff --git a/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css b/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css index 38aacc03..bf3c7cf8 100644 --- a/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css +++ b/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css @@ -115,4 +115,4 @@ /* list tool fix ticket #135 */ * html #ctl00_ctl00_left_pnlOpenSocialTools { height: 130px; } *+html #ctl00_ctl00_left_pnlOpenSocialTools { height: 130px; } -* html #ctl00_ctl00_left_pnlOpenSocialTools { margin-left: -8px; } \ No newline at end of file +* html #ctl00_ctl00_left_pnlOpenSocialTools { margin-left: -8px; } diff --git a/webapp/src/main/webapp/themes/wilma/css/reset.css b/webapp/src/main/webapp/themes/wilma/css/reset.css index 0aef5cac..c6ee6add 100644 --- a/webapp/src/main/webapp/themes/wilma/css/reset.css +++ b/webapp/src/main/webapp/themes/wilma/css/reset.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /* CSS Document CSS reste by Eric Meyer: @@ -99,4 +99,4 @@ fieldset { } legend { display: none; -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/themes/wilma/css/screen.css b/webapp/src/main/webapp/themes/wilma/css/screen.css index 4d475cf1..6921ed25 100644 --- a/webapp/src/main/webapp/themes/wilma/css/screen.css +++ b/webapp/src/main/webapp/themes/wilma/css/screen.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ /**************************************** **************************************** @@ -23,4 +23,4 @@ VIVO wilma theme: screen styles @charset "UTF-8"; @import url("reset.css"); -@import url("wilma.css"); \ No newline at end of file +@import url("wilma.css"); diff --git a/webapp/src/main/webapp/themes/wilma/css/wilma.css b/webapp/src/main/webapp/themes/wilma/css/wilma.css index 3612a0cb..75ff6b39 100644 --- a/webapp/src/main/webapp/themes/wilma/css/wilma.css +++ b/webapp/src/main/webapp/themes/wilma/css/wilma.css @@ -1,4 +1,4 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/* $This file is distributed under the terms of the license in LICENSE$ */ @charset "UTF-8"; /* CSS Document */ diff --git a/webapp/src/main/webapp/themes/wilma/templates/footer.ftl b/webapp/src/main/webapp/themes/wilma/templates/footer.ftl index 50b01a94..3375c08e 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/footer.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/footer.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ -->
@@ -30,4 +30,4 @@ -<#include "scripts.ftl"> \ No newline at end of file +<#include "scripts.ftl"> diff --git a/webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl b/webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl index 50ba92a9..896ced28 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for the body of the GadgetDetails page --> diff --git a/webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl b/webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl index 69c75cca..70990b55 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- Template for the body of the GadgetDetails page --> diff --git a/webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl b/webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl index 1000dbe9..a91c60b1 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- NOTICE: This is SAMPLE Google Analytics code. You must replace it with your institution's code. Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google+Analytics+for+UI. --> @@ -23,4 +23,4 @@ Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google catch(err) {} ---> \ No newline at end of file +--> diff --git a/webapp/src/main/webapp/themes/wilma/templates/head.ftl b/webapp/src/main/webapp/themes/wilma/templates/head.ftl index bf093232..8342ab5b 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/head.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/head.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> @@ -35,4 +35,4 @@ an individual profile page. --> ${headContent!} - \ No newline at end of file + diff --git a/webapp/src/main/webapp/themes/wilma/templates/identity.ftl b/webapp/src/main/webapp/themes/wilma/templates/identity.ftl index 47d5848d..0921fd85 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/identity.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/identity.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl index 323e26e2..282ac983 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <@widget name="login" include="assets" /> @@ -111,4 +111,4 @@ } - \ No newline at end of file + diff --git a/webapp/src/main/webapp/themes/wilma/templates/page.ftl b/webapp/src/main/webapp/themes/wilma/templates/page.ftl index b826291c..b7dd0785 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#import "lib-list.ftl" as l> @@ -24,4 +24,4 @@ <#include "footer.ftl"> - \ No newline at end of file + diff --git a/webapp/src/main/webapp/themes/wilma/templates/search.ftl b/webapp/src/main/webapp/themes/wilma/templates/search.ftl index a3825eea..b58572ae 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/search.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/search.ftl @@ -1,4 +1,4 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#--Breaking this out so this can be utilized by other pages such as the jsp advanced tools pages--> @@ -14,4 +14,4 @@ - \ No newline at end of file + From 35b01dda5f077cb093bddd71a90dd06605009b78 Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Wed, 2 Nov 2016 22:37:48 -0600 Subject: [PATCH 2/4] moving license file front and center --- LICENSE | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..27f3e967 --- /dev/null +++ b/LICENSE @@ -0,0 +1,25 @@ +Copyright (c) 2016, Cornell University +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of Cornell University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 76a60b2a949188fa78b34b68ff62a64181207e91 Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Wed, 2 Nov 2016 23:06:38 -0600 Subject: [PATCH 3/4] adding missing licenses and updating listings --- legacy/doc/3rd-party-licenses.txt | 20 +++++------ .../licenses/.relaxngDatatype.LICENSE.txt.swp | Bin 0 -> 12288 bytes legacy/doc/licenses/aterm-java.LICENSE.txt | 27 ++++++++++++++ .../doc/licenses/relaxngDatatype.LICENSE.txt | 30 ++++++++++++++++ legacy/doc/licenses/xsdlib-license.txt | 33 ++++++++++++++++++ 5 files changed, 99 insertions(+), 11 deletions(-) create mode 100644 legacy/doc/licenses/.relaxngDatatype.LICENSE.txt.swp create mode 100644 legacy/doc/licenses/aterm-java.LICENSE.txt create mode 100644 legacy/doc/licenses/relaxngDatatype.LICENSE.txt create mode 100644 legacy/doc/licenses/xsdlib-license.txt diff --git a/legacy/doc/3rd-party-licenses.txt b/legacy/doc/3rd-party-licenses.txt index 7a5b9128..f31cbc22 100644 --- a/legacy/doc/3rd-party-licenses.txt +++ b/legacy/doc/3rd-party-licenses.txt @@ -37,6 +37,7 @@ solr spring stax-api toggle +trippi xalan xercesImpl xml-apis @@ -65,11 +66,15 @@ sesame-repository (licenses/aduna.LICENSE.txt) sesame-rio (licenses/aduna.LICENSE.txt) sparqltag (licenses/sparqltag.LICENSE.txt) xpp3_min (licenses/extreme.LICENSE.txt) +xsdlib (licenses/xsdlib.LICENSE.txt) xstream (licenses/xstream.LICENSE.txt) + BSD 3-clause --- antisamy (licenses/antisamy.LICENSE.txt) +aterms-java (licenses/aterms-java.LICENSE.txt) +relaxngDatatype (licenses/relaxngDatatype.LICENSE.txt) CDDL 1.0 @@ -77,10 +82,12 @@ CDDL 1.0 jaxrpc (licenses/cddl.LICENSE.txt) saaj (licenses/cddl.LICENSE.txt) + ECLIPSE PUBLIC LICENSE v1.0 -------- webserviceutils (licenses/eclipse.LICENSE.txt) + GNU AGPL 3 ---------- licenses/agpl.LICENSE.txt @@ -143,6 +150,7 @@ slf4j-api (licenses/mit.LICENSE.txt) slf4j-log4j12 (licenses/mit.LICENSE.txt) XMLGregorianCalendarConverter.java (licenses/mit.LICENSE.txt) + MPL 1.1 ------- licenses/mpl.LICENSE.txt @@ -167,17 +175,7 @@ jtidy (licenses/jtidy.LICENSE.txt) ojdbc (licenses/oracle.LICENSE.txt) leaflet (licenses/leaflet.LICENSE.txt) -Unknown -------- -aterm-java -relaxngDatatype -xsdlib - - -None ----- -Trippi ORCID API client ---------------- -Written as part of the ORCID A&I grant. Source is available at https://github.com/j2blake/orcid-api-client \ No newline at end of file +Written as part of the ORCID A&I grant. Source is available at https://github.com/j2blake/orcid-api-client diff --git a/legacy/doc/licenses/.relaxngDatatype.LICENSE.txt.swp b/legacy/doc/licenses/.relaxngDatatype.LICENSE.txt.swp new file mode 100644 index 0000000000000000000000000000000000000000..f8ae45fb27b895e1e32ee5f0c0c1b389b3724a48 GIT binary patch literal 12288 zcmeI2O>f*p7{{l*@zR#p3kUQN5Nf3DZkh%m!O8JXvLkuz#V?yiJs`)P&04HID|>d+ zT;Re1J_O|pzzJ>~xNzgZl`DJ)I3oVz-EGoVqmRD1S|ndz!I`iXYAxT#{NW@|Nn3P{{Q|4V_zd4AnqYvL)<`INBn%9u`dx{ zAodY|U1RJ=#J7lV5L3iEh~Hmi>^H<$hQXaS%7f9Cukl5+qJL7lxaO64Rv3W8!BK}c=e8Tb8)S^qmJ5U>w9~gf_5kprT zbXaR%;7brjw9i}b9;X8&G%))ja%{^aax}h9L zoR>0hbNCW9Wep*cs04Em(l}t Date: Fri, 21 Apr 2017 17:18:35 -0600 Subject: [PATCH 4/4] updating year in LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 27f3e967..2237c2f9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016, Cornell University +Copyright (c) 2017, Cornell University All rights reserved. Redistribution and use in source and binary forms, with or without