Commit Graph

129 Commits

Author SHA1 Message Date
Alex Martzios 4dfe5f989a update OpenAIRE Graph name 2023-02-23 14:28:02 +02:00
argirok 0d66dab63e enable feedback when recaptcha key is available 2022-03-08 15:25:58 +02:00
argirok 845db0a835 truncate text for open access mandate and collected from aggregator_name labels - better display in mobile 2022-01-03 16:10:15 +02:00
argirok f911dec31e landing pages: keep the loaded url as canonical if there is a timeout error - show the correct message 2021-12-17 15:39:32 +02:00
Konstantina Galouni aab0341bea [Explore | Trunk]: 1. dataProvider.service.ts & project.service.ts & resultLanding.service.ts & searchDataproviders.service.ts & searchOrganizations.service.ts & searchProjects.service.ts & searchResearchResults.service.ts: Removed case sensitivity in parsing relations (rels.rel.to.class). 2. orcid.service.ts: Removed unused imports | Added comment related to KPI metrics calculated by orcid API. 2021-09-27 12:19:24 +03:00
argirok 9d65eaab72 update metrics API: use the new stats tool for both numbers & charts 2021-09-08 15:21:30 +03:00
argirok 3d413cde2d SEO - accessibility: In images add alt, add specific width and height, in links add <span class="visually-hidden"></span> with descriptive text - not visible (add class in library.css) 2021-08-10 13:46:33 +03:00
k.triantafyllou 08bf703186 [Library]: Move angular 11 to trunk. Remove no needed files. Delete angular upgrade branches
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61381 d315682c-612b-4755-9ff5-7f18f6832af3
2021-07-14 11:19:57 +00:00
konstantina.galouni 8c92a7fcdb [Trunk | Library]: organization.component.ts & project.component.ts: [Bug fix] Close report modal when opening loading modal (after clicking on some download button).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61249 d315682c-612b-4755-9ff5-7f18f6832af3
2021-06-17 13:33:16 +00:00
konstantina.galouni ac8381b004 [Trunk | Library]:
1. src/app/openaireLibrary/orcid/orcid-work.component.ts: [Bug fix] On ngOnInit() method, call getPutCode, only if(!this.givenPutCode && this.isLoggedIn).
2. src/app/openaireLibrary/utils/properties/env-properties.ts: Added field "enermapsAPIURL?: string".
3. src/app/openaireLibrary/utils/tabs/contents/search-tab.component.ts: Added <ng-content></ng-content> on top of <search-result>.
4. src/app/openaireLibrary/landingPages/project/project.component.html: Moved alert inside <search-tab> (was before it).
5. src/app/openaireLibrary/landingPages/result/resultLanding.service.ts: Added methods "getEnermapsDetails()" and "parseEnermapsDetails()" (hide "shared_id").
6. src/app/openaireLibrary/landingPages/result/resultLanding.component.ts: Added fields and methods to get enermpas details (only when properties.enermapsAPIURL is set).
7. src/app/openaireLibrary/landingPages/result/resultLanding.component.html: 
	a. [Bug fix] Capitalize first letter of title in "References" tab (in small tabs).
	b. When clicking on tab, call (selectedActiveTab)="onSelectActiveTab($event)".
	c. If available, show uk-list with enermaps details (key-value pairs).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61021 d315682c-612b-4755-9ff5-7f18f6832af3
2021-05-19 09:36:09 +00:00
k.triantafyllou 1e785e4fd9 [Library | Trunk]: Remove scroll to top from pages initiliazation
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60926 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-20 15:18:15 +00:00
argiro.kokogiannaki a8a8ba4016 [Library|Trunk]
Metrics:
  add back the Openaire views

SEO:
 - Landing: encode pid in canonical url
 - result preview: single encoding in pid url

Enermaps Integration:
 - update landing tab
 - update look for tool url



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60826 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-09 15:39:42 +00:00
argiro.kokogiannaki e6d0721fb8 [Library|Trunk]
Tabs: 
 - use CustomClass directive instead of statistics
 - update it  in landing pages

