Merge pull request #22 from nicolasmoreau/master

consumers usable with data from a node prefixed with ** to increase read...
misdoro · Nov 27, 2014 · e879931 · e879931
2 parents 8ed7c87 + 90f061e
commit e879931
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/consumers/Consumers.java b/portal.ejb/src/main/java/org/vamdc/portal/session/consumers/Consumers.java
@@ -78,7 +78,7 @@ public List<SelectItem> getConsumersUpdated(){
 
 			//recommended consumers
 			for (String ivoaID:visibleConsumers){
-				result.add(new SelectItem(ivoaID,registryFacade.getResourceTitle(ivoaID)+" *"));
+				result.add(new SelectItem(ivoaID," ** "+registryFacade.getResourceTitle(ivoaID)));
 			}
 
 			//other consumers

diff --git a/portal.war/src/main/webapp/help.xhtml b/portal.war/src/main/webapp/help.xhtml
@@ -9,9 +9,6 @@
 	template="/layout/template.xhtml">
 
 	<ui:define name="body">
-		<p>
-            <h:outputText value="Some information can be found on the  "/><h:outputLink value="http://voparis-twiki.obspm.fr/twiki/bin/view/VAMDC/PortalHelp" target="_blank">VAMDC wiki</h:outputLink>
-		</p>
         <p>
             <h:outputText value="Any topic related to the portal or VAMDC can be discussed on the "/><h:outputLink value="http://forum.vamdc.eu/" target="_blank">VAMDC forum</h:outputLink>
         </p>

diff --git a/portal.war/src/main/webapp/xhtml/consumer/consumerPanel.xhtml b/portal.war/src/main/webapp/xhtml/consumer/consumerPanel.xhtml
@@ -11,7 +11,7 @@
 
 	<rich:panel id="consumers" styleClass="consumerPanel">
 		<f:facet name="header">
-			<h:outputText value="3 : Results Conversion (entries labelled * are recommended)" />
+			<h:outputText value="3 : Results Conversion (entries starting with ** are recommended)" />
 		</f:facet>
 
 		<h:panelGroup id="inputFilesInfo" layout="block">