From 59025f6221571177295735b19bac74be00459d89 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight@gmail.com>
Date: Thu, 12 Jan 2017 11:39:20 +0000
Subject: [PATCH] Move src/templates => sidebar/templates

All of the templates are part of the sidebar application.
---
 gulpfile.js                                              | 2 +-
 src/sidebar/app.js                                       | 2 +-
 src/sidebar/directive/annotation-share-dialog.js         | 2 +-
 src/sidebar/directive/annotation-thread.js               | 2 +-
 src/sidebar/directive/annotation.js                      | 2 +-
 src/sidebar/directive/app.js                             | 2 +-
 src/sidebar/directive/dropdown-menu-btn.js               | 2 +-
 src/sidebar/directive/excerpt.js                         | 2 +-
 src/sidebar/directive/group-list.js                      | 2 +-
 src/sidebar/directive/help-link.js                       | 2 +-
 src/sidebar/directive/help-panel.js                      | 2 +-
 src/sidebar/directive/loggedout-message.js               | 2 +-
 src/sidebar/directive/login-control.js                   | 2 +-
 src/sidebar/directive/login-form.js                      | 2 +-
 src/sidebar/directive/markdown.js                        | 2 +-
 src/sidebar/directive/publish-annotation-btn.js          | 2 +-
 src/sidebar/directive/search-input.js                    | 2 +-
 src/sidebar/directive/search-status-bar.js               | 2 +-
 src/sidebar/directive/selection-tabs.js                  | 2 +-
 src/sidebar/directive/share-dialog.js                    | 2 +-
 src/sidebar/directive/sidebar-tutorial.js                | 2 +-
 src/sidebar/directive/sort-dropdown.js                   | 2 +-
 src/sidebar/directive/tag-editor.js                      | 2 +-
 src/sidebar/directive/thread-list.js                     | 2 +-
 src/sidebar/directive/top-bar.js                         | 2 +-
 src/{ => sidebar}/templates/annotation.html              | 0
 src/{ => sidebar}/templates/annotation_share_dialog.html | 0
 src/{ => sidebar}/templates/annotation_thread.html       | 0
 src/{ => sidebar}/templates/app.html                     | 0
 src/{ => sidebar}/templates/dropdown_menu_btn.html       | 0
 src/{ => sidebar}/templates/excerpt.html                 | 0
 src/{ => sidebar}/templates/group_list.html              | 0
 src/{ => sidebar}/templates/help_link.html               | 0
 src/{ => sidebar}/templates/help_panel.html              | 0
 src/{ => sidebar}/templates/loggedout_message.html       | 0
 src/{ => sidebar}/templates/login_control.html           | 0
 src/{ => sidebar}/templates/login_form.html              | 0
 src/{ => sidebar}/templates/markdown.html                | 0
 src/{ => sidebar}/templates/publish_annotation_btn.html  | 0
 src/{ => sidebar}/templates/search_input.html            | 0
 src/{ => sidebar}/templates/search_status_bar.html       | 0
 src/{ => sidebar}/templates/selection_tabs.html          | 0
 src/{ => sidebar}/templates/share_dialog.html            | 0
 src/{ => sidebar}/templates/sidebar_tutorial.html        | 0
 src/{ => sidebar}/templates/sort_dropdown.html           | 0
 src/{ => sidebar}/templates/tag_editor.html              | 0
 src/{ => sidebar}/templates/thread_list.html             | 0
 src/{ => sidebar}/templates/top_bar.html                 | 0
 src/{ => sidebar}/templates/viewer.html                  | 0
 49 files changed, 25 insertions(+), 25 deletions(-)
 rename src/{ => sidebar}/templates/annotation.html (100%)
 rename src/{ => sidebar}/templates/annotation_share_dialog.html (100%)
 rename src/{ => sidebar}/templates/annotation_thread.html (100%)
 rename src/{ => sidebar}/templates/app.html (100%)
 rename src/{ => sidebar}/templates/dropdown_menu_btn.html (100%)
 rename src/{ => sidebar}/templates/excerpt.html (100%)
 rename src/{ => sidebar}/templates/group_list.html (100%)
 rename src/{ => sidebar}/templates/help_link.html (100%)
 rename src/{ => sidebar}/templates/help_panel.html (100%)
 rename src/{ => sidebar}/templates/loggedout_message.html (100%)
 rename src/{ => sidebar}/templates/login_control.html (100%)
 rename src/{ => sidebar}/templates/login_form.html (100%)
 rename src/{ => sidebar}/templates/markdown.html (100%)
 rename src/{ => sidebar}/templates/publish_annotation_btn.html (100%)
 rename src/{ => sidebar}/templates/search_input.html (100%)
 rename src/{ => sidebar}/templates/search_status_bar.html (100%)
 rename src/{ => sidebar}/templates/selection_tabs.html (100%)
 rename src/{ => sidebar}/templates/share_dialog.html (100%)
 rename src/{ => sidebar}/templates/sidebar_tutorial.html (100%)
 rename src/{ => sidebar}/templates/sort_dropdown.html (100%)
 rename src/{ => sidebar}/templates/tag_editor.html (100%)
 rename src/{ => sidebar}/templates/thread_list.html (100%)
 rename src/{ => sidebar}/templates/top_bar.html (100%)
 rename src/{ => sidebar}/templates/viewer.html (100%)

