minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into binarity.cz

Browse Source
This commit is contained in:
Michal Kváček
2016-10-11 19:12:18 +02:00
parent 46ff310b01 625bdbb2e2
commit d761914786
27 changed files with 376 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/Base/OnePage/Resources/views/admin/widgets/onePageMenu/edit.blade.php
+2 -2
View File
@@ -4,10 +4,10 @@
@section('content')
<div class="col-lg-8">
@include('admin.widgets.htmlCode.form', ['action' => route('widgets.postEdit', ['id' => $widget->id])])
@include('template::admin.widgets.onePageMenu.form', ['action' => route('widgets.postEdit', ['id' => $widget->id])])
</div>
<div class="col-lg-4">
<h3>@lang('widgets/htmlCode.preview')</h3>
<h3>@lang('widgets/menu.preview')</h3>
@widgetPreview($widget)
</div>
templates/Base/OnePage/Widgets/OnePageMenu/OnePageMenu.php
+1 -3
View File
@@ -46,9 +46,7 @@ class OnePageMenu extends NonInstallableWidget
*/
public static function save(Widget $widget, stdClass $data)
{
$widgetSettings = ['containerClass' => isset($data->containerClass) ? $data->containerClass : ''];
$widget->settings = json_encode($widgetSettings);
$widget->settings = json_encode([]);
return $widget;
}
templates/Base/OnePage/Widgets/OnePageMenu/Presenter.php
+3 -3
View File
@@ -18,12 +18,12 @@ class Presenter implements WidgetRenderer
*
* This method renders some HTML code for displaying.
*
* @param object $settings
* @param Widget $widget
*
* @return mixed
* @throws \ErrorException
*/
public static function render($settings)
public static function render(Widget $widget)
{
if (!self::$template) {
throw new \ErrorException('Cannot render menu without template! Please, set Presenter::$template variable before rendering.');
@@ -31,7 +31,7 @@ class Presenter implements WidgetRenderer
$pages = OnePage::getPagesOnHomepage();
return view(self::$template, ['pages' => $pages])->render();
return view(self::$template, ['pages' => $pages, 'widget' => $widget])->render();
}
/**
templates/DobrotyZPece/Resources/views/visitor/errors/homepageNotAvailable.blade.php
View File
templates/DobrotyZPece/Resources/views/visitor/layout.blade.php
+3 -35
View File
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="cs">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -43,44 +43,12 @@
<footer class="page-footer grey lighten-2">
<div class="container">
<div class="row">
<div class="col l6 s12">
<form class="col s12">
<h5>Kontaktujte nás</h5>
<div class="input-field s12">
<input id="email" type="email" class="validate">
<label for="email">Váš e-mail</label>
</div>
<div class="input-field s12">
<textarea id="message" class="materialize-textarea validate"></textarea>
<label for="message">Textarea</label>
</div>
<button class="btn orange waves-effect waves-light" type="submit" name="action">Submit
<i class="material-icons right">send</i>
</button>
</form>
</div>
<div class="col l3 s12">
<h5>Menu</h5>
<ul class="">
<li><a href="#!">O nás</a></li>
<li><a href="#">Novinky</a></li>
<li><a href="#">Akce</a></li>
<li><a href="#">Kontakt</a></li>
</ul>
</div>
<div class="col l3 s12">
<h5>Firma</h5>
<span>Dobroty z pece</span>
<span>ICO</span>
<span>Adresa</span>
<span>email@dobrotyzpece.cz</span>
<p>www.dobrotyzpece.cz</p>
</div>
@widgetArea('footer')
</div>
</div>
<div class="footer-copyright">
<div class="container grey-text">
Copyright &copy; <a class="amber-text text-darken-3" href="https://www.binarity.cz/">www.binarity.cz</a>
&copy; {{date('Y')}} <a class="amber-text text-darken-3" href="https://www.binarity.cz/">www.binarity.cz</a>
</div>
</div>
</footer>