etusivulle muutoksia...

code/LanBortalWeb/WebContent/WEB-INF/web.xml

@@ -7,6 +7,7 @@
   <context-param>
     <param-name>javax.faces.PROJECT_STAGE</param-name>
       <param-value>Production</param-value> 
+   <!--<param-value>Development</param-value> -->
   </context-param>
   <context-param>
     <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>

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

@@ -12,6 +12,8 @@
 		<meta http-equiv="Content-Language" content="fi" />
 
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/tyyli.css" />
+		<!-- general style for nonlayout elements -->
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/general.css" />
 		<ui:insert name="headerdata" />
 		<h:outputScript name="prime_calendar.js" library="script" />
 	</h:head>

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

@@ -14,6 +14,7 @@
 		<meta http-equiv="Content-Language" content="fi" />
 
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/template1/css/style.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/template1/css/general.css" />
 		<ui:insert name="headerdata" />
 
 	</h:head>

code/LanBortalWeb/WebContent/resources/cditools/user/list.xhtml

@@ -7,35 +7,33 @@
 </composite:interface>
 
 <composite:implementation>
+<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
 	<h:dataTable styleClass="bordertable" id="user" value="#{userSearchView.results}" var="user">
 		<h:column>
 			<f:facet name="header">
-				<h:link value="ID" includeViewParams="true">
-					<f:param name="sort" value="id" />
-					<f:param name="page" value="0" />
-				</h:link>
-			</f:facet>
-			<h:outputText value="#{user.id}" />
-		</h:column>
-		<h:column>
-			<f:facet name="header">
-				<h:link value="#{i18n['user.login']}" includeViewParams="true">
-					<f:param name="sort" value="login" />
-					<f:param name="page" value="0" />
-
-				</h:link>
-			</f:facet>
-			<h:outputText value="#{user.login}" />
-		</h:column>
-		<h:column>
-			<f:facet name="header">
 				<h:link value="#{i18n['user.nick']}" includeViewParams="true">
 					<f:param name="sort" value="nick" />
 					<f:param name="page" value="0" />
-
 				</h:link>
 			</f:facet>
-			<h:outputText value="#{user.nick}" />
+			<h:outputText styleClass="hoverable" value="#{(empty user.nick)?'----':user.nick}" />
+			<div class="userdata_popup">
+		<h:panelGrid columns="2">
+			<img style="width:100px;" src="#{request.contextPath}/dydata/userimage/#{user.currentImage.id}.img" alt="image" />
+
+			<h:panelGroup>
+			<h:outputText value="#{user.nick}"/> <br />
+			<h:outputText value="#{user.firstnames} #{user.lastname}"/> <br />
+			<hr />
+			<h:outputText value="#{user.address}"/> <br />
+			<h:outputText value="#{user.zip} #{user.postalTown}"/> <br />
+			<br />
+			<h:outputText value="#{user.phone}"/> <br />
+			<h:outputText value="#{user.email}"/> <br />
+			</h:panelGroup>
+			</h:panelGrid>
+			</div>
+			
 		</h:column>
 		<h:column>
 			<f:facet name="header">
@@ -56,42 +54,26 @@
 			</f:facet>
 			<h:outputText value="#{user.lastname}" />
 		</h:column>
-		<h:column>
-			<f:facet name="header">
-				<h:link value="#{i18n['user.email']}" includeViewParams="true">
-					<f:param name="sort" value="email" />
-					<f:param name="page" value="0" />
 		
-				</h:link>
-			</f:facet>
-			<h:outputText value="#{user.email}" />
-		</h:column>
-		<!-- <h:column>
-			<f:facet name="header">
-				<h:outputText value="#{i18n['user.accountBalance']}" />
-			</f:facet>
-			<h:outputText value="#{user.accountBalance}">
-				<f:convertNumber />
-			</h:outputText>
-		</h:column>
-		 <h:column>
-				<f:facet name="header">
-					<h:outputText value="#{i18n['user.image']}" />
-				</f:facet>
-				<h:commandLink action="#{userView.showImage()}"
-					value="#{(empty user.currentImage)?i18n['user.noImage']:i18n['user.hasImage']}"
-				/>
-			</h:column>
-			 -->
 		<h:column>
-			<h:link outcome="/useradmin/edit" value="#{i18n['user.edit']}">
-				<f:param name="userid" value="#{user.id}" />
-			</h:link>
+			<button onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?user.id=#{user.id}')">#{i18n['user.edit']}</button>
 		</h:column>
+		
 		<!-- <h:column>
 				<h:commandButton action="#{userView.shop()}" value="#{i18n['user.shop']}" />
 			</h:column> -->
 	</h:dataTable>
+	<script>
+ jQuery(function() {
+	jQuery(".hoverable").hover(function () {
+	    jQuery(this).next().fadeIn();
+	  }, 
+	  function () {
+		  jQuery(this).next().fadeOut();
+	  });
+	 });
+</script>
 </composite:implementation>
+
 </html>
 

code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css

+/* General css, use for non-layout purposes for general elements */
+
+
+/* userlistview popup */
+.userdata_popup {
+position: absolute;
+border: 1px solid black;
+backgrond: white;
+border-radius: 3px;
+display: none;
+
+}
+
+
+/*  general class for hoverable usage  */
+.hoverable {
+
+}
\ No newline at end of file

code/LanBortalWeb/WebContent/resources/style/template1/css/general.css

+/* General css, use for non-layout purposes for general elements */
+
+
+/* userlistview popup */
+.userdata_popup {
+position: absolute;
+border: 1px solid black;
+background: white;
+border-radius: 3px;
+display: none;
+width: 300px;
+height: 150px;
+}
+
+
+/*  general class for hoverable usage  */
+.hoverable {
+
+}
\ No newline at end of file