diff --git a/app/CMS/Repositories/Widgets/Widget.php b/app/CMS/Repositories/Widgets/Widget.php index 25156d9f..bb924ce4 100644 --- a/app/CMS/Repositories/Widgets/Widget.php +++ b/app/CMS/Repositories/Widgets/Widget.php @@ -19,7 +19,7 @@ class Widget $widget->name = $data['name']; $widget->description = $data['description']; $widget->container_class = $data['containerClass']; - $widget->container_id = $data['containerId']; + $widget->container_id = empty($data['containerId']) ? null : $data['containerId']; $widget->settings = json_encode(call_user_func([$widgetType->handler, 'save'], $request)); // save into database diff --git a/app/Events/DeleteWidgetArea.php b/app/Events/DeleteWidgetArea.php index 8e667d6d..d01d7951 100644 --- a/app/Events/DeleteWidgetArea.php +++ b/app/Events/DeleteWidgetArea.php @@ -2,7 +2,7 @@ namespace App\Events; -use App\Models\WidgetArea; +use App\Models\Widgets\WidgetArea; use Illuminate\Queue\SerializesModels; class DeleteWidgetArea extends Event @@ -20,7 +20,6 @@ class DeleteWidgetArea extends Event */ public function __construct(WidgetArea $widgetArea) { - // $this->widgetArea = $widgetArea; } } diff --git a/modules/ContactForm/Widgets/Address/Presenter.php b/modules/ContactForm/Widgets/Address/Presenter.php index 568cf176..d828752d 100644 --- a/modules/ContactForm/Widgets/Address/Presenter.php +++ b/modules/ContactForm/Widgets/Address/Presenter.php @@ -24,15 +24,15 @@ class Presenter implements WidgetRenderer if (!$form) return null; - $formData = json_decode($form->moduleSettings); + $formData = $form->moduleSettings; $code = '
container_id) { $code .= ' id="' . e($widget->container_id).'"'; } $code .= '>'; - $code .= "

".e($formData->companyName).'

'; - $code .= nl2br($formData->address); + $code .= "

".e($formData['companyName']).'

