tyyliviilausta tapahtumaa varten

code/LanBortalDatabase/src/META-INF/persistence.xml

@@ -5,6 +5,7 @@
 	<persistence-unit name="BortalDb" transaction-type="JTA">
 	<persistence-unit name="BortalDb" transaction-type="JTA">
 		<jta-data-source>jdbc/bortal</jta-data-source>
 		<jta-data-source>jdbc/bortal</jta-data-source>
 		<properties>
 		<properties>
+		
 			<property name="eclipselink.ddl-generation" value="create-tables"/>
 			<property name="eclipselink.ddl-generation" value="create-tables"/>
 			<property name="eclipselink.ddl-generation.output-mode" value="both"/>
 			<property name="eclipselink.ddl-generation.output-mode" value="both"/>
 			<property name="eclipselink.cache.size.default" value="16384"/>
 			<property name="eclipselink.cache.size.default" value="16384"/>

code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java

@@ -28,6 +28,7 @@ import javax.persistence.TemporalType;
  * Account event contains the money / credit traffic for the user. Each row
  * Account event contains the money / credit traffic for the user. Each row
  * references a Product entity.
  * references a Product entity.
  */
  */
+
 @Entity
 @Entity
 @Table(name = "account_events")
 @Table(name = "account_events")
 @NamedQueries({
 @NamedQueries({

code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine.java

@@ -25,6 +25,7 @@ import javax.persistence.Version;
  */
  */
 @Entity
 @Entity
 @Table(name = "bill_lines")
 @Table(name = "bill_lines")
+
 @NamedQueries({
 @NamedQueries({
         @NamedQuery(name = "BillLine.findAll", query = "SELECT b FROM BillLine b"),
         @NamedQuery(name = "BillLine.findAll", query = "SELECT b FROM BillLine b"),
 
 
@@ -37,6 +38,8 @@ public class BillLine implements EventChildInterface {
     private static final BigDecimal DEFAULT_VAT = BigDecimal.ZERO;
     private static final BigDecimal DEFAULT_VAT = BigDecimal.ZERO;
     @EmbeddedId
     @EmbeddedId
     private EventPk id;
     private EventPk id;
+    
+    
 
 
     /**
     /**
      * Product name shown on the bill
      * Product name shown on the bill

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo.java

@@ -38,6 +38,7 @@ import javax.persistence.Version;
         @NamedQuery(name = "Compo.findBySubmitEnd", query = "SELECT c FROM Compo c WHERE c.submitEnd = :submitEnd"),
         @NamedQuery(name = "Compo.findBySubmitEnd", query = "SELECT c FROM Compo c WHERE c.submitEnd = :submitEnd"),
         @NamedQuery(name = "Compo.findByHoldVoting", query = "SELECT c FROM Compo c WHERE c.holdVoting = :holdVoting"),
         @NamedQuery(name = "Compo.findByHoldVoting", query = "SELECT c FROM Compo c WHERE c.holdVoting = :holdVoting"),
         @NamedQuery(name = "Compo.findByDescription", query = "SELECT c FROM Compo c WHERE c.description = :description") })
         @NamedQuery(name = "Compo.findByDescription", query = "SELECT c FROM Compo c WHERE c.description = :description") })
+        
 public class Compo implements EventChildInterface {
 public class Compo implements EventChildInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @EmbeddedId
     @EmbeddedId

code/LanBortalWeb/WebContent/layout/insomnia1/template.xhtml

@@ -22,9 +22,16 @@
 	<div id="wrapper">
 	<div id="wrapper">
 		<div id="navigation">
 		<div id="navigation">
 			<img id="head" src="#{request.contextPath}/resources/style/insomnia1/img/header.gif" alt="headerimage" />
 			<img id="head" src="#{request.contextPath}/resources/style/insomnia1/img/header.gif" alt="headerimage" />
+
 			<div style="float: left" >
 			<div style="float: left" >
 				<div id="headerbox"><tools:isLoggedIn>#{sessionHandler.loginname}</tools:isLoggedIn><tools:loginLogout /></div>
 				<div id="headerbox"><tools:isLoggedIn>#{sessionHandler.loginname}</tools:isLoggedIn><tools:loginLogout /></div>
-				<div>
+
+								
+			
+	
+			</div>
+	
+					<div id="mainmenu">
 					<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'frontpage'?'a':''}"> <h:link outcome="/index" value="#{i18n['topmenu.frontpage']}" /></div>
 					<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'frontpage'?'a':''}"> <h:link outcome="/index" value="#{i18n['topmenu.frontpage']}" /></div>
 					<tools:isLoggedIn>
 					<tools:isLoggedIn>
 						<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'user'?'a':''}"> <h:link outcome="/user/editself" value="#{i18n['topmenu.usersPreferences']}" /></div>
 						<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'user'?'a':''}"> <h:link outcome="/user/editself" value="#{i18n['topmenu.usersPreferences']}" /></div>
@@ -33,9 +40,10 @@
 					</tools:isLoggedIn>
 					</tools:isLoggedIn>
 				
 				
 					<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'placemap'?'a':''}"> <h:link outcome="/place/placemap" value="#{i18n['topmenu.placemap']}" /></div>
 					<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'placemap'?'a':''}"> <h:link outcome="/place/placemap" value="#{i18n['topmenu.placemap']}" /></div>
-					
+			
 				</div>
 				</div>
-			</div>
+	
+	
 		</div>
 		</div>
 		<div id="content">
 		<div id="content">
 			<div id="cwrap">
 			<div id="cwrap">

code/LanBortalWeb/WebContent/resources/style/insomnia1/style.css

@@ -74,6 +74,10 @@ body {
 	height: 80px;
 	height: 80px;
 }
 }
 
 
+#mainmenu {
+	margin-left: 10px;
+}
+
 #content {
 #content {
 	width: 100%;
 	width: 100%;
 	background-image: url('img/top.gif');
 	background-image: url('img/top.gif');