Add webinterface with functionallity

6 files changed, 151 insertions, 97 deletions

diff --git a/management-interface/views/about.htm b/management-interface/views/about.htm
index ed15306..e90cdd2 100644
--- a/management-interface/views/about.htm
+++ b/management-interface/views/about.htm
@@ -1,8 +1,8 @@
-    <div class="container">
-
-      <div class="jumbotron">
-        <h1>{{ strtoupper(@_module) }}</h1>
-	<p></p>
-      </div>
-
-    </div> <!-- /container -->
+<div class="jumbotron">
+	<p>This is the webinterface for the masterserver.</p>
+	<check if="{{ @loggedin }}=true">
+	<br /><br /><br />
+	<p>This is the public certificate for the FTPS connection: <a href="{{ @hostname }}asserts/public_ftp.cer">download</a></p>
+	<p>This is the tool to base64 the certificate.cer: <a href="{{ @hostname }}asserts/tool.tar.gz">download</a></p>
+	</check>
+</div>
diff --git a/management-interface/views/home.htm b/management-interface/views/home.htm
index f2cadd0..a6d5443 100644
--- a/management-interface/views/home.htm
+++ b/management-interface/views/home.htm
@@ -1,10 +1,6 @@
-    <div class="container">
-
       <div class="jumbotron">
 	<p>Hello {{ @username }}!<p>
 	<check if="{{ @loggedin }}">
 	<p>Status of server is: <check if="{{ @serverstatus }}"><true><span class="bg-success">online</span></true><false><span class="bg-danger">offline</span></false></check></p>
 	</check>
       </div>
-
-    </div> <!-- /container -->
diff --git a/management-interface/views/login.htm b/management-interface/views/login.htm
index d283f45..bfcb593 100644
--- a/management-interface/views/login.htm
+++ b/management-interface/views/login.htm
@@ -1,4 +1,8 @@
-<div class="container">
+      <check if="{{ @message }}!=''">
+        <div class="jumbotron">
+	   <p class="bg-danger">{{ message }}</p>
+        </div>
+      </check>
       <div class="jumbotron">
 	<check if="{{ @loggedin }}">
 	<true>
@@ -17,4 +21,3 @@
 	</false>
 	</check>
 	</div>
-</div>
diff --git a/management-interface/views/menu.php b/management-interface/views/menu.php
deleted file mode 100644
index d010119..0000000
--- a/management-interface/views/menu.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- Static navbar -->
-    <div class="navbar navbar-default navbar-static-top" role="navigation">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="<?=$hostname ?>"><?= $_title ?></a>
-        </div>
-        <div class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-	    <?php
-		for ($i = 0; $i < sizeof($item); $i++) {
-			if ($intern[$i]) continue;
-			echo '<li';
-			echo ($item[$i] === $_module)? ' class="active"':'';
-			echo '>';
-			echo '<a href="'.$hostname.$item[$i].'">';
-			echo Util::firstcap($item[$i]);
-			echo '</a>';
-			echo '</li>';
-		}
-	    ?>
-          </ul>
-          <ul class="nav navbar-nav navbar-right">
-	    <?php
-		if (!isset($_SESSION['username'])) {
-                        echo '<li';
-                        echo ('login' === $_module)? ' class="active"':'';
-                        echo '>';
-			echo '<a href="'.$hostname.'login">Login</a></li>';
-		} else {
-                        echo '<li>';
-                        echo '<a href="'.$hostname.'logout">Logout</a></li>';
-		}
-	    ?>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </div>
diff --git a/management-interface/views/satellites.htm b/management-interface/views/satellites.htm
index 24adba1..2d151f7 100644
--- a/management-interface/views/satellites.htm
+++ b/management-interface/views/satellites.htm
@@ -1,44 +1,138 @@
-    <div class="container">
+<check if="{{ @loggedin }}">
+  <true>
+    <check if="{{ @action }}=='edit'">
       <div class="jumbotron">