Enermaps Integration:
 - Result LAnding at a new tab with enermaps tool
 - Image on the left of the result preview component



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60814 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-08 10:50:11 +00:00
argiro.kokogiannaki 84f4ca48fa [Library|Trunk]
Metrics:
- comment Openaire views



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60789 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-05 10:49:47 +00:00
k.triantafyllou a9c25698dd [Library | Trunk]: Add dmps on project
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60614 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-10 13:24:19 +00:00
argiro.kokogiannaki 8a315f3963 [Library|Trunk]
Track Downloads:
- add the type of report (filename) in the url - to separate the different actions
- Organization: add piwik track in 2 reports that was missing
- Add track download for citations



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60406 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-10 12:50:02 +00:00
argiro.kokogiannaki ce1b7a2c86 [Library|Trunk]
Piwik: download give the current url instead of the blob url. Remove url parameter from trackDownload()

Metrics: add usage counts link in the logo


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60280 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-22 15:28:08 +00:00
argiro.kokogiannaki 8e4c151640 helper service: for monitor routes /_alias_/search_route split to remove alias
input: add check aboutlabel for checkbox
SideBar: add uk-bav-parent for sub menus


Piwik:
	- Search-download: get piwikId as input
	- Search page: pass piwik id in search download component
	- project landing - pass piwik id

Dashboard- Admin tools:
	- remove Guards from modules
	- add subscriptions array and unsubscribe them
	- read properties directly from file
	- update links to be relative



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60170 d315682c-612b-4755-9ff5-7f18f6832af3
2020-12-18 15:09:38 +00:00
k.triantafyllou 3dfe33b5c7 [Library | Trunk]: Annotations add list of related annotations resources
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59962 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-25 16:09:36 +00:00
k.triantafyllou 7fc62a8117 [Library | Trunk]: Add graph link on landings
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59942 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-24 08:21:36 +00:00
argiro.kokogiannaki 8d9420e4a1 [Library|Trunk]
properties: remove reading properties from route data

Aggregator: add aggregator checks in navbar, entities selection and as adminToolsPortalType



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59899 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-18 16:06:27 +00:00
argiro.kokogiannaki 1d5c753ff6 [Library|Trunk]
code clean up:
-remove app.* files from library
-remove unused imports, code, files (Old search pages for results, dataproviders, map search page, etc)
-remove Freeguard from modules
-unsubscribe all subscriptions
-Services: configuration, isvocabularies, user management: unsubscribe from app component or the component that uses them (clearSubscriptions())
-Fetchers: unsubscribe from  the component that uses them (clearSubscriptions())




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59816 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-11 14:43:13 +00:00
argiro.kokogiannaki 2716235881 [Library| Trunk]
- create timeout interceptor
- update urls for cache interceptor (&fields=country)


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59741 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-02 17:11:31 +00:00
k.triantafyllou 8f7d9a54d9 [Library | Trunk]: Landing remove Open on Power by message. Change metrics logo
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59560 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-13 12:07:16 +00:00
argiro.kokogiannaki 479a76b318 [Library|Trunk]
apply in all pages domain and baseLink changes (part 2)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59413 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-18 10:10:18 +00:00
argiro.kokogiannaki 7526ef56e3 [Library|Trunk]
properties changes: 
	domain:
	  -is https://{explore,connect,monitor, etc}.openaire.eu 
	  -initialized in environment files
	  -reset for communities in EnvironmentSpecificService
	baseLink: is the prefix after the domain / or /dahsboard for monitor_dashboard
