From ce720a6ef3442a7498ea7e4d41c41370b59c93b0 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 17 Mar 2015 12:24:50 -0400
Subject: [PATCH] moved all template variables to core

---
 templates/account/edit.tpl            |  7 ++-----
 templates/account/favourites.tpl      |  3 +--
 templates/account/posts.tpl           |  3 +--
 templates/account/profile.tpl         |  5 ++---
 templates/account/settings.tpl        |  4 +---
 templates/account/topics.tpl          |  4 +---
 templates/account/watched.tpl         |  3 +--
 templates/category.tpl                | 24 +++---------------------
 templates/groups/details.tpl          |  3 +--
 templates/partials/category/watch.tpl | 10 ++++++++++
 templates/reset_code.tpl              |  2 +-
 templates/tag.tpl                     |  7 +++----
 templates/topic.tpl                   | 15 ++-------------
 13 files changed, 29 insertions(+), 61 deletions(-)
 create mode 100644 templates/partials/category/watch.tpl

diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index 314c30a..67d548c 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -136,8 +136,5 @@
 	<!-- IMPORT partials/modals/upload_picture_from_url_modal.tpl -->
 </div>
 
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
-<input type="hidden" template-variable="userslug" value="{userslug}" />
-<input type="hidden" template-variable="gravatarpicture" value="{gravatarpicture}" />
-<input type="hidden" template-variable="uploadedpicture" value="{uploadedpicture}" />
+<!-- IMPORT partials/variables/account.tpl -->
+<!-- IMPORT partials/variables/account/edit.tpl -->
\ No newline at end of file
diff --git a/templates/account/favourites.tpl b/templates/account/favourites.tpl
index e482086..c7785f8 100644
--- a/templates/account/favourites.tpl
+++ b/templates/account/favourites.tpl
@@ -37,5 +37,4 @@
 	</div>
 </div>
 
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
+<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/account/posts.tpl b/templates/account/posts.tpl
index af0e125..4d1395f 100644
--- a/templates/account/posts.tpl
+++ b/templates/account/posts.tpl
@@ -36,5 +36,4 @@
 	</div>
 </div>
 
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
+<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 8f3c49f..d2fba42 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -176,6 +176,5 @@
 
 </div>
 
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
-<input type="hidden" template-type="boolean" template-variable="isFollowing" value="{isFollowing}" />
\ No newline at end of file
+<!-- IMPORT partials/variables/account.tpl -->
+<!-- IMPORT partials/variables/account/profile.tpl -->
\ No newline at end of file
diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index 977a417..a23953d 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -1,4 +1,3 @@
-
 <!-- IMPORT partials/account_menu.tpl -->
 
 <div class="account">
@@ -140,5 +139,4 @@
 	</div>
 </div>
 
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
+<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/account/topics.tpl b/templates/account/topics.tpl
index acd8a06..93b9050 100644
--- a/templates/account/topics.tpl
+++ b/templates/account/topics.tpl
@@ -1,4 +1,3 @@
-
 <!-- IMPORT partials/account_menu.tpl -->
 
 <div>
@@ -13,5 +12,4 @@
 	</div>
 </div>
 
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
+<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/account/watched.tpl b/templates/account/watched.tpl
index 16b8930..7ad1fd8 100644
--- a/templates/account/watched.tpl
+++ b/templates/account/watched.tpl
@@ -12,5 +12,4 @@
 	</div>
 </div>
 
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
+<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/category.tpl b/templates/category.tpl
index bbf8fc3..ca61dbe 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -1,12 +1,3 @@
-
-<input type="hidden" template-variable="category_id" value="{cid}" />
-<input type="hidden" template-variable="category_name" value="{name}" />
-<input type="hidden" template-variable="category_slug" value="{slug}" />
-<input type="hidden" template-variable="topic_count" value="{topic_count}" />
-<input type="hidden" template-variable="currentPage" value="{currentPage}" />
-<input type="hidden" template-variable="pageCount" value="{pageCount}" />
-
-
 <div class="category">
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
@@ -26,17 +17,7 @@
 		<!-- ENDIF privileges.topics:create -->
 
 		<span class="pull-right">
