From ce95ca6905d3d271335fc73cd35ce98c0c952344 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 2 Oct 2018 16:59:56 +0800 Subject: [PATCH] up --- app.py | 14 +++++++++++--- start.sh | 1 - templates/default/config.html | 20 ++++++++++++-------- templates/default/index.html | 8 ++++---- templates/default/layout.html | 1 - templates/default/soft.html | 28 +++++++++++++++++++--------- views/__init__.py | 3 ++- views/config.py | 10 ++++++++++ views/plugins.py | 10 ++++++++++ 9 files changed, 68 insertions(+), 27 deletions(-) create mode 100644 views/config.py create mode 100644 views/plugins.py diff --git a/app.py b/app.py index 4874d3ab5..dc6818f3d 100644 --- a/app.py +++ b/app.py @@ -1,6 +1,11 @@ from flask import Flask # from flask import Blueprint,render_template -from views import dashboard, site, files, soft +from views import dashboard +from views import site +from views import files +from views import soft +from views import config +from views import plugins app = Flask(__name__) app.debug = True @@ -9,9 +14,12 @@ DEFAULT_MODULES = ( (dashboard, "/"), (site, "/site"), (files, "/files"), - (soft, "/soft") + (soft, "/soft"), + (config, "/config"), + (plugins, "/plugins"), ) + def setting_modules(app, modules): for module, url_prefix in modules: app.register_blueprint(module, url_prefix=url_prefix) @@ -20,4 +28,4 @@ setting_modules(app, DEFAULT_MODULES) if __name__ == "__main__": - app.run() \ No newline at end of file + app.run() diff --git a/start.sh b/start.sh index e0232300e..3978f246b 100755 --- a/start.sh +++ b/start.sh @@ -1,6 +1,5 @@ #!/bin/sh -DEBUG=True gunicorn -b 127.0.0.1:7200 app:app #open "http://127.0.0.1:7200" \ No newline at end of file diff --git a/templates/default/config.html b/templates/default/config.html index d0ff2db39..6d5082158 100755 --- a/templates/default/config.html +++ b/templates/default/config.html @@ -1,29 +1,32 @@ -$def with (data) +{% extends "default/layout.html" %} + +{% block content %} +
- $data['lan']['H1']/$data['lan']['H2'] + 首页/面板设置
- $data['lan']['I1'] + 关闭面板
- $data['lan']['I2'] + 自动更新
- $data['lan']['I3'] + 面板SSL
@@ -33,11 +36,11 @@ $def with (data)
-

$data['lan']['C1']

+

设置

-

$data['lan']['C3']

+

为了提高安全，请修改别名、默认端口、面板用户和密码!

@@ -184,5 +187,6 @@ $def with (data) +{% endblock %} \ No newline at end of file diff --git a/templates/default/index.html b/templates/default/index.html index d8bcc32e7..e6f14852e 100755 --- a/templates/default/index.html +++ b/templates/default/index.html @@ -15,10 +15,10 @@
- $data['lan']['S1'] $data['lan']['S2']　　　$data['lan']['S3'] $data['lan']['S4'] - - - + 系统: $data['lan']['S2']　　　已不间断运行: $data['lan']['S4'] + + +
    diff --git a/templates/default/layout.html b/templates/default/layout.html index 38472f951..a2e567a37 100755 --- a/templates/default/layout.html +++ b/templates/default/layout.html @@ -43,7 +43,6 @@ - diff --git a/templates/default/soft.html b/templates/default/soft.html index c3317cda1..f6db82de1 100755 --- a/templates/default/soft.html +++ b/templates/default/soft.html @@ -1,9 +1,12 @@ +{% extends "default/layout.html" %} + +{% block content %}
    - $data['lan']['H1']/$data['lan']['H2'] + 首页/软件管理
    @@ -16,21 +19,27 @@
    +
    + 全部 + 运行环境 + 系统工具 + 插件
    - + +
    - - + + - - - - + + + + @@ -54,4 +63,5 @@ GetSList(); $$.get("/ajax?action=GetCloudHtml&rpath=btpanel_message/updata_pro.html",function(rdata){ $$("#updata_pro_info").html(rdata); }); - \ No newline at end of file + +{% endblock %} \ No newline at end of file diff --git a/views/__init__.py b/views/__init__.py index e4a8e6dc6..898fcd90c 100644 --- a/views/__init__.py +++ b/views/__init__.py @@ -4,4 +4,5 @@ from dashboard import * from site import * from files import * from soft import * - +from config import * +from plugins import * diff --git a/views/config.py b/views/config.py new file mode 100644 index 000000000..22ac9486f --- /dev/null +++ b/views/config.py @@ -0,0 +1,10 @@ +# coding:utf-8 + +from flask import Blueprint, render_template + +config = Blueprint('config', __name__, template_folder='templates') + + +@config.route("/") +def index(): + return render_template('default/config.html') diff --git a/views/plugins.py b/views/plugins.py new file mode 100644 index 000000000..ce02568f3 --- /dev/null +++ b/views/plugins.py @@ -0,0 +1,10 @@ +# coding:utf-8 + +from flask import Blueprint, render_template + +plugins = Blueprint('plugins', __name__, template_folder='templates') + + +@plugins.route("/") +def index(): + return render_template('default/plugins.html')
    $data['lan']['TH1']$data['lan']['TH3']软件名称说明 价格 到期时间$data['lan']['TH4']$data['lan']['TH5']$data['lan']['TH6']$data['lan']['TH7']状态位置状态操作