summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortspitzer2013-06-17 13:48:55 +0200
committertspitzer2013-06-17 13:48:55 +0200
commit9247bdf39c08525f1dfedef0c0fa929011af08eb (patch)
tree53bf62756fbd0871f4fc4497db1e6bfc3f1bb3a3
parentDelete old Home.jsp (diff)
downloadtutor-module-9247bdf39c08525f1dfedef0c0fa929011af08eb.tar.gz
tutor-module-9247bdf39c08525f1dfedef0c0fa929011af08eb.tar.xz
tutor-module-9247bdf39c08525f1dfedef0c0fa929011af08eb.zip
Grundaufbau der HP
Diffstat
-rw-r--r--Dozentenmodul_V1/WebContent/GUI/de/Home.jsp81
-rw-r--r--Dozentenmodul_V1/WebContent/GUI/de/Login.jsp45
-rw-r--r--Dozentenmodul_V1/WebContent/GUI/de/footer.html6
-rw-r--r--Dozentenmodul_V1/WebContent/GUI/de/header.html6
-rw-r--r--Dozentenmodul_V1/WebContent/GUI/de/menü.html8
-rw-r--r--Dozentenmodul_V1/WebContent/GUI/de/news.jsp15
-rw-r--r--Dozentenmodul_V1/WebContent/css/Layout.css193
-rw-r--r--Dozentenmodul_V1/build/classes/news/News.classbin0 -> 1577 bytes
-rw-r--r--Dozentenmodul_V1/src/news/News.java43
9 files changed, 182 insertions, 215 deletions
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp
index 1ea16e1b..1c5cd721 100644
--- a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp
+++ b/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp
@@ -6,84 +6,27 @@
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
<link rel="stylesheet" type="text/css"
href="/Dozentenmodul_V1/css/Layout.css"></link>
-<title>Login Dozentenmodul</title>
+<title>Home</title>
</head>
<body>
- <div id="left">
- <div>
- <img src="/Dozentenmodul_V1/img/openslx-logo.png" alt="bwLehrpool" />
- </div>
- <div>
- <ul>
- <li><a href="Home.html">Home</a></li>
- <li><a href="VL_erzeugen.jsp">VL erzeugen</a></li>
- <li>Logout</li>
- </ul>
- </div>
- </div>
- <div id="right">
- <div id="header">
- <h1 id="Ueberschrift">Dozentenmodul</h1>
- </div>
- <hr></hr>
- <div>
- Sprache: <img alt="de" src="/Dozentenmodul_V1/img/de.png"> de |
- <img alt="en" src="/Dozentenmodul_V1/img/us.png"> us
- </div>
- <hr></hr>
+<jsp:include page="header.html" />
+<jsp:include page="menü.html"/>
- <div id="breadcrumb">
- <p>
- Sie sind hier: <a href="Loginseite.html">Login</a>
- </p>
- </div>
- <hr></hr>
- <div id="Content">
- <h2>Herzlich Willkommen im Dozentenmodul des bwLehrpools</h2>
- <hr></hr>
- <h3>Ihre Aktiven VL's:</h3>
- <ul>
- <%
- MySQL sql = new MySQL();
- Connection con = sql.getConnection();
- ResultSet rs = sql.getActiveVLs(con, 2);
+<jsp:include page="news.jsp" />
- while (rs.next()) {
- %>
- <li><%=rs.getString("Laborname")%> <img
- src="/Dozentenmodul_V1/img/Pencil3.png" alt="Bearbeiten"
- onclick="location.href='VL_erzeugen.jsp'" /> <img
- src="/Dozentenmodul_V1/img/DeleteRed.png" alt="Löschen" /> <img
- src="/Dozentenmodul_V1/img/Shutdown_Box_Red.png" alt="Deaktivieren" /></li>
- <%
- }
- %>
- </ul>
- <hr></hr>
- <h3>Ihre Inaktiven VL's:</h3>
- <ul>
- <%
- ResultSet In = sql.getInactiveVLs(con, 2);
- while (In.next()) {
- %>
- <li><%=rs.getString("Laborname")%></li>
- <%
-}
-%>
- </ul>
- <hr></hr>
- <h3>Anfragen für ihre VL's:</h3>
- <ul>
- <li>bla</li>
- <li>bla</li>
- </ul>
+<div id="content">
+<h2>Aktive VL's</h2>
+<h2>Inaktive VL's</h2>
+<h2>Freigebene VL's</h2>
+</div>
- </div>
- </div>
+
+
+<jsp:include page="footer.html" />
</body>
</html>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp
index 149381e8..e5fc6ec1 100644
--- a/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp
+++ b/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp
@@ -28,50 +28,7 @@
</form>
</div>
-<div id="footer">
-<a id="linkleft" href="bla">Kontakt</a>
-<a id="linkcenter" href="bla">FAQ</a>
-<a id="linkright" href="bla">Impressum</a>
-
-</div>
-<!-- <div id="left">
-<div>
-
-</div>
-</div>
-<div id="right">
-<div id="header">
-<h1 id="Ueberschrift">Dozentenmodul</h1>
-</div>
-<hr></hr>
-<div>
-
-</div>
-<hr></hr>
-<div id="breadcrumb">
-<p>Sie sind hier: <a href="Loginseite.html">Login</a></p>
-</div>
-<hr></hr>
-<div id="Content">
-<h2>Herzlich Willkommen im Dozentenmodul des bwLehrpools</h2>
-<form action="/Dozentenmodul_V1/Ldap" method="post">
-<table>
-<tr>
-<td style="width: 143px"><label>bwIDM-Benutzername: </label></td>
-<td><input id="round" name="User" type="text" /></td>
-</tr>
-<tr>
-<td style="width: 143px"><label>bwIDM-Passwort:</label></td>
-<td><input name="Password" type="password" /></td>
-</tr>
-<tr>
-<td style="width: 143px"></td>
-<td><button type="submit" id="loginButton" name="login">Login</button></td>
-</tr>
-</table>
-</form>
-</div>
-</div>-->
+<jsp:include page="footer.html" />
</body>
</html>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/footer.html b/Dozentenmodul_V1/WebContent/GUI/de/footer.html
new file mode 100644
index 00000000..cb53a696
--- /dev/null
+++ b/Dozentenmodul_V1/WebContent/GUI/de/footer.html
@@ -0,0 +1,6 @@
+<div id="footer">
+<a id="link" href="bla">Kontakt</a>
+<a id="link" href="bla">FAQ</a>
+<a id="link" href="bla">Impressum</a>
+
+</div> \ No newline at end of file
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/header.html b/Dozentenmodul_V1/WebContent/GUI/de/header.html
new file mode 100644
index 00000000..072487c8
--- /dev/null
+++ b/Dozentenmodul_V1/WebContent/GUI/de/header.html
@@ -0,0 +1,6 @@
+<div id="lang">
+<img alt="de" src="/Dozentenmodul_V1/img/de.png"> de | <img alt="en" src="/Dozentenmodul_V1/img/us.png"> us
+</div>
+
+<img id="logo" src="/Dozentenmodul_V1/img/Logo_bwLehrpool.png" alt="bwLehrpool"/>
+<hr /> \ No newline at end of file
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/menü.html b/Dozentenmodul_V1/WebContent/GUI/de/menü.html
new file mode 100644
index 00000000..01eada04
--- /dev/null
+++ b/Dozentenmodul_V1/WebContent/GUI/de/menü.html
@@ -0,0 +1,8 @@
+<ul class="vertical-list">
+ <li><a href='/' class='button'>Home</a></li>
+ <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='/' class='button'>Logout</a></li>
+</ul>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/news.jsp b/Dozentenmodul_V1/WebContent/GUI/de/news.jsp
new file mode 100644
index 00000000..0104164d
--- /dev/null
+++ b/Dozentenmodul_V1/WebContent/GUI/de/news.jsp
@@ -0,0 +1,15 @@
+<%@ page language="java" import="news.News" %>
+<div id=news>
+<%
+ News news=new News();
+String text="";
+
+ text=news.refreshNews();
+
+%>
+<h3>News</h3>
+<p id="newstext">
+<%=text.toString() %>
+</p>
+
+</div> \ No newline at end of file
diff --git a/Dozentenmodul_V1/WebContent/css/Layout.css b/Dozentenmodul_V1/WebContent/css/Layout.css
index a12b797b..dd3054ce 100644
--- a/Dozentenmodul_V1/WebContent/css/Layout.css
+++ b/Dozentenmodul_V1/WebContent/css/Layout.css
@@ -1,128 +1,117 @@
+@CHARSET "ISO-8859-1";
+@font-face {
+ font-family: 'Ubuntu';
+ src: url(/Dozentenmodul_V1/UbuntuFonts/Ubuntu-L.ttf);
+}
+
html,body{
- height:100%;
+
background-image:url('../img/bg.png');
background-repeat:repeat-x;
}
-
-#Ueberschrift{
- text-align:left;
-}
-
-#right{
- position:absolute;
- width:100%;
- left:230px;
-
+#lang{
+ position: absolute;
+ top: 0px;
+ right: 0px;
}
-#left{
- width:220px;
- min-width:220px;
- float:left;
- height:100%;
- border-right:thin;
- border-right-color:black;
- border-right-style:solid;
+#logo{
+ width: 220px;
}
-hr{
- color:black;
+#news{
+ position:relative;
+ left: 0px;
+ list-style: none;
+ padding: 10px;
+ width: 200px;
+ border-radius: 5px;
+ border-width: 1px;
+ border-style: solid;
+ border-color: black;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ background: white;
}
-#loginButton{
- float:right;
-}
+#newstext{
+ position:relative;
+ margin-top: 10px;
+}
+/* Vertical List: */
+.vertical-list {
+ list-style: none;
+ padding: 10px;
+ width: 200px;
+ border-radius: 5px;
+ border-width: 1px;
+ border-style: solid;
+ border-color: black;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ background: white; /* old browsers */
-ul.tabs
-{
- padding: 6px 0;
- font-size: 0;
- margin:0;
- list-style-type: none;
- text-align: left; /*set to left, center, or right to align the tabs as desired*/
}
-
-ul.tabs li
-{
- display: inline;
- margin: 0;
- margin-right:4px; /*distance between tabs*/
-}
-
-ul.tabs li a
-{
- font: normal 12px Verdana;
+.vertical-list .button {
+ outline: 0;
+ padding: 5px 12px;
+ display: block;
+ color: white;
+ font-family: 'Ubuntu';
+ font-weight: bold;
+ text-shadow: 1px 1px #1f272b;
text-decoration: none;
- position: relative;
- z-index: 1;
- padding: 6px 14px;
- border: 1px solid #B7B7B7;
- color: #000;
- background: #F7F7F7 url(../img/tabbg2.gif) repeat-x 0 0;
- border-radius: 3px 3px 0 0;
- outline:none;
-}
-
-ul.tabs li a:visited
-{
- color: #000;
+ border: 1px solid #1c252b;
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ background: rgb(117,117,117);
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ background: background: rgb(117,117,117); /* old browsers */
}
-
-ul.tabs li a:hover
-{
- background:White url(../img/tabbg.gif) repeat-x 0 0;
+.vertical-list .button:hover {
+ background: rgb(255,166,38); /* old browsers */
+
}
-
-ul.tabs li.selected a
-{
- /*selected tab style */
+.vertical-list .button:active {
+ background-position: 0 top;
position: relative;
- top: 0px;
- font-weight:bold;
- background: white url(../img/tabbg.gif) 0 0 repeat-x;
- border-bottom-color: white;
-}
-
-
-ul.tabs li.selected a:hover
-{
- /*selected tab style */
- text-decoration: none;
+ top: 1px;
+ color: #fff;
+ padding: 6px 12px 4px;
+ background: rgb(255,166,38);
+
}
-
-div.tabcontent
-{
- display: block;
+#footer{
+ width:80%;
+ height:3%;
+ background-color: #757575;
+ position: absolute;
+ bottom: 0px;
+ left:50%;
+ margin-left:-40%;
+ -moz-border-radius: 25px 25px 0px 0px;
+ -webkit-border-radius: 25px 25px 0px 0px;
+ border-radius: 25px 25px 0px 0px;
}
-div.tabcontents
-{
- border-top: 1px solid #B7B7B7; padding:30px 16px;
- border-radius: 8px;
-}
-.container {
- border:2px solid #ccc;
- width:300px;
- height: 500px;
- overflow-y: scroll;
+#link{
+ color:white;
+ font-family: 'Ubuntu';
+ position: relative;
+ margin-left: 30px;
}
-#sw_chooser{
- width:300px;
- float:left;
+#link:hover{
+ color: #FFA626;
}
-
-#sw_choosed{
- width:300px;
+#content{
+ position:absolute;
+ left: 300px;
+ top: 100px;
}
-
-input{
-
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-
diff --git a/Dozentenmodul_V1/build/classes/news/News.class b/Dozentenmodul_V1/build/classes/news/News.class
new file mode 100644
index 00000000..05651c14
--- /dev/null
+++ b/Dozentenmodul_V1/build/classes/news/News.class
Binary files differ
diff --git a/Dozentenmodul_V1/src/news/News.java b/Dozentenmodul_V1/src/news/News.java
new file mode 100644
index 00000000..70146833
--- /dev/null
+++ b/Dozentenmodul_V1/src/news/News.java
@@ -0,0 +1,43 @@
+package news;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.StringTokenizer;
+
+public class News {
+
+
+ @SuppressWarnings("resource")
+ public String refreshNews(){
+
+ String news="";
+ BufferedReader in;
+ int lineCounter=0;
+ try {
+ in = new BufferedReader(new FileReader("C:\\Users\\tspitzer\\Desktop\\news.txt"));
+ String line;
+ while((line = in.readLine()) != null) {
+
+ StringTokenizer st = new StringTokenizer(line, ";");
+ String Datum = st.nextToken();
+ String msg = st.nextToken();
+ if(lineCounter!=0)
+ {
+ news=news.concat(Datum+" "+msg+" <br \\><hr \\><br \\>");
+ }
+
+ lineCounter++;
+ }
+
+ } catch (NumberFormatException | IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ return news;
+
+ }
+
+}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-03-01 17:47:25 +0100