diff options
| author | Simon Rettberg | 2017-05-10 10:01:57 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-05-10 10:01:57 +0200 |
| commit | 047f348742a38b6fc34d724e69e1c9a4f90821f8 (patch) | |
| tree | ec260d986336c27fa9e293da6c2b20ceb765165c | |
| parent | Merge branch 'master' of dnbd3:openslx-ng/slx-admin (diff) | |
| download | slx-admin-047f348742a38b6fc34d724e69e1c9a4f90821f8.tar.gz slx-admin-047f348742a38b6fc34d724e69e1c9a4f90821f8.tar.xz slx-admin-047f348742a38b6fc34d724e69e1c9a4f90821f8.zip | |
[statistics] Hide "add beamer" for screens with no EDID
3 files changed, 6 insertions, 2 deletions
diff --git a/modules-available/statistics/lang/de/template-tags.json b/modules-available/statistics/lang/de/template-tags.json index 7274aef4..e0be0d48 100644 --- a/modules-available/statistics/lang/de/template-tags.json +++ b/modules-available/statistics/lang/de/template-tags.json @@ -47,6 +47,7 @@ "lang_modelStats": "PC-Modelle", "lang_more": "Mehr", "lang_newMachines": "Neue Ger\u00e4te", + "lang_noEdid": "Kein EDID", "lang_noProjectorsDefined": "Keine Beamer-Overrides definiert", "lang_notes": "Anmerkungen", "lang_onlineMachines": "Gestartete Clients", diff --git a/modules-available/statistics/lang/en/template-tags.json b/modules-available/statistics/lang/en/template-tags.json index 4e135388..4a31a5ee 100644 --- a/modules-available/statistics/lang/en/template-tags.json +++ b/modules-available/statistics/lang/en/template-tags.json @@ -47,6 +47,7 @@ "lang_modelStats": "PC models", "lang_more": "More", "lang_newMachines": "New machines", + "lang_noEdid": "No EDID", "lang_noProjectorsDefined": "No projector overrides defined", "lang_notes": "Notes", "lang_onlineMachines": "Online clients", diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index bdc51167..74df80c4 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -143,6 +143,7 @@ </form> {{#screens}} <div class="small"> + {{#hwname}} <div class="pull-right btn-group btn-group-xs"> {{#projector}} <a href="?do=statistics&show=projectors" class="btn btn-default">{{lang_projector}}</a> @@ -154,7 +155,8 @@ class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> {{lang_projector}}</button> {{/projector}} </div> - {{connector}}: <b>{{hwname}}</b> {{resolution}} + {{/hwname}} + {{connector}}: <b>{{hwname}}</b> {{^hwname}}<i>{{lang_noEdid}}</i>{{/hwname}} {{resolution}} <div class="clearfix"></div> </div> {{/screens}} @@ -187,4 +189,4 @@ document.addEventListener("DOMContentLoaded", function () { $(this).load('?do=statistics&lookup=' + $(this).text()); }); }, false); -// --></script>
\ No newline at end of file +// --></script> |