From 59db0c72ece1e6ad24cd64616609faa0a3eb001b Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 17 Dec 2016 10:08:45 +0000
Subject: [PATCH] Merge origin/master
---
web/ui/user.jsp | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/web/ui/user.jsp b/web/ui/user.jsp
index 09a13bc..8952c94 100644
--- a/web/ui/user.jsp
+++ b/web/ui/user.jsp
@@ -10,15 +10,25 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Benutzer</title>
+ <link rel="stylesheet" href="/jslib/skeleton-2.0.4/css/normalize.css">
+ <link rel="stylesheet" href="/jslib/skeleton-2.0.4/css/skeleton.css">
<link rel="stylesheet" type="text/css" href="stile.css">
</head>
<body>
<h1>Benutzer</h1>
- <div>
+ <div id="user-form">
<input type="text" size="20" maxlength="20" placeholder="Anmeldename" name="anmeldename" id="anmeldename">
<input type="password" size="20" maxlength="20" placeholder="Kennwort" name="kennwort" id="kennwort">
<input type="password" size="20" maxlength="20" placeholder="Wiederholung" name="kennwortw" id="kennwortw">
- <button>OK</button>
+ <button class="user-save-btn">OK</button>
</div>
+ <script src="/jslib/jquery-1.11.1/jquery-1.11.1.min.js"></script>
+ <script src="ui.js"></script>
+ <script type="text/javascript" charset="utf-8">
+ //var ui;
+ $(document).ready(function() {
+ um_init();
+ });
+ </script>
</body>
</html>
--
Gitblit v1.9.3