Commit 6da1ce63 authored by Jérémie Garcia's avatar Jérémie Garcia
Browse files

Bug fixes + release ready

Multiplay improved
Background drawing
File path OK for source and build versions
New Icon
parent 539dbeaa
var NwBuilder = require('nw-builder');
var gulp = require('gulp');
var gutil = require('gulp-util');
gulp.task('traj', function () {
var nw = new NwBuilder({
version: '0.12.1',
macIcns: './icon-design/icon.icns',
zip:'false',
files: [ './**',
'!./gulpfile.js',
'!./icon-design/**',
'!./cache/**',
'!./build/**',
'!./node_modules/gulp/**',
'!./node_modules/gulp-util/**',
'!./node_modules/nw-builder/**'],
//platforms: ['osx32', 'win32', 'linux32'] // change this to 'win' for/on windows
platforms: ['osx'] // change this to 'win' for/on windows
});
// Log stuff you want
nw.on('log', function (msg) {
gutil.log('nw-builder', msg);
});
// Build returns a promise, return it so the task isn't called in parallel
return nw.build().catch(function (err) {
gutil.log('nw-builder', err);
});
});
\ No newline at end of file
<html>
<head>
<script src="./jquery-ui-1.10.1.custom/js/jquery-1.9.1.js"></script>
<script src="jquery-ui-1.10.1.custom/js/jquery-ui-1.10.1.custom.js" type="text/javascript" charset="utf-8"></script>
<script src="mousetrap.js" type="text/javascript" charset="utf-8"></script>
<link rel="stylesheet" href="jquery-ui-1.10.1.custom/css/base/jquery.ui.theme.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="jquery-ui-1.10.1.custom/css/base/jquery.ui.button.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="jquery-ui-1.10.1.custom/css/base/jquery.ui.resizable.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="jquery-ui-1.10.1.custom/css/base/jquery.ui.accordion.css" type="text/css" media="screen" title="no title" charset="utf-8">
<title>Web-OSC-Bridge</title>
<style>
.highlightedRow { background-color: #dedede; }
body { font-family:Helvetica, sans-serif; background-color:#ededed; }
ul { list-style:none; margin:0; padding:0;}
h3 { font-size:1em; display:inline; color:#333; margin-right:3em; margin-left:1em;}
h1 { font-size:1.2em;}
td { font-size:.6em; }
.infoTable td { border:none !important; }
.infoTable td { font-size:.8em !important; }
.infoTable tr td:first-child { text-align: right; white-space: nowrap !important; width:25%; font-color:#666; font-weight:bold;}
.infoTable tr td:last-child { width:75%; padding-left: 2em; text-align:left !important; }
table { border-collapse:collapse; width: 100%; table-layout:fixed; }
#monitorTable, #serverTable, #clientsTable, th { border: 1px solid #666;}
table thead th { font-size:.8em; }
th { white-space: nowrap !important; margin: 0; padding: 5px; font-weight:normal; font-size: .8em; background:#999; color:#fff;}
.ui-widget{font-size:.7em;}
thead tr { width: 100%; }
tbody { height: 2em;}
#clientsTableBody tr td, #monitorTableBody tr td { text-align: center; border-right:1px solid #666; border-top:1px solid #666; font-size:.9em; overflow:hidden; }
#serverTableBody td { border-right:1px solid #666; border-top:1px solid #666; }
#serverTableBody td:last-child, #serverTableBody td:nth-child(2) { text-align: center; vertical-align: top; }
#monitorTable, #serverTable, #clientsTable { border:1px solid #666; margin-bottom:1.5em; }
#clientsTable tbody, #serverTable tbody { font-size:.85em; }
#monitorTable tbody { font-size:.75em;}
#newServerTable { text-align:left ; }
input[type="text"] { width: 90%; }
.interfaceHeader { line-height:1.75em !important;}
</style>
</head>
<body>
<div id='servers'>
<div class="ui-widget-header ui-corner-all interfaceHeader">
<h3>Servers</h3>
<!-- <button id="newButton">New Server</button>
<button id="deleteButton">Remove Selected Server</button> -->
</div>
<table id='serverTable'>
<thead>
<tr>
<th width='80%'>server info</th><th width='10%'>append client id</th><th width='10%'>monitor</th>
</tr>
</thead>
<tbody id="serverTableBody">
</tbody>
</table>
</div>
<div style="height:245px ; text-align: center; diplay: block; margin:auto;">
<div id='target-qrcode'></div>
<div id='target-url' style="text-align: center; font-size:2em; margin:auto;"></div>
</div>
<div id='clients'>
<div class="ui-widget-header ui-corner-all interfaceHeader">
<h3>Clients</h3>
</div>
<table id='clientsTable'>
<thead>
<tr>
<th>id #</th><th>ip address</th><th>connected to</th><th>interface</th><th>monitor</th>
</tr>
</thead>
<tbody id="clientsTableBody">
</tbody>
</table>
</div>
<div id='monitor'>
<div class="ui-widget-header ui-corner-all interfaceHeader">
<h3>Monitor</h3>
<button id="clearMonitorButton">Clear</button>
</div>
<table id='monitorTable'>
<thead>
<tr>
<th width='10%'>server</th><th width='10%'>client id</th><th width='15%'>address / type</th><th width='15%'>typetags / channel</th><th width='50%'>values</th>
</tr>
</thead>
<tbody id="monitorTableBody">
</tbody>
</table>
</div>
<input type="file" nwfile style='display:none' id='fileButton'/>
<input type="file" nwsaveas style='display:none' id='saveFileButton'/>
<script>
if(typeof global.interface === 'undefined') {
var s = $('<script src="server.js" type="text/javascript" charset="utf-8">');
$('head').append(s);
}else{
// page reloaded, remove all servers
global.interface.removeAllServers();
}
</script>
</body>
</html>
\ No newline at end of file
This diff is collapsed.
/*!
* jQuery UI Accordion 1.10.1
* http://jqueryui.com
*
* Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Accordion#theming
*/
.ui-accordion .ui-accordion-header {
display: block;
cursor: pointer;
position: relative;
margin-top: 2px;
padding: .5em .5em .5em .7em;
min-height: 0; /* support: IE7 */
}
.ui-accordion .ui-accordion-icons {
padding-left: 2.2em;
}
.ui-accordion .ui-accordion-noicons {
padding-left: .7em;
}
.ui-accordion .ui-accordion-icons .ui-accordion-icons {
padding-left: 2.2em;
}
.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
position: absolute;
left: .5em;
top: 50%;
margin-top: -8px;
}
.ui-accordion .ui-accordion-content {
padding: 1em 2.2em;
border-top: 0;
overflow: auto;
}
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