You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/06/26 20:13:44 UTC
svn commit: r417289 - in /incubator/lokahi/lokahi/trunk/src:
java/org/apache/lokahi/core/api/file/ www/Apache/Pool/ www/Core/File/
www/Core/Pool/ www/Core/User/ www/Tomcat/Entity/ www/Tomcat/Pool/
www/layout/menu/
Author: toback
Date: Mon Jun 26 13:13:43 2006
New Revision: 417289
URL: http://svn.apache.org/viewvc?rev=417289&view=rev
Log:
Some small fixes to improve usability.
Modified:
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm
incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm
incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm
incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm
incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm
incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm
incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java Mon Jun 26 13:13:43 2006
@@ -57,10 +57,9 @@
JobPool.update(jp);
}
- public void updateFile(User u, Collection<File> fi, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
- for (File file : fi) this.updateFile(u, fi, f);
+ public void deleteFile(User u, Collection<File> fi, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
+ for (File file : fi) this.deleteFile(u, file, f);
} //todo fix the quick hack so that we only create one jobpool for the list of files we want to delete.
-
public void updateFile(User u, File fi, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
this.jpInit(f, u, fi.getName());
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm Mon Jun 26 13:13:43 2006
@@ -15,7 +15,7 @@
##
## $Id: viewconf.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
##
-#set ($menu = "/layout/PoolTop.vm")
+#set ($menu = "/layout/menu/PoolTop.vm")
#set ($pageSelected = "Pool")
#parse("/layout/header.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm Mon Jun 26 13:13:43 2006
@@ -15,7 +15,7 @@
##
## $Id: viewprop.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
##
-#set ($menu = "/layout/PoolTop.vm")
+#set ($menu = "/layout/menu/PoolTop.vm")
#set ($pageSelected = "Pool")
#parse("/layout/header.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm Mon Jun 26 13:13:43 2006
@@ -35,7 +35,7 @@
Content:
</td>
<td>
-<textarea id="content" name="content" cols="90" rows="30">$!{content}</textarea>
+<textarea id="content" name="content" cols="80" rows="30">$!{content}</textarea>
</td>
</tr>
<tr>
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm Mon Jun 26 13:13:43 2006
@@ -82,7 +82,7 @@
#foreach ($hp in $hps)
<option value="$appRoot/Core/Pool/details.vm?id=$hp.getPk()">$hp.getName()
#end
- </select><</td>
+ </select></td>
</table>
#end
<br />
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm Mon Jun 26 13:13:43 2006
@@ -66,7 +66,7 @@
#end
#else
User:
- #set ($us = $view.getAllUsers())
+ #set ($us = $User.getAllUsers())
<select name=id onchange='OnChange(this);'>
<option value="">Select one
#foreach ($u in $us)
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm Mon Jun 26 13:13:43 2006
@@ -58,7 +58,7 @@
#else
User:
- #set ($us = $view.getAllUsers())
+ #set ($us = $User.getAllUsers())
<select name=id onchange='OnChange(this);'>
<option value="">Select one
#foreach ($u in $us)
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm Mon Jun 26 13:13:43 2006
@@ -19,21 +19,24 @@
#parse("/layout/header.vm")
<div class="contentbox" align="center">
+<br /><br />
<div class="messagebox" width="75%" align="center">
#set ($cid = $request.getParameter("c"))
#set ($pid = $request.getParameter("p"))
#set ($fid = $request.getParameter("f"))
#set ($vid = $request.getParameter("v"))
-#if ($cid && $pid && $fid)
+#if ($cid && $fid)
#set ($context = $view.getContext($cid))
- #set ($project = $User.getProject($pid))
+ #if($pid)
+ #set ($project = $User.getProject($pid))
+ #end
#set ($f = $view.getFunction($fid))
- #if ($context && $project && $f)
- #if ($User.isAllowed($f, $project, $context))
+ #if ($context && $f)
+ #if ($User.isAllowed($f, $project, $context) || $User.isAllowed($f))
#set($tomcatPool = $context.getTomcatPool())
Please confirm:<BR>
- Project: $project.getName()<BR>
+ Project: $!{project.getName()}<BR>
Context: $context.getName() $!{context.getEnv().getName()}<br>
Action: $f.getName()<BR>
Pool: $!{tomcatPool.getName()}<br>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm Mon Jun 26 13:13:43 2006
@@ -13,7 +13,7 @@
## See the License for the specific language governing permissions and
## limitations under the License.
##
-## $Id: details.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+## $id$
##
#if(!$menu)
#set ($menu = "/layout/menu/PoolTop.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm Mon Jun 26 13:13:43 2006
@@ -15,7 +15,7 @@
##
## $Id: update.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
##
-#set ($menu = "/layout/UtilTop.vm")
+#set ($menu = "/layout/menu/PoolTop.vm")
#set ($pageSelected = "context")
#parse("/layout/header.vm")
<div id="center">
@@ -29,7 +29,7 @@
{
var myindex = dropdown.selectedIndex;
var SelValue = dropdown.options[myindex].value;
- var baseURL = "$appRoot/Core/Context/update.vm?id=" + SelValue;
+ var baseURL = "$appRoot/Tomcat/Entity/update.vm?id=" + SelValue;
top.location.href = baseURL;
return true;
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm Mon Jun 26 13:13:43 2006
@@ -13,7 +13,7 @@
## See the License for the specific language governing permissions and
## limitations under the License.
##
-## $Id: view.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+## $id$
##
#set ($menu = "/layout/menu/ProjectTop.vm")
#parse("/layout/header.vm")
@@ -55,13 +55,6 @@
#end
#end
-#if ($User.isAllowed("DeleteContext"))
- <form name="Form" method="post" action='$appRoot/administration/Context/Delete.do'>
- <input type=hidden name="methodToCall" value="DeleteContext" >
- <input type=hidden name=id value="$id" >
- <input type="submit" value="Delete">
- </form>
-#end
#else
Context:
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm Mon Jun 26 13:13:43 2006
@@ -18,6 +18,9 @@
#set ($menu = "/layout/menu/PoolTop.vm")
#set ($pageSelected = "Pool")
#parse("/layout/header.vm")
+<div align="center" class="contentbox">
+<br /><br />
+
<div class="projectbox">
<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
<TR CLASS="info" valign="top">
Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm Mon Jun 26 13:13:43 2006
@@ -19,8 +19,10 @@
#parse ("/layout/menu/top.vm")
<div id="submenu">
<ul>
+#if($User.isAllowed("AddHelpItem"))
<li><a href="$appRoot/Help/add.vm" class="rowlink" > Add </a></li>
<li><a href="$appRoot/Help/update.vm" class="rowlink" > Update </a></li>
+#end
</ul>
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm?rev=417289&r1=417288&r2=417289&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm Mon Jun 26 13:13:43 2006
@@ -62,7 +62,7 @@
#else
<li>
#end
- <a href="$appRoot/index.vm">TMC</a></li>
+ <a href="$appRoot/index.vm">Lokahi</a></li>
#end
</ul>
</div>