Merge branch 'master' of tkfftk@dev.intra.insomnia.fi:/data/bortal

code/.gitignore → .gitignore

 */build
 *.class
+.DS_Store

code/LanBortalBeansClient/ejbModule/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
-Class-Path: 
+Class-Path: lib/LanBortalDatabase.jar
 

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

@@ -38,6 +38,9 @@ public class AccessRight implements ModelInterface {
     @Column(name = "right_name", nullable = false)
     private String name;
 
+    /**
+     * Decribes the access right...
+     */
     @Lob
     @Column(name = "right_description")
     private String description;
@@ -48,9 +51,11 @@ public class AccessRight implements ModelInterface {
     @OneToMany(mappedBy = "accessRight")
     private List<RoleRight> roleRights;
 
+    
     @Override
     public Integer getId() {
         return id;
+        
     }
 
     @Override

code/LanBortalWeb/WebContent/WEB-INF/faces-config.xml

@@ -6,10 +6,10 @@
 	version="2.0">
 	<application>
 		<resource-bundle>
-			<base-name>resources.i18n</base-name>
+			<base-name>i18n</base-name>
 			<var>i18n</var>
 		</resource-bundle>
-		<message-bundle>i18n</message-bundle>
+		<message-bundle>resources.i18n</message-bundle>
 		<!-- Legal Country codes: http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_names_and_code_elements.htm -->
 		<!-- Assigned Country codes: -->
 		<!-- Insomnia: IN (INDIA) -->

code/LanBortalWeb/WebContent/layout/default-template.xhtml

@@ -22,7 +22,7 @@
           <a href="http://www.insomnia.fi">www.insomnia.fi</a>
     	</ui:insert>
     </div>
-    <div id="logo"><h1><ui:insert name="globaltitle">Y<span>ks </span>P<span>ikku </span>J<span>uttu </span></ui:insert></h1></div>
+    <div id="logo"><h1><ui:insert name="globaltitle">Lan Bortal</ui:insert></h1></div>
     <div id="menu">
     		<ui:insert name="toplinks"><ui:include src="/layout/toplinks.xhtml" /></ui:insert>
     

code/LanBortalWeb/WebContent/user/create.xhtml

@@ -16,7 +16,7 @@
 		<ui:define name="content">
 		
 		<h:form>
-		<h:panelGrid comlumns="2">
+		<h:panelGrid columns="2">
 			<h:outputLabel value="Nick:" /><h:inputText value="#{userView.nick}" />
 			<h:outputLabel value="Password:" /><h:inputSecret value="#{userView.password}" />
 			<h:commandButton action="#{userView.createUser()}" value="Create" />