k.triantafyllou
0e8aec9eac
[Library | Trunk: Add b2note component and enable it on development mode]
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58025 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-28 14:09:32 +00:00
konstantina.galouni
bbc045a366
[Trunk | Library]:
...
1. showIdentifiers.component.ts: Rename "Related identifiers" to "Identifiers".
2. organization.component.html & organization.component.ts & resultLanding.component.html & resultLanding.component.ts: Rename "Original versions" to "Other versions".
3. resultLanding.component.html & resultLanding.component.ts & resultLanding.service.ts & resultLandingInfo.ts:
Remove accordion "Software" from the bottom of the page (implementation of mining that used to return them, is removed).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57989 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-17 14:15:23 +00:00
konstantina.galouni
afd964abcb
[Trunk | Library]: organization.component & resultLanding.component: Text bug: "Original sources" renamed to "Original versions".
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57971 d315682c-612b-4755-9ff5-7f18f6832af3
2020-01-13 11:27:54 +00:00
konstantina.galouni
9dea633bd8
[Trunk | Library]: project.component: [Bug fix]: In widget (functionality to import research results - right column of page), fix content for software and other (src without line change).
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57855 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-11 11:13:57 +00:00
konstantina.galouni
7157e358a2
[Trunk | Library]:
...
1. Project Landing Page: Add all types of research results (publication, dataset, software, other) in the box, in the right column of page and redesign it (UI/UX).
2. common-assets/library.css: Add classes 'researchResultTypeSelected' and 'researchResultTypeNotSelected'. Used by Project Landing Page.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57853 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-10 14:45:13 +00:00
argiro.kokogiannaki
e3722b648d
[Library|Trunk]
...
SEO:
revove 'OpenaAIRE | ' prefix from page title and metatags
don't truncate the title
truncate description to 160 characters
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57820 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-05 16:07:07 +00:00
argiro.kokogiannaki
90c1ef5c41
[Library Trunk]
...
Cite this:
fix issue with titles
fix issue with authors (given name for surname and vice versa)
add ISSN and issue
add frontiers and ama csl
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57809 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-04 13:32:36 +00:00
argiro.kokogiannaki
2e7f7d7c38
[Library|Trunk]
...
Metric charts:
increase values number from 30 to 80,
IN X-AXIS show the date every 6 values
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57806 d315682c-612b-4755-9ff5-7f18f6832af3
2019-12-04 12:56:37 +00:00
konstantina.galouni
90f748f8e6
[Trunk | Library]:
...
1. error.module & errorPage.component: Set canonical url to '/error'.
2. dataProvider.component & organization.component & project.component & resultLanding.component: Use 'location.path(true)' for page parameter in error navigation.
3. organization.service: [Bug fix]: Initialize 'objIdentifier' field only when an organization was found.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57536 d315682c-612b-4755-9ff5-7f18f6832af3
2019-11-07 09:51:09 +00:00
konstantina.galouni
9a6031d28e
[Trunk | Library]:
...
1. landingPages/: When no id is specified or id is not found (search service returns 404), redirect to /error with more specific message.
2. error/errorPage.component.ts: When the error was caused by landing pages, add more specific message - suggest to search again.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57494 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-31 11:39:23 +00:00
konstantina.galouni
beb3734d7e
[Trunk | Library]:
...
1. depositFirstPage.component.ts: Minor changes in texts | Button for Zenodo is primary when on Explore portal and portal-button when on Connect portal.
2. resultLanding.component.html: Comment link for scrolling into accordion items.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57408 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-18 09:30:15 +00:00
konstantina.galouni
188fa6e314
[Trunk | Library]: dataprovider.service.ts: Extra check for aggregationHistory added in parsing.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57405 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-17 13:29:43 +00:00
konstantina.galouni
bb731fe686
[Trunk | Library]:
...
1. resultLandingInfo.ts & resultLanding.service.ts & parsingFunctions.class.ts & resultLanding.component: Relations 'isSupplementTo' and 'isSupplementedBy' parsed and added as accordion items.
2. resultLanding.component: After title, a link to scroll into accordion items added (this may be removed).
3. landind-utils/tabTable.component.ts: Special icon removed from each type of research results and type name added before each result.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57404 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-17 13:24:09 +00:00
konstantina.galouni
eea9c25108
[Trunk | Library]: deletedByInference: [Bug fix] Remove parsing and view of 'fundedByProjects' field ('projectsProvenanceVocabulary' which was used is deleted).
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57335 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-10 11:59:50 +00:00
konstantina.galouni
93f9b9ef7d
[Trunk | Library]:
...
1. resultLandingInfo.ts: Remove 'projectsProvenanceVocabulary' and 'researchResultsProvenanceVocabulary' - vocabulary API is used now.
2. resultLanding.service.ts: Create method 'getProvenanceActionVocabulary()' to get provenance action term from vocabulary and use it in 'parseResultLandingInfo()'.
3. resultLanding.component.ts: Before the request of 'ResultLandingInfo', request 'provenance action terms' from vocabulary API.
4. fundedBy.component.ts: Add provenance action label as is in tooltip & add class 'uk-light' in tooltip & use 'uk-text-small' instead of 'uk-text-meta' for provenance label.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57330 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-09 13:28:23 +00:00
konstantina.galouni
e6589f60d2
[Trunk | Library]: availableOn.component.ts & fundedBy.component.ts & publishedIn.component.ts (not used): Small fixed in bottom margin and remove 3 dots when more than [threshold] results.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57241 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-02 14:22:30 +00:00
konstantina.galouni
8ae241c208
[Trunk | Library]: Add 'landing-utils/relatedTo.component.ts' and use this in 'resultLanding.component.html' to show 'Related to' section in the APP BOX.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57240 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-02 14:20:34 +00:00
konstantina.galouni
a8f4a8f438
[Trunk | Library]: Original versions in Organization Landing Page
...
1. landingPages/organization/deletedByInference: Create folder and files for organizations deleted by Inference (original versions).
2. organizationInfo.ts: Add string array field 'deletedByInferenceIds'.
3. organization.service.ts: Parse deletedByInferenceIds (children which are organizations).
4. organization.component: Show (only in 'non production' environments) original versions and request them on click.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57238 d315682c-612b-4755-9ff5-7f18f6832af3
2019-10-02 14:15:08 +00:00
konstantina.galouni
7fcbea2b5a
[Trunk | Library]: original versions of results - deletedByInference:
...
1. Move 'landingPages/landing-utils/deletedByInference' folder to 'landingPages/result/deletedByInference'.
2. For original versions of results use 'ResultLandingInfo' entity instead of 'DeletedByInferenceResult' since the second is a subset.
3. Query original versions of results only on click.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57201 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-30 11:02:06 +00:00
konstantina.galouni
e7d0ef876f
[Trunk | Library]: (Bug Fix) parsingFunctions.class.ts: In 'parseContexts()' method: if there is no category, show only label (bug caused in r56937 when else section was moved after type check by accident).
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57082 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-15 18:11:00 +00:00
konstantina.galouni
4a541c2c6d
[Trunk | Library]: resultLanding.component.html: Rephrase sentence for original sources to original versions.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57052 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-12 14:32:26 +00:00
konstantina.galouni
55d27021cc
[Trunk | Library]: resultLanding.component.html: Bug fix: always use dedupId for deletedByInference results & rephrase sentence for original sources.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57049 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-12 11:06:35 +00:00
konstantina.galouni
cde4550dfc
[Trunk | Library]:
...
Merge services, fetchClasses, simple and advanced search pages for research results (publications, datasets, software, other):
1. advancedSearchResearchResults.component & advancedSearchResearchResults.module: New common advanced search page for research results.
2. searchResearchResults.component & searchResearchResults.module: New common simple search page for research results.
3. fetchResearchResults.class: New common fetch class for research results.
4. searchResearchResults.service: Update existing service to satisfy merge of research results services.
5. app.module.ts: Import one common simple and one common advanced search page for search results.
6. claimResultSearchForm & directLinking &
advancedSearchDatasets & advancedSearchOrps & advancedSearchPublications & advancedSearchSoftware &
searchDatasets & searchOrps & searchPublications & searchSoftware &
fetchDatasets.class & fetchOrps.class & fetchPublications.class & fetchSoftware.class: Use common service for research results (searchResearchResults.service).
7. datasetsTab & orpsTab & publicationsTab & softwareTab & relatedDatasourcesTab & statisticsTab: Use common fetch class for research results (fetchResearchResults.class).
8. dataProvider & organization & project & search : Use common service and common fetch class for research results (searchResearchResults.service, fetchResearchResults.class).
9. linkingGeneric.component: Remove import of services for publications and datasets.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57027 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-11 09:45:54 +00:00
argiro.kokogiannaki
af30b6981e
[Library|Trunk]
...
Charts - Iframes:
decrease width, increase height, set chart size parameters to &w=90%&h=90%
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57016 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-10 11:47:22 +00:00
konstantina.galouni
f34e657f99
[Trunk | Library]:
...
1. dataProvider.component.html: Add label "OpenAIRE Text Mining" if aggregationStatus.fulltexts > 0.
2. dataProvider.component.html & dataProvider.service.ts & dataProviderInfo.ts: Parse and show aggregationStatus.lastUpdateDate (last index date).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57003 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-09 10:45:35 +00:00
konstantina.galouni
3b849c78d6
[Trunk | Library]: Merging branch "mergeResultLandingPages" into Trunk 56883:56968
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56969 d315682c-612b-4755-9ff5-7f18f6832af3
2019-09-05 08:49:33 +00:00
konstantina.galouni
1bce72ccb4
[Trunk | Library]: (Bug Fix) parsingFunctions.class.ts: In 'parseContexts()' method, there may exist multiple categories.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56937 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-30 13:39:54 +00:00
konstantina.galouni
30bc39aa22
[Trunk | Library]: Fix and add when missing: schema2jsonld, canonincal url, meta tags, piwik call.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56840 d315682c-612b-4755-9ff5-7f18f6832af3
2019-08-02 14:55:32 +00:00
argiro.kokogiannaki
2c715bdb62
[Library|Trunk]
...
LAnding pages:
SEO - css changes :
remove width-expand: not working for bots/no js)
add margins where needed (mobile screen)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56759 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-25 10:43:08 +00:00
argiro.kokogiannaki
837c722c1e
[Library|Trunk]
...
Landing pages -> Other versions: hide them only for production
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56755 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-24 14:19:34 +00:00
argiro.kokogiannaki
322492af79
Linking:
...
Basket Limit:
set to 100
don't allow to add more through search forms
don't allow more in bulk
Bulk - access mode and date: fix getting info from csv
Add margins
Display claims; remove showLatestClaims attribute
Landing pub - HelpeTexts: remove doule quote and helper
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56750 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-24 12:46:29 +00:00
k.triantafyllou
7ec51c1a83
[Trunk|Library]: Landing pages: move helpers out of the grid.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56735 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-23 14:04:49 +00:00
argiro.kokogiannaki
18ad184578
[Library|Trunk]
...
Correcting issues found on build: (unclosed divs, unused variables)
add margins after theme
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56725 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-23 13:34:42 +00:00
argiro.kokogiannaki
e422f5fe77
[Library|Trunk]
...
Merging branch newlinking into Trunk 55132:56708
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56714 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-23 12:23:12 +00:00
argiro.kokogiannaki
8101d3ef2a
[Library|Trunk]
...
Layout Changes according to the new theme (containers margins, header fonts size)
Search: Update search filters layout: don't crop the text with css, but count the characters
LayoutService: create a mock method
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56677 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-22 14:15:23 +00:00
k.triantafyllou
11cf47ac5a
[Trunk|Library]: Add Helper on search Page, landings and deposit first page.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56644 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-22 09:16:50 +00:00
konstantina.galouni
e189697ed9
[Trunk | Library]: deletedByInference.component: Bug fix: Rename "Collected from" to "Download from" and hide it when no such results.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56600 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-17 20:38:05 +00:00
konstantina.galouni
d537e16b1e
[Trunk | Library]: deletedByInference.service: Bug fix
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56599 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-17 20:15:47 +00:00
konstantina.galouni
7f08d988c5
[Trunk | Library]: Add deletedByInference (other versions) in software, dataset, other landing pages
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56598 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-17 19:48:19 +00:00
konstantina.galouni
c670434702
[Trunk | Library]: parsingFunctions.class: Bug fix: In parsing 'context' field, position was not increased.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56576 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-16 12:44:43 +00:00
argiro.kokogiannaki
e06cc5ae70
[Library|Trunk]
...
Project landing: correct new line in the code of widget script
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56510 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-12 12:27:32 +00:00
argiro.kokogiannaki
9f9c2289e3
[Library|Trunk]
...
Sherpa/Romeo: make it available production
rephrase text
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56344 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-04 13:26:42 +00:00
argiro.kokogiannaki
065b82f9ce
[Library|Trunk]
...
Sherpa romeo: update text and tooltip
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56328 d315682c-612b-4755-9ff5-7f18f6832af3
2019-07-03 09:37:48 +00:00
konstantina.galouni
5fbcd7bf7d
[Trunk | Library] : Bug Fix: title of Project Publications csv, now always on top.
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56268 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-28 10:48:52 +00:00
konstantina.galouni
0cbc84677b
[Trunk | Library]: dataProvider.component (Landing): call 'getDataProviderAggregationStatus()' method (info from datasources API) only in browser (not server).
...
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56140 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-20 13:55:58 +00:00
argiro.kokogiannaki
873f0dccb4
[Library|Trunk]
...
landing pages:
in isRouteAvailable method pass correctly the route --> link to reappear for explore
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56136 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-20 11:29:37 +00:00
argiro.kokogiannaki
025de02c2f
[Trunk|Library]
...
htmlProjectReport.service.ts: set the return type as text (Angular 7 change)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56114 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-19 09:11:05 +00:00
konstantina.galouni
b74ccacf03
[Trunk | Library]:
...
publication.component & dataset.component & orp.component & software.component (Landing) & showAuthors.component: Add authors and description in scrollable containers if too long.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56074 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-13 14:14:11 +00:00
argiro.kokogiannaki
504fdfaa3c
[Library|Trunk]
...
Changes for Aggregator portal:
use a customFilter in search pages, and pass it through the components
for landing pages check if a route is available in order to add linking and deposit links
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56059 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-12 14:13:56 +00:00
argiro.kokogiannaki
64eebccc47
[Library|Trunk]
...
User info:
add user information when user is logged in and there is no error or redirect parameters
Add spaces lost after ang 7 migration (funded by component, orcid dropdown, search results labels)
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56056 d315682c-612b-4755-9ff5-7f18f6832af3
2019-06-12 11:50:48 +00:00