diff --git a/.travis.yml b/.travis.yml index 62681cf..5d26fab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,5 +31,8 @@ script: after_success: - travis_retry php vendor/bin/coveralls -v -r /home/travis/build/GrupaZero/cms +after_failure: + - cat vendor/orchestra/testbench-core/laravel/storage/logs/laravel-$(date +"%Y-%m-%d").log + matrix: fast_finish: true diff --git a/resources/views/blocks/basic.blade.php b/resources/views/blocks/basic.blade.php new file mode 100644 index 0000000..8e8d676 --- /dev/null +++ b/resources/views/blocks/basic.blade.php @@ -0,0 +1,10 @@ +
+ @if(isset($translation)) +
+

{{ $translation->title }}

+
+
+ {!! $translation->body !!} +
+ @endif +
diff --git a/resources/views/blocks/menu.blade.php b/resources/views/blocks/menu.blade.php new file mode 100644 index 0000000..c712c25 --- /dev/null +++ b/resources/views/blocks/menu.blade.php @@ -0,0 +1,10 @@ +
+ @if(isset($translation)) +
+

{{ $translation->title }}

+
+
+ {!! $translation->body !!} +
+ @endif +
diff --git a/resources/views/blocks/slider.blade.php b/resources/views/blocks/slider.blade.php new file mode 100644 index 0000000..6425000 --- /dev/null +++ b/resources/views/blocks/slider.blade.php @@ -0,0 +1,15 @@ +
+
+
+ @if(isset($translation)) +

{{ $translation->title }}

+

{!! $translation->body !!}

+ @endif +

+ + @lang('gzero-core::common.get_started_today') + +

+
+
+
diff --git a/resources/views/blocks/widget.blade.php b/resources/views/blocks/widget.blade.php new file mode 100644 index 0000000..c712c25 --- /dev/null +++ b/resources/views/blocks/widget.blade.php @@ -0,0 +1,10 @@ +
+ @if(isset($translation)) +
+

{{ $translation->title }}

+
+
+ {!! $translation->body !!} +
+ @endif +
diff --git a/resources/views/contents/_gallery.blade.php b/resources/views/contents/_gallery.blade.php index e824d80..e57de17 100644 --- a/resources/views/contents/_gallery.blade.php +++ b/resources/views/contents/_gallery.blade.php @@ -7,7 +7,7 @@
- {{($imageTranslation)? $imageTranslation->title : ''}} diff --git a/resources/views/contents/_notPublishedContentMsg.blade.php b/resources/views/contents/_notPublishedContentMsg.blade.php index d82e457..ca7b269 100644 --- a/resources/views/contents/_notPublishedContentMsg.blade.php +++ b/resources/views/contents/_notPublishedContentMsg.blade.php @@ -1,8 +1,12 @@ @if(!$content->canBeShown()) -
-@stop +@stop \ No newline at end of file diff --git a/src/Gzero/Cms/CMSSeeder.php b/src/Gzero/Cms/CMSSeeder.php index 8c620cc..e02c6d8 100644 --- a/src/Gzero/Cms/CMSSeeder.php +++ b/src/Gzero/Cms/CMSSeeder.php @@ -93,7 +93,7 @@ private function seedContent($languages, $users) dispatch_now(new AddContentTranslation($news, 'Aktualności', $pl, $user)); dispatch_now(new AddContentTranslation($offer, 'Oferta', $pl, $user)); - dispatch_now(new AddContentTranslation($aboutUs, 'About us', $pl, $user, $this->generateContentTranslation($pl))); + dispatch_now(new AddContentTranslation($aboutUs, 'O nas', $pl, $user, $this->generateContentTranslation($pl))); $contents = [$news, $offer, $aboutUs]; @@ -451,7 +451,7 @@ private function generateBodyHTML(Generator $faker) } // insert image if ($i == $paragraphImageNumber) { - $html[] = '

'; + $html[] = '

