diff options
| -rw-r--r-- | Dozentenmodul_V1/WebContent/GUI/de/Home.jsp | 20 | ||||
| -rw-r--r-- | Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp | 20 | ||||
| -rw-r--r-- | Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp | 61 | ||||
| -rw-r--r-- | Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp | 93 | ||||
| -rw-r--r-- | Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemine.jsp | 96 | ||||
| -rw-r--r-- | Dozentenmodul_V1/WebContent/GUI/de/menü.html | 2 | ||||
| -rw-r--r-- | Dozentenmodul_V1/WebContent/css/Input.css | 26 | ||||
| -rw-r--r-- | Dozentenmodul_V1/WebContent/css/Layout.css | 19 |
8 files changed, 305 insertions, 32 deletions
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp index 1c5cd721..970defcf 100644 --- a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp +++ b/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp @@ -9,24 +9,22 @@ <title>Home</title>
</head>
<body>
-<jsp:include page="header.html" />
-<jsp:include page="menü.html"/>
+ <jsp:include page="header.html" />
+ <jsp:include page="menü.html" />
+ <jsp:include page="news.jsp" />
-<jsp:include page="news.jsp" />
+ <div id="content">
+ <h2>Aktive VL's</h2>
+ <h2>Inaktive VL's</h2>
+ <h2>Freigebene VL's</h2>
+ </div>
-<div id="content">
-<h2>Aktive VL's</h2>
-<h2>Inaktive VL's</h2>
-<h2>Freigebene VL's</h2>
-</div>
-
-<jsp:include page="footer.html" />
+ <jsp:include page="footer.html" />
</body>
-
</html>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp b/Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp new file mode 100644 index 00000000..bec3f28e --- /dev/null +++ b/Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp @@ -0,0 +1,20 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" type="text/css"
+ href="/Dozentenmodul_V1/css/Layout.css"></link>
+<title>OTRS</title>
+</head>
+<body>
+ <jsp:include page="header.html" />
+ <jsp:include page="menü.html" />
+ <jsp:include page="news.jsp" />
+<iframe id="content" src="https://otrs.rz.hs-offenburg.de/otrs/customer.pl">
+
+</iframe>
+ <jsp:include page="footer.html" />
+</body>
+</html>
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp new file mode 100644 index 00000000..4da15b52 --- /dev/null +++ b/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp @@ -0,0 +1,61 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" type="text/css"
+ href="/Dozentenmodul_V1/css/Layout.css"></link>
+ <link rel="stylesheet" type="text/css"
+ href="/Dozentenmodul_V1/css/Input.css"></link>
+<title>Insert title here</title>
+</head>
+<body>
+ <jsp:include page="header.html" />
+ <jsp:include page="menü.html" />
+ <jsp:include page="news.jsp" />
+ <div id="content">
+ <div id="bread">
+ Sie sind hier:
+ <a href="#" rel="createVL_allgemine.jsp">Allgemein</a>
+ >
+ <a href="#" rel="system">System</a>
+ >
+ <a href="#" rel="software">Software</a>
+ </div>
+ <br \>
+ <form>
+ <p>
+ Sortierung nach: <select name="sort">
+ <option>Hersteller</option>
+ <option>Lizenzpflichtig/-frei</option>
+ </select>
+ </p>
+ <fieldset id="sw_chooser">
+ <legend>Verfügbare Software</legend>
+ <div class="container">
+
+ <label><b>test</b></label><br />
+
+ <input type="checkbox">TEst</input>
+ <br />
+
+ </div>
+ </fieldset>
+ <fieldset id="sw_choosed">
+ <legend>Ausgewählte Software</legend>
+ <div class="container">
+ <label>dasjhdja</label>
+ </div>
+ </fieldset>
+ <br></br>
+ <button name="addSW">Software hinzufügen</button>
+
+ </form>
+ </div>
+
+
+
+ <jsp:include page="footer.html" />
+</body>
+</html>
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp new file mode 100644 index 00000000..913fd91f --- /dev/null +++ b/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp @@ -0,0 +1,93 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" type="text/css"
+ href="/Dozentenmodul_V1/css/Layout.css"></link>
+ <link rel="stylesheet" type="text/css"
+ href="/Dozentenmodul_V1/css/Input.css"></link>
+<title>Insert title here</title>
+</head>
+<body>
+ <jsp:include page="header.html" />
+ <jsp:include page="menü.html" />
+ <jsp:include page="news.jsp" />
+ <div id="content">
+ <div id="bread">
+ Sie sind hier:
+ <a href="#" rel="createVL_allgemine.jsp">Allgemein</a>
+ >
+ <a href="#" rel="system">System</a>
+ <!-- >
+ <a href="#" rel="software">Software</a>-->
+ </div>
+ <br \>
+ <form action="createVL_Software.jsp">
+ <fieldset>
+ <legend>Systeminformationen</legend>
+ <table>
+ <tr>
+ <td>Laborname (Anzeigename): *</td>
+ <td><input name="Laborname" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Kurzbeschreibung: *</td>
+ <td><input name="shortDesc" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Langbeschreibung: *</td>
+ <td><textarea name="TextArea1" cols="20" rows="5"></textarea></td>
+ </tr>
+ <tr>
+ <td>Kommentar:</td>
+ <td><textarea name="TextArea1" cols="20" rows="5"></textarea></td>
+ </tr>
+ <tr>
+ <td>Betriebssystem: *</td>
+ <td><select name="OS">
+
+ <option>WIN</option>
+
+
+ </select></td>
+ </tr>
+ <tr>
+ <td>Gültigkeitsdatum: *</td>
+ <td>von: <input type="text" id="von_date" maxlength="25"
+ size="25" readonly="readonly" /> <img
+ src="/Dozentenmodul_V1/img/Calendar/cal.gif"
+ onclick="javascript:NewCssCal ('von_date','yyyyMMdd','arrow',true,'24',true)"
+ style="cursor: pointer" /> bis: <input type="text"
+ id="bis_date" maxlength="25" size="25" readonly="readonly" />
+ <img src="/Dozentenmodul_V1/img/Calendar/cal.gif"
+ onclick="javascript:NewCssCal ('bis_date','yyyyMMdd','arrow',true,'24',true)"
+ style="cursor: pointer" />
+ </td>
+ </tr>
+ <tr>
+ <td>Labor sichtbar: *</td>
+ <td><input name="sichtbar" type="radio" value="ja" />Ja<br></br>
+ <input name="sichtbar" type="radio" value="nein" />Nein</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ </tr>
+ </table>
+ </fieldset>
+ </div>
+ <button id="buttonweiter" type="submit">Weiter</button>
+ </form>
+ </div>
+
+
+
+ <jsp:include page="footer.html" />
+</body>
+</html>
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemine.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemine.jsp new file mode 100644 index 00000000..f5234350 --- /dev/null +++ b/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemine.jsp @@ -0,0 +1,96 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" type="text/css"
+ href="/Dozentenmodul_V1/css/Layout.css"></link>
+ <link rel="stylesheet" type="text/css"
+ href="/Dozentenmodul_V1/css/Input.css"></link>
+<title>Insert title here</title>
+</head>
+<body>
+ <jsp:include page="header.html" />
+ <jsp:include page="menü.html" />
+ <jsp:include page="news.jsp" />
+ <div id="content">
+ <div id="bread">
+ Sie sind hier:
+ <a href="#" rel="createVL_allgemine.jsp">Allgemein</a>
+ <!-- >
+ <a href="#" rel="system">System</a>
+ >
+ <a href="#" rel="software">Software</a>-->
+ </div>
+ <br \>
+ <form action="createVL_System.jsp">
+ <fieldset>
+ <legend>Allgemeine Informationen zum Verantwortlichen</legend>
+ <table>
+ <tr>
+ <td>Vorname: *</td>
+ <td><input name="Vorname_V" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Nachname: *</td>
+ <td><input name="Nachname_V" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Hochschule: *</td>
+ <td><input name="Hochschule_V" type="text" /></td>
+ </tr>
+ <tr>
+ <td>E-Mail: *</td>
+ <td><input name="Email_V" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Tel.-Nummer:</td>
+ <td><input name="Tel_V" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Fakultät:</td>
+ <td><input name="Fakultät_V" type="text" /></td>
+ </tr>
+ </table>
+ </fieldset>
+ <br></br>
+ <fieldset>
+ <legend>Allgemeine Informationen zum Ersteller</legend>
+ <table>
+ <tr>
+ <td>Vorname: *</td>
+ <td><input name="Vorname_E" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Nachname: *</td>
+ <td><input name="Nachname_E" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Hochschule: *</td>
+ <td><input name="Hochschule_E" type="text" /></td>
+ </tr>
+ <tr>
+ <td>E-Mail: *</td>
+ <td><input name="Email_E" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Tel.-Nummer:</td>
+ <td><input name="Tel_E" type="text" /></td>
+ </tr>
+ <tr>
+ <td>Fakultät:</td>
+ <td><input name="Fakultät_E" type="text" /></td>
+ </tr>
+ </table>
+ </fieldset>
+ <br />
+ <button id="buttonweiter" type="submit">Weiter</button>
+ </form>
+ </div>
+
+
+
+ <jsp:include page="footer.html" />
+</body>
+</html>
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/menü.html b/Dozentenmodul_V1/WebContent/GUI/de/menü.html index 01eada04..8e93f674 100644 --- a/Dozentenmodul_V1/WebContent/GUI/de/menü.html +++ b/Dozentenmodul_V1/WebContent/GUI/de/menü.html @@ -3,6 +3,6 @@ <li><a href='/' class='button'>VL erzeugen</a></li>
<li><a href='/' class='button'>VL bearbeiten</a></li>
<li><a href='/' class='button'>Einstellungen</a></li>
- <li><a href='/' class='button'>Wartung</a></li>
+ <li><a href='OTRS.jsp' class='button'>Wartung</a></li>
<li><a href='/' class='button'>Logout</a></li>
</ul>
diff --git a/Dozentenmodul_V1/WebContent/css/Input.css b/Dozentenmodul_V1/WebContent/css/Input.css index dce35868..41357090 100644 --- a/Dozentenmodul_V1/WebContent/css/Input.css +++ b/Dozentenmodul_V1/WebContent/css/Input.css @@ -5,21 +5,6 @@ src: url(/Dozentenmodul_V1/UbuntuFonts/Ubuntu-L.ttf);
}
-#Logo{
- top:0;
- left:0;
- height:120px;
- width:50%;
-}
-
-#deutsch{
- float:right;
- margin-right:10px;
-}
-
-#englisch{
- float:right;
-}
article.input section {
@@ -93,8 +78,7 @@ article.input section input{ fieldset{
margin-top: 10px;
- margin-left: 30px;
- margin-right: 30px;
+
}
article.input section input{
@@ -154,7 +138,13 @@ font-family:Ubuntu; width: 500px;
background-color: #c5d2de;
}
-
+#sw_chooser{
+ width: 310px;
+}
+#sw_choosed{
+ width:310px;
+ float:right;
+}
#buttonAddSW{
margin-left: 30px;
width: 150px;
diff --git a/Dozentenmodul_V1/WebContent/css/Layout.css b/Dozentenmodul_V1/WebContent/css/Layout.css index dd3054ce..2d0a57bc 100644 --- a/Dozentenmodul_V1/WebContent/css/Layout.css +++ b/Dozentenmodul_V1/WebContent/css/Layout.css @@ -91,8 +91,7 @@ html,body{ background-color: #757575;
position: absolute;
bottom: 0px;
- left:50%;
- margin-left:-40%;
+ left: 300px;
-moz-border-radius: 25px 25px 0px 0px;
-webkit-border-radius: 25px 25px 0px 0px;
border-radius: 25px 25px 0px 0px;
@@ -113,5 +112,21 @@ html,body{ position:absolute;
left: 300px;
top: 100px;
+ width:80%;
+ height:80%;
+ overflow-y: scroll;
}
+
+#bread a:hover {
+ text-decoration:none;
+}
+
+#bread a:hover {
+ text-decoration:underline;
+}
+
+#buttonweiter{
+ position: relative;
+ left: 300px;
+}
|