geolba/tethys
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

- new frontend style

Browse Source 
- GetRecord also with metadata
- no error during publishing
- more home views (etc. help, introduction)
- help image compressed (for web usage)
This commit is contained in:
Arno Kaimbacher 2019-09-12 17:40:21 +02:00
parent 720aa57810
commit d9e295f039
27 changed files with 956 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/Frontend/HomeController.php
View File

@ -74,9 +74,9 @@ class HomeController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function about(): View
public function intro(): View
{
return view('frontend.home.about');
return view('frontend.home.intro');
}
/**
@ -89,6 +89,25 @@ class HomeController extends Controller
return view('frontend.home.news');
}
/**
* Show the application dashboard.
*
* @return \Illuminate\Http\Response
*/
public function services(): View
{
return view('frontend.home.services');
}
/**
* Show the application dashboard.
*
* @return \Illuminate\Http\Response
*/
public function help(): View
{
return view('frontend.home.help');
}
/**
* show page by $page_slug.
*/

4
app/Http/Controllers/Oai/RequestController.php
View File

@ -182,7 +182,11 @@ class RequestController extends Controller
);
}
$metadataPrefix = null;
if (true === array_key_exists('metadataPrefix', $oaiRequest)) {
$metadataPrefix = $oaiRequest['metadataPrefix'];
}
$this->_proc->setParameter('', 'oai_metadataPrefix', $metadataPrefix);
// do not deliver datasets which are restricted by document state
if (is_null($dataset)

6
app/Http/Controllers/Publish/EditorController.php
View File

@ -20,6 +20,7 @@ use Illuminate\View\View;
use Illuminate\Support\Facades\DB;
// use App\Models\Coverage;
use Illuminate\Support\Facades\Validator;
use Carbon\Carbon;
class EditorController extends Controller
{
@ -372,13 +373,12 @@ class EditorController extends Controller
$dataset = Dataset::findOrFail($id);
$input = $request->all();
$input['server_state'] = 'published';
$time = new \Illuminate\Support\Carbon();
$input['server_date_published'] = $time;
$input['server_date_published'] = Carbon::now()->toDateTimeString(); // Produces something like "2019-03-11 12:25:00"
if ($dataset->update($input)) {
// event(new PageUpdated($page));
return redirect()
->route('publish.workflow.publish.index')
->route('publish.workflow.editor.index')
->with('flash_message', 'You have successfully published the dataset!');
}
throw new GeneralException(trans('exceptions.publish.publish.update_error'));

1
app/Models/Dataset.php
View File

@ -32,6 +32,7 @@ class Dataset extends Model
'type',
'language',
'server_state',
'server_date_published',
'creating_corporation',
'project_id',
'embargo_date',

2
config/solarium.php
View File

@ -9,5 +9,5 @@ return [
'core' => env('SOLR_CORE', 'rdr_data')
]
],
'xsltfile' => "public/solr.xslt"
'xsltfile' => "solr.xslt"
];

10
public/css/style.css vendored
View File

@ -126,7 +126,13 @@ section {
text-align: center;
padding: 80px 0;
}
section.normal {
text-align: left;
}
.content-container {
margin-top: 25px;
}
/*
Section with featured background image. Every section which will have this
@ -228,7 +234,6 @@ section {
position: fixed;
width: 100%;
z-index: 3;
border-bottom: 1px solid #dcdcdc;
}
.header .menu {
clear: both;
@ -261,6 +266,7 @@ section {
}
.navigation.active {
/* make visible visible */
-webkit-transform: translateX(0);
-moz-transform: translateX(0);
-ms-transform: translateX(0);
@ -699,6 +705,8 @@ there.
}
/* smaller than tablet */

17
public/datasetxml2oai-pmh.xslt
View File

@ -268,17 +268,13 @@
<datestamp>
<xsl:choose>
<xsl:when test="ServerDateModified">
<xsl:value-of select="ServerDateModified/@Year"/>
-
<xsl:value-of select="format-number(ServerDateModified/@Month,'00')"/>
-
<xsl:value-of select="ServerDateModified/@Year"/>-
<xsl:value-of select="format-number(ServerDateModified/@Month,'00')"/>-
<xsl:value-of select="format-number(ServerDateModified/@Day,'00')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="ServerDatePublished/@Year"/>
-
<xsl:value-of select="format-number(ServerDatePublished/@Month,'00')"/>
-
<xsl:value-of select="ServerDatePublished/@Year"/>-
<xsl:value-of select="format-number(ServerDatePublished/@Month,'00')"/>-
<xsl:value-of select="format-number(ServerDatePublished/@Day,'00')"/>
</xsl:otherwise>
</xsl:choose>
@ -290,9 +286,11 @@
<xsl:apply-templates select="SetSpec" />
</header>
<xsl:choose>
<!-- nicht bei ListIdentifiers-->
<!-- nicht bei ListIdentifiers und auch nicht bei gelöschten Datensätzen-->
<xsl:when test="$oai_verb!='ListIdentifiers' and @ServerState!='deleted'">
<metadata>
<!-- <xsl:value-of select="$oai_metadataPrefix" /> -->
<xsl:choose>
<xsl:when test="$oai_metadataPrefix='oai_dc'">
<xsl:apply-templates select="." mode="oai_dc" />
@ -302,6 +300,7 @@
</xsl:when>
</xsl:choose>
</metadata>
</xsl:when>
</xsl:choose>
</xsl:template>

