- new frontend style

- 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

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.
*/

View file

@ -182,7 +182,11 @@ class RequestController extends Controller
);
}
$metadataPrefix = $oaiRequest['metadataPrefix'];
$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)

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'));

View file

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