'; } } return implode('', $html); diff --git a/src/Gzero/Cms/Handlers/Block/Basic.php b/src/Gzero/Cms/Handlers/Block/Basic.php index 727ed4a..6318952 100644 --- a/src/Gzero/Cms/Handlers/Block/Basic.php +++ b/src/Gzero/Cms/Handlers/Block/Basic.php @@ -21,7 +21,10 @@ public function handle(Block $block, Language $language) if ($html !== null) { return $html; } - $html = view('blocks.basic', ['block' => $block])->render(); + $html = view('gzero-cms::blocks.basic', [ + 'block' => $block, + 'translation' => $block->getActiveTranslation($language->code), + ])->render(); $this->putInCache($block, $language, $html); return $html; } diff --git a/src/Gzero/Cms/Handlers/Block/Menu.php b/src/Gzero/Cms/Handlers/Block/Menu.php index 6fb16cd..3c2b4c4 100644 --- a/src/Gzero/Cms/Handlers/Block/Menu.php +++ b/src/Gzero/Cms/Handlers/Block/Menu.php @@ -21,7 +21,10 @@ public function handle(Block $block, Language $language) if ($html !== null) { return $html; } - $html = view('blocks.menu', ['block' => $block])->render(); + $html = view('gzero-cms::blocks.menu', [ + 'block' => $block, + 'translation' => $block->getActiveTranslation($language->code) + ])->render(); $this->putInCache($block, $language, $html); return $html; } diff --git a/src/Gzero/Cms/Handlers/Block/Slider.php b/src/Gzero/Cms/Handlers/Block/Slider.php index a1d7e27..fa838eb 100644 --- a/src/Gzero/Cms/Handlers/Block/Slider.php +++ b/src/Gzero/Cms/Handlers/Block/Slider.php @@ -44,7 +44,11 @@ public function handle(Block $block, Language $language) ['is_active', '=', true] ] ); - $html = view('blocks.slider', ['block' => $block, 'images' => $images])->render(); + $html = view('gzero-cms::blocks.slider', [ + 'block' => $block, + 'translation' => $block->getActiveTranslation($language->code), + 'images' => $images + ])->render(); $this->putInCache($block, $language, $html); return $html; } diff --git a/src/Gzero/Cms/Handlers/Block/Widget.php b/src/Gzero/Cms/Handlers/Block/Widget.php index cc3a877..872f1fe 100644 --- a/src/Gzero/Cms/Handlers/Block/Widget.php +++ b/src/Gzero/Cms/Handlers/Block/Widget.php @@ -21,7 +21,10 @@ public function handle(Block $block, Language $language) if ($html !== null) { return $html; } - $html = view('blocks.widget', ['block' => $block])->render(); + $html = view('gzero-cms::blocks.widget', [ + 'block' => $block, + 'translation' => $block->getActiveTranslation($language->code) + ])->render(); $this->putInCache($block, $language, $html); return $html; } diff --git a/src/Gzero/Cms/Listeners/BlockLoad.php b/src/Gzero/Cms/Listeners/BlockLoad.php index bf03c53..4c65910 100644 --- a/src/Gzero/Cms/Listeners/BlockLoad.php +++ b/src/Gzero/Cms/Listeners/BlockLoad.php @@ -72,7 +72,6 @@ public function handleLaravelRoute(RouteMatched $event) $this->handleBlockRendering($blocks); $blocks = $blocks->groupBy('region'); view()->share('blocks', $blocks); - view()->share('sidebarsNumber', $this->getSidebarsNumber($blocks)); } } @@ -91,7 +90,6 @@ public function handleRoute(GzeroRouteMatched $event) $this->handleBlockRendering($blocks); $blocks = $blocks->groupBy('region'); view()->share('blocks', $blocks); - view()->share('sidebarsNumber', $this->getSidebarsNumber($blocks)); } /** @@ -108,23 +106,4 @@ protected function handleBlockRendering($blocks) $block->view = $type->handle($block, $this->languageService->getCurrent()); } } - - /** - * It gets number of active sidebars regions - * - * @param Collection $blocks List of blocks - * - * @return int number of active sidebars - */ - protected function getSidebarsNumber($blocks) - { - $sidebarsNumber = 0; - foreach (['sidebarLeft', 'sidebarRight'] as $region) { - if ($blocks->has($region)) { - $sidebarsNumber++; - } - } - return $sidebarsNumber; - } - } diff --git a/src/Gzero/Cms/Models/Block.php b/src/Gzero/Cms/Models/Block.php index 31f6fb9..8c873ce 100644 --- a/src/Gzero/Cms/Models/Block.php +++ b/src/Gzero/Cms/Models/Block.php @@ -73,7 +73,6 @@ public function blockable() return $this->morphTo(); } - /** * Get all of the files for the content. * @@ -133,6 +132,20 @@ public function setTypeAttribute($type) $this->type()->associate($type); } + /** + * Returns active translation in specific language + * + * @param string $languageCode Language code + * + * @return mixed + */ + public function getActiveTranslation($languageCode) + { + return $this->translations->first(function ($translation) use ($languageCode) { + return $translation->is_active === true && $translation->language_code === $languageCode; + }); + } + /** * Return a created presenter. *