apply in all pages domain and baseLink changes

	


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59411 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-18 07:57:42 +00:00
argiro.kokogiannaki c22e64c46c [Library|Trunk]
update meta urls and canonicalurl to get domain from properties  instead of baseLink to work for community gateways



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59403 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-16 13:50:16 +00:00
argiro.kokogiannaki 78fed00f1d [Library|Trunk]
Project Landing:
	avoid double message "Nosummary available"
	enhance project meta and jsonld description



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59375 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-15 10:01:19 +00:00
argiro.kokogiannaki 7c54692d2c [Library|Trunk]
update indexInfo service to get last claim date
in landing use only the service response not the properties value 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59367 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-14 15:48:43 +00:00
k.triantafyllou 1e8a635c1b [Library | Trunk]: Remove directive modal-select.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59257 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-12 14:25:43 +00:00
k.triantafyllou e3a33ba2b5 [Library | Trunk]: Project Landing: Add message insead of - if no summary is available
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59144 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-17 13:19:57 +00:00
k.triantafyllou 775de0cd6b [Library | Trunk]: Projects: 1. Rename organizations to partners. Keep organizations on the right side of the page always, despite the summary is empty
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59143 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-17 09:32:05 +00:00
k.triantafyllou 5317506680 [Library | Trunk]: Change organization link base on property, on Projects
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59068 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-10 11:29:39 +00:00
argiro.kokogiannaki 979921c536 [Library |Trunk]
Landing: metrics charts -- > change size to 200 values


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59063 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-10 08:48:33 +00:00
konstantina.galouni 650964f962 [Trunk | Library]: resultLanding.component.html & project.component.html: [Bug fix] On modal for linking, when linking option was clicked, modal was not closing.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59049 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-06 17:46:11 +00:00
k.triantafyllou d07a30b5ca [Library | Trunk]: 1. Contact us css changes. 2. Search for monitor. 3. Landing for monitor
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59007 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-29 13:15:52 +00:00
argiro.kokogiannaki 1b576e5a40 [Library | Trunk]
Search:
1. advanced link in home and /search/find
2. DOI issue in /search/find/
3. update of numbers in tabs when there is an error in /search/find/
4. order of filters in search outcomes
5. In Landingpages:  rename "Publication Summary" --> "Summary" kai "Related outcomes" --> "Related research"

Linking:
get communities but not hidden ones



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59003 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-29 11:10:32 +00:00
argiro.kokogiannaki dae898b5ac [Library|Trunk]
Project Service: fixed issue in parsing #5682



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58959 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-18 11:48:46 +00:00
argiro.kokogiannaki b819a68e96 [Library|Trunk]
Landing pages: add check for openaire id

Search Page: support quoted queries only if the number is even



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58940 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-16 16:42:51 +00:00
konstantina.galouni c20391f3fc [Trunk | Library]:
1. src/assets/common-assets/common/custom.css: Add 'font-display: swap;' in '@font-face' css rules - improve performance.
2. dataProvider.component.html & organizations.component.html & project.component.html & resultLanding.component.html: Add check if 'indexUpdateDate' is initialized.
3. dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts: 
	Initialize 'indexUpdateDate' and tabs counts only if "typeof document !== 'undefined'" (javascript is enabled) - improve performance.