diff --git a/gulpfile.js b/gulpfile.js
index 9ef99c11502..465c6bfd3c1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -27,7 +27,7 @@ var SCRIPT_DIR = 'build/scripts';
 var STYLE_DIR = 'build/styles';
 var FONTS_DIR = 'build/fonts';
 var IMAGES_DIR = 'build/images';
-var TEMPLATES_DIR = 'src/templates';
+var TEMPLATES_DIR = 'src/sidebar/templates';
 
 // LiveReloadServer instance for sending messages to connected
 // development clients
diff --git a/src/sidebar/app.js b/src/sidebar/app.js
index 172f144e61f..322e3fbbcaa 100644
--- a/src/sidebar/app.js
+++ b/src/sidebar/app.js
@@ -53,7 +53,7 @@ function configureLocation($locationProvider) {
 }
 
 // @ngInject
-var VIEWER_TEMPLATE = require('../templates/viewer.html');
+var VIEWER_TEMPLATE = require('./templates/viewer.html');
 
 function configureRoutes($routeProvider) {
   $routeProvider.when('/a/:id',
diff --git a/src/sidebar/directive/annotation-share-dialog.js b/src/sidebar/directive/annotation-share-dialog.js
index 033b9713421..ef37a8e5c15 100644
--- a/src/sidebar/directive/annotation-share-dialog.js
+++ b/src/sidebar/directive/annotation-share-dialog.js
@@ -9,7 +9,7 @@ module.exports = function () {
     bindToController: true,
     controllerAs: 'vm',
     restrict: 'E',
-    template: require('../../templates/annotation_share_dialog.html'),
+    template: require('../templates/annotation_share_dialog.html'),
     // @ngInject
     controller: function ($scope, $element) {
       var shareLinkInput = $element.find('input')[0];
diff --git a/src/sidebar/directive/annotation-thread.js b/src/sidebar/directive/annotation-thread.js
index 4e846637671..e65a1dcf323 100644
--- a/src/sidebar/directive/annotation-thread.js
+++ b/src/sidebar/directive/annotation-thread.js
@@ -119,6 +119,6 @@ module.exports = function () {
        */
       onForceVisible: '&',
     },
-    template: require('../../templates/annotation_thread.html'),
+    template: require('../templates/annotation_thread.html'),
   };
 };
diff --git a/src/sidebar/directive/annotation.js b/src/sidebar/directive/annotation.js
index 54a02103fe8..b27fbd3a6b2 100644
--- a/src/sidebar/directive/annotation.js
+++ b/src/sidebar/directive/annotation.js
@@ -532,7 +532,7 @@ function annotation() {
       replyCount: '<',
       isCollapsed: '<',
     },
-    template: require('../../templates/annotation.html'),
+    template: require('../templates/annotation.html'),
   };
 }
 
