From 9dbfc8daebf945e6335ec9c32eed5029a96d620b Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Mon, 14 Dec 2015 17:21:45 +0100 Subject: [PATCH] Moved admin templates to admin module --- paramecio/modules/admin/index.py | 6 ++++-- .../admin}/templates/admin/content.html | 0 .../{citoplasma => modules/admin}/templates/admin/home.html | 0 .../admin}/templates/admin/index.html | 0 .../admin}/templates/admin/login.phtml | 0 .../admin}/templates/admin/register.phtml | 0 6 files changed, 4 insertions(+), 2 deletions(-) rename paramecio/{citoplasma => modules/admin}/templates/admin/content.html (100%) rename paramecio/{citoplasma => modules/admin}/templates/admin/home.html (100%) rename paramecio/{citoplasma => modules/admin}/templates/admin/index.html (100%) rename paramecio/{citoplasma => modules/admin}/templates/admin/login.phtml (100%) rename paramecio/{citoplasma => modules/admin}/templates/admin/register.phtml (100%) diff --git a/paramecio/modules/admin/index.py b/paramecio/modules/admin/index.py index a7e2a9d..8f36bb1 100644 --- a/paramecio/modules/admin/index.py +++ b/paramecio/modules/admin/index.py @@ -18,7 +18,7 @@ from bottle import redirect from collections import OrderedDict from time import time from hashlib import sha512 -from os import urandom +from os import urandom, path #from citoplasma.login import LoginClass # Check login @@ -29,7 +29,9 @@ def create_key_encrypt(): key_encrypt=create_key_encrypt() -t=ptemplate('admin') +module_admin=path.dirname(__file__) + +t=ptemplate(__file__) load_lang(['paramecio', 'admin'], ['paramecio', 'common']) diff --git a/paramecio/citoplasma/templates/admin/content.html b/paramecio/modules/admin/templates/admin/content.html similarity index 100% rename from paramecio/citoplasma/templates/admin/content.html rename to paramecio/modules/admin/templates/admin/content.html diff --git a/paramecio/citoplasma/templates/admin/home.html b/paramecio/modules/admin/templates/admin/home.html similarity index 100% rename from paramecio/citoplasma/templates/admin/home.html rename to paramecio/modules/admin/templates/admin/home.html diff --git a/paramecio/citoplasma/templates/admin/index.html b/paramecio/modules/admin/templates/admin/index.html similarity index 100% rename from paramecio/citoplasma/templates/admin/index.html rename to paramecio/modules/admin/templates/admin/index.html diff --git a/paramecio/citoplasma/templates/admin/login.phtml b/paramecio/modules/admin/templates/admin/login.phtml similarity index 100% rename from paramecio/citoplasma/templates/admin/login.phtml rename to paramecio/modules/admin/templates/admin/login.phtml diff --git a/paramecio/citoplasma/templates/admin/register.phtml b/paramecio/modules/admin/templates/admin/register.phtml similarity index 100% rename from paramecio/citoplasma/templates/admin/register.phtml rename to paramecio/modules/admin/templates/admin/register.phtml