Subversion Repositories WebE

Compare Revisions

Last modification

Regard whitespace Rev 30 → Rev 31

/trunk/WebContent/errorHandler.jsp
1,7 → 1,8
<?xml version="1.0" encoding="ISO-8859-1" ?>
<%@ page isErrorPage=true %>
<%@page isErrorPage="true"%>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="utf-8"%>
pageEncoding="utf-8"
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
9,6 → 10,7
<title>Error page</title>
</head>
<body>
Die Seite hat einen Fehler verursacht. Bitte versuchen Sie es nochmals.
Die Seite hat einen Fehler verursacht. Bitte versuchen Sie es
nochmals.
</body>
</html>
/trunk/WebContent/decorators/mainTemplate.jsp
1,4 → 1,6
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator"
prefix="decorator"
%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
13,8 → 15,11
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Ontologie - <decorator:title /></title>
<link rel="stylesheet" type="text/css" href="${contextPath}/resources/css/main.css" />
<title>Ontologie - <decorator:title />
</title>
<link rel="stylesheet" type="text/css"
href="${contextPath}/resources/css/main.css"
/>
</head>
<body>
 
22,17 → 27,23
Do not write any text directly into the page-container div! --%>
<div id="page-container">
<div id="header">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="header">
<table width="100%" border="0" cellspacing="0" cellpadding="0"
class="header"
>
<tr>
<td>
&nbsp;
<td>&nbsp;</td>
<td
style="vertical-align: top; font-size: 12pt; text-align: right;"
>
<div>
<strong>Semantic Web Project</strong><br /> by Michael
Moos<br /> Thomas Lahn
</div></td>
<td width="56" class="no_padding"><img
src="${contextPath}/resources/images/ontology_logo.jpg"
width="56" height="56" alt="logo"
/>
</td>
<td style="vertical-align:top;font-size:12pt;text-align:right;">
<div><strong>Semantic Web Project</strong><br />
by Michael Moos<br />
Thomas Lahn</div>
</td>
<td width="56" class="no_padding"><img src="${contextPath}/resources/images/ontology_logo.jpg" width="56" height="56" alt="logo" /></td>
</tr>
</table>
</div>
/trunk/WebContent/WEB-INF/sitemesh.xml
1,21 → 1,26
<sitemesh>
 
<page-parsers>
<parser default="true" class="com.opensymphony.module.sitemesh.parser.DefaultPageParser" />
<parser content-type="text/html" class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
<parser default="true"
class="com.opensymphony.module.sitemesh.parser.DefaultPageParser" />
<parser content-type="text/html"
class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
</page-parsers>
 
<decorator-mappers>
 
<mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper">
<mapper
class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper">
<param name="property.1" value="meta.decorator" />
<param name="property.2" value="decorator" />
</mapper>
 
<mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper">
<mapper
class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper">
</mapper>
 
<mapper class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper">
<mapper
class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper">
<param name="match.MSIE" value="ie" />
<param name="match.Mozilla [" value="ns" />
<param name="match.Opera" value="opera" />
22,26 → 27,31
<param name="match.Lynx" value="lynx" />
</mapper>
 
<mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper">
<mapper
class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper">
<param name="decorator" value="printable" />
<param name="parameter.name" value="printable" />
<param name="parameter.value" value="true" />
</mapper>
 
<mapper class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper">
<mapper
class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper">
<param name="decorator" value="robot" />
</mapper>
 
<mapper class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper">
<mapper
class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper">
<param name="decorator.parameter" value="decorator" />
<param name="parameter.name" value="confirm" />
<param name="parameter.value" value="true" />
</mapper>
 
<mapper class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper">
<mapper
class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper">
</mapper>
 
<mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
<mapper
class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
<param name="config" value="/WEB-INF/decorators.xml" />
</mapper>
 
/trunk/WebContent/WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA-sources.zip
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: WEB-INF/web.xml
===================================================================
--- WEB-INF/web.xml (revision 30)
+++ WEB-INF/web.xml (revision 31)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
<display-name>WebEngineeringProject</display-name>
@@ -20,7 +23,8 @@
<filter>
<filter-name>struts2</filter-name>
<filter-class>
- org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+ org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
+ </filter-class>
</filter>
<filter-mapping>
<filter-name>struts2</filter-name>
/trunk/WebContent/admin/main.jsp
4,6 → 4,8
</head>
<body>
 