-    	<check if="{{ @loggedin }}">
-	<true>
-	<h2>List of all satellite public keys</h2>
-	<table class="table">
+        <h2>Edit</h2>
+        <form name="edit" action="{{ @hostname }}do/savesatellite" method="post" role="form">
+          <div class="form-group">
+            <label for="organization">Organization*</label>
+            <input type="text" class="form-control" name="organization" id="organization" value="{{ @editprefix["organization"] }}">
+          </div>
+          <div class="form-group">
+            <label for="address">Address*</label>
+            <input type="text" class="form-control" name="address"  id="address" value="{{ @editprefix["address"] }}">
+          </div>
+          <div class="form-group">
+            <label for="name">Name*</label>
+            <input type="text" class="form-control" name="name" id="name" value="{{ @editprefix["name"] }}">
+          </div>
+          <div class="form-group">
+            <label for="prefix">Prefix*</label>
+            <input type="text" class="form-control" name="prefix" id="prefix" value="{{ @editprefix["prefix"] }}" disabled>
+  	    <span class="help-bock">If you use a prefix that is already in use, it will be overwritten</span>
+          </div>
+          <div class="form-group">
+            <label for="prefix">Public key</label>
+            <textarea class="form-control" name="publickey"  id="publickey">{{ @base64key }}</textarea>
+          </div>
+  	  <span class="help-block">Fields marked with * are mandatory</span>
+	  <input type="hidden" name="prefix" value="{{ @editprefix["prefix"] }}">
+	  <div class="form-group">
+            <button type="submit" class="btn btn-primary">Submit</button>
+	    <a class="btn btn-danger" role="button" href="{{ @hostname }}site/satellites?action=edit&prefix={{ @@editprefix["prefix"] }}">Reset</a>
+	  </div>
+        </form>
+      </div>
+    </check>
+    <check if="{{ @action }}=='new'">
+      <div class="jumbotron">
+	<h2>New</h2>
+	<form name="new" action="{{ @hostname }}do/newsatellite" method="post" role="form">
+          <div class="form-group">
+            <label for="organization">Organization*</label>
+            <input type="text" class="form-control" name="organization" id="organization" value="{{ @new["organization"] }}">
+          </div>
+          <div class="form-group">
+            <label for="address">Address*</label>
+            <input type="text" class="form-control" name="address"  id="address" value="{{ @new["address"] }}">
+          </div>
+          <div class="form-group">
+            <label for="name">Name*</label>
+            <input type="text" class="form-control" name="name" id="name" value="{{ @new["name"] }}">
+          </div>
+          <div class="form-group">
+            <label for="prefix">Prefix*</label>
+            <input type="text" class="form-control" name="prefix" id="prefix" value="{{ @new["prefix"] }}">
+            <span class="help-bock">If you use a prefix that is already in use, it will be overwritten</span>
+          </div>
+          <div class="form-group">
+            <label for="prefix">Public key</label>
+            <textarea class="form-control" name="publickey" id="publickey">{{ @new['publickey'] }}</textarea>
+          </div>
+          <span class="help-block">Fields marked with * are mandatory</span>
+          <div class="form-group">
+            <button type="submit" class="btn btn-primary">Submit</button>
+            <button class="btn btn-danger" role="button" type="reset">Reset</button>
+          </div>
+	  <input type="hidden" name="action" value="new" />
+	</form>
+      </div>
+    </check>
+    <div class="jumbotron">
+    <h2>List of all satellite public keys</h2>
+    <form action="{{ @hostname }}site/satellites" method="get" class="form-inline" role="form">
+      <table class="table table-striped table-responsive">
         <thead> 
           <tr>
-	    <td>
-		  <label>
-		    <input type="checkbox"> 
-		  </label>
-	    </td> 
-            <td>Organization</td>
-            <td>Address</td>
-            <td>Name</td>
-            <td>Prefix</td>
-	    <td>Public key</td>
+	    <th>
+	      <input name="checkall" type="checkbox"> 
+	    </th> 
+            <th>
+				<a href="?order=organization&di=<check if='{{ @order }}=="organization" && {{ @di }}=="ASC"'><true>desc</true><false>asc</false></check>">Organization</a>
+				<check if="{{ @order }}=='organization'">
+					<check if="{{ @di }}=='ASC'"><true>&uarr;</true><false>&darr;</false></check>
+				</check>
+				</th>
+            <th>
+				<a href="?order=address&di=<check if='{{ @order }}=="address" && {{ @di }}=="ASC"'><true>desc</true><false>asc</false></check>">Address</a>
+				<check if="{{ @order }}=='address'">
+					<check if="{{ @di }}=='ASC'"><true>&uarr;</true><false>&darr;</false></check>
+				</check>
+			</th>
+            <th>
+				<a href="?order=name&di=<check if='{{ @order }}=="name" && {{ @di }}=="ASC"'><true>desc</true><false>asc</false></check>">Name</a>
+				<check if="{{ @order }}=='name'">
+					<check if="{{ @di }}=='ASC'"><true>&uarr;</true><false>&darr;</false></check>
+				</check>
+			</th>
+            <th>
+				<a href="?order=prefix&di=<check if='{{ @order }}=="prefix" && {{ @di }}=="ASC"'><true>desc</true><false>asc</false></check>">Prefix</a>
+				<check if="{{ @order }}=='prefix'">
+					<check if="{{ @di }}=='ASC'"><true>&uarr;</true><false>&darr;</false></check>
+				</check>
+			</th>
+	    <th>Public key</th>
           </tr>   
 	</thead>
         <tbody>
