From 792c7d5ad54cbed27f0c08ea93c0b19c344dafa6 Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Sat, 8 Sep 2012 16:43:12 -0700
Subject: [PATCH] Move stub admin-templates to root template directory.

This fixes the import of stub templates in open-source installs.

Before pluginization, the admin-stub templates were imported from the
admin sub-module of the templates directory if r2admin were not
available. Since we're not doing that logic anymore, these stub
templates need to move into the root template directory so they can be
found by the system.
---
 r2/r2/templates/admin/__init__.py             | 22 -------------------
 r2/r2/templates/admin/admininfo.html          | 22 -------------------
 .../templates/{admin => }/adminlinkinfo.html  |  0
 r2/r2/templates/{admin => }/adminsidebar.html |  0
 r2/r2/templates/{admin => }/details.html      |  0
 5 files changed, 44 deletions(-)
 delete mode 100644 r2/r2/templates/admin/__init__.py
 delete mode 100644 r2/r2/templates/admin/admininfo.html
 rename r2/r2/templates/{admin => }/adminlinkinfo.html (100%)
 rename r2/r2/templates/{admin => }/adminsidebar.html (100%)
 rename r2/r2/templates/{admin => }/details.html (100%)

diff --git a/r2/r2/templates/admin/__init__.py b/r2/r2/templates/admin/__init__.py
deleted file mode 100644
index 90b6fc927..000000000
--- a/r2/r2/templates/admin/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# The contents of this file are subject to the Common Public Attribution
-# License Version 1.0. (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
-# License Version 1.1, but Sections 14 and 15 have been added to cover use of
-# software over a computer network and provide for limited attribution for the
-# Original Developer. In addition, Exhibit A has been modified to be consistent
-# with Exhibit B.
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-# the specific language governing rights and limitations under the License.
-#
-# The Original Code is reddit.
-#
-# The Original Developer is the Initial Developer.  The Initial Developer of
-# the Original Code is reddit Inc.
-#
-# All portions of the code written by reddit are Copyright (c) 2006-2012 reddit
-# Inc. All Rights Reserved.
-###############################################################################
-
diff --git a/r2/r2/templates/admin/admininfo.html b/r2/r2/templates/admin/admininfo.html
deleted file mode 100644
index 2cbf779d5..000000000
--- a/r2/r2/templates/admin/admininfo.html
+++ /dev/null
@@ -1,22 +0,0 @@
-## The contents of this file are subject to the Common Public Attribution
-## License Version 1.0. (the "License"); you may not use this file except in
-## compliance with the License. You may obtain a copy of the License at
-## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
-## License Version 1.1, but Sections 14 and 15 have been added to cover use of
-## software over a computer network and provide for limited attribution for the
-## Original Developer. In addition, Exhibit A has been modified to be
-## consistent with Exhibit B.
-##
-## Software distributed under the License is distributed on an "AS IS" basis,
-## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-## the specific language governing rights and limitations under the License.
-##
-## The Original Code is reddit.
-##
-## The Original Developer is the Initial Developer.  The Initial Developer of
-## the Original Code is reddit Inc.
-##
-## All portions of the code written by reddit are Copyright (c) 2006-2012
-## reddit Inc. All Rights Reserved.
-###############################################################################
-
diff --git a/r2/r2/templates/admin/adminlinkinfo.html b/r2/r2/templates/adminlinkinfo.html
similarity index 100%
rename from r2/r2/templates/admin/adminlinkinfo.html
rename to r2/r2/templates/adminlinkinfo.html
diff --git a/r2/r2/templates/admin/adminsidebar.html b/r2/r2/templates/adminsidebar.html
similarity index 100%
rename from r2/r2/templates/admin/adminsidebar.html
rename to r2/r2/templates/adminsidebar.html
diff --git a/r2/r2/templates/admin/details.html b/r2/r2/templates/details.html
similarity index 100%
rename from r2/r2/templates/admin/details.html
rename to r2/r2/templates/details.html