Skip to content

Commit

Permalink
Merge pull request #22 from Haba1234/master
Browse files Browse the repository at this point in the history 
New fixes for Admin3
  • Loading branch information
@Apollon77
Apollon77 authored Jan 19, 2018
2 parents 016028b + 47b2958 commit 66d9d13
Show file tree
Hide file tree
Showing 2 changed files with 133 additions and 110 deletions.
233 changes: 128 additions & 105 deletions admin/index_m.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,115 +148,138 @@
}
</script>
</head>
</body>
<body>
<!-- you have to put your config page in a div with id adapter-container -->
<div class="m adapter-container">

<table><tr>
<td><img src="telegram.png" width="100px"></td>
<td style="padding-top: 20px;padding-left: 10px"><h3 class="translate">telegram adapter settings</h3></td>
</tr></table>

<div id="tabs">
<ul>
<li><a href="#tabs-1" class="translate">Main settings</a></li>
<li><a href="#tabs-2" class="translate">Server settings</a></li>
</ul>
<div id="tabs-1">
<table style="width: 100%">
<tr>
<td colspan='3'><h4 class="translate" style="width: 90%">Main settings</h4></td>
</tr>
<tr>
<td><label class="translate" for="server">Type:</label></td>
<td>
<select id="server" class="value inputStyle" >
<option value="false" class="translate">polling</option>
<option value="true" class="translate">server</option>
</select>
</td>
<td></td>
</tr>
<tr>
<td class="translate">Token:</td>
<td><input id="token" class="value inputStyle" /></td>
<td><a href="https://github.com/ioBroker/ioBroker.telegram#iobroker-telegram-adapter" target="_blank" class="translate help">Read README.md how to get token</a></td>
</tr>
<tr>
<td class="translate">Password:</td>
<td><input id="password" class="value inputStyle" type="password"/></td>
<td class="translate help">Leave it blank if no password desired</td>
</tr>
<tr>
<td class="translate">Password repeat:</td>
<td><input id="passwordRepeat" class="inputStyle" type="password"/></td>
<td class="translate help">Repeat password</td>
</tr>
<tr>
<td class="translate">Text2Command Instance:</td>
<td><select id="text2command" class="value inputStyle"></select></td>
<td class="translate help">All requests will be sent to this text2Command instance</td>
</tr>
<tr>
<td class="translate">Store user's IDs:</td>
<td><input id="rememberUsers" class="value" type="checkbox"/></td>
<td class="translate help">Remember authenticated users</td>
</tr>
<tr>
<td colspan='3'><h4 class="translate" style="width: 90%">Texts</h4></td>
</tr>
<tr>
<td class="translate">"Started" text:</td>
<td><input id="restarted" class="value inputStyle"/></td>
<td class="translate help">restarted_help</td>
</tr>
<tr>
<td class="translate">"Restarting" text:</td>
<td><input id="restarting" class="value inputStyle"/></td>
<td class="translate help">restarting_help</td>
</tr>
</table>
<div class="row">
<div class="col s12 m4 l2"><img src="telegram.png" width="100px" class="logo"></div>
<div class="col s12 m4 l8"><h3 class="translate">telegram adapter settings</h3></div>
</div>
<div class="row">
<div class="col s12">
<ul class="tabs">
<li class="tab col s2"><a href="#tabs-1" class="translate">Main settings</a></li>
<li class="tab col s2 le-settings"><a href="#tabs-2" class="translate">Server settings</a></li>
</ul>
</div>
<div id="tabs-1" class="col s12 page">
<div class="row">
<div class="col s12"><h4 class="translate" style="width: 90%">Main settings</h4></div>
</div>
<div class="row">
<div class="col s12 m4">
<select class="value" id="server">
<option value="false" class="translate">polling</option>
<option value="true" class="translate">server</option>
</select>
<label class="translate" for="server">Type:</label>
</div>
</div>
<div class="row">
<div class="col s12 m4 l8">
<input id="token" class="value inputStyle" />
<label class="translate">Token:</label>
<a href="https://github.com/ioBroker/ioBroker.telegram#iobroker-telegram-adapter" target="_blank" class="translate help">Read README.md how to get token</a>
</div>
</div>
<div class="row">
<div class="col s12 m4 l5">
<input id="password" class="value inputStyle" type="password"/>
<label class="translate">Password:</label>
<span class="translate help">Leave it blank if no password desired</span>
</div>
<div class="col s12 m4 l5">
<input id="passwordRepeat" class="inputStyle" type="password"/>
<label class="translate">Password repeat:</label>
<span class="translate help">Repeat password</span>
</div>
</div>
<div class="row">
<div class="col s12 m4 l12">
<select id="text2command" class="value inputStyle"></select>
<label class="translate">Text2Command Instance:</label>
<span class="translate help">All requests will be sent to this text2Command instance</span>
</div>
</div>
<div class="row">
<div class="col s12 m4 l12">
<input id="rememberUsers" class="value" type="checkbox"/>
<label class="translate">Store user's IDs:</label>
<span class="translate help">Remember authenticated users</span>
</div>
</div>
<div class="row">
<div class="col s12"><h4 class="translate" style="width: 90%">Texts</h4></div>
</div>
<div class="row">
<div class="col s12 m4 l5">
<input id="restarted" class="value inputStyle"/>
<label class="translate">"Started" text:</label>
<span class="translate help">restarted_help</span>
</div>
<div class="col s12 m4 l5">
<input id="restarting" class="value inputStyle"/>
<label class="translate">"Restarting" text:</label>
<span class="translate help">estarting_help</span>
</div>
</div>
</div>
<div id="tabs-2">
<table style="width: 100%">
<tr class="server">
<td ><label class="translate" for="url">URL:</label></td>
<td><input class="value inputStyle" id="url"/></td>
<td class="translate help">url_help</td>
</tr>
<tr class="server">
<td ><label class="translate" for="bind">IP:</label></td>
<td colspan="2"><select class="value inputStyle" id="bind"></select></td>
<td></td>
</tr>
<tr class="server">
<td><label class="translate" for="port">Port:</label></td>
<td><input class="value" id="port" size="5" maxlength="5" type="number"/></td>
<td class="translate help">port_help</td>
</tr>
<tr class="server">
<td><label class="translate" for="certPublic">Public certificate:</label></td>
<td><select id="certPublic" class="value" style="width: 200px"></select></td>
<td></td>
</tr>
<tr class="server">
<td><label class="translate" for="certPrivate">Private certificate:</label></td>
<td><select id="certPrivate" class="value" style="width: 200px"></select></td>
<td></td>
</tr>
<tr class="server">
<td><label class="translate" for="certChained">Chained certificate:</label></td>
<td><select id="certChained" class="value" style="width: 200px"></select></td>
<td></td>
</tr>
<tr class="server">
<td colspan='3'><h4 class="translate" style="width: 90%">Let's Encrypt settings</h4></td>
</tr>
<tr class="server le-settings"><td><label for="leEnabled" class="translate">Use Lets Encrypt certificates:</label></td><td><input class="value" id="leEnabled" type="checkbox" /></td><td></td></tr>
<tr class="server le-settings le-sub-settings"><td><label for="leUpdate" class="translate">Use this instance for automatic update:</label></td><td><input class="value" id="leUpdate" type="checkbox" /></td><td></td></tr>
<tr class="server le-settings le-sub-settings le-sub-settings-update"><td><label for="lePort" class="translate">Port to check the domain:</label></td><td><input class="value number" id="lePort" type="number" size="5" maxlength="5" /></td><td></td></tr>
</table>
<div id="tabs-2" class="col s12 page">
<div class="row">
<div class="col s12 m4 l10">
<input class="value inputStyle" id="url"/>
<label class="translate" for="url">URL:</label>
<span class="translate help">url_help</span>
</div>
</div>
<div class="row">
<div class="col s12 m8 l5">
<select class="value" id="bind"></select>
<label class="translate" for="bind">IP:</label>
</div>
<div class="col s12 m4 l5">
<input class="value number" id="port" size="5" maxlength="5" type="number"/>
<label class="translate" for="port">Port:</label>
<span class="translate help">port_help</span>
</div>
</div>
<div class="row">
<div class="col s12 m3 col-certPublic">
<select id="certPublic" class="value"></select>
<label class="translate" for="certPublic">Public certificate:</label>
</div>
<div class="col s12 m3 col-certPrivate">
<select id="certPrivate" class="value"></select>
<label class="translate" for="certPrivate">Private certificate:</label>
</div>
<div class="col s12 m3 col-certChained">
<select id="certChained" class="value"></select>
<label class="translate" for="certChained">Chained certificate:</label>
</div>
</div>
<div class="row">
<div class="col s12"><h4 class="translate" style="width: 90%">Let's Encrypt settings</h4></div>
</div>
<div class="row">
<div class="col s11">
<input class="value" id="leEnabled" type="checkbox" data-link="lets-encrypt-certificates"/>
<label for="leEnabled" class="translate">Use Lets Encrypt certificates:</label>
</div>
</div>
<div class="row le-sub-settings">
<div class="col s11">
<input class="value" id="leUpdate" type="checkbox" data-link="lets-encrypt-certificates"/>
<label for="leUpdate" class="translate">Use this instance for automatic update:</label>
</div>
</div>
<div class="row le-sub-settings le-sub-settings-update">
<div class="col s11 m4 l2">
<input class="value number" id="lePort" type="number" size="5" maxlength="5" data-link="lets-encrypt-certificates"/>
<label for="lePort" class="translate">Port to check the domain:</label>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
10 changes: 5 additions & 5 deletions admin/words.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ systemDictionary = {
"Leave it blank if no password desired": {
"en": "Leave it blank if no password desired",
"de": "Lehr lassen, falls Kennwort nicht erwünscht",
"ru": "Оставить пустым, если опрос пароля не нужен",
"ru": "Оставить пустым, если запрос пароля не нужен",
"pt": "Deixe-o em branco se nenhuma senha desejada",
"nl": "Laat het leeg als er geen wachtwoord gewenst is",
"fr": "Laissez-le vide si aucun mot de passe n'est souhaité",
Expand All @@ -127,7 +127,7 @@ systemDictionary = {
"All requests will be sent to this text2Command instance": {
"en": "All requests will be sent to this text2Command instance",
"de": "Alle Anfragen werden an diese text2Command Instanz weitergeleitet",
"ru": "Все сообщения от клиентов будут пересылаться на етот text2Command драйвер",
"ru": "Все сообщения от клиентов будут пересылаться на этот text2Command драйвер",
"pt": "Todos os pedidos serão enviados para este exemplo de texto2Command",
"nl": "Alle aanvragen worden verzonden naar dit text2Command-exemplaar",
"fr": "Toutes les demandes seront envoyées à cette instance de text2Command",
Expand All @@ -139,7 +139,7 @@ systemDictionary = {
"Remember authenticated users": {
"en": "Remember authenticated users",
"de": "Speichere authentifizierte Anwender um kein Kennwort mehr zu fragen",
"ru": "Запоминпать ID клиентов, которые ввели пароль, что бы не спрашивать больше",
"ru": "Запоминать ID клиентов, которые ввели пароль, что бы в дальнейшем не спрашивать",
"pt": "Lembre-se de usuários autenticados",
"nl": "Onthoud geverifieerde gebruikers",
"fr": "Se souvenir des utilisateurs authentifiés",
Expand All @@ -163,12 +163,12 @@ systemDictionary = {
"restarting_help": {
"en": "This text will be sent to clients by stopping of bot",
"de": "Dieser Text wird beim Anhalten vom Bot an die Clients gesendet",
"ru": "Этот текст будет послан всем клиентам при остановке бота",
"ru": "Этот текст будет послан всем клиентам при останове бота",
"pt": "Este texto será enviado aos clientes, parando o bot",
"nl": "Deze tekst zal naar klanten worden verzonden door bot te stoppen",
"fr": "Ce texte sera envoyé aux clients en arrêtant le bot",
"it": "Questo testo verrà inviato ai client interrompendo il bot",
"es": "Este texto se enviará a los clientes deteniendo bot",
"pl": "Ten tekst zostanie wysłany do klientów poprzez zatrzymanie bota"
}
};
};

0 comments on commit 66d9d13

Please sign in to comment.