From 34d4489770efb6463b1f97a92df900b7f5510761 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 11 Apr 2017 13:27:34 +0200
Subject: [PATCH] link to external header file removed
---
.../WEB-INF/components/map/infoPanel.xhtml | 79 -------------------
web/src/main/webapp/index.xhtml | 3 +-
2 files changed, 2 insertions(+), 80 deletions(-)
delete mode 100644 web/src/main/webapp/WEB-INF/components/map/infoPanel.xhtml
diff --git a/web/src/main/webapp/WEB-INF/components/map/infoPanel.xhtml b/web/src/main/webapp/WEB-INF/components/map/infoPanel.xhtml
deleted file mode 100644
index 18d46f2166..0000000000
--- a/web/src/main/webapp/WEB-INF/components/map/infoPanel.xhtml
+++ /dev/null
@@ -1,79 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:cc="http://java.sun.com/jsf/composite/pfcomp"
- xmlns:p="http://primefaces.org/ui">
-
-<h:outputStylesheet library="css" name="info.css" />
-
-<h:form id="infoForm" class="infoPanel">
- <div style="top:0px; width:100%; display: block;">
- <p:messages style="top:0px; width:100%;" id="loginMessages" showDetail="true" autoUpdate="true" closable="true" />
- </div>
- <h:outputText value="PROJECT INFO" styleClass="headerText"/>
- <h:panelGrid columns="2" cellpadding="1" styleClass="infoPanelData">
- <h:outputText value="Name: " />
- <h:outputText value="#{mapMB.currentProject.name}"/>
-
- <h:outputText value="Version: " />
- <h:outputText value="#{mapMB.currentProjectView.version}"/>
-
- <h:outputText value="Description: " />
- <h:outputText value="#{mapMB.currentProjectView.description}"/>
-
- <h:outputText value="Associated disease: " />
- <h:panelGroup>
- <h:outputText value="#{mapMB.currentProjectView.diseaseName}"/>
- <cc:annotation element="#{mapMB.currentProjectView.projectDiseaseLink}" rendered='#{mapMB.currentProjectView.diseaseName!="N/A" && not empty mapMB.currentProjectView.diseaseName}'/>
- </h:panelGroup>
-
- <h:outputText value="Publications: " />
- <h:panelGroup>
- <h:outputText value="#{exportMB.pubmedModelSummary.size()}"/>
- <br/>
- <p:commandButton icon="ui-icon-document" oncomplete="infoPublications.show()" value="Show" title="Show"/>
- </h:panelGroup>
-
- <h:outputText value="Original file: " />
- <h:panelGroup>
- <p:commandButton id="downloadProjectButton" actionListener="#{projectMB.downloadInputData(mapMB.currentProjectView)}" icon="ui-icon-arrowthickstop-1-s" disabled="#{not mapMB.currentProjectView.inputDataAvailable}" ajax="false" rendered='#{mapMB.currentProjectView.inputDataAvailable}'/>
- <h:outputText value="N/A" rendered='#{not mapMB.currentProjectView.inputDataAvailable}'/>
- </h:panelGroup>
- </h:panelGrid >
-
-</h:form>
-
-<h:form id="infoForm2">
- <p:dialog header="Publications" widgetVar="infoPublications" resizable="true" id="publicationsDlg"
- showEffect="fade" modal="true">
- <p:dataTable id="pubmedDataTable" var="row" value="#{exportMB.pubmedModelSummary}" paginator="true" rows="20" styleClass="paginated" paginatorAlwaysVisible="false">
- <p:column headerText="PubMed ID">
- <a href="#{row.article.link}" target="_pubmed_#{row.article.id}">#{row.article.id}</a>
- </p:column>
- <p:column sortBy="article.title" headerText="Title">
- <h:outputLabel value="#{row.article.title}" />
- </p:column>
- <p:column headerText="Authors">
- <ui:repeat value="#{row.article.authors}" var="author">
- <h:outputText value="#{author}"/>,
- </ui:repeat>
- </p:column>
- <p:column sortBy="article.year" headerText="Year">
- <h:outputLabel value="#{row.article.year}" />
- </p:column>
- <p:column sortBy="article.journal" headerText="Journal">
- <h:outputLabel value="#{row.article.journal}" />
- </p:column>
- <p:column headerText="Elements on map">
- <ui:repeat value="#{row.elements}" var="element">
- <a href="#{request.contextPath}/?id=#{mapMB.currentMapId}&search=#{element.right}" >#{element.left}</a>,
- </ui:repeat>
- </p:column>
- </p:dataTable>
- </p:dialog>
-</h:form>
-
-
-</html>
diff --git a/web/src/main/webapp/index.xhtml b/web/src/main/webapp/index.xhtml
index cda8b93407..8477f18a75 100644
--- a/web/src/main/webapp/index.xhtml
+++ b/web/src/main/webapp/index.xhtml
@@ -76,7 +76,7 @@ function initMap(){
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<div class = "containerClass">
<div id="leftPanel" class ="leftPanelClass">
- <ui:include src="/WEB-INF/components/admin/header.xhtml" />
+ <div><a href="#{request.contextPath}/?id=#{mapMB.currentMapId}" class="mainTitle"><i class="fa fa-home" style="font-size:17px"></i> #{mapMB.currentProject.name}</a></div>
<p:tabView id="tabView" widgetVar="_tabViewVar" activeIndex="0" >
<p:tab id="searchTab" title="<div class='tngContainer'><div class='tng'></div></div><div class='maintabdiv'><i class='fa fa-search maintab'></i><br>SEARCH</div>" styleClass="leftTab">
@@ -190,3 +190,4 @@ function initMap(){
</h:body>
</f:view>
</html>
+
--
GitLab