diff --git a/app/Http/Controllers/Publish/EditorController.php b/app/Http/Controllers/Publish/EditorController.php index 76b195a..8f88c20 100644 --- a/app/Http/Controllers/Publish/EditorController.php +++ b/app/Http/Controllers/Publish/EditorController.php @@ -138,10 +138,8 @@ class EditorController extends Controller $referenceTypes = ["rdr-id", "doi", "handle", "isbn", "issn", "url", "urn"]; $referenceTypes = array_combine($referenceTypes, $referenceTypes); - $relationTypes = ["IsCitedBy", "Cites", "IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", - "HasMetadata", "IsMetadataFor", "IsNewVersionOf", "IsPreviousVersionOf", "IsPartOf", "HasPart", "IsReferencedBy", - "References", "IsDocumentedBy", "Documents", "IsCompiledBy", "Compiles", "IsVariantFormOf", "IsOriginalFormOf", - "IsIdenticalTo", "IsReviewedBy", "Reviews", "IsDerivedFrom", "IsSourceOf"]; + $relationTypes = ["IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", + "IsNewVersionOf", "IsPartOf", "HasPart", "Compiles", "IsVariantFormOf"]; $relationTypes = array_combine($relationTypes, $relationTypes); return View::make( diff --git a/app/Http/Controllers/Publish/IndexController.php b/app/Http/Controllers/Publish/IndexController.php index 2f9092c..334822f 100644 --- a/app/Http/Controllers/Publish/IndexController.php +++ b/app/Http/Controllers/Publish/IndexController.php @@ -61,11 +61,9 @@ class IndexController extends Controller $projects = Project::pluck('label', 'id'); $relatedIdentifierTypes = ["doi", "handle", "isbn", "issn", "url", "urn"]; $relatedIdentifierTypes = array_combine($relatedIdentifierTypes, $relatedIdentifierTypes); - - $relationTypes = ["IsCitedBy", "Cites", "IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", - "HasMetadata", "IsMetadataFor", "IsNewVersionOf", "IsPreviousVersionOf", "IsPartOf", "HasPart", "IsReferencedBy", - "References", "IsDocumentedBy", "Documents", "IsCompiledBy", "Compiles", "IsVariantFormOf", "IsOriginalFormOf", - "IsIdenticalTo", "IsReviewedBy", "Reviews", "IsDerivedFrom", "IsSourceOf"]; + + $relationTypes = ["IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", + "IsNewVersionOf", "IsPartOf", "HasPart", "Compiles", "IsVariantFormOf"]; $relationTypes = array_combine($relationTypes, $relationTypes); $titleTypes = ['Sub' => 'Sub', 'Alternative' => 'Alternative', 'Translated' => 'Translated', 'Other' => 'Other']; diff --git a/app/Http/Controllers/Publish/SubmitController.php b/app/Http/Controllers/Publish/SubmitController.php index 1c30ca8..fca9666 100644 --- a/app/Http/Controllers/Publish/SubmitController.php +++ b/app/Http/Controllers/Publish/SubmitController.php @@ -64,8 +64,10 @@ class SubmitController extends Controller $dataset = Dataset::findOrFail($id); $dataset->load('licenses', 'authors', 'contributors', 'titles', 'abstracts', 'files', 'coverage', 'subjects', 'references'); - $titleTypes = ['Main' => 'Main', 'Sub' => 'Sub', 'Alternative' => 'Alternative', 'Translated' => 'Translated', 'Other' => 'Other']; - $descriptionTypes = ['Abstract' => 'Abstract', 'Methods' => 'Methods', 'Series_information' => 'Series_information', + $titleTypes = ['Main' => 'Main', 'Sub' => 'Sub', 'Alternative' => 'Alternative', + 'Translated' => 'Translated', 'Other' => 'Other']; + $descriptionTypes = ['Abstract' => 'Abstract', 'Methods' => 'Methods', + 'Series_information' => 'Series_information', 'Technical_info' => 'Technical_info', 'Translated' => 'Translated', 'Other' => 'Other']; $languages = DB::table('languages') ->where('active', true) @@ -99,10 +101,8 @@ class SubmitController extends Controller $referenceTypes = ["rdr-id", "doi", "handle", "isbn", "issn", "url", "urn"]; $referenceTypes = array_combine($referenceTypes, $referenceTypes); - $relationTypes = ["IsCitedBy", "Cites", "IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", - "HasMetadata", "IsMetadataFor", "IsNewVersionOf", "IsPreviousVersionOf", "IsPartOf", "HasPart", "IsReferencedBy", - "References", "IsDocumentedBy", "Documents", "IsCompiledBy", "Compiles", "IsVariantFormOf", "IsOriginalFormOf", - "IsIdenticalTo", "IsReviewedBy", "Reviews", "IsDerivedFrom", "IsSourceOf"]; + $relationTypes = ["IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", + "IsNewVersionOf", "IsPartOf", "HasPart", "Compiles", "IsVariantFormOf"]; $relationTypes = array_combine($relationTypes, $relationTypes); return View::make( diff --git a/database/migrations/2019_09_02_105025_create_document_references_table.php b/database/migrations/2019_09_02_105025_create_document_references_table.php index 967126f..e882e2e 100644 --- a/database/migrations/2019_09_02_105025_create_document_references_table.php +++ b/database/migrations/2019_09_02_105025_create_document_references_table.php @@ -27,7 +27,8 @@ class CreateDocumentReferencesTable extends Migration ); $table->enum( 'relation', - ["IsCitedBy", "Cites", "IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", "HasMetadata", "IsMetadataFor","IsNewVersionOf", "IsPreviousVersionOf", "IsPartOf", "HasPart", "IsReferencedBy", "References", "IsDocumentedBy", "Documents", "IsCompiledBy", "Compiles", "IsVariantFormOf", "IsOriginalFormOf", "IsIdenticalTo", "IsReviewedBy", "Reviews", "IsDerivedFrom", "IsSourceOf"] + ["IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", + "IsNewVersionOf", "IsPartOf", "HasPart", "Compiles", "IsVariantFormOf"] ); $table->string('value', 255); $table->string('label', 50); diff --git a/public/images/help/secure_data.svg b/public/images/help/secure_data.svg index 65ec158..fcbb79c 100644 --- a/public/images/help/secure_data.svg +++ b/public/images/help/secure_data.svg @@ -1,107 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - secure data - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tethys + + diff --git a/public/images/help/specs.svg b/public/images/help/specs.svg index 460f810..33edc0c 100644 --- a/public/images/help/specs.svg +++ b/public/images/help/specs.svg @@ -1,82 +1,41 @@ - + - - - - - - - - + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/views/frontend/home/index.blade.php b/resources/views/frontend/home/index.blade.php index ca8430b..acda605 100644 --- a/resources/views/frontend/home/index.blade.php +++ b/resources/views/frontend/home/index.blade.php @@ -158,21 +158,21 @@
-

About us

-

- TETHYS focuses on disciplines who do not have a tradition - of data sharing thus ensuring better availability, - sustainable preservation and (independent) publication - capacity of their research data. -

+

Über Tethys RDR

+

+ Tethys RDR ist ein Datenverlag der Geologischen Bundesanstalt (GBA), + der ausschließlich an der GBA generierte geowissenschaftliche Forschungsdaten publiziert. + Die Datenpublikationen können sowohl in deutscher, als auch in englischer Sprache publiziert werden. + Durch die Bereitstellung der Datenpublikation zusammen mit Metadaten nach standardisierten Schemata + werden die Publikationen auffindbar und zitierbar. +

-{{--
--}} -
+ -
+