fix up

doxikus · Jun 18, 2015 · 5aa7405 · 5aa7405
1 parent b0a2583
commit 5aa7405
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/modules/kwh/highcharts b/modules/kwh/highcharts
@@ -10,7 +10,7 @@ fi
 
 
 
-mkdir -p $dir/tmp/kwh 1> /dev/null
+mkdir -p $dir/tmp/kwh
 gpio=$(sqlite3 $dir/dbf/nettemp.db  "SELECT gpio FROM gpio WHERE mode='kwh'")
 
 if [ -n "$gpio" ]; then
@@ -24,7 +24,7 @@ if base=$(sqlite3 $dir/dbf/kwh.db "select strftime('%s', time),pulse FROM kwh;")
 	middle=$(printf "$base %s\n" | awk -F "|" '{printf "["}{ printf "%3.0f",($1)*1000}{printf ","}{printf "%3.3f", $2/'$divider'}{print "]," }')
 	echo -e "[ ${middle%?} ]" > $dir/tmp/kwh/gpio_kwh_min.json
     else 
-	echo "cannot read base"
+	echo "kWh: cannot read base"
 fi
 else 
     echo "kWh OFF"

diff --git a/modules/kwh/html/kwh_charts.php b/modules/kwh/html/kwh_charts.php
@@ -1,11 +1,3 @@
-<span class="belka">&nbsp kWh charts<span class="okno"> 
-
-<script type="text/javascript" src="modules/kwh/html/js/jquery.min.js"></script>
-<script src="modules/kwh/html/js/highstock.js"></script>
-<script src="modules/kwh/html/js/exporting.js"></script>
-
-
-
 <div id="container" style="height: 400px"></div>
 <br />
 <div id="container2" style="height: 400px"></div>

diff --git a/modules/mail/html/mail_test.php b/modules/mail/html/mail_test.php
@@ -26,7 +26,7 @@
     <td>Send test mail to:</td>
     <td><input type="text" name="test_mail" size="25" value="<?php echo $a["test_mail"]; ?>" /></td>
     <input type="hidden" name="mail_test1" value="mail_test2" />
-    <td><input class="btn btn-primary" type="submit" value="Test"  /></td>
+    <td><input class="btn btn-primary" type="submit" value="Send"  /></td>
     </form>
 </tr>		
 </table>

diff --git a/modules/security/authmod/html/authmod_pass.php b/modules/security/authmod/html/authmod_pass.php
@@ -5,6 +5,9 @@
 	else {
 	    echo "Status: enabled"; 
 	}
+?>
+<hr>
+<?php
 
 $pass = isset($_POST['pass']) ? $_POST['pass'] : '';
 $pass2 = isset($_POST['pass2']) ? $_POST['pass2'] : '';
@@ -22,11 +25,11 @@
 	}
 	?>
 
-	<form action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
 	<table> 
+	<form action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
 	<input type="hidden"  name="chg" value="chg2"/></td></tr>
-        <tr><td>Password :</td><td><input type="password"  name="pass" size="8"/></td></tr>		
-	<tr><td>Repeat:</td><td><input type="password"  name="pass2" size="8"/></td></tr>		
-	</table>     
-        <input  type="submit" value="Change" class="btn btn-default" />
+        <tr><td><label>Password:</label><input type="password"  name="pass" size="8"/></td></tr>		
+	<tr><td><label>Repeat:</label><input type="password"  name="pass2" size="8"/></td></tr>		
+        <tr><td><input  type="submit" value="Change" class="btn btn-primary" /></td></tr>		
         </form>
+</table>     
diff --git a/modules/security/fw/html/fw_settings.php b/modules/security/fw/html/fw_settings.php
@@ -48,6 +48,6 @@
 		</p>
 		<input type="hidden" name="fw_apply" value="fw_apply" />
 		<br>
-	        <input type="submit" name="submit" value="Apply" class="btn btn-primary" />
+	        <input type="submit" name="submit" value="Save" class="btn btn-primary" />
 		</form>
 
diff --git a/modules/tools/html/tools.php b/modules/tools/html/tools.php
@@ -14,7 +14,7 @@
 <a href="index.php?id=tools&type=reboot" ><button class="btn btn-default">Reboot</button></a>
 <a href="index.php?id=tools&type=log" ><button class="btn btn-default">Logging</button></a>
 <?php if ( $gpio == 'on' ) { ?>
-<a href="index.php?id=tools&type=gpio" ><button class="btn btn-default">Gpio</button></a>
+<a href="index.php?id=tools&type=gpio" ><button class="btn btn-default">GPIO</button></a>
 <?php } ?>
 <a href="index.php?id=tools&type=backup" ><button class="btn btn-default">Backup/Restore</button></a>
 <a href="index.php?id=tools&type=espupload" ><button class="btn btn-default">ESPupload</button></a>