diff --git a/django_smartchart/settings.py b/django_smartchart/settings.py index 8822957..5ed8098 100644 --- a/django_smartchart/settings.py +++ b/django_smartchart/settings.py @@ -56,8 +56,7 @@ ROOT_URLCONF = 'django_smartchart.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'templates')] - , + 'DIRS': [os.path.join(BASE_DIR, 'templates')], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/templates/echart/base.html b/templates/echart/base.html new file mode 100644 index 0000000..3cefdbc --- /dev/null +++ b/templates/echart/base.html @@ -0,0 +1,64 @@ +大数据:{{title}}{% block head %}{% endblock %}{{contentrefresh|safe}} + +{% block stylesheet %}{% endblock %}{{devhead|safe}} +{% block body %}{% endblock %} {{footer|safe}} + +{% block javascript %}{% endblock %} + diff --git a/templates/echart/common.html b/templates/echart/common.html new file mode 100644 index 0000000..c58c0ef --- /dev/null +++ b/templates/echart/common.html @@ -0,0 +1,17 @@ +{% extends "echart/base.html" %} +{% block head %}{% endblock %} +{% block style %}{% endblock %} +{% block stylesheet %}{% endblock %} +{% block body %} + + +
+
+ {% for div in div_list %} + {{div|safe}} + {% endfor %} +
+
+ +{% endblock %} +{% block javascript %}{% endblock %} \ No newline at end of file diff --git a/templates/echart/divlist_editor.html b/templates/echart/divlist_editor.html index 9de5771..35081d1 100644 --- a/templates/echart/divlist_editor.html +++ b/templates/echart/divlist_editor.html @@ -55,7 +55,6 @@ - + + diff --git a/templates/echart/editor_min.html b/templates/echart/editor_min.html index 50950e7..dd33dc2 100644 --- a/templates/echart/editor_min.html +++ b/templates/echart/editor_min.html @@ -15,8 +15,6 @@ - - SmartChart Editor - - - - - - - - - - - - - - - - - -
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
- - -
- \ No newline at end of file diff --git a/templates/index/index.html b/templates/index/index.html index 166a97d..5466383 100644 --- a/templates/index/index.html +++ b/templates/index/index.html @@ -47,7 +47,6 @@ - @@ -55,17 +54,15 @@