'; + $code .= nl2br($formData['address']); $code .= "
"; return $code; diff --git a/templates/PragueTennisCamp/Handler.php b/templates/PragueTennisCamp/Handler.php index 08b377c8..f7427478 100644 --- a/templates/PragueTennisCamp/Handler.php +++ b/templates/PragueTennisCamp/Handler.php @@ -80,12 +80,12 @@ class Handler implements TemplateHandler */ public static function beforeRender(Content & $content) { - if ($content->isHomepage) { +// if ($content->isHomepage) { $category = Category::where('url', 'trenersky-tym') ->first(); $content->traineeTeamCategory = $category; - } +// } } /** diff --git a/templates/PragueTennisCamp/Resources/assets/css/app.css b/templates/PragueTennisCamp/Resources/assets/css/app.css index 48b3e9f5..d8638223 100644 --- a/templates/PragueTennisCamp/Resources/assets/css/app.css +++ b/templates/PragueTennisCamp/Resources/assets/css/app.css @@ -3,16 +3,44 @@ body { font-family: Ubuntu; text-align: justify; - background: #eef4d4 url("./images/bg.png"); + background: #EEF4D4 url("./images/bg.png"); } +body.photo-bg { + background: url("./images/clay-bg.jpg") no-repeat fixed; + background-size: cover; +} + +h1, h2, h3, h4 { + font-family: Comfortaa; + color: #FF7F11; +} + +a { + color: #FF7F11; +} + +a:hover { + color: #983628; +} + +/** HEADER **/ header.top-bar { - background: #3f3f37; + background: #3F3F37; padding: 0; + border-bottom: solid 1px #FF7F11; } header.top-bar h1 { - font-size: 100%; + font-size: 130%; + line-height: 38px; + margin-top: 0; + margin-bottom: 0; + text-align: center; +} + +header.top-bar.centered .menu li { + display: inline-block; } header.top-bar ul { @@ -23,59 +51,57 @@ header.top-bar a { color: white; } +header.top-bar h1 a { + color: #FF7F11; +} + .menu .active > a { - background: #ff7f11; + background: #FF7F11; +} + +.menu a:hover { + background: #983628; + transition: background 400ms linear; } .logo { - max-height: 35px; + max-height: 25px; + margin: 0 15px; } -h1, h2, h3, h4 { - font-family: Comfortaa; - color: #ff7f11; -} - - +/** END HEADER **/ .stripe { - padding: 50px; - margin: 50px 0; width: 100%; } .stripe.light { - background: rgba(0, 0, 0, 0.1); -} - -.stripe h1 { - color: white; - font-size: 270%; -} - -.stripe p { - padding-left: 150px; + background: rgba(0, 0, 0, 0.3); } .content-container.row { + margin-top: 1em; line-height: 170%; padding: 1em; - background: #FFFEF0; + background: #F8FEF0; + box-shadow: 0 0 10px #CBCBCB; + border-radius: 5px 5px 0 0; } .orbit { position: relative; overflow: hidden; + background: silver; } .orbit-bullets { - margin-top: -54px; - padding-bottom: 11px; + margin-top: -100px; + padding-bottom: 20px; } .orbit .stripe { height: 20px; - background: rgba(255,255,255, 0.2); + background: rgba(255, 127, 17, 0.3); position: absolute; left: 0; right: 0; @@ -89,26 +115,53 @@ h1, h2, h3, h4 { .orbit-bottom { bottom: 0; + border-bottom: solid 1px #3F3F37; } .slow { - transition-duration: 4500ms !important; + transition-duration: 3500ms !important; +} + +.trainee-team { + margin-top: 2em; } .trainee-team .thumbnail { max-height: 150px; } -#footer { - margin-top: 10em; -} - .rounded { border-radius: 50%; } +.title-photo img { + border-radius: 0 0 5px 5px; +} + .trainer { max-width: 25%; padding: 3px; border: solid 1px #CCC; } + +#footer { + margin-bottom: 150px; +} + +#footer-widgets { + border-top: solid 2px #FF7F11; + background: #3F3F37; + padding: 1em; + border-radius: 0 0 5px 5px; + color: #EEF4D4; +} + +#binarity { + margin-top: 2em; +} + +@media screen and (max-width: 639px) { + .menu > li { + display: block !important; + } +} \ No newline at end of file diff --git a/templates/PragueTennisCamp/Resources/assets/css/images/clay-bg.jpg b/templates/PragueTennisCamp/Resources/assets/css/images/clay-bg.jpg new file mode 100644 index 00000000..ac4adf4c Binary files /dev/null and b/templates/PragueTennisCamp/Resources/assets/css/images/clay-bg.jpg differ diff --git a/templates/PragueTennisCamp/Resources/assets/images/logo.png b/templates/PragueTennisCamp/Resources/assets/images/logo.png index 3a47e570..3c957d70 100644 Binary files a/templates/PragueTennisCamp/Resources/assets/images/logo.png and b/templates/PragueTennisCamp/Resources/assets/images/logo.png differ diff --git a/templates/PragueTennisCamp/Resources/views/modules/contactform/_partials/form.blade.php b/templates/PragueTennisCamp/Resources/views/modules/contactform/_partials/form.blade.php index 336d769b..e7d99aae 100644 --- a/templates/PragueTennisCamp/Resources/views/modules/contactform/_partials/form.blade.php +++ b/templates/PragueTennisCamp/Resources/views/modules/contactform/_partials/form.blade.php @@ -1,13 +1,28 @@
{!! csrf_field() !!} -
+
-
+
-
+
+
+ + +
+ +
+
+ +
+ +
+ +
+ +
diff --git a/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php b/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php index 09f233ef..a7e2e69b 100644 --- a/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php +++ b/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php @@ -1,61 +1,35 @@ @extendVisitor('defaultLayout') + +@section('topMenu') + @include(\App\CMS\Helpers\Template::name('commonHeader')) +@endsection + + @section('content') -
+

Kontakt

-
-
-

Kontakt

-

{{$page->moduleSettings['companyName']}}

-

- {!! nl2br($page->moduleSettings['address']) !!} -
- -
- tel.: {{$page->moduleSettings['phone']}}
- e-mail: {{$page->moduleSettings['email']}} -

-
-
-
-
-
+
+

Kontakt

