diff --git a/diffido.py b/diffido.py index b3ed4f6..e0c1c9e 100755 --- a/diffido.py +++ b/diffido.py @@ -15,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. """ - import os import re import io @@ -44,6 +43,7 @@ from tornado.options import define, options import tornado.web from tornado import gen, escape + JOBS_STORE = 'sqlite:///conf/jobs.db' API_VERSION = '1.0' SCHEDULES_FILE = 'conf/schedules.json' diff --git a/dist/base.html b/dist/base.html index dc16df2..cd7ed54 100644 --- a/dist/base.html +++ b/dist/base.html @@ -6,12 +6,11 @@ - - + {% block head %}{% end %} {% block body %}{% end %} diff --git a/dist/diff.html b/dist/diff.html index efbbcad..b9cb387 100644 --- a/dist/diff.html +++ b/dist/diff.html @@ -1,5 +1,10 @@ {% extends "base.html" %} +{% block head %} + + +{% end %} + {% block body %}
diff --git a/dist/schedule.html b/dist/schedule.html index 75c833a..0b15829 100644 --- a/dist/schedule.html +++ b/dist/schedule.html @@ -2,27 +2,35 @@ {% block body %}
-
-
+
+
+
+ + + home + + Diffido: ${(schedule && schedule.title) || 'new'} schedule + +
+
+ +
- - home - - Diffido: ${(schedule && schedule.title) || 'new'} schedule + Settings
-
+
-
+
@@ -30,59 +38,6 @@
-
-
- - - - interval - cron - - -
-
-
- - - - -
-
-
- -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
-
@@ -104,14 +59,84 @@
enabled - -
- save - delete - back
+ +
+ + +
+ Trigger +
+ + +
+
+ + + + interval + cron + + +
+
+
+
+ + + + +
+
+ +
+
+ + + + +
+
+ + + + +
+
+
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + +
+ +
+
+
+ save + delete + back +
+
@@ -179,13 +204,24 @@ var app = new Vue({ body { background-color: white; - padding: 6px; + padding: 12px 20px 12px 20px; } .md-table { height: 80%; } +.home-icon { + margin-top: -6px; +} + +.md-card-content { + padding: 20px; +} + +#trigger-card, #main-card { + min-height: 350px; +} {% end %}