diff --git a/diffido.py b/diffido.py index 30536f6..46644de 100755 --- a/diffido.py +++ b/diffido.py @@ -213,6 +213,7 @@ def get_history(id_): def get_diff(id_, commit_id='HEAD', old_commit_id=None): + logger.warn('MEHHHH %s %s %s' % (id_, commit_id, old_commit_id)) def _history(id_, commit_id, old_commit_id, queue): os.chdir('storage/%s' % id_) p = subprocess.Popen([GIT_CMD, 'commit_id', old_commit_id or '%s~' % commit_id, commit_id], diff --git a/dist/diff.html b/dist/diff.html index 9453ab0..24bf5fa 100644 --- a/dist/diff.html +++ b/dist/diff.html @@ -42,7 +42,6 @@ var app = new Vue({ getDiff: function() { self = this; var data = axios.get('/api/diff/' + this.id + '/' + this.diff + '/' + (this.oldid || '')).then(function(response) { - console.log(response); self.difftext = response.data.diff; var pretty_diff = Diff2Html.getPrettyHtml(self.difftext); document.getElementById('diffpanel').innerHTML = pretty_diff; diff --git a/dist/index.html b/dist/index.html index ebd78e9..7e418dc 100644 --- a/dist/index.html +++ b/dist/index.html @@ -7,7 +7,7 @@
- Card without hover effect + Diffido add_circle_outline diff --git a/dist/schedule.html b/dist/schedule.html index 502b026..e143538 100644 --- a/dist/schedule.html +++ b/dist/schedule.html @@ -3,72 +3,115 @@ {% block body %}
-
- - - - - - - - +
+ + +
+ + home + + Schedule ${schedule && schedule.title} +
+
- - - - interval - cron - - + -
- - - - - - - - - - - - - - - - - - - - -
+
+
+ + + + +
+
+ + + + +
+
-
- - - - -
+
+
+ + + + interval + cron + + +
+
+
+ + + + +
+
+
- - - - - - - - - - - - - enabled - -
- save - delete - back +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ enabled + +
+ save + delete + back +
+
@@ -112,12 +155,12 @@ var app = new Vue({ var data = this.schedule; if (this.hasID()) { axios.put('/api/schedules/' + this.id, data).then(function(response) { - console.log(response); + window.location = '/'; }); } else { axios.post('/api/schedules', data).then(function(response) { - console.log(response); - window.location = '/schedule.html?id=' + response.data.id; + window.location = '/'; + /* window.location = '/schedule.html?id=' + response.data.id; */ }); } }, @@ -137,7 +180,13 @@ var app = new Vue({ body { background-color: white; + padding: 6px; } +.md-table { + height: 80%; +} + + {% end %}