From 6783962cd8f8ee39a26d7524fbadaa814f90ca9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Sun, 25 Nov 2018 13:31:55 +0100
Subject: [PATCH] Move template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/Controller/PageController.php |  2 +-
 templates/main.php                | 79 ++++++-------------------------
 templates/vue.php                 | 27 -----------
 3 files changed, 15 insertions(+), 93 deletions(-)
 delete mode 100644 templates/vue.php

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 76f3dc542..e457c154f 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -66,7 +66,7 @@ public function index() {
 			$this->defaultBoardService->createDefaultBoard($this->l10n->t('Personal'), $this->userId, '000000');
 		}
 
-		return new TemplateResponse('deck', 'vue', $params);
+		return new TemplateResponse('deck', 'main', $params);
 	}
 
 }
diff --git a/templates/main.php b/templates/main.php
index 73cb8271e..c293f74e2 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -1,78 +1,27 @@
 <?php
 /**
- * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
+ * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
  *
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
-use OCP\Util;
-
-Util::addScript('activity', 'richObjectStringParser');
-if (\OC_Util::getVersion()[0] > 14) {
-	Util::addScript('activity', 'templates');
-}
-
-Util::addStyle('activity', 'style');
-Util::addStyle('comments', 'comments');
-Util::addScript('oc-backbone-webdav');
-
-Util::addStyle('deck', '../js/build/vendor');
-Util::addScript('deck', 'build/vendor');
-
-Util::addStyle('deck', 'style');
-Util::addScript('deck', 'build/deck');
-
-if (\OC_Util::getVersion()[0] < 14) {
-	Util::addStyle('deck', 'comp-13');
-}
+style('deck', 'style');
+script('deck', 'deck');
 ?>
 
-<div
-		class="app app-deck"
-		data-ng-app="Deck"
-		ng-controller="AppController"
-		ng-cloak
-		config="<?php p(json_encode($_)); ?>"
-		ng-class="{'app-navigation-hide': appNavigationHide, 'compact-mode': compactMode}">
-
-	<div id="app-navigation" data-ng-controller="ListController" ng-init="initSidebar()">
-		<?php print_unescaped($this->inc('part.navigation')); ?>
-		<?php /* print_unescaped($this->inc('part.settings')); */ ?>
-	</div>
-	<div id="app-content" ng-class="{ 'details-visible': sidebar.show }"><div id="app-navigation-toggle-custom" class="icon-menu" ng-click="toggleSidebar()"></div><div ui-view></div></div>
-	<div id="app-sidebar" ng-class="{ 'details-visible': sidebar.show }" ng-if="sidebar.show" class="details-view scroll-container" ui-view="sidebarView"></div>
-	<route-loading-indicator></route-loading-indicator>
-
-	<script type="text/ng-template" id="/boardlist.mainView.html">
-		<?php print_unescaped($this->inc('part.boardlist')); ?>
-	</script>
-	<script type="text/ng-template" id="/board.sidebarView.html">
-		<?php print_unescaped($this->inc('part.board.sidebarView')); ?>
-	</script>
-	<script type="text/ng-template" id="/board.html">
-		<?php print_unescaped($this->inc('part.board.mainView')); ?>
-	</script>
-	<script type="text/ng-template" id="/card.sidebarView.html">
-		<?php print_unescaped($this->inc('part.card')); ?>
-	</script>
-	<script type="text/ng-template" id="/card.attachments.html">
-		<?php print_unescaped($this->inc('part.card.attachments')); ?>
-	</script>
-
-</div>
+<input type="hidden" id="debug-mode" value="<?php p($_['debug'] ? 'true' : 'false'); ?>">
\ No newline at end of file
diff --git a/templates/vue.php b/templates/vue.php
deleted file mode 100644
index c293f74e2..000000000
--- a/templates/vue.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-style('deck', 'style');
-script('deck', 'deck');
-?>
-
-<input type="hidden" id="debug-mode" value="<?php p($_['debug'] ? 'true' : 'false'); ?>">
\ No newline at end of file