<p>Willkommen im Admin-Bereich</p>
<p>
Willkommen im Admin-Bereich
</p>
</body>
</html>
/trunk/WebContent/admin/nav.jsp
1,37 → 1,21
<div id="navigation">
<ul>
<li>
User
<li>User
<ul>
<li>
<a href="userAddForm">Hinzuf&uuml;gen</a>
</li>
<li>
<a href="userList">&Auml;ndern, L&ouml;schen</a>
</li>
</ul>
</li>
<li><a href="userAddForm">Hinzuf&uuml;gen</a></li>
<li><a href="userList">&Auml;ndern, L&ouml;schen</a></li>
</ul></li>
<li>
Beziehungstypen
<li>Beziehungstypen
<ul>
<li>
<a href="relTypeAddForm">Hinzuf&uuml;gen</a>
</li>
<li>
<a href="relTypeList">&Auml;ndern, L&ouml;schen</a>
</li>
</ul>
</li>
<li><a href="relTypeAddForm">Hinzuf&uuml;gen</a></li>
<li><a href="relTypeList">&Auml;ndern, L&ouml;schen</a></li>
</ul></li>
<li>
User-Settings
<li>User-Settings
<ul>
<li>
<a href="../Logout">Logout</a>
</li>
</ul>
</li>
<li><a href="../Logout">Logout</a></li>
</ul></li>
</ul>
</div>
/trunk/WebContent/admin/userAdd.jsp
4,8 → 4,14
</head>
<body>
 
<h1>User hinzugef&uuml;gt</h1>
<p>Der Benutzer wurde hinzugef&uuml;gt</p>
<p>TODO: Weiterleitung!!</p>
<h1>
User hinzugef&uuml;gt
</h1>
<p>
Der Benutzer wurde hinzugef&uuml;gt
</p>
<p>
TODO: Weiterleitung!!
</p>
</body>
</html>
/trunk/WebContent/admin/relTypeAdd.jsp
4,8 → 4,14
</head>
<body>
 
<h1>Beziehungstyp hinzugef&uuml;gt</h1>
<p>Der Beziehungstyp wurde hinzugef&uuml;gt</p>
<p>TODO: Weiterleitung!!</p>
<h1>
Beziehungstyp hinzugef&uuml;gt
</h1>
<p>
Der Beziehungstyp wurde hinzugef&uuml;gt
</p>
<p>
TODO: Weiterleitung!!
</p>
</body>
</html>
/trunk/WebContent/admin/adminError.jsp
4,6 → 4,9
</head>
<body>
 
<p>Es ist ein Fehler aufgetreten. Bitte gehen Sie zurück und versuchen Sie es erneut. Wir bitten um Entschuldigung</p>
<p>
Es ist ein Fehler aufgetreten. Bitte gehen Sie zurück und versuchen
Sie es erneut. Wir bitten um Entschuldigung
</p>
</body>
</html>
/trunk/WebContent/resources/css/main.css
31,12 → 31,9
border:none;
}
 
 
 
/*********************************************************************************
* Links
*/
 
a, a:link, a:visited, a:active {
color: #AA0000;
text-decoration: none;
74,11 → 71,9
background-color: #DDDDDD;
}
 
 
/*********************************************************************************
* Table
*/
 
table {
margin: 5px 0 10px 0;
padding: 0;
125,11 → 120,9
padding: 0;
}
 
 
/*********************************************************************************
* Custom classes
*/
 
div#page-container {
width: 100%;
}
168,7 → 161,6
/*********************************************************************************
* Login
*/
div#login {
background-color: #EBEBED;
width: 350px;
188,9 → 180,6
width: 200px;
}
 
 
 
 
/*********************************************************************************
* Dialogs
*/
217,13 → 206,10
left: 30%;
top: 20px;
text-align: left;
padding: 10px 10px 10px 80px;
margin: 20px auto auto auto;
width: 40%;
background-color: #FFFFFF;
z-index: 1000;
}
 
235,31 → 221,34
height: 100%;
z-index: 500;
background-color: #EBEBED;
opacity: 0.7; /* for real browsers */
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; /* for IE 8 */
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
/* for IE 8 */
filter: alpha(opacity=70); /* for IE */
}
 
 
/* Error dialog */
.dialog_error {
background: #FFFFFF url(../../resources/images/dialog_error.png) no-repeat 10px 10px;
background: #FFFFFF url(../../resources/images/dialog_error.png)
no-repeat 10px 10px;
}
 
/* Warning dialog */
.dialog_warning {
background: #FFFFFF url(../../resources/images/dialog_warning.png) no-repeat 10px 10px;
background: #FFFFFF url(../../resources/images/dialog_warning.png)
no-repeat 10px 10px;
}
 
/* Info dialog */
.dialog_info {
background: #FFFFFF url(../../resources/images/dialog_info.png) no-repeat 10px 10px;
background: #FFFFFF url(../../resources/images/dialog_info.png)
no-repeat 10px 10px;
}
 
/* Question dialog */
.dialog_question {
background: #FFFFFF url(../../resources/images/dialog_question.png) no-repeat 10px 10px;
background: #FFFFFF url(../../resources/images/dialog_question.png)
no-repeat 10px 10px;
}
 
