Mobile Table view & Merge wording from leiweibau

config/pialert.conf

@@ -25,7 +25,7 @@ REPORT_DEVICE_URL = 'http://pi.alert/deviceDetails.php?mac='
 
 REPORT_NTFY       = False
 REPORT_DASHBOARD_URL = 'http://pi.alert/'
-NTFY_TOPIC        = 'replace_my_secure_topicname_91h889f28'
+NTFY_TOPIC        = 'replace-my-secure-topicname-91h889f28'
 
 # QUERY_MYIP_SERVER = 'https://diagnostic.opendns.com/myip'
 QUERY_MYIP_SERVER = 'http://ipv4.icanhazip.com'

front/deviceDetails.php

@@ -321,9 +321,9 @@ if ($_REQUEST['mac'] == 'Internet') { $DevDetail_Tap_temp = "Tools"; } else { $D
                               <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false" id="dropdownButtonScanCycle">
                                 <span class="fa fa-caret-down"></span></button>
                               <ul id="dropdownScanCycle" class="dropdown-menu dropdown-menu-right">
-                                <li><a href="javascript:void(0)" onclick="setTextValue('txtScanCycle','1 min')">   Scan Device (1min)</a></li>
+                                <li><a href="javascript:void(0)" onclick="setTextValue('txtScanCycle','1 min')"><?php echo $pia_lang['DevDetail_EveandAl_ScanCycle_a'];?></a></li>
                                 <!-- <li><a href="javascript:void(0)" onclick="setTextValue('txtScanCycle','15 min');"> Scan 12 min every 15 min</a></li> -->
-                                <li><a href="javascript:void(0)" onclick="setTextValue('txtScanCycle','0 min');">  Don't Scan (0min)</a></li>
+                                <li><a href="javascript:void(0)" onclick="setTextValue('txtScanCycle','0 min');"><?php echo $pia_lang['DevDetail_EveandAl_ScanCycle_z'];?></a></li>
                               </ul>
                             </div>
                           </div>

front/devices.php

@@ -246,7 +246,13 @@ function initializeDatatable () {
     // 'order'       : [[3,'desc'], [0,'asc']],
 
     'columnDefs'   : [
-      {visible:   false,         targets: [10, 11, 12] },
+      // Only display all collums on non mobile device width - still in testing phase
+      if ($(window).width() < 400) {
+        {visible:   false,         targets: [10,11,12,1,2,3,4,5,6,8] },
+      }
+      else {
+        {visible:   false,         targets: [10, 11, 12] },
+      }
       {className: 'text-center', targets: [3, 8, 9] },
       {width:     '80px',        targets: [5, 6] },
       {width:     '0px',         targets: 9 },

front/php/templates/language/de_de.php

@@ -135,6 +135,8 @@ $pia_lang['DevDetail_EveandAl_Skip'] = 'pausiere wiederhol. Meldungen für';
 $pia_lang['DevDetail_EveandAl_NewDevice'] = 'Neues Gerät';
 $pia_lang['DevDetail_EveandAl_Archived'] = 'Archivierung';
 $pia_lang['DevDetail_EveandAl_RandomMAC'] = 'Zufällige MAC';
+$pia_lang['DevDetail_EveandAl_ScanCycle_a'] = 'Gerät scannen (1 min)';
+$pia_lang['DevDetail_EveandAl_ScanCycle_z'] = 'Gerät nicht scannen (0 min)';
 $pia_lang['DevDetail_button_Delete'] = 'Lösche Gerät';
 $pia_lang['DevDetail_button_Reset'] = 'Verwerfen';
 $pia_lang['DevDetail_button_Save'] = 'Speichern';

front/php/templates/language/en_us.php

@@ -135,6 +135,8 @@ $pia_lang['DevDetail_EveandAl_Skip'] = 'Skip repeated notifications during';
 $pia_lang['DevDetail_EveandAl_NewDevice'] = 'New Device';
 $pia_lang['DevDetail_EveandAl_Archived'] = 'Archived';
 $pia_lang['DevDetail_EveandAl_RandomMAC'] = 'Random MAC';
+$pia_lang['DevDetail_EveandAl_ScanCycle_a'] = 'Scan Device (1 min)';
+$pia_lang['DevDetail_EveandAl_ScanCycle_z'] = 'Don't Scan Device (0 min)';
 $pia_lang['DevDetail_button_Delete'] = 'Delete Device';
 $pia_lang['DevDetail_button_Reset'] = 'Reset Changes';
 $pia_lang['DevDetail_button_Save'] = 'Save';