BIN
public/images/help_bg_image.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 MiB

After

Width:  |  Height:  |  Size: 686 KiB

10
public/index.html
View File

@ -19,7 +19,7 @@
<!-- FONT
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
<!-- <link href='http://fonts.googleapis.com/css?family=Raleway:400,300,600' rel='stylesheet' type='text/css'> -->
<link href="http://fonts.googleapis.com/css?family=Roboto:400,500,700,900" rel="stylesheet" type='text/css'>
<link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700,900" rel="stylesheet" type='text/css'>
<!-- CSS
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
@ -50,7 +50,13 @@
<a href="#" class="menu-icon">
<i class="fa fa-bars"></i>
</a>
<div class="container">
<ul class="menu">
<!-- <li>
<a href="#" class="menu-icon">
<i class="fa fa-bars"></i>
</a>
</li> -->
<li><a href="#hero">Home</a></li>
<li><a href="#introduction">Introduction</a></li>
<li><a href="#work">Work</a></li>
@ -61,6 +67,7 @@
<li><a href="#contact">Contact</a></li> -->
<li class="right"><a href="#">Login</a></li>
</ul>
</div>
</nav>
</header>
@ -186,7 +193,6 @@
</li>
</ul>
</div>
</div>
</section>
<!-- About -->

2
public/js/scripts.js
View File

File diff suppressed because one or more lines are too long

32
resources/assets/js/scripts.js
View File

