Mercurial > hg > ismi-richfaces

changeset 62:bba950221e71 remove_escidoc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup. site name on page configurable with openmind.properties "instance-name".
author casties
date Mon, 30 Nov 2015 17:39:56 +0100
parents 8cbc94004a64
children b530266402a3
files src/main/java/org/mpiwg/itgroup/geonames/bo/Geoname.java src/main/resources/openmind-context.xml src/main/webapp/entry/digi.xhtml src/main/webapp/templates/main_template.xhtml
diffstat 4 files changed, 15 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/org/mpiwg/itgroup/geonames/bo/Geoname.java	Mon Nov 30 16:16:01 2015 +0100
+++ b/src/main/java/org/mpiwg/itgroup/geonames/bo/Geoname.java	Mon Nov 30 17:39:56 2015 +0100
@@ -6,8 +6,6 @@
 import java.util.List;
 import java.util.Queue;
 
-import org.apache.commons.lang.StringUtils;
-
 public class Geoname  implements Serializable{
 	private static final long serialVersionUID = -3256085837090516807L;
 	
--- a/src/main/resources/openmind-context.xml	Mon Nov 30 16:16:01 2015 +0100
+++ b/src/main/resources/openmind-context.xml	Mon Nov 30 17:39:56 2015 +0100
@@ -41,35 +41,36 @@
     </bean>
     
     
-    <!-- Scheduler for Date-Based Mailings -->
+    <!-- Scheduler for Date-Based Mailings -
     <bean id="scheduling" class="org.mpi.openmind.scheduling.utils.Scheduling">
         <property name="persistenceService" ref="persistenceService"/>
         <property name="configurationService" ref="configurationService"/>
-    </bean>
+    </bean> -->
     
-    <bean id="schedulingJobs" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+    <!-- <bean id="schedulingJobs" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <property name="targetObject" ref="scheduling"/>
-        <property name="targetMethod" value="dailyKickOff"/>
-        <!--property name="concurrent" value="false"/-->
-    </bean>    
+        <property name="targetMethod" value="dailyKickOff"/> -->
+        <!-- property name="concurrent" value="false"/ -->
+    <!-- </bean> -->
     
-    <bean id="schedulingCronTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
-        <property name="jobDetail" ref="schedulingJobs"/>
+    <!-- <bean id="schedulingCronTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+        <property name="jobDetail" ref="schedulingJobs"/> -->
         <!-- daily 6 AM -->
         
-        <property name="cronExpression" value="0 0 6 * * ?"/>
+        <!-- <property name="cronExpression" value="0 0 6 * * ?"/> -->
         <!-- 
         every 5 minutes 
         <property name="cronExpression" value="0 0/5 * * * ?"/>
         -->
         
-    </bean>
+    <!-- </bean> -->
         
-    <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
+    <!-- <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
         <property name="triggers">
             <list>
                 <ref bean="schedulingCronTrigger"/>
             </list>
         </property>
-    </bean>        
+    </bean>
+    -->        
 </beans>
\ No newline at end of file
--- a/src/main/webapp/entry/digi.xhtml	Mon Nov 30 16:16:01 2015 +0100
+++ b/src/main/webapp/entry/digi.xhtml	Mon Nov 30 17:39:56 2015 +0100
@@ -17,7 +17,7 @@
 					rendered="#{!empty CurrentDigi.entity.ownValue}"
 					style="font-size: 12pt;" styleClass="titlePanel" />
 				
-				<h:outputText value="Person"
+				<h:outputText value="Digitalization"
 					rendered="#{empty CurrentDigi.entity.ownValue}"
 					style="font-size: 12pt; " styleClass="titlePanel"/>
 				<h:outputLink
--- a/src/main/webapp/templates/main_template.xhtml	Mon Nov 30 16:16:01 2015 +0100
+++ b/src/main/webapp/templates/main_template.xhtml	Mon Nov 30 17:39:56 2015 +0100
@@ -11,28 +11,7 @@
 	<h:outputStylesheet name="/css/ismi-db/default.css" />
 	<h:outputStylesheet name="/css/ismi-db/popupPanel.css" />
 
-
 	<h:outputScript name="/js/autocomplete.js" />
-	<h:outputScript name="/js/autocomplete.js" />
-	
-	<!-- 
-	<h:outputStylesheet name="/imageServer/css/diva.min.css" />
-	<h:outputStylesheet name="/imageServer/css/bootstrap.css" />
-	<h:outputStylesheet name="/imageServer/css/bootstrap-responsive.min.css" />
-	<h:outputStylesheet name="/imageServer/css/style.css" />
-	
-	<h:outputScript name="imageServer/js/jquery.min.js" />
-	 -->
-	<!--  <h:outputScript name="imageServer/js/diva.min.js" /> -->
-	
-	<!-- <script type="text/javascript" src="http://localhost:8080/ismi-richfaces/resources/imageServer/js/diva.min.js"/> -->
-	<!-- 
-	<h:outputScript name="imageServer/js/diva.js" />
-	<h:outputScript name="imageServer/js/bootstrap.min.js" />
-	<h:outputScript name="imageServer/js/typeahead.js" />
-
-	<h:outputScript name="imageServer/js/jurzua/shared.js" />
- 	-->
 	
 </h:head>
 
@@ -120,15 +99,11 @@
 				<div id="iconContent">
 					<h:graphicImage
 						url="/resources/images/ismi_icon.png" width="90"/>
-						<!-- 
-					<h:graphicImage
-						url="http://www.mpiwg-berlin.mpg.de/en/images/logo.png" />
-						 -->
 				</div>
 			</div>
 			<div id="headerContent">
 				<h1>
-					<a href="#{ApplicationBean1.root}">ISMI Lab</a>
+					<a href="#{ApplicationBean1.root}">#{ApplicationBean1.confService.instanceName}</a>
 				</h1>
 				<p>Islamic Scientific Manuscripts Initiative</p>
 			</div>