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

new fontawesome version 5 via npm

Browse source
This commit is contained in:
Arno Kaimbacher 2019-04-18 13:16:50 +02:00
parent f7673e33e0
commit fa31100c2e
42 changed files with 8903 additions and 766 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/views/layouts/app.blade.php
View file

@ -20,7 +20,7 @@
<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 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')
@ -75,7 +75,7 @@
<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="fa 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>
@ -83,9 +83,9 @@
<div class="block">
<h3 class="block-title">CONNECT WITH US</h3>
<ul>
<li><a target="_blank" href="https://www.geologie.ac.at/"><i class="fa fa-home"></i> GBA</a></li>
<li><span><i class="fa fa-mobile-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="fa fa-envelope-o"></i> repository@geologie.ac.at</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></li>
</ul>
</div>

16
resources/views/partials/nav.blade.php
View file

@ -50,8 +50,8 @@
<div id="topmenu-inner">
<nav class="pure-menu pure-menu-open pure-menu-horizontal">
<ul class="pure-menu-list">
<li class="pure-menu-item {{ Route::currentRouteName() == 'frontend.home.index' ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ url('/') }}">HOME</a>
<li class="pure-menu-item {{ Route::currentRouteName() == 'frontend.home.index' ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ url('/') }}"><i class="fas fa-home"></i> HOME</a>
</li>
<!-- <li><a class="marvel" href="{{ url('books') }}">BOOKS</a></li> -->
@ -78,16 +78,16 @@
@else
<li class="pure-menu-item {{ Route::currentRouteName() == 'frontend.search.index' ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ route('frontend.search.index') }}">
<i class="fa fa-search" aria-hidden="true"></i>
<a class="pure-menu-link" href="{{ route('frontend.search.index') }}">
<i class="fas fa-search" aria-hidden="true"></i>
SEARCH
</a>
</li>
<li class="pure-menu-item pure-menu-allow-hover">
<a href="#" class="pure-menu-link">
<i class="fa fa-bars"></i>
<i class="fas fa-bars"></i>
MENU
<span class="fa fa-angle-down"></span>
<span class="fas fa-angle-down"></span>
</a>
<ul class="pure-menu-children" role="menu">
<li class="pure-menu-item"><a class="pure-menu-link" href="{{ URL::route('oai') }}" target="_blank"> OAI-PMH 2.0</a></li>
@ -110,7 +110,7 @@
<ul class="pure-menu-list">
@if (Auth::guest())
<li class="pure-menu-item {{ Route::currentRouteName() == 'login' ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ route('login') }}">LOGIN</a>
<a class="pure-menu-link" href="{{ route('login') }}"><i class="fas fa-sign-in-alt"></i> LOGIN</a>
</li>
<!--<li class="pure-menu-item"><a class="pure-menu-link" href="{{ url('register') }}">REGISTER</a></li>-->
@else
@ -122,7 +122,7 @@
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('access.user.index') }}"><i class="fa fa-users"></i> EDIT USERS</a></li>
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('access.role.index') }}"><i class="fa fa-key"></i> EDIT ROLES</a></li>
@endrole
<li class="pure-menu-item"><a class="pure-menu-link" href="{{ route('logout') }}"><i class="fa fa-sign-out"></i> LOG OUT</a></li>
<li class="pure-menu-item"><a class="pure-menu-link" href="{{ route('logout') }}"><i class="fas fa-sign-out-alt"></i> LOG OUT</a></li>
</ul>
</li>
@endif

6
resources/views/publish/create-step1.blade.php
View file

@ -5,7 +5,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-upload"></i> Publish New Dataset
<i class="fas fa-plus-square"></i> Publish New Dataset
</h3>
</div>
@ -656,10 +656,10 @@
<i class="fa fa-save"></i>
<span>Save Dataset</span>
</button>
<button @click.prevent="submit('unpublished')" class="pure-button button-small">
{{-- <button @click.prevent="submit('unpublished')" class="pure-button button-small">
<i class="fa fa-upload"></i>
<span>Release Dataset</span>
</button>
</button> --}}
</div>

2
resources/views/settings/filetype/index.blade.php
View file