4. resultLanding.component.ts: Get "provenanceActionVocabulary" and "altMetrics" only if "typeof document !== 'undefined'" (javascript is enabled) - improve performance.
5. organization.component.ts: [Bug fix] Get 'indexUpdateDate' from service (not properties) if available.
6. project.component.ts: [Bug fix] Call 'getProjectInfo()' only once (was called twice).
7. project.service.ts: [Bug fix] Add check for rels.rel.to.class=="hasParticipant" (when not array).
8. metrics.component.ts: Get metrics if "typeof document !== 'undefined'" (javascript is enabled) | Show charts only if user clicked on metrics badge | Do not set "width" for <i-frame> elements.
9. iframe.component.ts: Add case when only height is sent as input.
10. searchDataProviders.component.ts & searchOrganizations.component.ts: [Bug fix] Set "firstLoad" to false after getting results (was asking refine filters in paging too). 
11. search-tab.component.ts: [Bug fix]: In method "getEntityName()" add cases when 'entityType == "project"' and 'entityType == "dataprovider"' and fix case when 'entityType == "result"'.
12. navigationBar.component.ts: [Bug fix] Do not initialize navbar inside route.queryParams subscription - !!! check it carefully when deployed in all portals !!! .


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58874 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-10 11:05:59 +00:00
konstantina.galouni 3b35ac3b83 [Trunk | Library]: project.component.html: [Bug fix - again] <ul> tag missing.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58818 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-01 13:17:13 +00:00
konstantina.galouni 9d36f734fb [Trunk | Library]: project.component.html: [Bug fix] <ul> tag missing (probably deleted in previous commit).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58817 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-01 13:10:21 +00:00
konstantina.galouni 026dd123fd [Trunk | Library]: dataProvider.component.html & organization.component.html & project.component.html: Remove old commented code from previous designs of landing pages.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58814 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-31 13:51:35 +00:00
konstantina.galouni dfb98fffcc [Trunk | Library]: dataProvider.component & organization.component & project.component: Use <search-tab> (common view for tabs with search results) - also used in community first page.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58813 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-31 13:44:52 +00:00
konstantina.galouni cf7ed8a085 [Trunk | Library]: dataProvider.component & organization.component & project.component: Add better checks in search calls (fetch classes).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58812 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-31 13:09:26 +00:00
konstantina.galouni ad44991cd1 [Trunk | Library]:
1. tabs.component.ts: If tabs are more than 2, add class (in all html) 'uk-visible@m' - <small-tabs> will be displayed instead.
2. small-tabs.component.ts: Show small tabs if they are more than 2 and add class 'uk-hidden@m'.   
3. resultLanding.component & project.component & organization.component & dataProvider.component:
        a. Show tabs without waiting for initialization - do not calculate number of tabs.
        b. Show summary tab always - if no primary or secondary information, show alert message.
        c. Remove checks and 'uk-visible@m', 'uk-hidden@m' from calling <my-tabs> and <my-small-tabs> - chekcs are now inside components.
        d. Add 'uk-active' in first tab (no need to calculate which tab is first).
        e. resultLanding.component & project.component & dataProvider.component: 
                Summary tab always visible - if no primary or secondary information, show alert message.
        f. organizations.component: projects tab always visible.
        g. resultLanding.component & project.component: Add margins in linking button.
4. organization.component: 
        a. [Bug fix] Execute search queries only once for each tab.
        b. [Bug fix] In datasets and other tab, show appropriate view (not projects tab).
        c. [Bug fix] On initialization, get projects results (not just count).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58807 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-29 14:15:35 +00:00
konstantina.galouni 8fdaac2d0d [Trunk | Library]:
1. fetchResearchResults.class.ts & searchResearchResults.service.ts: Change queries when searching results of organizations/ projects/ dataproviders to sort by date (landing page tabs).
2. dataProvider.component & project.component: 
	a. Use <search-result> instead of <result-preview>.
	b. Add in "view all" link of search tabs parameter for sorting by date.
	c. [Bug fix] Show tabs loading only when tabs are not initialized (if not tabs, don't show loading forever).
3. project.component: 
	d. Make "#search_tab" template same as in "dataprovider.component" (will be possibly replaced by common component).
	e. In Deposit link use secondary button.
	f. In pie chart (in statistics), enable "dataLabels".


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58799 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-28 10:53:29 +00:00
konstantina.galouni 9a59027576 [Trunk | Library]: project.component:
1. Add fields 'firstTab' (to add 'uk-active' in active tab on start), '_numberOfTabs' (to count existing tabs - checks for showing tabs/ small tabs), 'tabsAreInitialized'.
2. Selects have first option selected by default.
3. Add methods 'public get hasPrimaryInfo(): boolean', 'public get hasSecondaryInfo(): boolean', 'public get numberOfTabs(): number' for checking when and how to show tabs.
4. Do not use 'square-button' button.
5. Use svg version for linking icon | Rename 'Research results' to 'Research outcomes'.
6. Add checks for tabs (when and how to show them) | Loading until tabs are initialized | In small screens use <small-tabs>.
7. Update 'Powered by OpenAIRE graph' and 'Last update date' to be the same as in resultLanding.component.
8. Update margins and paddings.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58788 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-26 20:34:04 +00:00
k.triantafyllou f146738716 [Library | Trunk]: Change feedback position on projects too
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58737 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-20 20:48:32 +00:00
k.triantafyllou cbc32aaa46 [Library | Trunk]: Some changes on result landing page base on new mocks.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58735 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-20 20:34:29 +00:00