From 0180a6d4989e8c8902e9d363d9ac413829e6ea7f Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sun, 14 Oct 2018 20:49:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.py                          |  3 ++-
 class/public.py                 |  8 +++++++-
 templates/default/crontab.html  |  8 ++++++--
 templates/default/database.html |  2 +-
 templates/default/login.html    |  2 +-
 views/__init__.py               |  2 ++
 views/crontab.py                | 10 ++++++++++
 7 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 views/crontab.py
diff --git a/app.py b/app.py
index 5ccc83942..d75776b30 100644
--- a/app.py
+++ b/app.py
@@ -21,7 +21,8 @@ DEFAULT_MODULES = (
     (views.plugins, "/plugins"),
     (views.task, "/task"),
     (views.system, "/system"),
-    (views.database, "/database")
+    (views.database, "/database"),
+    (views.crontab, "/crontab")
 )
 
 import time
diff --git a/class/public.py b/class/public.py
index 82f170058..9fc17033c 100755
--- a/class/public.py
+++ b/class/public.py
@@ -17,13 +17,19 @@ sys.path.append(os.getcwd() + "/class/")
 import db
 
 from random import Random
-# from flask import jsonify
+from flask import jsonify
 
 
 def getRunDir():
+    # 运行目录
     return os.getcwd()
 
 
+def getBinDir():
+    # 安装软件
+    pass
+
+
 def M(table):
 
     sql = db.Sql()
diff --git a/templates/default/crontab.html b/templates/default/crontab.html
index 374b30314..ccaa78d7c 100755
--- a/templates/default/crontab.html
+++ b/templates/default/crontab.html
@@ -1,4 +1,7 @@
-$def with (data)
+{% extends "default/layout.html" %}
+
+{% block content %}
+
 <div class="main-content">
 		<div class="container-fluid" style="padding-bottom:54px">
 			<div class="pos-box bgw mtb15">
@@ -172,4 +175,5 @@ $def with (data)
 	toMinute();
 	toShell();
 	getCronData();
-</script>
\ No newline at end of file
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/default/database.html b/templates/default/database.html
index 05e87ff58..a946dad2d 100755
--- a/templates/default/database.html
+++ b/templates/default/database.html
@@ -79,4 +79,4 @@
 	});
 </script>
 <script src="/static/js/upload.js?date=20180124"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/default/login.html b/templates/default/login.html
index 70d40b8f1..4e18fab1c 100755
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -1,4 +1,4 @@
-$def with (tData)
+
 <!doctype html>
 <html lang="zh">
 <head>
diff --git a/views/__init__.py b/views/__init__.py
index 6c715c9f9..3bd83da44 100644
--- a/views/__init__.py
+++ b/views/__init__.py
@@ -1,3 +1,4 @@
+
 from dashboard import *
 from site import *
 from files import *
@@ -7,3 +8,4 @@ from task import *
 from system import *
 from plugins import *
 from database import *
+from crontab import *
diff --git a/views/crontab.py b/views/crontab.py
new file mode 100644
index 000000000..46034716c
--- /dev/null
+++ b/views/crontab.py
@@ -0,0 +1,10 @@
+# coding:utf-8
+
+from flask import Blueprint, render_template
+
+crontab = Blueprint('crontab', __name__, template_folder='templates')
+
+
+@crontab.route("/")
+def index():
+    return render_template('default/crontab.html')
