Some little fixes

iobroker-community-adapters · Sep 20, 2019 · 46e97ce · 46e97ce
1 parent 3d51d9f
commit 46e97ce
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 7 deletions.
diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "Hardware",
     "Hide assigned issues button": "Button 'Zugewiesene Issues' ausblenden",
     "Hide clock": "Uhr nicht anzeigen",
+    "Hide closed adapter requests": "Geschlossene Adapteranforderungen ausblenden",
     "Hide my issues button": "Button 'Meine Issues' ausblenden",
     "Hide starred repos button": "Button 'Lieblings-Repos' ausblenden",
     "Hide watched repos button": "Button 'Beobachtete Repos' ausblenden",

diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "Hardware",
     "Hide assigned issues button": "Hide 'assigned issues' button",
     "Hide clock": "Do not show clock",
+    "Hide closed adapter requests": "Hide closed adapter requests",
     "Hide my issues button": "Hide 'my issues' button",
     "Hide starred repos button": "Hide 'favourite repos' button",
     "Hide watched repos button": "Hide 'watched repos' button",

diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "Hardware",
     "Hide assigned issues button": "Oculta el botón 'Asignaciones asignadas'",
     "Hide clock": "No mostrar reloj",
+    "Hide closed adapter requests": "Ocultar solicitudes de adaptador cerradas",
     "Hide my issues button": "Ocultar el botón 'Mis problemas'",
     "Hide starred repos button": "Ocultar el botón 'Repos favoritos'",
     "Hide watched repos button": "Ocultar el botón 'Repos vistos'",

diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "Matériel",
     "Hide assigned issues button": "Masquer le bouton 'Problèmes assignés'",
     "Hide clock": "Ne pas montrer l'horloge",
+    "Hide closed adapter requests": "Masquer les demandes d'adaptateur fermées",
     "Hide my issues button": "Masquer le bouton 'Mes problèmes'",
     "Hide starred repos button": "Masquer le bouton 'Repos favori'",
     "Hide watched repos button": "Masquer le bouton 'Repos surveillé'",

diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "Hardware",
     "Hide assigned issues button": "Nascondi pulsante 'problemi assegnati'",
     "Hide clock": "Nascondi l'orologio",
+    "Hide closed adapter requests": "Nascondi richieste di adattatori chiuse",
     "Hide my issues button": "Nascondi pulsante 'i miei problemi'",
     "Hide starred repos button": "Nascondi pulsante 'Repos preferiti'",
     "Hide watched repos button": "Nascondi pulsante 'Repos osservati'",

diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "Hardware",
     "Hide assigned issues button": "Verberg de knop 'Toegewezen problemen'",
     "Hide clock": "Laat de klok niet zien",
+    "Hide closed adapter requests": "Verberg gesloten adapterverzoeken",
     "Hide my issues button": "Verberg de knop 'Mijn problemen'",
     "Hide starred repos button": "Verberg 'Favoriete repos'-knop",
     "Hide watched repos button": "Verberg de 'Bewaakte repos'-knop",

diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "Sprzęt",
     "Hide assigned issues button": "Ukryj przycisk „przypisane problemy”",
     "Hide clock": "Nie pokazuj zegara",
+    "Hide closed adapter requests": "Ukryj zamknięte żądania adaptera",
     "Hide my issues button": "Ukryj przycisk „moje problemy”",
     "Hide starred repos button": "Ukryj przycisk „ulubione repo”",
     "Hide watched repos button": "Ukryj przycisk „oglądane repo”",

diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "Hardware",
     "Hide assigned issues button": "Ocultar o botão 'Problemas atribuídos'",
     "Hide clock": "Não mostrar relógio",
+    "Hide closed adapter requests": "Ocultar solicitações de adaptador fechado",
     "Hide my issues button": "Ocultar o botão 'Meus problemas'",
     "Hide starred repos button": "Ocultar o botão 'Repos favoritos'",
     "Hide watched repos button": "Ocultar o botão 'Repos assistidos'",

diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "Аппаратные средства",
     "Hide assigned issues button": "Скрыть кнопку «Назначенные проблемы»",
     "Hide clock": "Не показывать часы",
+    "Hide closed adapter requests": "Скрыть закрытые запросы адаптера",
     "Hide my issues button": "Скрыть кнопку «Мои проблемы»",
     "Hide starred repos button": "Скрыть кнопку «Любимые репо»",
     "Hide watched repos button": "Скрыть кнопку «Просмотренные репо»",

diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json
@@ -50,6 +50,7 @@
     "Hardware": "硬件",
     "Hide assigned issues button": "隐藏“已分配的问题”按钮",
     "Hide clock": "隐藏时钟",
+    "Hide closed adapter requests": "隐藏已关闭的适配器请",
     "Hide my issues button": "隐藏“我的问题”按钮",
     "Hide starred repos button": "隐藏“最喜欢的回购”按钮",
     "Hide watched repos button": "隐藏'看过的回购'按钮",

diff --git a/admin/index_m.html b/admin/index_m.html
@@ -85,16 +85,24 @@
                         <label for="clock" class="translate">Hide clock</label>
                         <span class="translate"></span>
                     </div>
