Modal

iobroker-community-adapters · Apr 4, 2019 · d4ab635 · d4ab635
1 parent 78c4ef2
commit d4ab635
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/admin/index_m.html b/admin/index_m.html
@@ -180,7 +180,7 @@
 
                 <div class="row">                    
                     <div class="input-field col s6">
-                        <input class="value" id="new_adapters_order" type="text" />
+                        <input class="value" id="github_token" type="text" />
                         <label for="github_token" class="translate">GitHub personal access token</label>
                         <span class="translate"></span>
                     </div>                  

diff --git a/admin/lib/js/helper.js b/admin/lib/js/helper.js
@@ -261,15 +261,34 @@ $(function () {
     $('#modal-system').on('hidden.bs.modal', function (e) {
         socket.emit('unsubscribe', 'info.0.sysinfo.*');
     });
+
+    function isBugReport(){
+        $('#githubChooseButtons').addClass('hidden');
+        $('#githubIssueCreator').removeClass('hidden');
+        $('#githubSystemInformationForRequest').html(systemInfoForGithub.replace(/(?:\r\n|\r|\n)/g, ", ")).removeClass('hidden');
+    }    
+    function isFeatureRequest(){
+        $('#githubChooseButtons').addClass('hidden');
+        $('#githubIssueCreator').removeClass('hidden');
+        $('#githubSystemInformationForRequest').addClass('hidden');
+    }
+    function backToBasic(){
+        $('#githubChooseButtons').removeClass('hidden');
+        $('#githubIssueCreator').addClass('hidden');
+        $('#githubSystemInformationForRequest').addClass('hidden');
+    }
 
     $(document.body).on('click', '#new-adapter-request:not(.disabled)', function () {
+        isFeatureRequest();
         $('#modal-github').modal();
     });
-
     $(document.body).on('click', '.create-issue-adapter-button:not(.disabled)', function () {
-        $('#githubSystemInformationForRequest').html(systemInfoForGithub.replace(/(?:\r\n|\r|\n)/g, ", "));
+        isBugReport();
         $('#modal-github').modal();
     });
+     $('#modal-github').on('hidden.bs.modal', function (e) {
+        backToBasic();
+    });
 
     $(document.body).on('click', '.show-md', function () {
         const url = $(this).data('md-url');

diff --git a/admin/tab_m.html b/admin/tab_m.html
@@ -569,14 +569,14 @@ <h4 class="modal-title" id="modal-command-label">Modal title</h4>
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal">
-                            <i class="fa fa-window-minimize"></i>
+                            <i class="fa fa-close"></i>
                         </button>
                         <h4 class="modal-title translate">Create new issue on GitHub</h4>
                     </div>
                     <div class="modal-body">
                         <div id="githubChooseButtons" class="text-center">
-                            <button type="button" class="btn btn-primary translate">Add feature request</button>
-                            <button type="button" class="btn btn-danger translate">Add bug report</button>
+                            <button type="button" id="addRequestBtn" class="btn btn-primary translate">Add feature request</button>
+                            <button type="button" id="addBugBtn" class="btn btn-danger translate">Add bug report</button>
                         </div>
                         <div id="githubIssueCreator" class="hidden">
                             <p class="h4 alert alert-info translate">Ideally, inquiries should be made in English because some developers come from abroad and are not proficient in the local language.</p>
@@ -597,9 +597,11 @@ <h4 class="translate">To better investigate the problem, the following data will
                     </div>
                     <div class="modal-footer">
                         <div class="btn-group pull-left">
-                            <button type="button" class="btn btn-default translate disabled">Open on GitHub</button>
+                            <button type="button" class="btn btn-default disabled">
+                                <span class='glyphicon glyphicon-globe' aria-hidden='true'></span> <span class="translate">Open on GitHub</span>
+                            </button>
                         </div>
-                        <button type="button" class="btn btn-success translate">Submit new issue</button>
+                        <button type="button" class="btn btn-success translate disabled">Submit new issue</button>
                         <button type="button" class="btn btn-default translate" data-dismiss="modal">Cancel</button>
                     </div>
                 </div>
@@ -613,7 +615,7 @@ <h4 class="translate">To better investigate the problem, the following data will
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal">
-                            <i class="fa fa-window-minimize"></i>
+                            <i class="fa fa-close"></i>
                         </button>
                         <h4 class="modal-title translate">System informations</h4>
                     </div>