--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/webapp/home/branchEditor.xhtml	Tue Mar 10 14:50:41 2015 +0100
@@ -0,0 +1,166 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:ace="http://www.icefaces.org/icefaces/components"
+	xmlns:ice="http://www.icesoft.com/icefaces/component"
+	xmlns:icecore="http://www.icefaces.org/icefaces/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:cl="http://java.sun.com/jsf/composite/jsf/cl"
+	template="../templates/publicTemplate.xhtml">
+	
+	<ui:define name="content">
+
+	<h:form>
+            
+	<ace:dialog id="dialog"
+		header="Message"
+		closable="false"
+		visible="#{!empty sessionBean.branchEditor.suggestionUserList}"
+		modal="true"
+		draggable="false">
+		<h:panelGrid columns="1">
+			<ace:dataTable value="#{sessionBean.branchEditor.suggestionUserList}" var="contributor">
+				<ace:column>
+					<h:commandLink value="#{contributor.userName}" actionListener="#{sessionBean.branchEditor.listenerAddContributor}"/>
+				</ace:column>
+			</ace:dataTable>
+			<h:commandButton 
+				value="Close" actionListener="#{sessionBean.branchEditor.listenerCloseContributorsDialog}" 
+				style="margin-left: auto;margin-right: auto; width:100%;"/>
+		</h:panelGrid>
+	</ace:dialog>
+	</h:form>
+
+		
+			<ice:form styleClass="content">
+			
+				<ice:outputLabel value="Branch Editor" styleClass="subTitle"/>
+				
+				<h:panelGrid columns="1">
+					<h:outputLabel value="No branch loaded!" rendered="#{sessionBean.branchEditor.currentBranch == null}"/>
+				</h:panelGrid>
+				
+				<h:panelGrid columns="2" rendered="#{sessionBean.branchEditor.currentBranch != null}">
+					
+					<h:outputLabel value="Branch" styleClass="subTitle"/>
+					<h:panelGrid columns="2" styleClass="tableComponent">
+						
+						<h:outputLabel value="Id"/>
+						<h:outputLabel value="#{sessionBean.branchEditor.currentBranch.id}"/>
+						
+						<h:outputLabel value="Label"/>
+						<h:panelGrid columns="2">
+							<h:inputText value="#{sessionBean.branchEditor.currentBranch.label}"/>
+							<h:commandButton value="Update" actionListener="#{sessionBean.branchEditor.listenerUpdateBranch}"/>
+						</h:panelGrid>
+						
+						<h:outputLabel value="Section Name"/>
+						<h:outputLabel value="#{sessionBean.branchEditor.currentBranch.sectionName}"/>
+						
+						<h:outputLabel value="Section Id"/>
+						<h:outputLabel value="#{sessionBean.branchEditor.currentBranch.sectionId}"/>
+						
+						<h:outputLabel value="Book Name"/>
+						<h:outputLabel value="#{sessionBean.branchEditor.currentBranch.book.name}"/>
+						
+						<h:outputLabel value="Book Id"/>
+						<h:outputLabel value="#{sessionBean.branchEditor.currentBranch.book.id}"/>
+						
+						<h:outputLabel value="Creator"/>
+						<h:outputLabel value="#{sessionBean.branchEditor.currentBranch.username}"/>
+						
+						<h:outputLabel value="Created"/>
+						<h:outputLabel value="#{sessionBean.branchEditor.currentBranch.fomattedCreation}"/>
+						
+						<h:outputLabel value="Contributors"/>
+						<h:panelGrid columns="2">
+							<ace:dataTable 
+								value="#{sessionBean.branchEditor.contributors}" 
+								var="soContributor">
+								<ace:column>
+							 		<h:outputLabel value="#{soContributor.obj.userName}"/>
+							 	</ace:column>
+							 	<ace:column>
+							 		<h:selectBooleanCheckbox value="#{soContributor.selected}"/>
+							 	</ace:column>
+							</ace:dataTable>
+							<h:panelGrid columns="1">
+								<h:commandButton 
+									value="Add Contributors" 
+									actionListener="#{sessionBean.branchEditor.listenerShowContributorsDialog}"/>
+								<h:commandButton 
+									value="Remove Contributors" 
+									actionListener="#{sessionBean.branchEditor.listenerRemoveContributor}"/>
+							</h:panelGrid>
+							
+						</h:panelGrid>
+						
+					</h:panelGrid>
+					
+					<h:outputLabel value="Current File"  styleClass="subTitle"/>
+					<h:panelGrid columns="2" styleClass="tableComponent">
+					
+						<h:outputLabel value="ID"/>
+						<h:outputText value="#{sessionBean.branchEditor.currentLastFile.id}"/>
+						
+						<h:outputLabel value="Version"/>
+						<h:outputText value="#{sessionBean.branchEditor.currentLastFile.version}"/>
+						
+						<h:outputLabel value="User"/>
+						<h:outputText value="#{sessionBean.branchEditor.currentLastFile.username}"/>
+						
+						<h:outputLabel value="File Name"/>
+						<h:outputText value="#{sessionBean.branchEditor.currentLastFile.fileName}"/>
+						
+						<h:outputLabel value="Created"/>
+						<h:outputText value="#{sessionBean.branchEditor.currentLastFile.fomattedCreation}"/>
+						
+						<h:outputText/>
+						<h:panelGrid columns="1">
+							<h:inputTextarea value="#{sessionBean.branchEditor.text}" style="width: 400px; height: 200px;'"/>
+							<h:commandButton value="Save Changes" actionListener="#{sessionBean.branchEditor.listenerSaveText}"/>						
+						</h:panelGrid>
+						
+					</h:panelGrid>
+					
+					
+					<h:outputLabel value="All files"  styleClass="subTitle"/>
+					<ace:dataTable value="#{sessionBean.branchEditor.allFiles}" var="file" styleClass="tableComponent">
+						<ace:column headerText="ID">
+							<h:outputText value="#{file.id}"/>
+						</ace:column>
+						<ace:column headerText="Version">
+							<h:outputText value="#{file.version}"/>
+						</ace:column>
+						<ace:column headerText="User">
+							<h:outputText value="#{file.username}"/>
+						</ace:column>
+						<ace:column headerText="Created">
+							<h:outputText value="#{file.fomattedCreation}"/>
+						</ace:column>
+						<ace:column headerText="Extraction Interface">
+							
+						</ace:column>
+						<ace:column headerText="Export Table">
+						
+						</ace:column>
+						<ace:column headerText="Text">
+							<h:outputLink 
+								value="#{appBean.rootServer}/rest/text/getFileText?fileId=#{file.id}"
+								target="_blank">
+								<h:graphicImage value="#{appBean.showImage}"/>
+							</h:outputLink>
+						</ace:column>
+					</ace:dataTable>
+								
+				</h:panelGrid>
+				
+
+			</ice:form>
+			
+	</ui:define>
+	
+		
+	
+</ui:composition>
\ No newline at end of file