@ -2,7 +2,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-file"></i>
<i class="fas fa-file-code"></i>
<span> Mime-Types</span>
</h3>
</div>

32
resources/views/settings/layouts/app.blade.php
View file

@ -8,15 +8,15 @@
<link rel="shortcut icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
{{-- <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/grids-responsive-min.css') }}" /> --}}
<!--<link rel="stylesheet" type="text/css" href="bower_components/font-awesome/css/font-awesome.min.css">-->
<link rel='stylesheet' href="{{ asset('css/font-awesome.css') }}" />
{{-- <link rel='stylesheet' href="{{ asset('css/font-awesome.css') }}" /> --}}
<link rel='stylesheet' href="{{ asset('css/app1.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ asset('/backend/style.css') }}">
<link rel="stylesheet" type="text/css" href="{{ asset('/backend/pagination.css') }}">
<link rel="stylesheet" type="text/css" href="{{ asset('/backend/tabs.css') }}">
@yield('styles')
</head>
<body>
@ -44,14 +44,14 @@
<li class="{{ active_class(Route::is('settings.dashboard')) }}">
<a href="{{ route('settings.dashboard') }}">
<i class="fa fa-dashboard"></i>
<i class="fa fa-tachometer-alt"></i>
<span>Reports</span>
</a>
</li>
@permission('settings')
<li class="treeview">
<h2 class="pure-menu-heading">Settings <span class="fa fa-angle-down"></h2>
<h2 class="pure-menu-heading">Settings <span class="fas fa-angle-down"></h2>
<ul class="pure-menu-list treeview-menu {{ active_class(Route::is('settings.*'), 'menu-open') }}" style="display: none; {{ active_class(Route::is('settings.*'), 'display: block;') }}">
<li class="pure-menu-item {{ Route::is('settings.document*') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ route('settings.document') }}"><i class="fa fa-database"></i> Datasets</a>
@ -63,23 +63,23 @@
<a class="pure-menu-link" href="{{ route('settings.collectionrole.index') }}"><i class="fa fa-archive"></i> Collection Roles</a>
</li>
<li class="pure-menu-item {{ Route::is('settings.license*') ? 'active' : '' }}">
<a href="{{ route('settings.license') }}" class="pure-menu-link"><i class="fa fa-file"></i> Licenses</a>
<a href="{{ route('settings.license') }}" class="pure-menu-link"><i class="fab fa-creative-commons"></i> Licenses</a>
</li>
<li class="pure-menu-item {{ Route::is('settings.person*') ? 'active' : '' }}">
<a href="{{ route('settings.person') }}" class="pure-menu-link"><i class="fa fa-edit"></i> Persons</a>
<a href="{{ route('settings.person') }}" class="pure-menu-link"><i class="fas fa-users"></i> Persons</a>
</li>
<li class="pure-menu-item {{ Route::is('settings.project*') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ route('settings.project') }}"><i class="fa fa-tasks"></i> Projects</a>
</li>
<li class="pure-menu-item {{ Route::is('settings.mimetype') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ route('settings.mimetype.index') }}"><i class="fa fa-archive"></i> Mimetypes</a>
<a class="pure-menu-link" href="{{ route('settings.mimetype.index') }}"><i class="fas fa-file-code"></i> Mimetypes</a>
</li>
@permission('page')
<li class="{{ active_class(Active::checkUriPattern('settings/page*')) }}">
<a class="pure-menu-link" href="{{ route('settings.page.index') }}">
<i class="fa fa-file-text"></i>
<i class="fas fa-file-signature"></i>
<span>{{ trans('labels.backend.pages.title') }}</span>
</a>
</li>
@ -95,27 +95,27 @@
<ul class="pure-menu-list">
@permission('dataset-submit')
<li class="pure-menu-item {{ Route::is('publish.dataset.create') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.dataset.create') }}"><i class="fa fa-upload"></i> Create</a>
<a class="pure-menu-link" href="{{ URL::route('publish.dataset.create') }}"><i class="fas fa-plus-square"></i> Create</a>
</li>
@endpermission
@permission('dataset-list')
<li class="pure-menu-item {{ Route::is('publish.workflow.index') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.index') }}"><i class="fa fa-upload"></i> All my datasets</a>
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.index') }}"><i class="fas fa-list"></i> All my datasets</a>
</li>
@endpermission
@permission('dataset-editor-list')
<li class="pure-menu-item {{ Route::is('publish.workflow.editor.index') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.editor.index') }}"><i class="fa fa-upload"></i> EDITOR PAGE: Released datasets</a>
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.editor.index') }}"><i class="fas fa-list"></i> EDITOR PAGE: Released datasets</a>
</li>
@endpermission
@permission('dataset-review-list')
<li class="pure-menu-item {{ Route::is('publish.workflow.review.index') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.review.index') }}"><i class="fa fa-upload"></i> REVIEW PAGE: Approved datasets</a>
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.review.index') }}"><i class="fas fa-list"></i> REVIEW PAGE: Approved datasets</a>
</li>
@endpermission
@permission('dataset-publish-list')
<li class="pure-menu-item {{ Route::is('publish.workflow.publish.index') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.publish.index') }}"><i class="fa fa-upload"></i> Publish PAGE: Reviewed datasets</a>
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.publish.index') }}"><i class="fas fa-list"></i> Publish PAGE: Reviewed datasets</a>
</li>
@endpermission
{{-- <li class="pure-menu-item {{ Route::is('publish.workflow.release') ? 'active' : '' }}">
@ -159,7 +159,7 @@
</li>
@endpermission
<li class="pure-menu-item">
<a class="pure-menu-link" href="{{ route('logout') }}"><i class="fa fa-sign-out"></i>Logout</a>
<a class="pure-menu-link" href="{{ route('logout') }}"><i class="fas fa-sign-out-alt"></i></i>Logout</a>
</li>
@endif
</ul>

2
resources/views/settings/license/license.blade.php
View file

@ -3,7 +3,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-file"></i> Licenses
<i class="fab fa-creative-commons"></i> Licenses
</h3>
</div>

2
resources/views/settings/page/index.blade.php
View file

@ -9,7 +9,7 @@
<div class="box-header with-border header">
<h3 class="header-title">
<i class="fa fa fa-edit"></i> {{ trans('labels.backend.pages.management') }}
<i class="fas fa-file-signature"></i> {{ trans('labels.backend.pages.management') }}
</h3>
<div class="box-tools pull-right">
{{--

2
resources/views/settings/person/person.blade.php
View file

@ -3,7 +3,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa fa-edit"></i> Persons Management
<i class="fas fa-users"></i> Persons Management
</h3>
</div>

2
resources/views/workflow/editor/index.blade.php
View file

@ -2,7 +2,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-file"></i> EDITOR PAGE: Approve released datasets
<i class="fas fa-list"></i> EDITOR PAGE: Approve released datasets
</h3>
</div>

8
resources/views/workflow/publish/index.blade.php
View file

@ -2,14 +2,14 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-file"></i> PUBLISH PAGE: Publish reviewed datasets
<i class="fas fa-list"></i> PUBLISH PAGE: Publish reviewed datasets
</h3>
</div>
<div class="pure-g box-content">
<div class="pure-u-1">
@if($datasets->count() > 0)
<table class="pure-table pure-table-horizontal">
<thead>
<th>Dataset Title</th>
<th>ID</th>
@ -70,8 +70,10 @@
</tr>
@endforeach
</tbody>
</table>
@else
<p>there are no reviewed datasets for publishing...</p>
@endif
</div>
</div>

2
resources/views/workflow/review/index.blade.php
View file

@ -2,7 +2,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-file"></i> REVIEW PAGE: Review approved datasets assigned to you
<i class="fas fa-list"></i> REVIEW PAGE: Review approved datasets assigned to you
</h3>
</div>

3
resources/views/workflow/review/review.blade.php
View file

@ -49,8 +49,7 @@
@foreach($fields as $field => $fieldValue)
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{{ Form::label($field, $field . ": ") }}
<span class="help is-info"> {!! $fieldValue !!} </span>
<span class="help is-info"> {!! $fieldValue !!} </span>
</div>
@endforeach

2
resources/views/workflow/submitter/index.blade.php
View file

@ -2,7 +2,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-file"></i> Release saved datasets
<i class="fas fa-list"></i> Release saved datasets
</h3>
</div>