diff --git a/src/sidebar/directive/app.js b/src/sidebar/directive/app.js
index b963c494de1..c2293172cdb 100644
--- a/src/sidebar/directive/app.js
+++ b/src/sidebar/directive/app.js
@@ -7,6 +7,6 @@ module.exports = function () {
     restrict: 'E',
     controller: AppController,
     scope: {},
-    template: require('../../templates/app.html'),
+    template: require('../templates/app.html'),
   };
 };
diff --git a/src/sidebar/directive/dropdown-menu-btn.js b/src/sidebar/directive/dropdown-menu-btn.js
index c00ed6b4ed7..c5841a06469 100644
--- a/src/sidebar/directive/dropdown-menu-btn.js
+++ b/src/sidebar/directive/dropdown-menu-btn.js
@@ -26,6 +26,6 @@ module.exports = function () {
       onClick: '&',
       onToggleDropdown: '&',
     },
-    template: require('../../templates/dropdown_menu_btn.html'),
+    template: require('../templates/dropdown_menu_btn.html'),
   };
 };
diff --git a/src/sidebar/directive/excerpt.js b/src/sidebar/directive/excerpt.js
index fd34a93a06a..6fb06cbe817 100644
--- a/src/sidebar/directive/excerpt.js
+++ b/src/sidebar/directive/excerpt.js
@@ -180,7 +180,7 @@ function excerpt(ExcerptOverflowMonitor) {
     },
     restrict: 'E',
     transclude: true,
-    template: require('../../templates/excerpt.html'),
+    template: require('../templates/excerpt.html'),
   };
 }
 
diff --git a/src/sidebar/directive/group-list.js b/src/sidebar/directive/group-list.js
index a9054b649c1..c2f59139521 100644
--- a/src/sidebar/directive/group-list.js
+++ b/src/sidebar/directive/group-list.js
@@ -37,7 +37,7 @@ function groupList($window, groups, serviceUrl) {
     scope: {
       auth: '<',
     },
-    template: require('../../templates/group_list.html'),
+    template: require('../templates/group_list.html'),
   };
 }
 
diff --git a/src/sidebar/directive/help-link.js b/src/sidebar/directive/help-link.js
index 7197c4d06f2..7d0800fd753 100644
--- a/src/sidebar/directive/help-link.js
+++ b/src/sidebar/directive/help-link.js
@@ -5,7 +5,7 @@ module.exports = function () {
     bindToController: true,
     controllerAs: 'vm',
     restrict: 'E',
-    template: require('../../templates/help_link.html'),
+    template: require('../templates/help_link.html'),
     controller: function () {},
     scope: {
       version: '<',
diff --git a/src/sidebar/directive/help-panel.js b/src/sidebar/directive/help-panel.js
index 9161cc90306..52896637c18 100644
--- a/src/sidebar/directive/help-panel.js
+++ b/src/sidebar/directive/help-panel.js
@@ -31,7 +31,7 @@ module.exports = function () {
       );
     },
     restrict: 'E',
-    template: require('../../templates/help_panel.html'),
+    template: require('../templates/help_panel.html'),
     scope: {
       auth: '<',
       onClose: '&',
diff --git a/src/sidebar/directive/loggedout-message.js b/src/sidebar/directive/loggedout-message.js
index 0c17e12284c..e47ae930f1d 100644
--- a/src/sidebar/directive/loggedout-message.js
+++ b/src/sidebar/directive/loggedout-message.js
@@ -15,6 +15,6 @@ module.exports = function () {
        */
       onLogin: '&',
     },
-    template: require('../../templates/loggedout_message.html'),
+    template: require('../templates/loggedout_message.html'),
   };
 };
