last fixes

faebser · Oct 24, 2015 · 33e2f35 · 33e2f35
1 parent 6984df8
commit 33e2f35
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/js/main.js b/js/main.js
@@ -360,6 +360,18 @@ var app = (function ($, Vue, superagent) {
 			}
 		});
 
+		var stopButtonComponent = Vue.extend({
+			data: {
+				state: state
+			},
+			methods: {
+				stopStream: function () {
+
+				}
+			},
+			template: $('#stopButtonTemplate').html()
+		});
+
 		var testButtonComponent = Vue.extend({
 			data: {
 				state: state
@@ -429,6 +441,7 @@ var app = (function ($, Vue, superagent) {
 		Vue.component('stream-form', streamFormComponent);
 		Vue.component('stream-button', streamButtonComponent);
 		Vue.component('test-button', testButtonComponent);
+		Vue.component('stop-button', testButtonComponent);
 		Vue.component('download-list', downloadComponent);
 
 		var mainApp = new Vue({
@@ -442,7 +455,8 @@ var app = (function ($, Vue, superagent) {
 				'streamForm': streamFormComponent,
 				'streamButton': streamButtonComponent,
 				'testButton': testButtonComponent,
-				'download': downloadComponent
+				'download': downloadComponent,
+				'stopButton': stopButtonComponent
 			},
 			methods: {
 				toggleDownloads: function (event) {

diff --git a/pistream.py b/pistream.py
@@ -359,4 +359,4 @@ def get(section, option):
 
 TEMPLATE_PATH.append('./sections/templates')
 init()
-run(host='0.0.0.0', port=8080, debug=True)
+run(host='0.0.0.0', port=80, debug=True)
diff --git a/views/template.html b/views/template.html
@@ -43,6 +43,7 @@
 
               <test-button v-if="state.store.hasStatusItems && state.store.streamLink == ''">
               </test-button>
+
             </div>
 
           </div>
@@ -124,6 +125,12 @@ <h1>Configuration</h1>
         </a>
       </div>
 
+      <div id="stopButtonTemplate">
+        <a class="button bad" v-class="class" v-on="click: stopStream">
+          <span v-class="spanClass" v-text="spanText"></span> {{ 'Stop Stream'|uppercase }}
+        </a>
+      </div>
+
       <div id="downloadTemplate">
         <div class="box header">
           <h1>Recordings</h1>
@@ -133,7 +140,7 @@ <h1>Recordings</h1>
             <ul class="innerGradientBox downloads">
               <li v-repeat="state.store.fileList">
                 <span class="icon icon-cross_mark" v-class="red: confirmations[$value]" v-on="click: deleteFile($value)"></span>
-                  <a data-bla="confirmations[$value]" class="" href="download/{{ $value }}" target="_blank">{{ $value }}</a>
+                  <a data-bla="confirmations[$value]" href="download/{{ $value }}" target="_blank">{{ $value }}</a>
               </li>
             </ul>
           </div>