@ -44,6 +44,7 @@ $(document).ready(function(){
$menu = $('.menu'),
$navigationLink = $('.menu a');
if (location.pathname == "/") {
$(window).scroll(function () {
if (window.scrollY > window.outerHeight) {
$menuIcon.addClass('active');
@ -51,28 +52,27 @@ $(document).ready(function(){
$menuIcon.removeClass('active');
}
});
}
$menuIcon.click(function (e) {
e.preventDefault();
$navigation.toggleClass('active');
});
$menu.singlePageNav({
filter: ':not(.external)',
speed: 1000,
currentClass: 'current',
easing: 'swing',
updateHash: false,
beforeStart: function() {
},
onComplete: function() {
$navigation.removeClass('active');
}
});
// Scrollreveal initialize
// $menu.singlePageNav({
// filter: ':not(.external)',
// speed: 1000,
// currentClass: 'current',
// easing: 'swing',
// updateHash: false,
// beforeStart: function() {
// },
// onComplete: function() {
// $navigation.removeClass('active');
// }
// });
//// Scrollreveal initialize
// var config = {
// easing: 'hustle',
// reset: false,
@ -81,8 +81,6 @@ $(document).ready(function(){
// vFactor: 0.2,
// mobile: false
// }
// window.sr = new scrollReveal(config);
});

24
resources/views/frontend/home/about.blade.php
View File

@ -1,24 +0,0 @@
@extends('layouts.app')
@section('title', Lang::get('resources.home_about_pagetitle'))
@section('content')
<div class="pure-g">
<div class="pure-u-1 pure-u-md-2-3">
<div class="content">
<h1>
@lang('resources.home_about_title')
</h1>
<div>
<p>
@lang('resources.home_about_content')
</p>
</div>
</div>
</div>
</div>
@endsection

75
resources/views/frontend/home/contact.blade.php
View File

@ -3,14 +3,8 @@
@section('title', Lang::get('resources.home_index_contact_pagetitle'))
@section('content')
<!--<div class="pure-g content">
<div class="pure-u-1 content lead">
<h1 class="title"> @lang('resources.home_index_contact_title')</h1>
</div>
</div>-->
<div class="pure-g">
{{-- <div class="pure-g">
<div class="pure-u-1 pure-u-md-2-3">
<div class="content">
<h1>Kontakt</h1>
@ -49,7 +43,74 @@
<div class="sidebar">
</div>
</div>
</div> --}}
{{-- <section data-sr id="contact" class="contact u-full-width">
<div class="container">
<div class="row">
<div class="two-thirds column">
<h3 class="separator">Get in touch</h3>
<h4>
Want to keep updated or need further information?
</h4>
</div>
<div class="one-third column">
<div class="sidebar">
</div>
</div>
</div>
</div>
</section> --}}
<!-- Contact Us -->
<section data-sr class="contact-us u-full-width">
<div class="container">
<div class="row">
<h4>
Want to keep updated or need further information?
</h4>
</div>
<div class="row">
<div class="four columns contact-us-details">
<h3>Our Location</h3>
<h5>
Neulinggasse 38 <br />
1030 Wien <br />
+43-1-7125674 <br />
</h5>
<ul class="social-links">
<li>
<a href="https://twitter.com/GeologischeBA" target="_blank">
<i class="fab fa-twitter"></i>
</a>
</li>
<li>
<a href="https://www.facebook.com/geologie.ac.at" target="_blank">
<i class="fab fa-facebook"></i>
</a>
</li>
</ul>
</div>
<div class="eight columns contact-us-form">
<form>
<div class="row">
<div class="six columns">
<input class="u-full-width" type="text" placeholder="Name" id="nameInput">
</div>
<div class="six columns">
<input class="u-full-width" type="email" placeholder="Email" id="emailInput">
</div>
</div>
<textarea class="u-full-width" placeholder="Message" id="messageInput"></textarea>
<input class="button u-pull-right" type="submit" value="Send">
</form>
</div>
</div>
</div>
</section>
@endsection

32
resources/views/frontend/home/help.blade.php Normal file
View File

@ -0,0 +1,32 @@
@extends('layouts.app')
{{-- @section('title', Lang::get('resources.home_about_pagetitle')) --}}
@section('content')
<!-- Help -->
<section data-sr id="help" class="help u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h3 class="separator">HELP</h3>
</div>
</div>
<div class="row">
<ul class="help-items">
<li class="four columns">
About RDR
</li>
<li class="four columns">
Requirements for the Use of RDR
</li>
<li class="four columns">
Upload Data
</li>
</ul>
</div>
</div>
</section>
@endsection

20
resources/views/frontend/home/imprint.blade.php
View File

@ -1,20 +0,0 @@
@extends('layouts.app')
@section('title', Lang::get('resources.home_index_imprint_pagetitle'))
@section('content')
<h1>
@lang('resources.home_index_imprint_title')
</h1>
<div>
<p>
@lang('resources.help_content_imprint')
</p>
</div>
@endsection

42
resources/views/frontend/home/index.blade.old.php Normal file
View File

@ -0,0 +1,42 @@
@extends('layouts.app')
@section('hero')
<div class="pure-g slider">
<div class="container">
<div class="pure-g">
<div class="pure-u-1">
<h2 class="brand-tagline">
<strong>RDR is a data repository</strong> for the research community with secure preservation and data publication.
</h2>
</div>
</div>
</div>
</div>
@endsection
@section('content')
<div class="pure-g">
<div class="pure-u-1 lead">
<div class="content">
<h1 class="title">DATA RESEARCH REPOSITORY</h1>
</div>
</div>
</div>
<div class="pure-g content two-col">
<div class="pure-u-1-2">
<div class="box box-l">
<!--<h2>Title</h2>-->
<p> @lang('resources.home_index_welcome')</p>
</div>
</div>
<div class="pure-u-1-2">
<div class="box box-r">
<p> @lang('resources.home_index_instructions')</p>
</div>
</div>
</div>
@endsection

248
resources/views/frontend/home/index.blade.php
View File

@ -1,42 +1,242 @@
@extends('layouts.app')
@section('hero')
<div class="pure-g slider">
<div class="container">
<div class="pure-g">
<div class="pure-u-1">
<h2 class="brand-tagline">
<strong>RDR is a data repository</strong> for the research community with secure preservation and data publication.
<!-- Hero -->
<section id="hero" class="hero u-full-width">
<div class="hero-image"></div>
<div class="container centered">
<div class="twelve columns">
<h1 class="separator">Research Data Repository</h1>
<h2>
A data repository for the research community with secure preservation and data publication.
</h2>
</div>
</div>
</div>
</div>
</section>
@endsection
@section('content')
<div class="pure-g">
<div class="pure-u-1 lead">
<div class="content">
<h1 class="title">DATA RESEARCH REPOSITORY</h1>
<!-- Introduction -->
<section data-sr id="introduction" class="introduction u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h3 class="separator">Introduction RDR</h3>
<h4>
RDR offers institutions and researchers a comprehensive archiving
and publishing service with reliable storage options for backing up
and managing research data. With RDR you can promote research data
management at your institution and make an important contribution to improve
availability, long-term preservation and independent publication of your research data.
</h4>
<p>
The use of RDR as a data centre for archiving and/or publishing research data is invoiced annually.
The invoice consists of a basic annual contract fee and a usage-related fee.
</p>
</div>
</div>
</div>
</section>
<!-- Work -->
<section data-sr id="work" class="work u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h3 class="separator">RDR SERVICES</h3>
</div>
</div>
<div class="pure-g content two-col">
<div class="pure-u-1-2">
<div class="box box-l">
<!--<h2>Title</h2>-->
<p> @lang('resources.home_index_welcome')</p>
<div class="row">
<ul class="work-items isotope js-isotope u-cf">
<li class="four columns isotope-item design ui">
<!-- <img src="images/portfolio/work_1.svg"> -->
<div class="work-front">
<div class="vertical-centered">
<h3>Data Archival</h3>
</div>
</div>
<div class="work-detail">
<div class="vertical-centered">
<p class="separator orange">Data Archival</p>
<p>
RDR provides format-independent archiving services for data protection.
</p>
</div>
</div>
</li>
<li class="four columns isotope-item branding web-design">
<!-- <img src="images/portfolio/work_2.svg"> -->
<div class="work-front">
<div class="vertical-centered">
<h3>Data Publication</h3>
</div>
</div>
<div class="work-detail">
<div class="vertical-centered">
<p class="separator orange">Data Publication</p>
<p>
With RDR you can publish research data,
so that your data is citable and reusable.
</p>
</div>
</div>
</li>
<li class="four columns isotope-item mobile ui branding">
<!-- <img src="images/portfolio/work_3.svg"> -->
<div class="work-front">
<div class="vertical-centered">
<h3>Peer Review</h3>
</div>
</div>
<div class="work-detail">
<div class="vertical-centered">
<p class="separator orange">Peer Review</p>
<p>
All RDR datasets undergo a full, efficient peer review process.
</p>
</div>
</div>
</li>
</ul>
</div>
</div>
</section>
<!-- Help -->
<section data-sr id="help" class="help u-full-width featured-bg-image">
<h4 class="centered">
<button class="button inverted">We're here to help!</button>
</h4>
</section>
<!-- Clients -->
<section data-sr id="clients" class="clients u-full-width">
<div class="container">
<div class="row">
<h3 class="separator">Cooperation Partners</h3>
</div>
<ul class="clients u-full-width u-cf">
<li>
<img src="images/clients/logo_zamg.png" alt="Zamg Client">
</li>
</ul>
</div>
</section>
<!-- About -->
<section data-sr id="about" class="about u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h3 class="separator">About us</h3>
<h4>
RDR 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.
</h4>
</div>
</div>
</div>
</section>
<!-- Why us -->
<section data-sr id="why-us" class="why u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h3 class="separator">Why choose us</h3>
<h4>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut
labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
laboris.</h4>
</div>
</div>
<div class="row">
<ul class="services">
<li class="four columns">
<div class="service-image">
<img src="images/services/iphone5c.png">
</div>
<h5>App Design</h5>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
ilabore et dolore.</p>
</li>
<li class="four columns">
<div class="service-image">
<img src="images/services/ipad_air.png">
</div>
<h5>Responsive Layout</h5>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
ilabore et dolore.</p>
</li>
<li class="four columns">
<div class="service-image">
<img src="images/services/macbook_pro.png">
</div>
<h5>Pixel Perfect design</h5>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
ilabore et dolore.</p>
</li>
</ul>
</div>
</div>
</section>
<!-- Contact -->
<section data-sr id="contact" class="contact u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h3 class="separator">Get in touch</h3>
<h4>
Want to keep updated or need further information?
</h4>
</div>
</div>
</div>
</section>
<!-- Contact Us -->
<section data-sr class="container contact-us u-full-width u-max-full-width">
<div class="row">
<div class="four columns contact-us-details">
<h3>Our Location</h3>
<h5>
Neulinggasse 38 <br />
1030 Wien <br />
+43-1-7125674 <br />
</h5>
<ul class="social-links">
<li>
<a href="https://twitter.com/GeologischeBA" target="_blank">
<i class="fab fa-twitter"></i>
</a>
</li>
<li>
<a href="https://www.facebook.com/geologie.ac.at" target="_blank">
<i class="fab fa-facebook"></i>
</a>
</li>
</ul>
</div>
<div class="eight columns contact-us-form">
<form>
<div class="row">
<div class="six columns">
<input class="u-full-width" type="text" placeholder="Name" id="nameInput">
</div>
<div class="six columns">
<input class="u-full-width" type="email" placeholder="Email" id="emailInput">
</div>
</div>
<textarea class="u-full-width" placeholder="Message" id="messageInput"></textarea>
<input class="button u-pull-right" type="submit" value="Send">
</form>
</div>
</div>
<div class="pure-u-1-2">
<div class="box box-r">
<p> @lang('resources.home_index_instructions')</p>
</div>
</div>
</div>
</section>
@endsection

29
resources/views/frontend/home/intro.blade.php Normal file
View File

@ -0,0 +1,29 @@
@extends('layouts.app')
{{-- @section('title', Lang::get('resources.home_about_pagetitle')) --}}
@section('content')
<!-- Introduction -->
<section data-sr id="introduction" class="introduction u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h3 class="separator">Introduction RDR</h3>
<h4>
RDR offers institutions and researchers a comprehensive archiving
and publishing service with reliable storage options for backing up
and managing research data. With RDR you can promote research data
management at your institution and make an important contribution to improve
availability, long-term preservation and independent publication of your research data.
</h4>
<p>
The use of RDR as a data centre for archiving and/or publishing research data is invoiced annually.
The invoice consists of a basic annual contract fee and a usage-related fee.
</p>
</div>
</div>
</div>
</section>
@endsection

39
resources/views/frontend/home/news.blade.php
View File

@ -1,36 +1,39 @@
@extends('layouts.app')
@section('title', Lang::get('resources.home_news_pagetitle'))
{{-- @section('title', Lang::get('resources.home_news_pagetitle')) --}}
@section('content')
<div class="pure-g">
<div class="pure-u-1 pure-u-md-3-3">
<div class="content">
<!--<h1>
@lang('resources.home_news_title')
</h1>-->
<h2>
<strong>RDR included in re3data.org list of research data repositories </strong>
</h2>
<section id="about" class="u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h3 class="separator">
@lang('resources.home_news_pagetitle')
</h3>
<h4>Published: 27.07.2019</h4>
<p>
re3data.org is a global registry of research data repositories. The registry covers research data repositories from
different academic disciplines. re3data.org presents repositories for the permanent storage and access to datasets
for researchers, funding bodies, publishers and academic institutions. re3data.org aims to promote a culture of
re3data.org is a global registry of research data repositories. The registry covers research data
repositories from
different academic disciplines. re3data.org presents repositories for the permanent storage and
access to datasets
for researchers, funding bodies, publishers and academic institutions. re3data.org aims to promote a
culture of
sharing and increased access to research data.
</p>
<p>
re3data.org helps researchers to find appropriate repositories for the storage and access of research data.
Further, it can be used by funding organisations to promote permanent access to research data from their research projects.
In addition re3data.org offers publishers and academic institutions a tool for the identification of research data repositories
re3data.org helps researchers to find appropriate repositories for the storage and access of
research data.
Further, it can be used by funding organisations to promote permanent access to research data from
their research projects.
In addition re3data.org offers publishers and academic institutions a tool for the identification of
research data repositories
where scientists can deposit their data.
</p>
</div>
</div>
</div>
</section>
@endsection

72
resources/views/frontend/home/services.blade.php Normal file
View File

@ -0,0 +1,72 @@
@extends('layouts.app')
{{-- @section('title', Lang::get('resources.home_about_pagetitle')) --}}
@section('content')
<!-- Work -->
<section data-sr id="work" class="work u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h3 class="separator">RDR SERVICES</h3>
</div>
</div>
<div class="row">
<ul class="work-items isotope js-isotope u-cf">
<li class="four columns isotope-item design ui">
<!-- <img src="images/portfolio/work_1.svg"> -->
<div class="work-front">
<div class="vertical-centered">
<h3>Data Archival</h3>
</div>
</div>
<div class="work-detail">
<div class="vertical-centered">
<p class="separator orange">Data Archival</p>
<p>
RDR provides format-independent archiving services for data protection.
</p>
</div>
</div>
</li>
<li class="four columns isotope-item branding web-design">
<!-- <img src="images/portfolio/work_2.svg"> -->
<div class="work-front">
<div class="vertical-centered">
<h3>Data Publication</h3>
</div>
</div>
<div class="work-detail">
<div class="vertical-centered">
<p class="separator orange">Data Publication</p>
<p>
With RDR you can publish research data,
so that your data is citable and reusable.
</p>
</div>
</div>
</li>
<li class="four columns isotope-item mobile ui branding">
<!-- <img src="images/portfolio/work_3.svg"> -->
<div class="work-front">
<div class="vertical-centered">
<h3>Peer Review</h3>
</div>
</div>
<div class="work-detail">
<div class="vertical-centered">
<p class="separator orange">Peer Review</p>
<p>
All RDR datasets undergo a full, efficient peer review process.
</p>
</div>
</div>
</li>
</ul>
</div>
</div>
</section>
@endsection

8
resources/views/frontend/pages/index.blade.php
View File

@ -1,7 +1,10 @@
@extends('layouts.app')
@section('content')
<div class="content">
<section id="sitelinks" class="normal u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<h1>
{!! $page->title !!}
</h1>
@ -12,5 +15,8 @@
</p>
</div>
</div>
</div>
</div>
</section>
@endsection

17
resources/views/frontend/sitelink/index.blade.php
View File

@ -1,13 +1,17 @@
@extends('layouts.app')
@section('content')
<div class="pure-g">
<div class="pure-u-1 pure-u-md-2-3">
<section id="sitelinks" class="normal u-full-width">
<div class="container">
<div class="row">
<div class="twelve columns">
<div class="content">
<h1 class="title">Sitelinks for Web Crawlers</h1>
<span>
<?php foreach ($years as $year) : ?>
<a title="datasets published in year <?= $year ?>" href="{{ URL::route('frontend.sitelinks.list',['year' => $year]) }}"><?= $year ?>
<a title="datasets published in year <?= $year ?>"
href="{{ URL::route('frontend.sitelinks.list',['year' => $year]) }}"><?= $year ?>
</a>
<?php endforeach; ?>
</span>
@ -16,7 +20,7 @@
<ol>
<?php foreach ($documents as $document) : ?>
<li>
<section class="post">
<div class="post">
<header class="post-header">
<h2 class="post-title">
<a href="{{ URL::route('frontend.dataset.show',['id' =>$document->id]) }}"><?= $document->type; $document->id; ?>
@ -37,7 +41,7 @@
@endforeach
</div>
</section>
</div>
</li>
<?php endforeach; ?>
</ol>
@ -47,4 +51,7 @@
</div>
</div>
</div>
</div>
</section>
@endsection

130
resources/views/layouts/app.blade.old.php Normal file
View File

@ -0,0 +1,130 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ app()->getLocale() }}">
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Language" content="de">
<!--<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">-->
<meta charset="utf-8">
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>@yield('title') RDR</title>
<link rel="shortcut icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
{{-- <link rel="stylesheet" type="text/css" href="{{ asset('css/bootstrap.min.css') }}"> --}}
{{-- <link rel='stylesheet' href="{{ asset('css/pure-min.css') }}" /> --}}
{{-- <link rel='stylesheet' href="{{ asset('css/grids-responsive-min.css') }}" /> --}}
<link rel='stylesheet' href="{{ asset('css/app1.css') }}" />
<!--<link rel='stylesheet' href="{{ asset('css/page.css') }}" />-->
<link rel='stylesheet' href="{{ asset('css/styles.css') }}" />
<link rel='stylesheet' href="{{ asset('css/langswitch.css') }}" />
<!-- Fonts -->
{{-- <link rel='stylesheet' href="{{ asset('css/font-awesome.css') }}" /> --}}
{{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans%3A300italic%2C400italic%2C700italic%2C400%2C300%2C700%2C800&amp;ver=3.8.1" type="text/css" rel="stylesheet"> --}}
@yield('head')
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
<body class="layout-home-html">
@include('partials.nav')
<div id="mobile-menu" class="pure-hidden-phone pure-hidden-tablet pure-hidden-desktop">
<ul></ul>
</div>
@yield('hero')
<div class="content-container">
<div class="container">
@include('partials.flash')
@yield('content')
</div>
</div>
<!--@yield('footer')-->
<div class="footer">
<div class="container">
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-4 footer-about">
<div class="block">
<h3 class="block-title">About RDR</h3>
<ul>
{{-- <li><a href="{{ URL::route('frontend.home.about') }}">About Us</a></li> --}}
<li class="last"><a href="{!! URL::route('frontend.pages.show', ['page_slug'=>'about']) !!}">About Us</a></li>
<li><a href="{{ URL::route('frontend.home.news') }}">News</a></li>
</ul>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-4">
</div>
<div class="pure-u-1 pure-u-md-1-4 footer-links">
<div class="block">
<h3 class="block-title">TOOLS &amp; SUPPORT</h3>
<ul id="secondary-nav" class="nav">
<li class="first"><a href="{{ URL::route('frontend.home.contact') }}">Contact</a></li>
{{-- <li><a href="{{ URL::route('frontend.home.imprint') }}">Impressum</a></li> --}}
<li class="last"><a href="{!! URL::route('frontend.pages.show', ['page_slug'=>'imprint']) !!}">Impressum</a></li>
<li class="last"><a href="{{ URL::route('frontend.sitelinks.index') }}">Sitelinks</a></li>
<li class="last"><a href="{!! URL::route('frontend.pages.show', ['page_slug'=>'terms-and-conditions']) !!}">Terms and Conditions</a></li>
<li><a target="_blank" href="https://github.com/geolba"><i class="fab fa-github"></i> rdr bei GitHub</a></li>
</ul>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-4 block">
<div class="block">
<h3 class="block-title">CONNECT WITH US</h3>
<ul>
<li><a target="_blank" href="https://www.geologie.ac.at/"><i class="fas fa-home"></i> GBA</a></li>
<li><span><i class="fas fa-phone"></i> +43-1-7125674</span></li>
<li><a href="mailto:repository@geologie.ac.at?Subject= RDR &amp;body=How can I help you?"><i class="far fa-envelope"></i> repository@geologie.ac.at</a> </li>
<li></li>
</ul>
</div>
</div>
</div>
<hr>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-4 footer-copyright">
Geologische Bundesanstalt &copy; {{ date('Y') }}
<!--<p id="logo-wrapper">
<a href="http://www.kobv.de/opus4/" title="Opus4 Website">
</a>
</p>-->
</div>
<div class="pure-u-1 pure-u-md-1-4 footer-funded">
{{-- @role('administrator')
I'm an administrator!
@else
I'm not an administrator...
@endrole --}}
</div>
<div class="pure-u-1 pure-u-md-1-4 footer-funded">
</div>
<div class="pure-u-1 pure-u-md-1-4 footer-funded">
</div>
</div>
</div>
</div>
<!-- Scripts -->
{{-- <script type="text/javascript" src="{{ asset('js/jquery-2.1.1.min.js') }}"></script> --}}
<script type="text/javascript" src="{{ asset('js/lib.js') }}"></script>
<script type="text/javascript">
$(document).ready(function() {
$('div.alert').not('alert-important').delay(3000).slideUp(300);
});
</script>
@yield('scripts')
</body>
</html>

189
resources/views/layouts/app.blade.php
View File

@ -1,130 +1,161 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ app()->getLocale() }}">
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Language" content="de">
<!--<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">-->
<!-- Basic Page Needs
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
<meta charset="utf-8">
<title>RDR - For Scientists</title>
<meta name="description" content="An awesome one page website">
<meta name="author" content="Arno Kaimbacher">
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>@yield('title') RDR</title>
<link rel="shortcut icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
{{-- <link rel="stylesheet" type="text/css" href="{{ asset('css/bootstrap.min.css') }}"> --}}
{{-- <link rel='stylesheet' href="{{ asset('css/pure-min.css') }}" /> --}}
{{-- <link rel='stylesheet' href="{{ asset('css/grids-responsive-min.css') }}" /> --}}
<link rel='stylesheet' href="{{ asset('css/app1.css') }}" />
<!--<link rel='stylesheet' href="{{ asset('css/page.css') }}" />-->
<link rel='stylesheet' href="{{ asset('css/styles.css') }}" />
<link rel='stylesheet' href="{{ asset('css/langswitch.css') }}" />
<!-- Fonts -->
{{-- <link rel='stylesheet' href="{{ asset('css/font-awesome.css') }}" /> --}}
{{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans%3A300italic%2C400italic%2C700italic%2C400%2C300%2C700%2C800&amp;ver=3.8.1" type="text/css" rel="stylesheet"> --}}
<!-- Mobile Specific Metas
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<!-- FONT
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
<!-- <link href='http://fonts.googleapis.com/css?family=Raleway:400,300,600' rel='stylesheet' type='text/css'> -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700,900" rel="stylesheet" type='text/css'>
<!-- CSS
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
<link rel="stylesheet" href="/css/normalize.css">
<link rel="stylesheet" href="/css/skeleton.css">
<link rel="stylesheet" href="/css/font-awesome.css">
<link rel="stylesheet" href="/css/style.css">
<!-- Favicon
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
<link rel="icon" type="image/png" href="/images/favicon/favicon.ico" />
<!-- <link rel="apple-touch-icon" sizes="180x180" href="images/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon/favicon-16x16.png">
<link rel="manifest" href="images/favicon/site.webmanifest"> -->
<!-- Javascript
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
<script type="text/javascript" src="/js/scripts.js"></script>
@yield('head')
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
<body class="layout-home-html">
@include('partials.nav')
<div id="mobile-menu" class="pure-hidden-phone pure-hidden-tablet pure-hidden-desktop">
<ul></ul>
<!-- Menu -->
<header class="header">
<nav class="navigation">
<a href="#" class="menu-icon {{ Route::currentRouteName() != 'frontend.home.index' ? 'active' : '' }}"">
<i class="fa fa-bars"></i>
</a>
<div class="container">
<ul class="menu">
<!-- <li><a href="#hero">Home</a></li> -->
<li>
<a class="{{ Route::currentRouteName() == 'frontend.home.index' ? 'current' : '' }}"
href="{{ url('/') }}">Home</a>
</li>
<!-- <li><a href="#introduction">Introduction</a></li> -->
<li>
<a class="{{ Route::currentRouteName() == 'frontend.home.intro' ? 'current' : '' }}"
href="{{ route('frontend.home.intro') }}">Introduction</a>
</li>
<!-- <li><a href="#work">Work</a></li> -->
<li>
<a class="{{ Route::currentRouteName() == 'frontend.home.services' ? 'current' : '' }}"
href="{{ route('frontend.home.services') }}">Services</a>
</li>
<!-- <li><a href="#help">Help</a></li> -->
<li>
<a class="{{ Route::currentRouteName() == 'frontend.home.help' ? 'current' : '' }}"
href="{{ route('frontend.home.help') }}">Help</a>
</li>
<!-- <li><a href="#clients">Clients</a></li> -->
<!-- <li><a href="#about">About</a></li> -->
<li><a class="{{ Route::currentRouteName() == 'frontend.pages.show' ? 'current' : '' }}"
href="{!! url('/pages/about') !!}">About</a></li>
<!-- <li><a href="#why-us">Why us?</a></li>
<li><a href="#contact">Contact</a></li> -->
<!-- <li class="right"><a href="#">Login</a></li> -->
@if (Auth::guest())
<li class="right">
<a class="{{ Route::currentRouteName() == 'login' ? 'current' : '' }}"
href="{{ route('login') }}">
<i class="fas fa-sign-in-alt"></i> Login
</a>
</li>
@endif
</ul>
</div>
</nav>
</header>
@yield('hero')
<div class="content-container">
<div class="container">
@include('partials.flash')
@yield('content')
</div>
</div>
<!--@yield('footer')-->
<div class="footer">
<!-- Footer -->
<section data-sr class="footer u-full-width u-max-full-width">
<div class="container">
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-4 footer-about">
<div class="row">
<div class="four columns footer-about">
<!-- <h5>&copy 2015 Tuts+ Web Design.</h5> -->
<div class="block">
<h3 class="block-title">About RDR</h3>
<ul>
{{-- <li><a href="{{ URL::route('frontend.home.about') }}">About Us</a></li> --}}
<li class="last"><a href="{!! URL::route('frontend.pages.show', ['page_slug'=>'about']) !!}">About Us</a></li>
<li class="last"><a
href="{!! URL::route('frontend.pages.show', ['page_slug'=>'about']) !!}">About
Us</a></li>
<li><a href="{{ URL::route('frontend.home.news') }}">News</a></li>
</ul>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-4">
</div>
<div class="pure-u-1 pure-u-md-1-4 footer-links">
<div class="four columns footer-links">
<div class="block">
<h3 class="block-title">TOOLS &amp; SUPPORT</h3>
<ul id="secondary-nav" class="nav">
<li class="first"><a href="{{ URL::route('frontend.home.contact') }}">Contact</a></li>
{{-- <li><a href="{{ URL::route('frontend.home.imprint') }}">Impressum</a></li> --}}
<li class="last"><a href="{!! URL::route('frontend.pages.show', ['page_slug'=>'imprint']) !!}">Impressum</a></li>
<li class="last"><a
href="{!! URL::route('frontend.pages.show', ['page_slug'=>'imprint']) !!}">Impressum</a>
</li>
<li class="last"><a href="{{ URL::route('frontend.sitelinks.index') }}">Sitelinks</a></li>
<li class="last"><a href="{!! URL::route('frontend.pages.show', ['page_slug'=>'terms-and-conditions']) !!}">Terms and Conditions</a></li>
<li class="last"><a
href="{!! URL::route('frontend.pages.show', ['page_slug'=>'terms-and-conditions']) !!}">Terms
and Conditions</a></li>
<li><a target="_blank" href="https://github.com/geolba"><i class="fab fa-github"></i> rdr bei GitHub</a></li>
<li><a target="_blank" href="https://github.com/geolba"><i class="fab fa-github"></i> rdr
bei GitHub</a></li>
</ul>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-4 block">
<div class="four columns block">
<div class="block">
<h3 class="block-title">CONNECT WITH US</h3>
<ul>
<li><a target="_blank" href="https://www.geologie.ac.at/"><i class="fas fa-home"></i> GBA</a></li>
<li><a target="_blank" href="https://www.geologie.ac.at/"><i class="fas fa-home"></i>
GBA</a></li>
<li><span><i class="fas fa-phone"></i> +43-1-7125674</span></li>
<li><a href="mailto:repository@geologie.ac.at?Subject= RDR &amp;body=How can I help you?"><i class="far fa-envelope"></i> repository@geologie.ac.at</a> </li>
<li><a href="mailto:repository@geologie.ac.at?Subject= RDR &amp;body=How can I help you?"><i
class="far fa-envelope"></i> repository@geologie.ac.at</a> </li>
<li></li>
</ul>
</div>
</div>
</div>
<hr>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-4 footer-copyright">
Geologische Bundesanstalt &copy; {{ date('Y') }}
<!--<p id="logo-wrapper">
<a href="http://www.kobv.de/opus4/" title="Opus4 Website">
</a>
</p>-->
</div>
<div class="pure-u-1 pure-u-md-1-4 footer-funded">
{{-- @role('administrator')
I'm an administrator!
@else
I'm not an administrator...
@endrole --}}
</div>
<div class="pure-u-1 pure-u-md-1-4 footer-funded">
</div>
<div class="pure-u-1 pure-u-md-1-4 footer-funded">
</div>
</div>
</div>
</div>
<!-- Scripts -->
{{-- <script type="text/javascript" src="{{ asset('js/jquery-2.1.1.min.js') }}"></script> --}}
<script type="text/javascript" src="{{ asset('js/lib.js') }}"></script>
<script type="text/javascript">
$(document).ready(function() {
$('div.alert').not('alert-important').delay(3000).slideUp(300);
});
</script>
@yield('scripts')
</div>
</div>
</section>
<!-- End Document
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
</body>
</html>

10
routes/web.php
View File

@ -429,12 +429,18 @@ Route::group(['namespace' => 'Frontend', 'as' => 'frontend.'], function () {
Route::get('/imprint', [
'as' => 'home.imprint', 'uses' => 'HomeController@imprint',
]);
Route::get('/about', [
'as' => 'home.about', 'uses' => 'HomeController@about',
Route::get('/intro', [
'as' => 'home.intro', 'uses' => 'HomeController@intro',
]);
Route::get('/news', [
'as' => 'home.news', 'uses' => 'HomeController@news',
]);
Route::get('/services', [
'as' => 'home.services', 'uses' => 'HomeController@services',
]);
Route::get('/help', [
'as' => 'home.help', 'uses' => 'HomeController@help',
]);
//=================================================Crawlers====================================================
Route::get('sitelinks', [

1
storage/app/.gitignore vendored
View File

@ -1,2 +1,3 @@
*
!public/
!.gitignore

2
storage/app/public/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*
!.gitignore