diff --git a/src/sidebar/directive/login-control.js b/src/sidebar/directive/login-control.js
index a284304a91e..4464639fbc3 100644
--- a/src/sidebar/directive/login-control.js
+++ b/src/sidebar/directive/login-control.js
@@ -33,6 +33,6 @@ module.exports = function () {
        */
       newStyle: '<',
     },
-    template: require('../../templates/login_control.html'),
+    template: require('../templates/login_control.html'),
   };
 };
diff --git a/src/sidebar/directive/login-form.js b/src/sidebar/directive/login-form.js
index 55313cfc03c..4130ad2f06b 100644
--- a/src/sidebar/directive/login-form.js
+++ b/src/sidebar/directive/login-form.js
@@ -103,7 +103,7 @@ module.exports = {
       scope: {
         onClose: '&',
       },
-      template: require('../../templates/login_form.html'),
+      template: require('../templates/login_form.html'),
     };
   },
   Controller: Controller,
diff --git a/src/sidebar/directive/markdown.js b/src/sidebar/directive/markdown.js
index c21128ed21d..09b3de7b8dc 100644
--- a/src/sidebar/directive/markdown.js
+++ b/src/sidebar/directive/markdown.js
@@ -169,6 +169,6 @@ module.exports = function($sanitize) {
       text: '<?',
       onEditText: '&',
     },
-    template: require('../../templates/markdown.html'),
+    template: require('../templates/markdown.html'),
   };
 };
diff --git a/src/sidebar/directive/publish-annotation-btn.js b/src/sidebar/directive/publish-annotation-btn.js
index ab7733505e4..53939842074 100644
--- a/src/sidebar/directive/publish-annotation-btn.js
+++ b/src/sidebar/directive/publish-annotation-btn.js
@@ -36,6 +36,6 @@ module.exports = function () {
       onSave: '&',
       onSetPrivacy: '&',
     },
-    template: require('../../templates/publish_annotation_btn.html'),
+    template: require('../templates/publish_annotation_btn.html'),
   };
 };
diff --git a/src/sidebar/directive/search-input.js b/src/sidebar/directive/search-input.js
index a22ae8f0863..57abd463797 100644
--- a/src/sidebar/directive/search-input.js
+++ b/src/sidebar/directive/search-input.js
@@ -48,6 +48,6 @@ module.exports = function () {
       query: '<',
       onSearch: '&',
     },
-    template: require('../../templates/search_input.html'),
+    template: require('../templates/search_input.html'),
   };
 };
diff --git a/src/sidebar/directive/search-status-bar.js b/src/sidebar/directive/search-status-bar.js
index 7333e04c173..abbc515e53f 100644
--- a/src/sidebar/directive/search-status-bar.js
+++ b/src/sidebar/directive/search-status-bar.js
@@ -23,6 +23,6 @@ module.exports = function () {
       totalAnnotations: '<',
       totalNotes: '<',
     },
-    template: require('../../templates/search_status_bar.html'),
+    template: require('../templates/search_status_bar.html'),
   };
 };
diff --git a/src/sidebar/directive/selection-tabs.js b/src/sidebar/directive/selection-tabs.js
index 6b08342405e..a5ac33d20b7 100644
--- a/src/sidebar/directive/selection-tabs.js
+++ b/src/sidebar/directive/selection-tabs.js
@@ -41,6 +41,6 @@ module.exports = function () {
       totalNotes: '<',
       totalOrphans: '<',
     },
-    template: require('../../templates/selection_tabs.html'),
+    template: require('../templates/selection_tabs.html'),
   };
 };
diff --git a/src/sidebar/directive/share-dialog.js b/src/sidebar/directive/share-dialog.js
index 18d834f777b..c484812c988 100644
--- a/src/sidebar/directive/share-dialog.js
+++ b/src/sidebar/directive/share-dialog.js
@@ -37,6 +37,6 @@ module.exports = function () {
     scope: {
       onClose: '&',
     },
-    template: require('../../templates/share_dialog.html'),
+    template: require('../templates/share_dialog.html'),
   };
 };
