Subversion Repositories WebE

Compare Revisions

Last modification

Regard whitespace Rev 31 → Rev 30

/trunk/src/ch/ffhs/webE/action/TermAction.java
File deleted
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/dao/TermDAOImpl.java
===================================================================
--- trunk/src/ch/ffhs/webE/dao/TermDAOImpl.java (revision 31)
+++ trunk/src/ch/ffhs/webE/dao/TermDAOImpl.java (nonexistent)
@@ -1,145 +0,0 @@
-package ch.ffhs.webE.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-import ch.ffhs.webE.domain.Term;
-
-import com.googlecode.s2hibernate.struts2.plugin.annotations.SessionTarget;
-import com.googlecode.s2hibernate.struts2.plugin.annotations.TransactionTarget;
-
-/**
- * Implements the Database Access Object for terms
- *
- * @author Thomas Lahn
- */
-public class TermDAOImpl implements TermDAO
-{
- /**
- * Database session
- */
- @SessionTarget
- Session session;
-
- /**
- * Database transaction
- */
- @TransactionTarget
- Transaction transaction;
-
- /**
- * Creates a list of all terms
- *
- * @return an ArrayList with all the users - in case of a problem, an empty
- * list is returned
- */
- @SuppressWarnings("unchecked")
- public List<Term> listTerm()
- {
- List<Term> term = null;
- try
- {
- term = this.session.createQuery("FROM term").list(); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- /*
- * If no term was checked, return an empty list to mitigate null pointer
- * exceptions
- */
- if (term == null)
- {
- term = new ArrayList<Term>();
- }
- return term;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ch.ffhs.webE.dao.TermDAO#saveOrUpdate(ch.ffhs.webE.domain.Term)
- */
- public void saveOrUpdate(Term term)
- {
- try
- {
- this.session.saveOrUpdate(term);
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- e.printStackTrace();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ch.ffhs.webE.dao.TermDAO#deleteTerm(int)
- */
- public void deleteTerm(int termId)
- {
- try
- {
- Term user = (Term) this.session.get(Term.class, termId);
- this.session.delete(user);
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- e.printStackTrace();
- }
- }
-
- /**
- * Returns a single user with this user name (used for login)
- *
- * @param termName
- * Term name
- * @return User: Returns a user object if something is found. If not, null is
- * returned
- */
- public Term searchTerm(String termName)
- {
- Term term = null;
-
- /* Exec query */
- try
- {
- term = (Term) this.session
- .createQuery("FROM User " + "WHERE username = :username") //$NON-NLS-1$ //$NON-NLS-2$
- .setParameter("username", termName).uniqueResult(); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- /* TODO: Log error */
- }
- return term;
- }
-
- /**
- * List a term by ID
- *
- * @param termId
- * @return
- */
- public Term listTermById(int termId)
- {
- Term term = null;
- try
- {
- term = (Term) this.session.get(Term.class, termId);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- return term;
- }
-}
\ No newline at end of file
/trunk/src/ch/ffhs/webE/dao/TermDAOImpl.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/dao/TermDAO.java
===================================================================
--- trunk/src/ch/ffhs/webE/dao/TermDAO.java (revision 31)
+++ trunk/src/ch/ffhs/webE/dao/TermDAO.java (nonexistent)
@@ -1,46 +0,0 @@
-package ch.ffhs.webE.dao;
-
-import java.util.List;
-
-import ch.ffhs.webE.domain.Term;
-
-/**
- * Defines methods all term DAO implementations must implement
- *
- * @author pelinux
- */
-public interface TermDAO
-{
- /**
- * @return
- */
- List<Term> listTerm();
-
- /**
- * @param termName
- * @return
- */
- Term searchTerm(String termName);
-
- /**
- * Delete a term
- *
- * @param termId
- * Term ID
- */
- void deleteTerm(int termId);
-
- /**
- * @param termId
- * @return
- */
- Term listTermById(int termId);
-
- /**
- * Executes the query to save the term
- *
- * @param term
- * Domain object to be saved
- */
- void saveOrUpdate(Term term);
-}
/trunk/src/ch/ffhs/webE/dao/TermDAO.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/struts.xml
===================================================================
--- trunk/src/struts.xml (revision 31)
+++ trunk/src/struts.xml (revision 30)
@@ -11,11 +11,6 @@
<action name="termAddForm">
<result>/user/termAddForm.jsp</result>
</action>
-
- <action name="doTermAdd" method="addOrUpdate"
- class="ch.ffhs.webE.action.TermAction">
- <result name="success">/user/termAdd.jsp</result>
- </action>
</package>
<!-- Admin environment -->
@@ -26,23 +21,19 @@
<result>/admin/userAddForm.jsp</result>
</action>
- <action name="doUserAdd" method="addOrUpdate"
- class="ch.ffhs.webE.action.UserAction">
+ <action name="doUserAdd" method="addOrUpdate" class="ch.ffhs.webE.action.UserAction">
<result name="success">/admin/userAdd.jsp</result>
</action>
- <action name="userList" method="list"
- class="ch.ffhs.webE.action.UserAction">
+ <action name="userList" method="list" class="ch.ffhs.webE.action.UserAction">
<result name="success">/admin/userList.jsp</result>
</action>
- <action name="deleteUser" method="delete"
- class="ch.ffhs.webE.action.UserAction">
+ <action name="deleteUser" method="delete" class="ch.ffhs.webE.action.UserAction">
<result name="success" type="redirect">/admin/userList</result>
</action>
- <action name="editUser" method="edit"
- class="ch.ffhs.webE.action.UserAction">
+ <action name="editUser" method="edit" class="ch.ffhs.webE.action.UserAction">
<result name="success">/admin/userAddForm.jsp</result>
</action>
@@ -50,8 +41,7 @@
<!-- Relationship Type management -->
- <action name="relTypeList" method="list"
- class="ch.ffhs.webE.action.RelationshipTypeAction">
+ <action name="relTypeList" method="list" class="ch.ffhs.webE.action.RelationshipTypeAction">
<result name="success">/admin/relTypeList.jsp</result>
</action>
@@ -59,18 +49,15 @@
<result>/admin/relTypeAddForm.jsp</result>
</action>
- <action name="doRelTypeAdd" method="addOrUpdate"
- class="ch.ffhs.webE.action.RelationshipTypeAction">
+ <action name="doRelTypeAdd" method="addOrUpdate" class="ch.ffhs.webE.action.RelationshipTypeAction">
<result name="success" type="redirect">/admin/relTypeList</result>
</action>
- <action name="deleteRelType" method="delete"
- class="ch.ffhs.webE.action.RelationshipTypeAction">
+ <action name="deleteRelType" method="delete" class="ch.ffhs.webE.action.RelationshipTypeAction">
<result name="success" type="redirect">/admin/relTypeList</result>
</action>
- <action name="editRelType" method="edit"
- class="ch.ffhs.webE.action.RelationshipTypeAction">
+ <action name="editRelType" method="edit" class="ch.ffhs.webE.action.RelationshipTypeAction">
<result name="success">/admin/relTypeAddForm.jsp</result>
<result name="error">/admin/adminError.jsp</result>
</action>
@@ -90,8 +77,7 @@
<result name="error" type="redirect">/index.jsp</result>
</action>
- <action name="Logout" method="doLogout"
- class="ch.ffhs.webE.action.LoginAction">
+ <action name="Logout" method="doLogout" class="ch.ffhs.webE.action.LoginAction">
<result name="success" type="redirect">/index.jsp</result>
</action>
</package>
/trunk/src/hibernate.cfg.xml
16,7 → 16,9
<!-- Print all generated SQL to the console -->
<property name="show_sql">true</property>
<property name="format_sql">true</property>
<!-- <property name="connection.provider_class"> org.hibernate.connection.C3P0ConnectionProvider
<!--
<property name="connection.provider_class">
org.hibernate.connection.C3P0ConnectionProvider
</property> -->
<!-- C3P0 connection pool -->
<property name="hibernate.c3p0.min_size">5</property>
/trunk/WebContent/admin/userAdd.jsp
4,14 → 4,8
</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,14 → 4,8
</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,9 → 4,6
</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/admin/nav.jsp
1,21 → 1,37
<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/main.jsp
4,8 → 4,6
</head>
<body>
 
<p>
Willkommen im Admin-Bereich
</p>
<p>Willkommen im Admin-Bereich</p>
</body>
</html>
/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:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/sitemesh.xml
===================================================================
--- trunk/WebContent/WEB-INF/sitemesh.xml (revision 31)
+++ trunk/WebContent/WEB-INF/sitemesh.xml (revision 30)
@@ -1,26 +1,21 @@
<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" />
@@ -27,31 +22,26 @@
<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/web.xml
1,8 → 1,5
<?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>
 
 
23,8 → 20,7
<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/user/termAdd.jsp
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/user/nav.jsp
===================================================================
--- trunk/WebContent/user/nav.jsp (revision 31)
+++ trunk/WebContent/user/nav.jsp (revision 30)
@@ -1,26 +1,46 @@
<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,12 → 4,10
<title>Begriff erstellen</title>
</head>
<body>
<h1>
Begriff hinzuf&uuml;gen
</h1>
<s:form action="doTermAdd">
<s:hidden name="term.id" />
<s:textfield name="term.username" label="Name" />
<h1>Begriff hinzuf&uuml;gen</h1>
<s:form action="doUserAdd">
<s:hidden name="user.id" />
<s:textfield name="user.username" label="Name" />
<s:submit value="Add" />
</s:form>
</body>
/trunk/WebContent/user/main.jsp
4,9 → 4,7
</head>
<body>
 
<p>
Willkommen im User-Bereich
</p>
<p>Willkommen im User-Bereich</p>
 
</body>
</html>
/trunk/WebContent/decorators/mainTemplate.jsp
1,6 → 1,4
<%@ 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"%>
 
15,11 → 13,8
<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>
 
27,23 → 22,17
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>
<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>
&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>
</tr>
</table>
</div>
/trunk/WebContent/resources/css/main.css
31,9 → 31,12
border: none;
}
 
 
 
/*********************************************************************************
* Links
*/
 
a,a:link,a:visited,a:active {
color: #AA0000;
text-decoration: none;
71,9 → 74,11
background-color: #DDDDDD;
}
 
 
/*********************************************************************************
* Table
*/
 
table {
margin: 5px 0 10px 0;
padding: 0;
120,9 → 125,11
padding: 0;
}
 
 
/*********************************************************************************
* Custom classes
*/
 
div#page-container {
width: 100%;
}
161,6 → 168,7
/*********************************************************************************
* Login
*/
div#login {
background-color: #EBEBED;
width: 350px;
180,6 → 188,9
width: 200px;
}
 
 
 
 
/*********************************************************************************
* Dialogs
*/
206,10 → 217,13
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;
}
 
221,34 → 235,31
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*/
256,6 → 267,7
float: right;
}
 
 
/* Title of dialog box */
#dialog_title {
float: left;
285,6 → 297,7
padding: 10px 0 0 0;
}
 
 
/*********************************************************************************
* Navigation on the left side
*/
334,15 → 347,16
color: #E30119;
}
 
 
/*********************************************************************************
* General page formatting
*/
p.main_hint {
font-weight: bold;
}
 
