incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r629916 [3/3] - in /incubator/lokahi/lokahi/trunk: conf/ database/mysql/ database/oracle/ src/java/org/apache/lokahi/core/api/server/ src/java/org/apache/lokahi/core/api/template/ src/java/org/apache/lokahi/core/common/interfaces/ src/java/...
Date Thu, 21 Feb 2008 18:44:09 GMT
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/indiv.vm?rev=629916&r1=629915&r2=629916&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/indiv.vm Thu Feb 21 10:43:55
2008
@@ -39,12 +39,15 @@
   #end
   #if($User.isAllowed("StartTomcat"))
   <option value="$appRoot/Tomcat/Worker/starttomcat.vm?id=$!{ent.getPk()}">&nbsp;Start&nbsp;</option>
-  #end
-  #if($User.isAllowed("ViewTomcatWorker"))
-  <option value="$appRoot/Tomcat/Worker/viewconf.vm?id=$!{ent.getPk()}">&nbsp;View
server.xml&nbsp;</option>
+  #end  
+  #foreach ($template in $ent.getTomcat().getTemplates())
+	  #if($User.isAllowed("ViewTomcatWorker"))
+	  <option value="$appRoot/Tomcat/Worker/viewconf.vm?id=$!{ent.getPk()}&ct=$!{template.getPk()}">&nbsp;View
$template.getName()&nbsp;</option>
+	  #end
   #end
   #if($User.isAllowed("DeployTomcatConfig"))
   <option value="$appRoot/Tomcat/Worker/deployconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy
Config File&nbsp;</option>
   #end
 </select>
+
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm?rev=629916&r1=629915&r2=629916&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm Thu Feb 21 10:43:55 2008
@@ -27,6 +27,11 @@
 #set ($id = $request.getParameter("id"))
 #end
 
+#if ($request.getParameter("ct"))
+#set ($ct = $request.getParameter("ct"))
+#end
+
+
 <div align="center" class="contentbox">
   <br /><br />
 
@@ -46,7 +51,7 @@
       #if ($id)
       #set ($tomcatWorker = $view.getTomcatWorker($id))
 
-      <TextArea cols="90" READONLY rows="30">$!{tomcatWorker.buildConfForWeb()}</textarea>
+      <TextArea cols="90" READONLY rows="30">$!{tomcatWorker.buildConfForWeb($ct)}</textarea>
       #else
       Tomcat Worker:
       #set ($tws = $view.getTomcatWorkers())
@@ -63,5 +68,6 @@
   <br />
 </div>
 #parse("/layout/footer.vm")
+
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/js/common.js
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/js/common.js?rev=629916&r1=629915&r2=629916&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/js/common.js (original)
+++ incubator/lokahi/lokahi/trunk/src/www/js/common.js Thu Feb 21 10:43:55 2008
@@ -28,4 +28,17 @@
   return true;
 }
 
+function toggleDisplay(element) {
+  var obj = document.getElementById(element);
+  if (obj.style.display == "none") {
+	obj.style.display = "block";
+  } else {
+  	obj.style.display = "none"
+  }
+  return true;
+}
+
+
+
+
 

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm?rev=629916&r1=629915&r2=629916&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm Thu Feb 21 10:43:55 2008
@@ -33,7 +33,7 @@
 ##
 ## $individual $indivPage
 ##
-<!--$collection -->
+##<!--$collection -->
 #if($plf)
 	<div align="center" class="contentbox">
 	<br /><br />
@@ -63,9 +63,9 @@
 	</table>
 	<br />
 #end
-<!--$collection -->
-<!-- $individual -->
-<!-- $indivPage -->
+##<!--$collection -->
+##<!-- $individual -->
+##<!-- $indivPage -->
 #if ($individual && $indivPage)
 #parse($indivPage)
 #else
@@ -75,7 +75,7 @@
     <input type="submit" value="$buttonName" />
   #end
   #set($c = 1)
-  <!-- $collection -->
+  ##<!-- $collection -->
   #if( $collection && ! $collection.isEmpty())
     <table width="95%" border="0" cellspacing="0" cellpadding="1">
     <tr class="info">
@@ -141,4 +141,5 @@
 <br />
 </div>
 #end
+
 

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/style.vmcss
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/style.vmcss?rev=629916&r1=629915&r2=629916&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/style.vmcss (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/style.vmcss Thu Feb 21 10:43:55 2008
@@ -600,4 +600,30 @@
 .popup { POSITION: absolute; VISIBILITY: hidden; BACKGROUND-COLOR: silver; LAYER-BACKGROUND-COLOR:
yellow; width: 250; BORDER-LEFT: 1px solid black; BORDER-TOP: 1px solid black; BORDER-BOTTOM:
3px solid black; BORDER-RIGHT: 3px solid black; PADDING: 3px; z-index: 10 }
 
 
+/* template css */
+#viewTemplateVars {
+	text-decoration: underline;
+	color: #0000FF;
+}
+
+#templateVariables {
+	display: none;
+	position: absolute;
+	padding: 10px 10px 10px 10px;
+	background-color: FFFFCC;
+	border: 1px solid #000000;
+}
+
+#templateVariables .templateVar {
+	display: block;
+}
+#templateVariables .templateNotice {
+	display: block;
+	color: #FF0000;
+	font-weight:bold;
+}
+
+
+
+
 



Mime
View raw message