Merge branch 'template_support' into dev

2016-09-20 20:17:06 +02:00
parent bbffbd5616 f3873ed61c
commit f25ef4ab1b
148 changed files with 890 additions and 5299 deletions
@@ -62,22 +62,6 @@ class ArticleServiceProvider extends ServiceProvider {
 		$this->loadViewsFrom(array_merge(array_map(function ($path) {
 			return $path . '/modules/article';
 		}, \Config::get('view.paths')), [$sourcePath]), 'article');
-
-       /**
-        * @var $registrator TemplateRegistrator
-        */
-       try {
-           // setup some global variables
-           $registrator = $this->app->make('registerTemplateDir');
-           $registrator->setBaseDirectory('resources/views/modules/article/visitor');
-           $registrator->setNamespace('article');
-           $registrator->setModuleId(Article::getModuleId());
-
-           // register path with current template name
-           $registrator->register(config('app.theme'), 'article::admin/adminMenu.templatePath');
-       } catch (InvalidArgumentException $e) {
-           // ignore this exception
-       }
 	}

 	/**