/*Notification*/
267,7 → 256,6
float:right;
}
 
 
/* Title of dialog box */
#dialog_title {
float: left;
297,7 → 285,6
padding: 10px 0 0 0;
}
 
 
/*********************************************************************************
* Navigation on the left side
*/
347,16 → 334,15
color: #E30119;
}
 
 
/*********************************************************************************
* General page formatting
*/
p.main_hint {
font-weight: bold;
}
 
p.sub_hint {
}
 
.hidden {
366,7 → 352,6
/*********************************************************************************
* Customer selection
*/
 
div.customer {
border-left: #EBEBED 5px solid;
padding: 0 5px 0 5px;
385,7 → 370,6
/*********************************************************************************
* Form fields
*/
.input_ro { /* read only input field */
border: 2px solid #EEEEEE;
background-color: #EEEEEE;
396,11 → 380,9
background-color: #FFDDDD;
}
 
 
/*********************************************************************************
* Shopping cart
*/
table.shopping_cart {
border-collapse: collapse;
border: 3px solid #EBEBED;
415,8 → 397,7
border-top: none;
}
 
table.shopping_cart td.right,
table.shopping_cart th.right {
table.shopping_cart td.right,table.shopping_cart th.right {
padding-right: 20px;
}
 
430,8 → 411,10
float: right;
margin: 7px 0 0 10px;
}
 
table.shopping_cart form {
margin: 0; padding: 0; /* Necessary for IE */
margin: 0;
padding: 0; /* Necessary for IE */
}
 
/* No padding-right for buttons in shopping cart */
485,7 → 468,8
#arrow_left {
height: 38px;
padding-left: 45px;
background: url('../../resources/images/double_left_arrow.png') no-repeat 3px 3px;
background: url('../../resources/images/double_left_arrow.png')
no-repeat 3px 3px;
}
 
/* Difference to minimum order value */
494,7 → 478,6
color: #E30119;
}
 
 
#shopping_cart_buttons {
width: 100%;
}
507,11 → 490,9
float: right;
}
 
 
/*********************************************************************************
* Filter
*/
 
#filter_list {
display: inline-block;
float: none;
535,7 → 516,6
width: 150px;
}
 
 
#user_id_block {
width: 200px;
height: 80px;
559,7 → 539,6
padding-right: 5px;
}
 
 
#filter_spacer {
width: 10px;
height: 80px;
604,5 → 583,4
 
.pager span {
padding: 5px;
}
 
}
/trunk/WebContent/user/main.jsp
4,7 → 4,9
</head>
<body>
 
<p>Willkommen im User-Bereich</p>
<p>
Willkommen im User-Bereich
</p>
 
</body>
</html>
/trunk/WebContent/user/nav.jsp
1,46 → 1,26
<div id="navigation">
<ul>
<li>
Ontologie
<li>Ontologie
<ul>
<li>
<a href="">Ansehen</a>
</li>
</ul>
</li>
<li><a href="">Ansehen</a></li>
</ul></li>
<li>
Begriffe
<li>Begriffe
<ul>
<li>
<a href="termAddForm">Hinzuf&uuml;gen</a>
</li>
<li>
<a href="">&Auml;ndern, L&ouml;schen</a>
</li>
</ul>
</li>
<li><a href="termAddForm">Hinzuf&uuml;gen</a></li>
<li><a href="">&Auml;ndern, L&ouml;schen</a></li>
</ul></li>
<li>
Beziehungen
<li>Beziehungen
<ul>
<li>
<a href="">Hinzuf&uuml;gen</a>
</li>
<li>
<a href="">&Auml;ndern, L&ouml;schen</a>
</li>
</ul>
</li>
<li><a href="">Hinzuf&uuml;gen</a></li>
<li><a href="">&Auml;ndern, L&ouml;schen</a></li>
</ul></li>
<li>
User-Settings
<li>User-Settings
<ul>
<li>
<a href="../Logout">Logout</a>
</li>
</ul>
</li>
<li><a href="../Logout">Logout</a></li>
</ul></li>
</ul>
</div>
/trunk/WebContent/user/termAddForm.jsp
4,10 → 4,12
<title>Begriff erstellen</title>
</head>
<body>
<h1>Begriff hinzuf&uuml;gen</h1>
<s:form action="doUserAdd">
<s:hidden name="user.id" />
<s:textfield name="user.username" label="Name" />
<h1>
Begriff hinzuf&uuml;gen
</h1>
<s:form action="doTermAdd">
<s:hidden name="term.id" />
<s:textfield name="term.username" label="Name" />
<s:submit value="Add" />
</s:form>
</body>
/trunk/WebContent/user/termAdd.jsp
0,0 → 1,17
<html>
<head>
<title>Term added</title>
</head>
<body>
 
<h1>
Begriff hinzugef&uuml;gt
</h1>
<p>
Der Begriff wurde hinzugef&uuml;gt
</p>
<p>
TODO: Weiterleitung!!
</p>
</body>
</html>
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property