-			<!-- IF loggedIn -->
-			<button type="button" class="btn btn-default btn-success watch <!-- IF !isIgnored -->hidden<!-- ENDIF !isIgnored -->">
-				<i class="fa fa-eye"></i>
-				<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:watch]]</span>
-			</button>
-			<button type="button" class="btn btn-default btn-warning ignore <!-- IF isIgnored -->hidden<!-- ENDIF isIgnored -->">
-				<i class="fa fa-eye-slash"></i>
-				<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[category:ignore]]</span>
-			</button>
-			<!-- ENDIF loggedIn -->
-
+			<!-- IMPORT partials/category/watch.tpl -->
 			<!-- IMPORT partials/category/tools.tpl -->
 			<!-- IMPORT partials/category/sort.tpl -->
 		</span>
@@ -114,4 +95,5 @@
 </div>
 
 <!-- IMPORT partials/move_thread_modal.tpl -->
-<!-- IMPORT partials/noscript/paginator.tpl -->
\ No newline at end of file
+<!-- IMPORT partials/noscript/paginator.tpl -->
+<!-- IMPORT partials/variables/category.tpl -->
\ No newline at end of file
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index 1d7a79f..5469910 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -206,5 +206,4 @@
 	</div>
 </div>
 
-<input type="hidden" template-variable="group_name" value="{group.name}" />
-<input type="hidden" template-variable="is_owner" value="{group.isOwner}" />
\ No newline at end of file
+<!-- IMPORT partials/variables/groups/details.tpl -->
\ No newline at end of file
diff --git a/templates/partials/category/watch.tpl b/templates/partials/category/watch.tpl
new file mode 100644
index 0000000..96674f3
--- /dev/null
+++ b/templates/partials/category/watch.tpl
@@ -0,0 +1,10 @@
+<!-- IF loggedIn -->
+<button type="button" class="btn btn-default btn-success watch <!-- IF !isIgnored -->hidden<!-- ENDIF !isIgnored -->">
+	<i class="fa fa-eye"></i>
+	<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:watch]]</span>
+</button>
+<button type="button" class="btn btn-default btn-warning ignore <!-- IF isIgnored -->hidden<!-- ENDIF isIgnored -->">
+	<i class="fa fa-eye-slash"></i>
+	<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[category:ignore]]</span>
+</button>
+<!-- ENDIF loggedIn -->
\ No newline at end of file
diff --git a/templates/reset_code.tpl b/templates/reset_code.tpl
index e9e46c1..49bdb9c 100644
--- a/templates/reset_code.tpl
+++ b/templates/reset_code.tpl
@@ -24,7 +24,7 @@
 		<button class="btn btn-primary btn-block" id="reset" type="submit">[[reset_password:reset_password]]</button>
 	</form>
 </div>
-<input type="hidden" template-variable="reset_code" value="{reset_code}" />
+<!-- IMPORT partials/variables/reset_code.tpl -->
 <!-- ELSE -->
 <div class="panel panel-default panel-danger">
 	<div class="panel-heading">
diff --git a/templates/tag.tpl b/templates/tag.tpl
index bba196a..c9b543c 100644
--- a/templates/tag.tpl
+++ b/templates/tag.tpl
@@ -1,6 +1,3 @@
-
-<input type="hidden" template-variable="tag" value="{tag}" />
-
 <div class="tag">
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
@@ -16,4 +13,6 @@
 			<button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<!-- IMPORT partials/variables/tag.tpl -->
\ No newline at end of file
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 4aaf7e6..65a11ae 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -1,15 +1,3 @@
-<input type="hidden" template-variable="topic_id" value="{tid}" />
-<input type="hidden" template-variable="topic_slug" value="{slug}" />
-<input type="hidden" template-variable="category_id" value="{category.cid}" />
-<input type="hidden" template-variable="currentPage" value="{currentPage}" />
-<input type="hidden" template-variable="pageCount" value="{pageCount}" />
-<input type="hidden" template-variable="locked" template-type="boolean" value="{locked}" />
-<input type="hidden" template-variable="deleted" template-type="boolean" value="{deleted}" />
-<input type="hidden" template-variable="pinned" template-type="boolean" value="{pinned}" />
-<input type="hidden" template-variable="topic_name" value="{title}" />
-<input type="hidden" template-variable="postcount" value="{postcount}" />
-<input type="hidden" template-variable="viewcount" value="{viewcount}" />
-
 <div class="topic">
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
@@ -179,4 +167,5 @@
 
 <div widget-area="footer" class="col-xs-12"></div>
 
-<!-- IMPORT partials/noscript/paginator.tpl -->
\ No newline at end of file
+<!-- IMPORT partials/noscript/paginator.tpl -->
+<!-- IMPORT partials/variables/topic.tpl -->
\ No newline at end of file