-        <repeat group="{{ @result }}" value="{{ @item }}">
-            <tr>
+          <repeat group="{{ @result }}" value="{{ @item }}">
+            <tr class="organization">
               <td>
-                    <label>
-                      <input type="checkbox">
-                    </label>
+                <input type="checkbox" name="prefix[]" value="{{ @item.prefix }}">
               </td>
               <td>{{ @item.organization }}</td>
               <td>{{ @item.address  }}</td>
-              <td>{{ @item.name  }}</td>
+              <td><a href="{{ @hostname }}site/satellites/?action=edit&prefix={{ @item.prefix }}">{{ @item.name  }}</a></td>
               <td>{{ @item.prefix}}</td>
               <td><check if="{{ @item.publickey}} == ''"><true>no</true><false>yes</false></check></td>
             </tr>
-        </repeat>
+          </repeat>
         </tbody>
-        </table>
-	</true>
-	<false>
-	  <p class="bg-danger">Please <a href="{{ $hostname }}login">login</a></p>
-	</false>
-	</check>
+      </table>
+      <div class="form-group">
+	<label for="action">Action:</label>
+        <select id="action" name="action" class="form-control"><option>delete</option></select>
+      </div>
+      <div class="form-group">
+	<button class="btn btn-primary" type="submit">Go</button>
       </div>
-    </div> <!-- /container -->
+    <div style="float:right">
+      <a href="{{ @hostname }}site/satellites?action=new" class="btn btn-default" role="button">New</a>
+    </div>
+    </form>
+  </true>
+  <false>
+    <p class="bg-danger">Please <a href="{{ $hostname }}site/login">login</a></p>
+  </false>
+</check>
+</div>
diff --git a/management-interface/views/users.htm b/management-interface/views/users.htm
index c461072..703f009 100644
--- a/management-interface/views/users.htm
+++ b/management-interface/views/users.htm
@@ -1,18 +1,17 @@
-    <div class="container">
       <div class="jumbotron">
     <check if="{{ @loggedin }}">
     <true>
 	<h2>List of all users</h2>
-	<table class="table">
+	<table class="table table-striped table-responsive">
 	<thead>
 	  <tr>
-	    <td>ID</td>
-	    <td>Username</td>
-            <td>Organization</td>
-            <td>First name</td>
-            <td>Last name</td>
-            <td>Email</td>
-            <td>Last login</td>
+	    <th>#</th>
+	    <th>Username</th>
+            <th>Organization</th>
+            <th>First name</th>
+            <th>Last name</th>
+            <th>Email</th>
+            <th>Last login</th>
 	  </tr>
 </thead>
 	<tbody>
@@ -29,10 +28,15 @@
 	</repeat>
 	</tbody>
 	</table>
+	<form name="filter" role="form" class="form form-inline" method="get" action="{{ @hostname }}site/users">
+		<div class="form-group">
+			<input class="form-control" type="text" name="filter" placeholder="filter" value="{{ @oldFilter }}"/>
+			<button type="submit" class="btn btn-default">go</button>
+		</div>
+	</form>
     </true>
     <false>
-	<p class="bg-danger">Please <a href="{{ $hostname }}login">login</a></p>
+	<p class="bg-danger">Please <a href="{{ $hostname }}site/login">login</a></p>
     </false>
     </check>
       </div>
-    </div> <!-- /container -->