Move subproject templates/static into module
This commit is contained in:
parent
fb38888aa9
commit
a14fa3011d
|
@ -7,5 +7,5 @@ lib/
|
|||
*.rdb
|
||||
pip-selfcheck.json
|
||||
.sass-cache/
|
||||
build/
|
||||
node_modules
|
||||
build
|
||||
|
|
5
setup.py
5
setup.py
|
@ -2,6 +2,11 @@
|
|||
from distutils.core import setup
|
||||
import subprocess
|
||||
import glob
|
||||
import os
|
||||
|
||||
if not os.path.exists("srht/node_modules"):
|
||||
subprocess.call(["npm", "i"], cwd="srht")
|
||||
|
||||
setup(
|
||||
name = 'srht',
|
||||
packages = ['srht'],
|
||||
|
|
|
@ -3,35 +3,35 @@
|
|||
|
||||
.PHONY: all static watch clean
|
||||
|
||||
SCRIPTS+=$(patsubst js/%.js,static/%.js,$(wildcard js/*.js))
|
||||
_STATIC:=$(patsubst _static/%,static/%,$(wildcard _static/*))
|
||||
SCRIPTS+=$(patsubst js/%.js,$(MODULE)static/%.js,$(wildcard js/*.js))
|
||||
_STATIC:=$(patsubst _static/%,$(MODULE)static/%,$(wildcard _static/*))
|
||||
|
||||
SRHT_PATH?=/usr/lib/python3.6/site-packages/srht
|
||||
|
||||
static/%: _static/%
|
||||
@mkdir -p static/
|
||||
$(MODULE)static/%: _static/%
|
||||
@mkdir -p $(MODULE)static/
|
||||
cp $< $@
|
||||
|
||||
static/main.css: scss/*.scss ${SRHT_PATH}/scss/*.scss
|
||||
@mkdir -p static/
|
||||
$(MODULE)static/main.css: scss/*.scss ${SRHT_PATH}/scss/*.scss
|
||||
@mkdir -p $(MODULE)static/
|
||||
sassc -I${SRHT_PATH}/scss scss/main.scss $@
|
||||
|
||||
static/main.min.css: static/main.css
|
||||
$(MODULE)static/main.min.css: $(MODULE)static/main.css
|
||||
node ${SRHT_PATH}/minify-css.js \
|
||||
static/main.css \
|
||||
static/main.min.css \
|
||||
"templates/*" "${SRHT_PATH}/templates/*"
|
||||
"$(MODULE)templates/*" "${SRHT_PATH}/templates/*"
|
||||
|
||||
static/%.js: js/%.js
|
||||
@mkdir -p static/
|
||||
$(MODULE)static/%.js: js/%.js
|
||||
@mkdir -p $(MODULE)static/
|
||||
cp $< $@
|
||||
|
||||
static: $(SCRIPTS) $(_STATIC) static/main.min.css
|
||||
static: $(SCRIPTS) $(_STATIC) $(MODULE)static/main.min.css
|
||||
|
||||
all: static
|
||||
|
||||
clean:
|
||||
rm -rf static
|
||||
rm -rf $(MODULE)static
|
||||
|
||||
watch:
|
||||
while inotifywait \
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
from configparser import ConfigParser
|
||||
|
||||
config = ConfigParser()
|
||||
config = None
|
||||
|
||||
def load_config(name, paths=None):
|
||||
global config
|
||||
config = ConfigParser()
|
||||
if paths == None:
|
||||
paths = [ "config.ini", "/etc/sr.ht/{}.ini".format(name) ]
|
||||
for path in paths:
|
||||
|
@ -13,6 +14,9 @@ def load_config(name, paths=None):
|
|||
except FileNotFoundError:
|
||||
pass
|
||||
|
||||
def loaded():
|
||||
return config != None
|
||||
|
||||
_throw = 1
|
||||
|
||||
def cfg(section, key, default=_throw):
|
||||
|
|
|
@ -5,6 +5,7 @@ from srht.validation import Validation
|
|||
from srht.database import db
|
||||
from datetime import datetime
|
||||
from jinja2 import Markup, FileSystemLoader, ChoiceLoader
|
||||
import inspect
|
||||
import humanize
|
||||
import decimal
|
||||
import json
|
||||
|
@ -35,10 +36,15 @@ class SrhtFlask(Flask):
|
|||
def __init__(self, site, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
mod = inspect.getmodule(inspect.stack()[1][0])
|
||||
mod = __import__(mod.__package__)
|
||||
path = list(mod.__path__)[0]
|
||||
|
||||
self.jinja_env.cache = None
|
||||
self.jinja_env.filters['date'] = datef
|
||||
self.jinja_loader = ChoiceLoader([
|
||||
FileSystemLoader("templates"),
|
||||
FileSystemLoader(os.path.join(path, "templates")),
|
||||
FileSystemLoader(os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
"templates"
|
||||
|
|
Loading…
Reference in New Issue