-                    <div class="input-field col m6 l2">
+                    <div class="input-field col m4 l2">
                         <input class="value" id="adapter_request" type="checkbox" />
                         <label for="adapter_request" class="translate">Show adapter requests</label>
                         <span class="translate"></span>
                     </div>
-                    <div class="input-field col m6 l3">
+                    <div class="input-field col m4 l3">
+                        <input class="value" id="adapter_request_close_hidden" type="checkbox" />
+                        <label for="adapter_request_close_hidden" class="translate">Hide closed adapter requests</label>
+                        <span class="translate"></span>
+                    </div>                    
+                    <div class="input-field col m4 l3">
                         <input class="value" id="adapter_request_closed" type="checkbox" />
                         <label for="adapter_request_closed" class="translate">Show adapter requests closed at startup</label>
                         <span class="translate"></span>
                     </div>
+                </div>
+
+                <div class="row">
                     <div class="input-field col m6 l2">
                         <input class="value" id="adapter_issue" type="checkbox" />
                         <label for="adapter_issue" class="translate">Show known errors</label>

diff --git a/admin/lib/js/adapterRequests.js b/admin/lib/js/adapterRequests.js
@@ -112,7 +112,7 @@ function writeAllIssuesV4(allIssues, id) {
                 const votes = "<strong class='text-primary'>" + _("Total votes") + ": <span id='reactionARNumber" + issue.number + "'>" + issue.reactions.totalCount + "</span></strong>";
                 let buttons = "<div class='pull-right marginHoch'>";
                 if (issue.comments.totalCount > 0) {
-                    buttons += "<button type='button' data-issue-id='" + issue.id + "' id='issueComments" + issue.databaseId + "' class='openIssueComments btn btn-default'><i class='fa fa-commenting fa-lg'></i></button>"
+                    buttons += "<button type='button' data-issue-id='" + issue.id + "' id='issueComments" + issue.databaseId + "' class='openIssueComments btn btn-default'><i class='fa fa-commenting fa-lg'></i></button>&nbsp;";
                 }
                 buttons += "<button type='button' title='" + (issue.reactions.viewerHasReacted ? _("I voted!") : _("Vote for this adapter request!")) + "' id='reactionAR" + issue.number + "' class='adapterRequestReaction btn btn-" + (issue.reactions.viewerHasReacted ? 'success' : 'default') + "'><i class='fa fa-thumbs-up fa-lg'></i></button>";
                 buttons += "</div>";
@@ -132,7 +132,7 @@ function writeAllIssuesV4(allIssues, id) {
                         $item.find('.y_title').css("background-color", "#cccccc");
                     }
                 }
-                $item.find('y_content').append($(votes));
+                $item.find('.y_content').append($(votes)).append($("<div class='marginRunter' id='allCommentsDiv" + issue.databaseId + "'></div>"));
             } else {
                 if (issue.comments.totalCount > 0) {
                     let number = issue.comments.totalCount;
@@ -240,7 +240,7 @@ function showAdapterRequest() {
             allIssues = JSON.parse(sessionStorage.getItem(storagePoint));
         } else {
             if (adapterConfig.github_token) {
-                allIssues = await getAllIssues("ioBroker", "AdapterRequests", null, false, false);
+                allIssues = await getAllIssues("ioBroker", "AdapterRequests", null, false, adapterConfig.adapter_request_close_hidden ? true : false);
             } else {
                 allIssues = await getAllIssuesFromAdapter("ioBroker/AdapterRequests");
             }

diff --git a/admin/words.js b/admin/words.js
diff --git a/data/news.json b/data/news.json
@@ -293,4 +293,4 @@
             "iot": "between(1.0.0,1.0.3)"
         }
     }
-]
+]
diff --git a/io-package.json b/io-package.json
@@ -4,7 +4,16 @@
         "version": "1.5.0",
         "news": {
             "1.5.0": {
-                "en": "I don't know"
+                "en": "New features for adapter request",
+                "de": "Neue Funktionen für die Adapteranforderung",
+                "ru": "Новые функции для запроса адаптера",
+                "pt": "Novos recursos para solicitação de adaptador",
+                "nl": "Nieuwe functies voor adapteraanvraag",
+                "fr": "Nouvelles fonctionnalités pour la demande d'adaptateur",
+                "it": "Nuove funzionalità per la richiesta dell'adattatore",
+                "es": "Nuevas características para solicitud de adaptador",
+                "pl": "Nowe funkcje żądania adaptera",
+                "zh-cn": "适配器请求的新功能"
             },
             "1.4.3": {
                 "en": "News bug fixed",
@@ -190,6 +199,7 @@
         "new_adapters_order": false,
         "new_adapters_closed": false,
         "adapter_request": true,
+        "adapter_request_close_hidden": false,
         "adapter_request_closed": false,
         "adapter_issue": true,
         "adapter_issue_closed": false,
-Original file line number
+Diff line change
@@ Expand Up / @@ -293,4 +293,4 @@ @@
                 "iot": "between(1.0.0,1.0.3)"
             }
         }
-    ]
+    ]