diff options
7 files changed, 29 insertions, 53 deletions
diff --git a/modules-available/debugconfig/lang/de/module.json b/modules-available/debugconfig/lang/de/module.json index 461bebdb..dd56d45e 100644 --- a/modules-available/debugconfig/lang/de/module.json +++ b/modules-available/debugconfig/lang/de/module.json @@ -1,3 +1,3 @@ { - "module_name": "KonfigurationsVariablen" -}
\ No newline at end of file + "module_name": "Remote Debugging" +} diff --git a/modules-available/debugconfig/lang/de/template-tags.json b/modules-available/debugconfig/lang/de/template-tags.json index cdd54f6a..3268ff13 100644 --- a/modules-available/debugconfig/lang/de/template-tags.json +++ b/modules-available/debugconfig/lang/de/template-tags.json @@ -1,7 +1,6 @@ { - "lang_basicConfiguration": "Basiskonfiguration", - "lang_clientRelatedConfig": "Die Optionen auf dieser Seite beziehen sich auf das Verhalten der bwLehrpool-Clients.", - "lang_editOverrideNotice": "Sie bearbeiten die Einstellungen f\u00fcr einen Unterbereich", - "lang_enableOverride": "\u00dcberschreiben", - "lang_settingActive": "Einstellung aktiv" -}
\ No newline at end of file + "lang_debugConfig": "Remote Debugging Konfiguration", + "lang_debugDescription": "Optionen f\u00fcr die Remote Debugging Konfiguration. Wenn die Funktion aktiviert ist, akzeptiert der Satelliten Server Anfragen von bwlp-Arbeitspl\u00e4tzen und leitet die Daten an den spezifizierten Debugging Server weiter.", + "lang_debuggingActive": "Remote debugging ist aktiviert", + "lang_debuggingInactive": "Remote debugging ist deaktiviert" +} diff --git a/modules-available/debugconfig/lang/en/template-tags.json b/modules-available/debugconfig/lang/en/template-tags.json index 351dc0bc..8989deec 100644 --- a/modules-available/debugconfig/lang/en/template-tags.json +++ b/modules-available/debugconfig/lang/en/template-tags.json @@ -1,6 +1,6 @@ { "lang_debugConfig": "Remote Debugging Configuration", - "lang_debugDescription": "Configure remote debugging options. If enabled, the satellite server will accept client requests and relay data to the debugging server.", + "lang_debugDescription": "Configure remote debugging options. If enabled, the satellite server will accept client requests and relay data to the specified debugging server.", "lang_debuggingActive": "Remote debugging is enabled", "lang_debuggingInactive": "Remote debugging is disabled" } diff --git a/modules-available/debugconfig/lang/pt/template-tags.json b/modules-available/debugconfig/lang/pt/template-tags.json index 14367665..8989deec 100644 --- a/modules-available/debugconfig/lang/pt/template-tags.json +++ b/modules-available/debugconfig/lang/pt/template-tags.json @@ -1,3 +1,6 @@ { - "lang_basicConfiguration": "Configura\u00e7\u00e3o B\u00e1sica" -}
\ No newline at end of file + "lang_debugConfig": "Remote Debugging Configuration", + "lang_debugDescription": "Configure remote debugging options. If enabled, the satellite server will accept client requests and relay data to the specified debugging server.", + "lang_debuggingActive": "Remote debugging is enabled", + "lang_debuggingInactive": "Remote debugging is disabled" +} diff --git a/modules-available/debugconfig/page.inc.php b/modules-available/debugconfig/page.inc.php index 3ec394f6..27ef94fd 100644 --- a/modules-available/debugconfig/page.inc.php +++ b/modules-available/debugconfig/page.inc.php @@ -51,12 +51,14 @@ class Page_debugConfig extends Page foreach ($relays as $key => $value) { $task = Taskmanager::status($value); $finished = Taskmanager::isFinished($task); - $endpoints = $task["data"]["endpoints"]; + //$endpoints = $task["data"]["endpoints"]; if ($task["statusCode"] == "NO_SUCH_INSTANCE" || $finished) { Property::removeFromList("DispatchedRelay", $value); unset($relays[$key]); } - $relays[$key] = array("id" => $value, "bwlpclient" => $endpoints[0], "debugserver" => $endpoints[1]); + $relays[$key] = array("id" => $value, "port" => $task["data"]["listenPort"], + "code" => $task["statusCode"], "cltAddress" => $task["data"]["cltAddr"]); + //$relays[$key] = array("id" => $value, "bwlpclient" => $endpoints[0], "debugserver" => $endpoints[1]); } return $relays; } diff --git a/modules-available/debugconfig/templates/debugconfig.html b/modules-available/debugconfig/templates/debugconfig.html index 200eb355..91ee9799 100644 --- a/modules-available/debugconfig/templates/debugconfig.html +++ b/modules-available/debugconfig/templates/debugconfig.html @@ -19,21 +19,6 @@ <div class="col-md-2"> <input name="port" id="DBG_SERVER_PORT" class="form-control" value="{{port}}" type="text" /> </div> - <div class="col-md-2"> - <a class="btn btn-default" data-toggle="modal" data-target="help-remoteDebugging"> - <span class="glyphicon glyphicon-question-sign"></span> - </a> - </div> - - <div class="modal fade" id="help-remoteDebugging" tabindex="-1" role="dialog"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header">{{setting}}</div> - <div class="modal-body">{{{description}}}</div> - <div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div> - </div> - </div> - </div> </div> <div class="panel-footer"> <button type="submit" class="btn btn-primary">{{lang_save}}</button> diff --git a/modules-available/debugconfig/templates/relaystatus.html b/modules-available/debugconfig/templates/relaystatus.html index d38b3735..17b05b04 100644 --- a/modules-available/debugconfig/templates/relaystatus.html +++ b/modules-available/debugconfig/templates/relaystatus.html @@ -1,32 +1,23 @@ <div class="panel panel-default"> - <div class="panel-heading"> - Active relays - </div> + <div class="panel-heading">Relay Status</div> <div class="panel-body"> <table class="table table-striped table-condensed"> <thead> <tr> - <th>Relay ID</th> - <th>BWLP client</th> - <th>Debug Server</th> - <th> - <form method="post"> - <input type="hidden" name="token" value={{token}}> - <input type="hidden" name="action" value="refreshList"> - <button type="submit" class="btn btn-default pull-right btn-xs" title="Refresh relay list"><span class="glyphicon glyphicon-refresh"></span></button> - </form> - </th> + <th>Client</th> + <th>Port</th> + <th>Status</th> + <th>Log</th> </tr> </thead> <tbody> - {{#activeRelays}} + {{#activeRelays}} <tr> - <td>{{id}}</td> - <td>{{bwlpclient}}</td> - <td>{{debugserver}}</td> - <td> - <div class="btn-group pull-right"> + <td>{{cltAddress}}</td> + <td>{{port}}</td> + <td>{{code}}</td> + <td> <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#log" title="Show log"><span class="glyphicon glyphicon-paperclip"></span></button> <div id="log" class="modal fade" tabindex="-1" role="dialog"> <div class="modal-dialog"> @@ -39,14 +30,10 @@ </div> </div> </div> - </div> - </td> + </td> </tr> - {{/activeRelays}} + {{/activeRelays}} </tbody> </table> - <!-- </div> - <div data-tm-id="{{id}}" data-tm-log="messages"> - </div> --> </div> </div> |