- add search to menu
- better dataset.show view for new ui
This commit is contained in:
Arno Kaimbacher
parent
e526a95960
commit
5c66a33e51
5 changed files with 168 additions and 165 deletions
|
|
@ -1,70 +1,63 @@
|
|||
@extends('layouts.app')
|
||||
@section('content')
|
||||
|
||||
<div>
|
||||
<section class="normal dataset u-full-width">
|
||||
<div class="container">
|
||||
<div class="blog-meta">
|
||||
created: <?= $dataset->created_at->toDayDateTimeString() ?>
|
||||
</div>
|
||||
<div class="post-description">
|
||||
{{-- @foreach ($dataset->authors as $author)
|
||||
<em>Author: {{ $author->full_name }}</em>
|
||||
<br />
|
||||
@endforeach --}}
|
||||
@foreach ($dataset->titles as $title)
|
||||
<em>Main Title: {{ $title->value }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
@foreach ($dataset->abstracts as $abstract)
|
||||
<em>Abstract: {{ $abstract->value }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
@foreach ($authors as $author)
|
||||
<em>Author: {{ $author->full_name }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
@foreach ($contributors as $contributor)
|
||||
<em>Contributor: {{ $contributor->full_name }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
@foreach ($submitters as $submitter)
|
||||
<em>Submitter: {{ $submitter->full_name }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
|
||||
<section class="post">
|
||||
<header class="post-header">
|
||||
|
||||
</header>
|
||||
<div class="blog-meta">
|
||||
created: <?= $dataset->created_at->toDayDateTimeString() ?>
|
||||
</div>
|
||||
<div class="post-description">
|
||||
{{-- @foreach ($dataset->authors as $author)
|
||||
<em>Author: {{ $author->full_name }}</em>
|
||||
<br />
|
||||
@endforeach --}}
|
||||
@foreach ($dataset->titles as $title)
|
||||
<em>Main Title: {{ $title->value }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
@foreach ($dataset->abstracts as $abstract)
|
||||
<em>Abstract: {{ $abstract->value }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
@foreach ($authors as $author)
|
||||
<em>Author: {{ $author->full_name }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
@foreach ($contributors as $contributor)
|
||||
<em>Contributor: {{ $contributor->full_name }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
@foreach ($submitters as $submitter)
|
||||
<em>Submitter: {{ $submitter->full_name }}</em>
|
||||
<br />
|
||||
@endforeach
|
||||
<table id="items" class="pure-table pure-table-horizontal">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Path Name</th>
|
||||
<th>Label</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($dataset->files as $key => $file)
|
||||
<tr>
|
||||
<td>
|
||||
@if($file->exists() === true)
|
||||
<a href="{{ route('settings.file.download', ['id' => $file->id]) }}"> {{ $file->path_name }} </a>
|
||||
@else
|
||||
<span class="alert">missing file: {{ $file->path_name }}</span>
|
||||
@endif
|
||||
</td>
|
||||
<td> {{ $file->label }} </td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<table id="items" class="pure-table pure-table-horizontal">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Path Name</th>
|
||||
<th>Label</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($dataset->files as $key => $file)
|
||||
<tr>
|
||||
<td>
|
||||
@if($file->exists() === true)
|
||||
<a href="{{ route('settings.file.download', ['id' => $file->id]) }}"> {{ $file->path_name }} </a>
|
||||
@else
|
||||
<span class="alert">missing file: {{ $file->path_name }}</span>
|
||||
@endif
|
||||
</td>
|
||||
<td> {{ $file->label }} </td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
|
||||
@stop
|
||||
|
|
@ -3,7 +3,9 @@
|
|||
|
||||
|
||||
|
||||
{!! Form::text('query', isset($filter) ? $filter : '', array('class'=>'pure-input-1', 'placeholder'=>'Search for a dataset...')) !!}
|
||||
{!! Form::text('query', isset($filter) ? $filter : '', array('class'=>'u-full-width', 'placeholder'=>'Search for a dataset...')) !!}
|
||||
|
||||
{{-- <input class="u-full-width" placeholder="Search for a dataset..." id="query"></input> --}}
|
||||
|
||||
<!--<div id="edit-submit-search-wrapper" class="form-item">
|
||||
<span class="form-submit-wrapper">
|
||||
|
|
|
|||
|
|
@ -5,63 +5,67 @@
|
|||
@section('content')
|
||||
|
||||
|
||||
<!-- Help -->
|
||||
<section data-sr id="search" class="normal search u-full-width">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
|
||||
<div class="two-thirds column">
|
||||
<div class="content">
|
||||
<h1>Suche</h1>
|
||||
@include('frontend.partials.simpleSearchForm')
|
||||
|
||||
<div id="searchbar">
|
||||
@if (isset($results))
|
||||
<div id="search_results" class="plugin-simplesearch-result search_results">
|
||||
@foreach($results as $result)
|
||||
<div class="result">
|
||||
<dt class="results_title">
|
||||
@if (!is_null($result->getAsset( 'abstract_output' )))
|
||||
<img src="../img/theme/icon-on-off.png" alt="results_hideabstract_alt"
|
||||
onclick="$(function(){$('#abstractText_{{ $result->getId() }}').toggle();});" />
|
||||
@endif
|
||||
|
||||
@if (!is_null($result->getAsset('title_output')))
|
||||
<a href="{{ route('frontend.dataset.show', $result->getId()) }}">
|
||||
{{ $result->getAsset('title_output') }}
|
||||
</a>
|
||||
@else
|
||||
<a>results_missingtitle</a>
|
||||
@endif
|
||||
|
||||
@if ($result->getAsset('year'))
|
||||
<span>( {{ $result->getAsset('year') }} )</span>
|
||||
@endif
|
||||
</dt>
|
||||
|
||||
|
||||
<div class="pure-g">
|
||||
@if (!is_null($result->getAsset('author')))
|
||||
<dt class="results_author">
|
||||
@foreach($result->getAsset('author') as $authorIndex => $author)
|
||||
<a>{{ htmlspecialchars($author)}}</a>
|
||||
@endforeach
|
||||
</dt>
|
||||
@endif
|
||||
|
||||
<div class="pure-u-1 pure-u-md-2-3">
|
||||
<div class="content">
|
||||
<h1>Suche</h1>
|
||||
@include('frontend.partials.simpleSearchForm')
|
||||
<dt class="abstractText" id="abstractText_{{ $result->getId() }}">
|
||||
{{ htmlspecialchars($result->getAsset('abstract_output')) }}
|
||||
</dt>
|
||||
|
||||
<div id="searchbar">
|
||||
@if (isset($results))
|
||||
<div id="search_results" class="plugin-simplesearch-result search_results">
|
||||
@foreach($results as $result)
|
||||
<div class="result">
|
||||
<dt class="results_title">
|
||||
@if (!is_null($result->getAsset( 'abstract_output' )))
|
||||
<img src="../img/theme/icon-on-off.png" alt="results_hideabstract_alt" onclick="$(function(){$('#abstractText_{{ $result->getId() }}').toggle();});" />
|
||||
@endif
|
||||
|
||||
@if (!is_null($result->getAsset('title_output')))
|
||||
<a href="{{ route('frontend.dataset.show', $result->getId()) }}">
|
||||
{{ $result->getAsset('title_output') }}
|
||||
</a>
|
||||
@else
|
||||
<a>results_missingtitle</a>
|
||||
@endif
|
||||
|
||||
@if ($result->getAsset('year'))
|
||||
<span>( {{ $result->getAsset('year') }} )</span>
|
||||
@endif
|
||||
</dt>
|
||||
|
||||
|
||||
@if (!is_null($result->getAsset('author')))
|
||||
<dt class="results_author">
|
||||
@foreach($result->getAsset('author') as $authorIndex => $author)
|
||||
<a>{{ htmlspecialchars($author)}}</a>
|
||||
</div>
|
||||
@endforeach
|
||||
</dt>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<dt class="abstractText" id="abstractText_{{ $result->getId() }}">
|
||||
{{ htmlspecialchars($result->getAsset('abstract_output')) }}
|
||||
</dt>
|
||||
|
||||
@include('frontend.solrsearch.pagination')
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@include('frontend.solrsearch.pagination')
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@endsection
|
||||
|
||||
|
|
@ -72,4 +76,4 @@
|
|||
$('.abstractText').hide();
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
@endsection
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
<header class="header">
|
||||
<nav class="navigation">
|
||||
<a href="#" class="menu-icon {{ Route::currentRouteName() != 'frontend.home.index' ? 'active' : '' }}"">
|
||||
<i class="fa fa-bars"></i>
|
||||
<i class=" fa fa-bars"></i>
|
||||
</a>
|
||||
<div class="container">
|
||||
<ul class="menu">
|
||||
|
|
@ -64,6 +64,11 @@
|
|||
<a class="{{ Route::currentRouteName() == 'frontend.home.intro' ? 'current' : '' }}"
|
||||
href="{{ route('frontend.home.intro') }}">Intro</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="pure-menu-item {{ Route::currentRouteName() == 'frontend.search.index' ? 'current' : '' }}"
|
||||
href="{{ route('frontend.search.index') }}"> SEARCH</a>
|
||||
</li>
|
||||
|
||||
<!-- <li><a href="#work">Work</a></li> -->
|
||||
<li>
|
||||
<a class="{{ Route::currentRouteName() == 'frontend.home.services' ? 'current' : '' }}"
|
||||
|
|
@ -76,9 +81,10 @@
|
|||
</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 class="{{ Route::currentRouteName() == 'frontend.pages.show' ? 'current' : '' }}"
|
||||
href="{!! url('/pages/about') !!}">About</a>
|
||||
</li> -->
|
||||
<li class="right"><a href="{{ URL::route('oai') }}" target="_blank"> OAI</a></li>
|
||||
|
||||
<!-- <li><a href="#why-us">Why us?</a></li>
|
||||
|
|
|
|||
Loading…
Add table
editor.link_modal.header
Reference in a new issue