[Cdk-commits] CVS: cdkweb/src/vmtemplates/portlets/html generator.vm,1.7,1.8 render3d.vm,1.6,1.7

[Stefan K. <sh...@us...>]

Update of /cvsroot/cdk/cdkweb/src/vmtemplates/portlets/html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4482/src/vmtemplates/portlets/html

Modified Files:
	generator.vm render3d.vm 
Log Message:
some links from generator did not workd, now they do


Index: generator.vm
===================================================================
RCS file: /cvsroot/cdk/cdkweb/src/vmtemplates/portlets/html/generator.vm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- generator.vm	9 Nov 2005 16:44:04 -0000	1.7
+++ generator.vm	9 Nov 2005 17:13:44 -0000	1.8
@@ -8,7 +8,7 @@
 #if($data.getSession().getAttribute("smiles"))
 <p>The following structures have been generated from $data.getSession().getAttribute("formula"). Click a SMILES to show and analyze it!</p>
 #foreach($smile in $data.getSession().getAttribute("smiles"))
-	<a href="$jslink.getPaneById("P-106c69a12de-10000")?cdkaction=loadsmiles&smiles=$smile">$smile</a><br>
+	<a href="$jslink.getPaneById("P-106c69a12de-10000")?cdkaction=loadsmiles&smiles=$gutils.escapeInURL($smile)">$smile</a><br>
 #end
 #end
 

Index: render3d.vm
===================================================================
RCS file: /cvsroot/cdk/cdkweb/src/vmtemplates/portlets/html/render3d.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- render3d.vm	9 Nov 2005 16:44:04 -0000	1.6
+++ render3d.vm	9 Nov 2005 17:13:44 -0000	1.7
@@ -9,7 +9,7 @@
     <script src="./cdkwebhtml/Jmol.js"></script>
     <script>
       jmolInitialize("./cdkwebhtml");
-      jmolApplet(200, "load cdkwebhtml/${data.getSession().getId()}.mol");
+      jmolApplet(350, "load cdkwebhtml/${data.getSession().getId()}.mol");
     </script>
   #end
   <form action="portal;jsessionid=$data.getSession().getId()" method="post" NAME="MolForm">