-
-
-

Napište nám

+

{{$page->moduleSettings['companyName']}}

+ +

+ {!! nl2br($page->moduleSettings['address']) !!} +

+ +

+ tel.: {{$page->moduleSettings['phone']}}
+ e-mail: {{$page->moduleSettings['email']}} +

+
+ +
@include('modules.contactform._partials.form')
-@endsection - -@section('javascripts') - - - @endsection \ No newline at end of file diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php index 3a28b608..91bd3d2e 100644 --- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php +++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php @@ -1,14 +1,19 @@ @extendVisitor('defaultLayout') +@section('topMenu') + @include(\App\CMS\Helpers\Template::name('commonHeader')) +@endsection + @section('content') + @if (!empty($page->titlePhoto)) +
+ +
+ @endif

{{$page->title}}

{!! $page->pageContent !!} -
- - - @endsection \ No newline at end of file diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php index f3ea1333..49240946 100644 --- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php +++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php @@ -1,5 +1,25 @@ @extendVisitor('defaultLayout') +@section('topMenu') +

+ + + {{setting('pageName')}} + +

+ +
+ +
+ +
+ +
+ +@endsection + @section('content') @php $images = $page->files()->where('mime_type', 'like', 'image%')->get(); @endphp @if(count($images) > 0) @@ -18,21 +38,21 @@ @endforeach - -
-
+ +
+ @widgetArea('mainMenu') +
@endif
{!! $page->pageContent !!} -
- +

{{$page->traineeTeamCategory->name}}

@foreach($page->traineeTeamCategory->content as $i => $subpage) -
@if(empty($subpage->titlePhoto)) @@ -44,7 +64,6 @@
@endforeach -
@endsection \ No newline at end of file diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepagePhoto.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepagePhoto.blade.php new file mode 100644 index 00000000..59b24c91 --- /dev/null +++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepagePhoto.blade.php @@ -0,0 +1,71 @@ +@extendVisitor('defaultLayout') + +@section('bodyClass', 'photo-bg') + +@section('topMenu') +

+ + + {{setting('pageName')}} + +

+ +
+ +
+ +
+ +
+ +@endsection + +@section('content') + @php $images = $page->files()->where('mime_type', 'like', 'image%')->get(); @endphp + @if(count($images) > 0) +
+
    + @foreach($images as $i => $image) +
  • + +
    • + @endforeach +
+ + +
+ +
+ @widgetArea('mainMenu') +
+ @endif + +
+ {!! $page->pageContent !!} + +
+

{{$page->traineeTeamCategory->name}}

+ + @foreach($page->traineeTeamCategory->content as $i => $subpage) +
+ + @if(empty($subpage->titlePhoto)) + {{$subpage->title}} + @else + {{$subpage->title}} + @endif +

{{$subpage->title}}

+ +
+ @endforeach +
+
+@endsection \ No newline at end of file diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/trainer.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/trainer.blade.php index 26b3e7c7..1ff8c237 100644 --- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/trainer.blade.php +++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/trainer.blade.php @@ -1,19 +1,17 @@ @extendVisitor('defaultLayout') +@section('topMenu') + @include(\App\CMS\Helpers\Template::name('commonHeader')) +@endsection + @section('content')
-

{{$page->title}}

- {!! $page->pageContent !!} -
- - - @endsection \ No newline at end of file diff --git a/templates/PragueTennisCamp/Resources/views/visitor/commonHeader.blade.php b/templates/PragueTennisCamp/Resources/views/visitor/commonHeader.blade.php new file mode 100644 index 00000000..d43328c2 --- /dev/null +++ b/templates/PragueTennisCamp/Resources/views/visitor/commonHeader.blade.php @@ -0,0 +1,19 @@ +
+ +
+ + + diff --git a/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php b/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php index b8e7cc64..043a1f65 100644 --- a/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php +++ b/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php @@ -12,49 +12,43 @@ + @if (!empty($googleAnalyticsCode)) + + @endif + @include('visitor.metaInformation') - -@if (!empty($googleAnalyticsCode)) - -@endif
-
-

- - {{setting('pageName')}} - -

-
-
- @widgetArea('mainMenu') -
+ @yield('topMenu')
@yield('content')
-