Changes made to map viewer.

code/MoyaWeb/WebContent/resources/cditools/map/placeSelect.xhtml

@@ -24,8 +24,8 @@
 		</h:commandButton>
 		</h:commandButton>
 </div>
 </div>
 
 
+<h:panelGrid columns="3" cellpadding="10">
 
 
-		<h:panelGrid styleClass="placeSelectInfotable" columns="3">
 			<h:panelGrid columns="2">
 			<h:panelGrid columns="2">
 				<div style="border-color: black; border-style: solid; border-width: 1px; background-color: grey; width: 10px; height: 10px;" >&nbsp;</div>
 				<div style="border-color: black; border-style: solid; border-width: 1px; background-color: grey; width: 10px; height: 10px;" >&nbsp;</div>
 				<h:outputText value="#{i18n['placeSelect.legend.grey']}" />
 				<h:outputText value="#{i18n['placeSelect.legend.grey']}" />
@@ -39,8 +39,7 @@
 				<h:outputText value="#{i18n['placeSelect.legend.blue']}" />
 				<h:outputText value="#{i18n['placeSelect.legend.blue']}" />
 			</h:panelGrid>
 			</h:panelGrid>
 
 
-			<h:panelGroup>
-				<h:panelGrid columnClasses=",rightalign" columns="2">
+			<h:panelGrid columnClasses=",rightalign" columns="2">
 					<h:outputLabel value="#{i18n['placeSelect.totalPlaces']}:" />
 					<h:outputLabel value="#{i18n['placeSelect.totalPlaces']}:" />
 					<h:outputText value="#{mapView.availablePlaces}" />
 					<h:outputText value="#{mapView.availablePlaces}" />
 
 
@@ -57,12 +56,16 @@
 						<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
 						<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
 					</h:outputText>
 					</h:outputText>
 
 
-				</h:panelGrid>
-			</h:panelGroup>
-
+			</h:panelGrid>
+			
 
 
-			<h:panelGrid columnClasses=",rightalign" columns="2" rendered="#{not empty placeView.place }">
+	
+			
+			<h:panelGrid columnClasses=",rightalign" columns="2" rendered="#{not empty placeView.place}">
 
 
+				<h:commandButton rendered="#{placeView.canEdit()}" value="#{i18n['place.edit']}" action="/place/edit" />
+				<h:outputText rendered="#{placeView.canEdit()}" value=""/>
+				
 				<h:outputLabel value="#{i18n['placeSelect.placeName']}:" />
 				<h:outputLabel value="#{i18n['placeSelect.placeName']}:" />
 				<h:outputText value="#{placeView.place.name}" />
 				<h:outputText value="#{placeView.place.name}" />
 
 
@@ -74,13 +77,41 @@
 					<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
 					<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
 				</h:outputText>
 				</h:outputText>
 
 
-				<h:commandButton rendered="#{placeView.canEdit()}" value="#{i18n['place.edit']}" action="/place/edit" />
-
-			</h:panelGrid>
-
-		</h:panelGrid>
+				<h:outputLabel rendered="#{placeView.canEdit()}" value="#{i18n['placegroup.creator']}" />
+				<h:outputText  rendered="#{placeView.canEdit()}" value="#{placeView.place.group.creator.wholeName}" />
 
 
+				
 
 
+			</h:panelGrid>
+			
+		<h:outputText rendered="#{placeView.canEdit() and not empty placeView.place}" value=""/>	
+		<h:outputText rendered="#{placeView.canEdit() and not empty placeView.place}" value=""/>
+		<h:dataTable rendered="#{placeView.canEdit() and not empty placeView.place}" border="1" id="placelist" value="#{placeView.place.group.places}" var="place">
+
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="${i18n['placegroup.placename']}" />
+					</f:facet>
+					<h:link outcome="/place/edit" value="#{place.name}">
+						<f:param name="placeid" value="#{place.id}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<h:outputText rendered="#{empty place.placeReserver.user}" value="#{i18n['place.noReserver']}" />
+ 					<h:link rendered="#{!empty place.placeReserver.user}" outcome="/useradmin/edit">
+						<h:outputText value="#{place.placeReserver.user.wholeName}" />
+						(<h:outputText value="#{place.placeReserver.user.nick}" />)
+						<f:param name="userid" value="#{place.placeReserver.user.user.id}" />
+					</h:link>
+				</h:column>
+				<h:column>
+				</h:column>
+
+
+		</h:dataTable>
+		
+	</h:panelGrid>
 
 
 	</h:form>
 	</h:form>
 	<div>
 	<div>