From 2a5f8f80cbab3742818ad7279e1efacec1c94807 Mon Sep 17 00:00:00 2001
From: Nils Schneider <nils.schneider@gmail.com>
Date: Thu, 24 May 2012 20:10:06 +0200
Subject: [PATCH] styling

---
 .../lua/luci/view/ffhl-wizard/completed.htm   |  2 +-
 .../lua/luci/view/ffhl-wizard/meshvpn-key.htm |  6 +++---
 .../usr/lib/lua/luci/view/ffhl-wizard/nav.htm | 19 +++++++++++--------
 .../lib/lua/luci/view/ffhl-wizard/welcome.htm |  6 ++++--
 .../lua/luci/view/ffhl-wizard/wizardform.htm  | 16 +++++++++++-----
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/completed.htm b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/completed.htm
index cbec028..48aa0e4 100644
--- a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/completed.htm
+++ b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/completed.htm
@@ -9,6 +9,6 @@
 	<p>Damit sie aktiv wird, muss der Knoten neugestartet werden.</p>
 	
 	<p>
-		<a href="<%=disp.build_url("wizard", "completed", "reboot")%>">Jetzt neustarten!</a>
+		<a class="btn primary" href="<%=disp.build_url("wizard", "completed", "reboot")%>">Jetzt neustarten!</a>
 	</p>
 <%+footer%>
diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/meshvpn-key.htm b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/meshvpn-key.htm
index 59c37e9..0d50fa6 100644
--- a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/meshvpn-key.htm
+++ b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/meshvpn-key.htm
@@ -1,6 +1,6 @@
 <%
 	local disp = require "luci.dispatcher"
-	local f = io.popen("/etc/init.d/fastd show-key ffhl_mesh_vpn", "r")
+	local f = io.popen("/etc/init.d/fastd show_key ffhl_mesh_vpn", "r")
 	local key = f:read("*a")
 	f:close()
 
@@ -8,8 +8,8 @@
 <%+header%>
 	<h2>Schlüsselaustausch</h2>
 	<p>Dies ist der öffentliche Schlüssel deines Freifunkknotens. Bitte schicke ihn an freifunk.luebeck@asta.uni-luebeck.de um ihn auf den Freifunkservern eintragen zu lassen. Sobald der Schlüssel eingetragen wurde, kann dein Knoten das Mesh-VPN nutzen.</p>
-	<pre>
+	<div style="text-align: center;font-size: 2em;line-height: 1em; background: #f5f5f5; border: 1px solid #ececec; margin-bottom: 0.5em; padding: 0.5em">
 		<%=key%>
-	</pre>
+	</div>	
 <%+ffhl-wizard/nav%>	
 <%+footer%>
diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/nav.htm b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/nav.htm
index 905df98..3c8e3c0 100644
--- a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/nav.htm
+++ b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/nav.htm
@@ -2,15 +2,18 @@
         local nav = require "luci.tools.ffhl-wizard.nav"
         local predecessor, successor = nav.get()
 %>
-        
-<% if predecessor then %>
-	<a href="<%=luci.dispatcher.build_url("wizard", predecessor.href)%>">
-		Zurück
-	</a>
-<% end %>
 
-<% if not have_form and successor then %>
-	<a href="<%=luci.dispatcher.build_url("wizard", successor.href)%>">
+<div class="actions">
+        
+<% if successor then %>
+	<a class="btn primary" href="<%=luci.dispatcher.build_url("wizard", successor.href)%>">
 		Weiter
 	</a>
 <% end %>
+
+<% if predecessor then %>
+	<a class="btn" href="<%=luci.dispatcher.build_url("wizard", predecessor.href)%>">
+		Zurück
+	</a>
+<% end %>
+</div>
diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/welcome.htm b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/welcome.htm
index 6c5e51d..969b923 100644
--- a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/welcome.htm
+++ b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/welcome.htm
@@ -6,8 +6,9 @@
 <%+header%>                                                               
         <h2>Willkommen auf deinem Freifunkknoten!</h2>                    
         <p>Dieser Wizard hilft dir deinen Freifunkknoten einzurichten.</p>
-                                                                                               
-<% if not have_form and successor then %>                                                      
+
+<div class="actions">
+<% if successor then %>                                                      
         <a class="btn primary" href="<%=luci.dispatcher.build_url("wizard", successor.href)%>">
                 Knoten neu einrichten                                                          
         </a>                                                                                   
@@ -16,5 +17,6 @@
         <a class="btn" href="<%=luci.dispatcher.build_url("admin", "system", "flashops")%>">
                 Firmware upgrade einspielen                                                 
         </a>                                                                                
+</div>
 <%+footer%>                                                                                 
 
diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/wizardform.htm b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/wizardform.htm
index b3f01c4..58f31ba 100644
--- a/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/wizardform.htm
+++ b/luci/config-mode/files/usr/lib/lua/luci/view/ffhl-wizard/wizardform.htm
@@ -28,6 +28,7 @@
 		end
 	end
 %>
+	<div class="actions">
 <% if redirect then %>
 	<div style="float:left">
 		<input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" />
@@ -37,7 +38,7 @@
 	<input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:Skip%>" />
 <% end %>
 <%- if self.submit ~= false then %>
-	<input class="cbi-button cbi-button-save" type="submit" value="
+	<input class="cbi-button cbi-button-save btn primary" type="submit" value="
 		<%- if not self.submit then -%>Weiter<%-else-%><%=self.submit%><%end-%>
 	" />
 <% end %>
@@ -51,11 +52,16 @@
 		<%- if not self.cancel then -%><%-:Cancel-%><%-else-%><%=self.cancel%><%end-%>
 	" />
 <% end %>
+<%
+        local nav = require "luci.tools.ffhl-wizard.nav"
+        local predecessor, successor = nav.get()
+%>
+	<% if predecessor then %>
+	  <a class="btn" href="<%=luci.dispatcher.build_url("wizard", predecessor.href)%>">
+	    Zurück
+	  </a>
+	<% end %>
 		<script type="text/javascript">cbi_d_update();</script>
 	</div>
 </form>
 <% end %>
-
-<% have_form = true %>
-
-<%+ffhl-wizard/nav%>