Merge branch 'dev' into binarity.cz

2016-10-04 00:44:40 +02:00
parent 52b0ec7c72 581e32e98b
commit 7234fa0810
8 changed files with 149 additions and 14 deletions
@@ -22,6 +22,7 @@ class GlobalViewDataProvider extends ServiceProvider
        }

        view()->share('currentUrl', \Request::url());
+        view()->share('loggedUser', \Auth::user());

        $this->extendBlade();
    }
@@ -100,6 +101,21 @@ class GlobalViewDataProvider extends ServiceProvider
            return preg_replace($pattern, $code, $view);
        });

+        Blade::extend(function ($view) {
+            $pattern = $this->createPattern('customDate');
+            $code = '<?php echo \App\Helpers\Date::dateFormatted($2); ?>';
+
+            return preg_replace($pattern, $code, $view);
+        });
+
+        Blade::extend(function ($view) {
+            $pattern = $this->createPattern('monthName');
+            $code = '<?php echo \App\Helpers\Date::monthName($2); ?>';
+
+            return preg_replace($pattern, $code, $view);
+        });
+
+
        // register extension for rendering widget areas
        Blade::extend(function ($view) {
            $pattern = $this->createPattern('widgetArea');