diff --git a/src/sidebar/directive/sidebar-tutorial.js b/src/sidebar/directive/sidebar-tutorial.js
index c2f1c11486d..cc27ad34823 100644
--- a/src/sidebar/directive/sidebar-tutorial.js
+++ b/src/sidebar/directive/sidebar-tutorial.js
@@ -30,7 +30,7 @@ module.exports = {
       controllerAs: 'vm',
       restrict: 'E',
       scope: {},
-      template: require('../../templates/sidebar_tutorial.html'),
+      template: require('../templates/sidebar_tutorial.html'),
     };
   },
   Controller: SidebarTutorialController,
diff --git a/src/sidebar/directive/sort-dropdown.js b/src/sidebar/directive/sort-dropdown.js
index 90ef7de40c5..a87a4d7498c 100644
--- a/src/sidebar/directive/sort-dropdown.js
+++ b/src/sidebar/directive/sort-dropdown.js
@@ -12,6 +12,6 @@ module.exports = function () {
       /** Called when the user changes the sort key. */
       onChangeSortKey: '&',
     },
-    template: require('../../templates/sort_dropdown.html'),
+    template: require('../templates/sort_dropdown.html'),
   };
 };
diff --git a/src/sidebar/directive/tag-editor.js b/src/sidebar/directive/tag-editor.js
index 3c5b0e14594..e333feebb0b 100644
--- a/src/sidebar/directive/tag-editor.js
+++ b/src/sidebar/directive/tag-editor.js
@@ -32,6 +32,6 @@ module.exports = function () {
       tags: '<',
       onEditTags: '&',
     },
-    template: require('../../templates/tag_editor.html'),
+    template: require('../templates/tag_editor.html'),
   };
 };
diff --git a/src/sidebar/directive/thread-list.js b/src/sidebar/directive/thread-list.js
index 4a04c9c51f5..1331e9f6620 100644
--- a/src/sidebar/directive/thread-list.js
+++ b/src/sidebar/directive/thread-list.js
@@ -140,6 +140,6 @@ module.exports = function () {
       /** Called to clear the current selection. */
       onClearSelection: '&',
     },
-    template: require('../../templates/thread_list.html'),
+    template: require('../templates/thread_list.html'),
   };
 };
diff --git a/src/sidebar/directive/top-bar.js b/src/sidebar/directive/top-bar.js
index 15e3db6ff6b..bec292a84c7 100644
--- a/src/sidebar/directive/top-bar.js
+++ b/src/sidebar/directive/top-bar.js
@@ -20,6 +20,6 @@ module.exports = function () {
       pendingUpdateCount: '<',
       onApplyPendingUpdates: '&',
     },
-    template: require('../../templates/top_bar.html'),
+    template: require('../templates/top_bar.html'),
   };
 };