p.sub_hint {
}
 
.hidden {
352,6 → 366,7
/*********************************************************************************
* Customer selection
*/
 
div.customer {
border-left: #EBEBED 5px solid;
padding: 0 5px 0 5px;
370,6 → 385,7
/*********************************************************************************
* Form fields
*/
.input_ro { /* read only input field */
border: 2px solid #EEEEEE;
background-color: #EEEEEE;
380,9 → 396,11
background-color: #FFDDDD;
}
 
 
/*********************************************************************************
* Shopping cart
*/
table.shopping_cart {
border-collapse: collapse;
border: 3px solid #EBEBED;
397,7 → 415,8
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;
}
 
411,10 → 430,8
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 */
468,8 → 485,7
#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 */
478,6 → 494,7
color: #E30119;
}
 
 
#shopping_cart_buttons {
width: 100%;
}
490,9 → 507,11
float: right;
}
 
 
/*********************************************************************************
* Filter
*/
 
#filter_list {
display: inline-block;
float: none;
516,6 → 535,7
width: 150px;
}
 
 
#user_id_block {
width: 200px;
height: 80px;
539,6 → 559,7
padding-right: 5px;
}
 
 
#filter_spacer {
width: 10px;
height: 80px;
583,4 → 604,5
 
.pager span {
padding: 5px;
}
}
 
