From 8864c558582e0c9e368a1919a4d65c3e7a28a4ba Mon Sep 17 00:00:00 2001
From: Griffin Boyce <griffinboyce@gmail.com>
Date: Tue, 5 Nov 2013 15:47:54 -0500
Subject: [PATCH 1/2] disabled ui element float on load, fixes #32

---
 files/usr/share/commotion/files/olsr-viz.sh | 2 +-
 htdocs/luci-static/commotion_index.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/usr/share/commotion/files/olsr-viz.sh b/files/usr/share/commotion/files/olsr-viz.sh
index bed9f0f..5c2e4c1 100755
--- a/files/usr/share/commotion/files/olsr-viz.sh
+++ b/files/usr/share/commotion/files/olsr-viz.sh
@@ -25,7 +25,7 @@ STYLE="width: 100%; height: 83%; border: 1px solid #ccc; margin-left:auto; margi
 <FORM ACTION="">
 <P><B TITLE="Sets the Level of Magnification.">Zoom</B>&#160;<A HREF="javascript:set_scale(scale+0.1)">+</A>&#160;<A HREF="javascript:set_scale(scale-0.1)">&ndash;</A>&#160;<INPUT ID="zoom" NAME="zoom" TYPE="text" VALUE="2.0" SIZE="5" ONCHANGE="set_scale()">&#160;
 | &#160;<B TITLE="Sets the Maximum hop-distance.">Max-Hops</B>&#160;<A HREF="javascript:set_maxmetric(maxmetric+1)">+</A>&#160;<A HREF="javascript:if(0<maxmetric)set_maxmetric(maxmetric-1)">&ndash;</A>&#160;<INPUT ID="maxmetric" NAME="maxmetric" TYPE="text" VALUE="3" SIZE="4" ONCHANGE="set_maxmetric(this.value)">&#160;
-| &#160;<B TITLE="Sets the node auto-spacer.">Auto-Spacer</B><INPUT ID="auto_declump" NAME="auto_declump" TYPE="checkbox" ONCHANGE="set_autodeclump(this.checked)" CHECKED="CHECKED">&#160;
+| &#160;<B TITLE="Sets the node auto-spacer.">Auto-Spacer</B><INPUT ID="auto_declump" NAME="auto_declump" TYPE="checkbox" ONCHANGE="set_autodeclump(this.checked)" >&#160;
 | &#160;<B TITLE="Show Host Names.">Host Names</B><INPUT ID="show_hostnames" NAME="show_hostnames" TYPE="checkbox" ONCHANGE="set_showdesc(this.checked)" CHECKED="CHECKED">&#160;
 | &#160;<A HREF="javascript:viz_save()" TITLE="Saves current settings in a cookie.">Save Settings</A>&#160;
 | &#160;<A HREF="javascript:viz_reset()" TITLE="Resets Visualizer.">Reset</A></P>
diff --git a/htdocs/luci-static/commotion_index.html b/htdocs/luci-static/commotion_index.html
index 318d878..bcd5ce2 100644
--- a/htdocs/luci-static/commotion_index.html
+++ b/htdocs/luci-static/commotion_index.html
@@ -4,4 +4,4 @@ <h2>Welcome to Commotion!</h2>
 
 <h3><a href="https://commotionwireless.net">Commotion Wireless</a></h3>
 
-Thanks for using our network!
+<p>Thanks for using our network!</p>

From 0cea269b6a9c7046d74ca6ebe33120533fb96b7a Mon Sep 17 00:00:00 2001
From: Griffin Boyce <griffinboyce@gmail.com>
Date: Wed, 6 Nov 2013 14:58:59 -0500
Subject: [PATCH 2/2] added translation tags per issue #39

---
 luasrc/view/commotion/meshprofile.htm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/luasrc/view/commotion/meshprofile.htm b/luasrc/view/commotion/meshprofile.htm
index 0d646cc..c22df62 100644
--- a/luasrc/view/commotion/meshprofile.htm
+++ b/luasrc/view/commotion/meshprofile.htm
@@ -18,9 +18,9 @@
 
 <h1><%:Node Profiles%></h1>
 
-<p>If your node includes configuration profiles for multiple Commotion 
-networks, this form allows you to set your defaults. NOTE: Channel settings must be manually changed.
-We recommend that you reboot your node after changing these settings.</p>
+<p><%:If your node includes configuration profiles for multiple Commotion 
+networks, this form allows you to set your defaults.%> <%:NOTE: Channel settings must be manually changed.%>
+<%:We recommend that you reboot your node after changing these settings.%></p>
 
 <%-if ERR then-%>
 <div class="error"><%=ERR%></div>
@@ -30,8 +30,8 @@ <h1><%:Node Profiles%></h1>
 <form method="post" action="<%=uri_prefix%>_up" enctype="multipart/form-data" id="up">
 <h1> Overwrite existing profile? </h1>
 <input type="hidden" name="config" value="<%=ul%>" >
-<input type="radio" name="overwrite" value="yes">Yes, please overwrite the existing profile<br>
-<input type="radio" name="overwrite" value="no">No, I will rename the file and upload it again<br>
+<input type="radio" name="overwrite" value="yes"><%:Yes, please overwrite the existing profile%><br>
+<input type="radio" name="overwrite" value="no"><%:No, I will rename the file and upload it again%><br>
 <input type="submit" name="submit" value="Confirm"/>
 </form> 
 <%end%>
@@ -57,9 +57,9 @@ <h2><%:Select a profile to apply%></h2>
 </form>
 
 <br /><br />
-	<h1>Download a Profile</h1>
+	<h1><%:Download a Profile%></h1>
 	<form method="post" action="<%=uri_prefix%>_down" enctype="multipart/form-data" id="down">
-	<label class="cbi-value-title tippable" data-tip="Choose a profile and click download here.">Choose a profile to download</label>
+	<label class="cbi-value-title tippable" data-tip="<%:Choose a profile and click download here.%>"><%:Choose a profile to download%></label>
 	<select name="dl_profile">
 		<% for _,p in ipairs(profiles) do %>
 			<option id="<%=p%>" value="<%=p%>"><%=p%></option>
@@ -68,16 +68,16 @@ <h1>Download a Profile</h1>
 	<input type="submit" name="submit" value="Download"/>	
 </form>
 
-	<h1>Upload a Profile</h1>
+	<h1><%:Upload a Profile%></h1>
 	<form method="post" action="<%=uri_prefix%>_up" enctype="multipart/form-data" id="up">
 	<div id="zone-content-wrapper">
 	  <div id="zone-content">
 		<input type="hidden" name="moduleName" value="upload">
 		<div class="cbi-value">
-		  <label class="cbi-value-title tippable" data-tip="Click on the field below to upload a file.">Upload <%=uploadTitle%></label>
+		  <label class="cbi-value-title tippable" data-tip="<%:Click on the field below to upload a file.%>"><%:Upload%> <%=uploadTitle%></label>
 		  <input type="file" name="config" id="media" />
 		  <div class="upload-description">
-			Upload a config file from your own computer.
+			<%:Upload a config file from your own computer.%>
 		  </div>
 		</div>
 	  </div>