diff --git a/src/templates/annotation.html b/src/sidebar/templates/annotation.html
similarity index 100%
rename from src/templates/annotation.html
rename to src/sidebar/templates/annotation.html
diff --git a/src/templates/annotation_share_dialog.html b/src/sidebar/templates/annotation_share_dialog.html
similarity index 100%
rename from src/templates/annotation_share_dialog.html
rename to src/sidebar/templates/annotation_share_dialog.html
diff --git a/src/templates/annotation_thread.html b/src/sidebar/templates/annotation_thread.html
similarity index 100%
rename from src/templates/annotation_thread.html
rename to src/sidebar/templates/annotation_thread.html
diff --git a/src/templates/app.html b/src/sidebar/templates/app.html
similarity index 100%
rename from src/templates/app.html
rename to src/sidebar/templates/app.html
diff --git a/src/templates/dropdown_menu_btn.html b/src/sidebar/templates/dropdown_menu_btn.html
similarity index 100%
rename from src/templates/dropdown_menu_btn.html
rename to src/sidebar/templates/dropdown_menu_btn.html
diff --git a/src/templates/excerpt.html b/src/sidebar/templates/excerpt.html
similarity index 100%
rename from src/templates/excerpt.html
rename to src/sidebar/templates/excerpt.html
diff --git a/src/templates/group_list.html b/src/sidebar/templates/group_list.html
similarity index 100%
rename from src/templates/group_list.html
rename to src/sidebar/templates/group_list.html
diff --git a/src/templates/help_link.html b/src/sidebar/templates/help_link.html
similarity index 100%
rename from src/templates/help_link.html
rename to src/sidebar/templates/help_link.html
diff --git a/src/templates/help_panel.html b/src/sidebar/templates/help_panel.html
similarity index 100%
rename from src/templates/help_panel.html
rename to src/sidebar/templates/help_panel.html
diff --git a/src/templates/loggedout_message.html b/src/sidebar/templates/loggedout_message.html
similarity index 100%
rename from src/templates/loggedout_message.html
rename to src/sidebar/templates/loggedout_message.html
diff --git a/src/templates/login_control.html b/src/sidebar/templates/login_control.html
similarity index 100%
rename from src/templates/login_control.html
rename to src/sidebar/templates/login_control.html
diff --git a/src/templates/login_form.html b/src/sidebar/templates/login_form.html
similarity index 100%
rename from src/templates/login_form.html
rename to src/sidebar/templates/login_form.html
diff --git a/src/templates/markdown.html b/src/sidebar/templates/markdown.html
similarity index 100%
rename from src/templates/markdown.html
rename to src/sidebar/templates/markdown.html
diff --git a/src/templates/publish_annotation_btn.html b/src/sidebar/templates/publish_annotation_btn.html
similarity index 100%
rename from src/templates/publish_annotation_btn.html
rename to src/sidebar/templates/publish_annotation_btn.html
diff --git a/src/templates/search_input.html b/src/sidebar/templates/search_input.html
similarity index 100%
rename from src/templates/search_input.html
rename to src/sidebar/templates/search_input.html
diff --git a/src/templates/search_status_bar.html b/src/sidebar/templates/search_status_bar.html
similarity index 100%
rename from src/templates/search_status_bar.html
rename to src/sidebar/templates/search_status_bar.html
diff --git a/src/templates/selection_tabs.html b/src/sidebar/templates/selection_tabs.html
similarity index 100%
rename from src/templates/selection_tabs.html
rename to src/sidebar/templates/selection_tabs.html
diff --git a/src/templates/share_dialog.html b/src/sidebar/templates/share_dialog.html
similarity index 100%
rename from src/templates/share_dialog.html
rename to src/sidebar/templates/share_dialog.html
diff --git a/src/templates/sidebar_tutorial.html b/src/sidebar/templates/sidebar_tutorial.html
similarity index 100%
rename from src/templates/sidebar_tutorial.html
rename to src/sidebar/templates/sidebar_tutorial.html
diff --git a/src/templates/sort_dropdown.html b/src/sidebar/templates/sort_dropdown.html
similarity index 100%
rename from src/templates/sort_dropdown.html
rename to src/sidebar/templates/sort_dropdown.html
diff --git a/src/templates/tag_editor.html b/src/sidebar/templates/tag_editor.html
similarity index 100%
rename from src/templates/tag_editor.html
rename to src/sidebar/templates/tag_editor.html
diff --git a/src/templates/thread_list.html b/src/sidebar/templates/thread_list.html
similarity index 100%
rename from src/templates/thread_list.html
rename to src/sidebar/templates/thread_list.html
diff --git a/src/templates/top_bar.html b/src/sidebar/templates/top_bar.html
similarity index 100%
rename from src/templates/top_bar.html
rename to src/sidebar/templates/top_bar.html
diff --git a/src/templates/viewer.html b/src/sidebar/templates/viewer.html
similarity index 100%
rename from src/templates/viewer.html
rename to src/sidebar/templates/viewer.html