Merge branch 'master' into develop

This commit is contained in:
dbroqua 2018-08-26 17:27:06 +02:00
commit 13518d3ee0
2 changed files with 75 additions and 11 deletions

2
.gitignore vendored
View file

@ -1 +1 @@
./conf.js
/conf.js

View file

@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<title>Free Telec</title>
<!-- Bootstrap -->
@ -21,23 +21,56 @@
<![endif]-->
<style type="text/css">
.btn-group .col-md-4,
.btn-group .col-md-12 {
header{
padding-left: 16px;
}
.row {
margin: 0;
padding: 0;
}
.btn-group .col-md-4, .btn-group .col-md-12 {
padding: 10px;
}
.freeHome {
max-width: 100%;
max-height: 100%;
.clear {
clear: both;
}
.bs-callout {
padding: 20px;
margin: 20px 0;
border: 1px solid #eee;
border-left-color: rgb(238, 238, 238);
border-left-width: 1px;
border-left-width: 5px;
border-radius: 3px;
}
.bs-callout-info {
border-left-color: #2aabd2;
}
ul {
height: 100px;
display: flex;
flex-direction: column;
flex-wrap: wrap;
}
@media screen and (max-width: 640px) {
ul {
height: auto;
}
}
</style>
</head>
<body>
<header>
<h1>Free Telec <small>v0.2.1</small></h1>
<h1>Free Telec <small>v0.2.3</small></h1>
</header>
``
<section>
<div class="row col-xs-12">
<div class="col-md-4 col-xs-12 btn-group">
@ -114,7 +147,7 @@
</div>
<div class="col-xs-12">
<div class="col-xs-12 btn btn-default btn-lg btn-free" data-key="home"><img src="img/free.png" class="freeHome" /></div>
<div class="col-xs-12 btn btn-default btn-lg btn-free" data-key="home"><img src="img/free.png" /></div>
</div>
</div>
<div class="col-md-4 col-xs-12 btn-group">
@ -157,8 +190,35 @@
</div>
</div>
</div>
<div class="col-xs-12">
<div class="bs-callout bs-callout-info clear">
<h4>Raccourcis clavier</h4>
<p>
Certaines fonctionnalités de la télécommande peuvent être directement utilisée avec votre clavier.
<br />
En voici la liste :
</p>
<ul>
<li>Entrée : ok</li>
<li>Flèche haut: haut</li>
<li>Flèche bas: bas</li>
<li>Flèche droite: droite</li>
<li>Flèche gauche: gauche</li>
<li>Echap: retour (touche rouge)</li>
<li>f: Free</li>
<li>m: Menu (touche verte)</li>
<li>i: Info (touche jaune)</li>
<li>s: Recherche (touche bleue)</li>
<li>a: A/V</li>
<li>1-0: touche 1-0</li>
<li>+: Programme +</li>
<li>-: Programme -</li>
</ul>
</div>
</div>
</section>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
@ -181,6 +241,8 @@
40: 'down',
37: 'left',
39: 'right',
27: 'red', //Esc/back
102: 'home', //Free
109: 'green', //m -> Menu
105: 'yellow', //i -> Info
115: 'blue', //s -> Search
@ -194,7 +256,9 @@
55: 7,
56: 8,
57: 9,
48: 0
48: 0,
45: 'prgm_dec',
43: 'prgm_inc'
};
let code = (e.keyCode ? e.keyCode : e.which);