From b557c855ccde97f41cfc0eb9b0a9ebcbb0fe596b Mon Sep 17 00:00:00 2001
From: felixerdy <felix.erdmann@uni-muenster.de>
Date: Wed, 29 Apr 2020 13:55:40 +0200
Subject: [PATCH] fix(TTN): TTN port optional and sketch params layout

---
 app/styles/main.css                    |  4 ++++
 app/views/account.box.edit.script.html | 16 ++++++++--------
 app/views/account.box.edit.ttn.html    |  2 +-
 app/views/account.box.register.html    |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/styles/main.css b/app/styles/main.css
index 1f05ed70..d56134c2 100644
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -1783,4 +1783,8 @@ nav > a.active {
 .btn-toClipboard:hover {
   color:#fff;
   background-color: #4EAF47;
+}
+
+.break {
+  display: block !important;
 }
\ No newline at end of file
diff --git a/app/views/account.box.edit.script.html b/app/views/account.box.edit.script.html
index 20e548bb..2385f94e 100644
--- a/app/views/account.box.edit.script.html
+++ b/app/views/account.box.edit.script.html
@@ -7,7 +7,7 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
     <!-- Firefox workaround https://github.com/sensebox/openSenseMap/issues/295-->
     <input type="password" style="display:none;">
     <!-- Firefox workaround end -->
-    <div class="form-group" ng-if="script.showSerialPort">
+    <div class="form-group break" ng-if="script.showSerialPort">
       <label for="serialport">{{'PORT'|translate}}</label>
       <div class="input-group" uib-tooltip-template="'tooltip_serialports.html'" tooltip-placement="bottom"
         tooltip-trigger="'mouseenter'">
@@ -21,7 +21,7 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
         </div>
       </div>
     </div>
-    <div class="form-group" ng-if="script.showSoilDigitalPort">
+    <div class="form-group break" ng-if="script.showSoilDigitalPort">
       <label for="soilDigitalPort">{{'SOIL_MOISTURE'|translate}}<br />{{'DIGITAL_PORT'|translate}}</label>
       <div class="input-group">
         <select type="text" class="form-control" id="soilDigitalPort" ng-model="script.soilDigitalPort"
@@ -35,7 +35,7 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
         </div>
       </div>
     </div>
-    <div class="form-group" ng-if="script.showSoundMeterPort">
+    <div class="form-group break" ng-if="script.showSoundMeterPort">
       <label for="soundMeterPort">{{'SOUND_LEVEL'|translate}}<br />{{'DIGITAL_PORT'|translate}}</label>
       <div class="input-group">
         <select type="text" class="form-control" id="soundMeterPort" ng-model="script.soundMeterPort"
@@ -49,7 +49,7 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
         </div>
       </div>
     </div>
-    <div class="form-group" ng-if="script.showWifiConfiguration">
+    <div class="form-group break" ng-if="script.showWifiConfiguration">
       <label for="ssid">WiFi SSID</label>
       <div class="input-group" uib-tooltip="{{'DATA_NOT_STORED'|translate}}" tooltip-placement="top"
         tooltip-trigger="'mouseenter'">
@@ -60,7 +60,7 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
         </div>
       </div>
     </div>
-    <div class="form-group" ng-if="script.showWifiConfiguration">
+    <div class="form-group break" ng-if="script.showWifiConfiguration">
       <label for="password">WiFi {{'ACCOUNT_PASSWORD'|translate}}</label>
       <div class="input-group" uib-tooltip="{{'DATA_NOT_STORED'|translate}}" tooltip-placement="top"
         tooltip-trigger="'mouseenter'">
@@ -74,7 +74,7 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
         </div>
       </div>
     </div>
-    <div class="form-group" ng-if="script.showTTNConfiguration">
+    <div class="form-group break" ng-if="script.showTTNConfiguration">
       <label for="devEUI">The Things Network Device EUI</label>
       <div class="input-group" uib-tooltip-template="'tooltip_ttn_keys.html'" tooltip-placement="top"
         tooltip-trigger="'mouseenter'">
@@ -85,7 +85,7 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
         </div>
       </div>
     </div>
-    <div class="form-group" ng-if="script.showTTNConfiguration">
+    <div class="form-group break" ng-if="script.showTTNConfiguration">
       <label for="appEUI">The Things Network Application EUI</label>
       <div class="input-group" uib-tooltip-template="'tooltip_ttn_keys.html'" tooltip-placement="top"
         tooltip-trigger="'mouseenter'">
@@ -98,7 +98,7 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
         </div>
       </div>
     </div>
-    <div class="form-group" ng-if="script.showTTNConfiguration">
+    <div class="form-group break" ng-if="script.showTTNConfiguration">
       <label for="appKey">The Things Network Application Key</label>
       <div class="input-group" uib-tooltip-template="'tooltip_ttn_keys.html'" tooltip-placement="top"
         tooltip-trigger="'mouseenter'">
diff --git a/app/views/account.box.edit.ttn.html b/app/views/account.box.edit.ttn.html
index a03549a9..51b983f4 100644
--- a/app/views/account.box.edit.ttn.html
+++ b/app/views/account.box.edit.ttn.html
@@ -41,7 +41,7 @@ <h2 style="margin-top: 0px; margin-bottom: 0px">{{'EDIT_TTN'|translate}} - TTN</
     </div>
     <!-- TTN Port -->
     <div class="form-group">
-      <label class="control-label">{{ 'TTN_PORT' | translate }}</label>
+      <label class="control-label">{{ 'TTN_PORT' | translate }} (optional)</label>
       <input type="number"  name="ttn_decodeoptions" class="form-control monospace" ng-model="ttn.settings.port" min="1" max="65535">
     </div>
     <div uib-alert class="alert-danger" ng-hide="ttn.validTTNconfig">{{ 'TTN_INVALID_DECODEOPTS' | translate }}</div>
diff --git a/app/views/account.box.register.html b/app/views/account.box.register.html
index 7e7e67b7..c64066f4 100644
--- a/app/views/account.box.register.html
+++ b/app/views/account.box.register.html
@@ -1185,7 +1185,7 @@ <h1><small>{{ 'STEP2_SUB4' | translate }}</small></h1>
                   </div>
                   <!-- TTN Port -->
                   <div class="form-group">
-                    <label class="control-label">{{ 'TTN_PORT' | translate }}</label>
+                    <label class="control-label">{{ 'TTN_PORT' | translate }} (optional)</label>
                     <input type="number" name="ttn_decodeoptions" class="form-control monospace"
                       ng-model="register.ttn.port" min="1" max="65535">
                   </div>