Commit f0aa3f2e authored by Gautam Chitnis's avatar Gautam Chitnis

Fix (minor):Multiple fixes for consistency

This commit makes multiple changes and fixes at appropriate places to help towards code consistency and cleaning.

Gautam C.
parent f4d16d65
......@@ -13,7 +13,7 @@ MKDIR_P := mkdir -p
SASS_TARGETS = ../share/lua/http/src/scss/main.scss
SASS_DIST_DIR = ../share/lua/http/dist/css
SASSC = ../extras/tools/sassc $(SASS_TARGETS) $(SASS_DIST_DIR)/main.css
SASSC = ../extras/tools/sassc $(SASS_TARGETS) $(SASS_DIST_DIR)/style.css
SASSC_FLAGS =
desktopdir = $(datadir)/applications
......@@ -139,6 +139,7 @@ css:
preserve:
rsync -rupE ../share/lua/http/src/vendors ../share/lua/http/dist/
rsync -rupE ../share/lua/http/src/assets ../share/lua/http/dist/
if BUILD_LUA
nobase_vlclib_DATA = \
......
......@@ -10,4 +10,4 @@
--js ../share/lua/http/src/components/equalizer/equalizer.component.js
--js ../share/lua/http/src/components/track-synchronisation/tracksync.component.js
--js ../share/lua/http/src/components/sot/stream.manager.component.js
--js_output_file ../share/lua/http/dist/js/output_script.js
\ No newline at end of file
--js_output_file ../share/lua/http/dist/js/script.js
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<!-- Development <head> tag-->
<!-- Production <head> Tag-->
<head>
<meta charset="utf-8">
<meta name="viewport" content="initial-scale=1">
......@@ -8,56 +8,44 @@
<link rel="stylesheet" href="dist/vendors/bootstrap/bootstrap.min.css">
<link rel="stylesheet" href="dist/vendors/font-awesome/font-awesome.css">
<link rel="stylesheet" href="dist/vendors/jstree/themes/default/style.css">
<link rel="stylesheet" href="dist/css/main.css">
<link rel="stylesheet" href="dist/css/style.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src='dist/vendors/vue/vue.js'></script>
<script src="dist/vendors/plyr/plyr.js"></script>
<script src="dist/vendors/jstree/jstree.min.js"></script>
<script src="dist/js/output_script.js"></script>
<script src="dist/js/script.js"></script>
<script src="dist/vendors/bootstrap/bootstrap.min.js"></script>
</head>
<!--
PRODUCTION <head> tag
<head>
<link rel="stylesheet" href="dist/css/plyr-custom.css">
<link rel="stylesheet" href="dist/css/bootstrap.min.css">
<link rel="stylesheet" href="dist/main.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src='dist/js/vue.js'></script>
<script src="dist/js/plyr.js"></script>
<script src='dist/js/functions.js'></script>
</head>
-->
<body>
<div id="app">
<sidenav></sidenav>
<div id="playlistNav" class="playlistNav">
<div class="container">
<playlist></playlist>
</div>
</div>
<playlist></playlist>
<!-- Modals -->
<div id="vlmModal" class="modal fade" role="dialog">
<vlm-modal></vlm-modal>
</div>
<div id="fileModal" class="modal fade" role="dialog">
<file-modal></file-modal>
</div>
<div id="equalizerModal" class="modal fade" role="dialog">
<equalizer-modal></equalizer-modal>
</div>
<div id="trackSyncModal" class="modal fade" role="dialog">
<track-sync-modal></track-sync-modal>
</div>
<div id="streamManagerModal" class="modal fade" role="dialog">
<stream-manager-modal></stream-manager-modal>
</div>
</div>
<div id="videoPlayer" class="">
<!-- Video -->
<div id="videoPlayer">
<video></video>
</div>
</body>
......@@ -66,19 +54,23 @@
<!-- Playlist Template -->
<script type="text/x-template" id="playlist-template">
<div>
<playlist-buttons></playlist-buttons>
<div>
<h1 class="playlistHeader">Playlist</h1>
</div>
<div id="playlist">
<ol type="1">
<li v-for="item in this.$parent.playlistItems">
<button v-on:click="play(item.src, item.id)" class="playlistItem">{{ item.title }}</button>
</li>
</ol>
</div>
<div class="playlistNavMobile" id="mobilePlaylistNavButton">
Playlist
<div id="playlistNav" class="playlistNav">
<div class="container">
<playlist-buttons></playlist-buttons>
<div>
<h1 class="playlistHeader">Playlist</h1>
</div>
<div id="playlist">
<ol type="1">
<li v-for="item in this.$parent.playlistItems">
<button v-on:click="play(item.src, item.id)" class="playlistItem">{{ item.title }}</button>
</li>
</ol>
</div>
<div class="playlistNavMobile" id="mobilePlaylistNavButton">
Playlist
</div>
</div>
</div>
</div>
</script>
......@@ -93,8 +85,8 @@
<button type="button" class="btn-circle col-xs"><i class="glyphicon glyphicon-play-circle"></i></button>
</div>
<div class="row">
<button type="button" class="btn-circle col-xs" data-toggle="modal" data-target="#equalizerModal" onclick=""><i class="glyphicon glyphicon-equalizer"></i></button>
<button type="button" class="btn-circle col-xs" data-toggle="modal" data-target="#fileModal" onclick=""><i class="glyphicon glyphicon-plus"></i></button>
<button type="button" class="btn-circle col-xs" data-toggle="modal" data-target="#equalizerModal"><i class="glyphicon glyphicon-equalizer"></i></button>
<button type="button" class="btn-circle col-xs" data-toggle="modal" data-target="#fileModal"><i class="glyphicon glyphicon-plus"></i></button>
<button type="button" class="btn-circle col-xs" id="removeButton"><i class="glyphicon glyphicon-trash"></i></button>
</div>
</div>
......@@ -106,12 +98,12 @@
<div>
<div id="sideNav" class="sideNav">
<a href="javascript:void(0)" class="closebtn" id="closeNavButton">Menu</span></a>
<a href="#" data-toggle="modal" data-target="#fileModal" onclick="">Open File</a>
<a href="#" data-toggle="modal" data-target="#fileModal">Open File</a>
<a href="#">Local Network</a>
<a href="#">Podcast</a>
<a href="#" data-toggle="modal" data-target="#streamManagerModal" onclick="">Manage Streams</a>
<a href="#" data-toggle="modal" data-target="#trackSyncModal" onclick="">Track Synchronization</a>
<a href="#" data-toggle="modal" data-target="#vlmModal" onclick="">VLM Batch Commands</a>
<a href="#" data-toggle="modal" data-target="#streamManagerModal">Manage Streams</a>
<a href="#" data-toggle="modal" data-target="#trackSyncModal">Track Synchronization</a>
<a href="#" data-toggle="modal" data-target="#vlmModal">VLM Batch Commands</a>
</div>
<span id="openNavButton"><i class="glyphicon glyphicon-menu-hamburger"></i></span>
</div>
......@@ -127,8 +119,8 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Write your VLM commands here (seperated by new line)</h4>
</div>
<div class="modal-body" id="">
<textarea id="vlm-command" cols="30 " rows="5"></textarea>
<div class="modal-body">
<textarea id="vlmCommand" cols="30" rows="5"></textarea>
<div id="status">
status:
</div>
......@@ -171,8 +163,8 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Equalizer</h4>
</div>
<div class="modal-body" id="">
<input type="range" name="equalizer-input" id="equalizer-input" min="-20" max="20" step="0.1"/>
<div class="modal-body">
<input type="range" name="equalizerInput" id="equalizerInput" min="-20" max="20" step="0.1"/>
<center id="eqVal">{{ eqVal }}</center>
</div>
<div class="modal-footer">
......@@ -195,15 +187,15 @@
<div class="modal-body" id="">
Playback Rate
<center id="playbackVal">{{ playbackVal }}</center>
<input type="range" name="playback-input" id="playback-input" min="-20" max="20" step="0.1"/>
<input type="range" name="playbackInput" id="playbackInput" min="-20" max="20" step="0.1"/>
<br>
Audio Delay
<center id="audioDelayVal">{{ audioDelayVal }}</center>
<input type="range" name="audioDelay-input" id="audioDelay-input" min="-20" max="20" step="0.1"/>
<input type="range" name="audioDelayInput" id="audioDelayInput" min="-20" max="20" step="0.1"/>
<br>
Subtitle Delay
<center id="subDelayVal">{{ subDelayVal }}</center>
<input type="range" name="subDelay-input" id="subDelay-input" min="-20" max="20" step="0.1"/>
<input type="range" name="subDelayInput" id="subDelayInput" min="-20" max="20" step="0.1"/>
</div>
<div class="modal-footer">
</div>
......@@ -221,7 +213,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Stream Manager</h4>
</div>
<div class="modal-body" id="">
<div class="modal-body">
</div>
<div class="modal-footer">
</div>
......
/* The side navigation menu */
.sideNav {
height: 100%; /* 100% Full-height */
width: 0; /* 0 width - change this with JavaScript */
position: fixed; /* Stay in place */
z-index: 5; /* Stay on top */
height: 100%;
width: 0;
position: fixed;
z-index: 5;
top: 0;
left: 0;
background-color: orange;
overflow-x: hidden; /* Disable horizontal scroll */
padding-top: 60px; /* Place content 60px from the top */
transition: 0.5s; /* 0.5 second transition effect to slide in the sidenav */
overflow-x: hidden;
padding-top: 60px;
transition: 0.5s;
}
/* The navigation menu links */
......
......@@ -11,7 +11,7 @@ Vue.component('equalizer-modal', {
methods: {
handleEvents: function()
{
let equalizerElement = $('#equalizer-input');
let equalizerElement = $('#equalizerInput');
data.eqVal = equalizerElement[0].value;
//console.log(equalizerElement[0].value);
equalizerElement.on("input",function(e){
......
.playlistNav {
right: 0;
width: 20%;
height: 100%; /* 100% Full-height */
position: fixed; /* Stay in place */
z-index: 5; /* Stay on top */
height: 100%;
position: fixed;
z-index: 5;
top: 0;
background-color: orange; /* Black*/
overflow-x: hidden; /* Disable horizontal scroll */
background-color: orange;
overflow-x: hidden;
padding-top: 2%;
transition: 0.5s; /* 0.5 second transition effect to slide in the sidenav */
transition: 0.5s;
}
.playlistIcons {
......@@ -20,15 +20,14 @@
visibility: hidden;
right: 0;
width: 10%;
height: 100%; /* 100% Full-height */
/*width: 250px;*/
position: fixed; /* Stay in place */
z-index: 5; /* Stay on top */
height: 100%;
position: fixed;
z-index: 5;
top: 0;
background-color: orange; /* Black*/
overflow-x: hidden; /* Disable horizontal scroll */
background-color: orange;
overflow-x: hidden;
padding-top: 2%;
transition: 0.5s; /* 0.5 second transition effect to slide in the sidenav */
transition: 0.5s;
}
.btn-circle {
......@@ -36,7 +35,6 @@
height: 30px;
text-align: center;
padding: 6px 0;
/*font-size: 12px;*/
border-radius: 15px;
border: 0;
background-color: orange;
......@@ -65,31 +63,31 @@
background-color: white;
}
#playlist {
width:21.5%;
height: 100%;
background-color: white;
}
.playlistHeader{
color: black;
padding-left: 5%;
padding-right: 5%;
}
@media screen and (min-device-width : 320px) and (max-device-width : 480px) {
.playlistNav {
width: 0%;
#playlist {
width:21.5%;
height: 100%;
background-color: white;
}
.playlistNavMobile {
visibility: visible;
height: 10%;
top: 50%;
}
@media screen and (min-device-width : 320px) and (max-device-width : 480px) {
.playlistNav {
width: 0%;
}
#playlist {
width: 95%;
height: 90%;
}
.playlistNavMobile {
visibility: visible;
height: 10%;
top: 50%;
}
#playlist {
width: 95%;
height: 90%;
}
}
\ No newline at end of file
......@@ -35,9 +35,9 @@ Vue.component('track-sync-modal', {
}
},
mounted: function() {
playbackElement = $('#playback-input');
audioDelayElement = $('#audioDelay-input');
subDelayElement = $('#subDelay-input');
playbackElement = $('#playbackInput');
audioDelayElement = $('#audioDelayInput');
subDelayElement = $('#subDelayInput');
this.handleEvents();
}
});
\ No newline at end of file
......@@ -5,7 +5,7 @@ Vue.component('vlm-modal', {
template: '#vlm-modal-template',
methods: {
executeVLM: function () {
var cmd = document.getElementById("vlm-command").value;
var cmd = document.getElementById("vlmCommand").value;
console.log(cmd);
sendCommand(2,"?command="+cmd);
//console.log(xmlData);
......
......@@ -11,15 +11,6 @@ body {
}
}
#cust-progress {
display: block;
width:100%;
}
#cust-controls {
display: block;
}
// component styles
@import 'components.scss';
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment