Merge remote-tracking branch 'origin/master' into enh/albums

2 files changed, 7 insertions, 2 deletions

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 52139b4d..97ab98b4 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -28,9 +28,9 @@ use OCP\AppFramework\App;
 
 class Application extends App {
 
-	const appID = 'photos';
+	const APP_ID = 'photos';
 
 	public function __construct() {
-		parent::__construct(self::appID);
+		parent::__construct(self::APP_ID);
 	}
 }
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 7f9538a6..8529441e 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -30,6 +30,7 @@ use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IRequest;
+use OCP\Util;
 
 class PageController extends Controller {
 
@@ -58,6 +59,10 @@ class PageController extends Controller {
 		$this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar());
 		$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
 
+
+		Util::addScript('photos', 'photos');
+		Util::addStyle('photos', 'icons');
+
 		$response = new TemplateResponse($this->appName, 'main');
 		return $response;
 	}