/trunk/WebContent/errorHandler.jsp
1,8 → 1,7
<?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>
10,7 → 9,6
<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/.classpath
1,7 → 1,6
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="hibernate-src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="owner.project.facets" value="java"/>
/trunk/.settings/org.eclipse.jdt.core.prefs
1,4 → 1,4
#Wed Dec 29 00:20:56 CET 2010
#Mon Dec 20 19:09:36 CET 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
276,7 → 276,7
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=2
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
/trunk/.settings/.jsdtscope
1,15 → 1,12
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="WebContent" />
<classpathentry kind="con"
path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER" />
<classpathentry kind="con"
path="org.eclipse.wst.jsdt.launching.WebProject">
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="con"
path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary" />
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path="" />
</classpath>
/trunk/.settings/org.eclipse.wst.common.component
3,7 → 3,6
<wb-module deploy-name="WebEngineeringProject">
<wb-resource deploy-path="/" source-path="/WebContent"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/hibernate-src"/>
<property name="context-root" value="WebEngineeringProject"/>
<property name="java-output-path" value="/WebEngineeringProject/build/classes"/>
</wb-module>
/trunk/.project
3,7 → 3,6
<name>WebEngineeringProject</name>
<comment></comment>
<projects>
<project>Hibernate3</project>
</projects>
<buildSpec>
<buildCommand>
34,11 → 33,4
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
<linkedResources>
<link>
<name>hibernate-src</name>
<type>2</type>
<locationURI>WORKSPACE_LOC/Hibernate3/src</locationURI>
</link>
</linkedResources>
</projectDescription>