Tool bar is improved.

[tools/siman.git] / Workspace / Siman / WebContent / jsp / toolbar.jsp

diff --git a/Workspace/Siman/WebContent/jsp/toolbar.jsp b/Workspace/Siman/WebContent/jsp/toolbar.jsp
index f1b216452e14ebaa610f5748d41cb258e849532c..00c9795d2057fec4e4d540eb8ee9deec1cf312d5 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/toolbar.jsp
+++ b/Workspace/Siman/WebContent/jsp/toolbar.jsp
@@ -1,23 +1,15 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"
 %>
-<%@ page import="org.splat.som.StudyRights"%>
 <%@ page import="org.splat.som.StepRights"%>
 <%@ page import="org.splat.simer.OpenStudy"%>
 <%@ page import="org.splat.wapp.ToolBar"%>
 <%@ page import="org.splat.wapp.ToolButton"%>
-<%@ page import="org.splat.wapp.PopupMenu"%>
 <%@ page import="java.util.Iterator"%>
 <%@
     taglib prefix="s" uri="/struts-tags"
 %>
-<%!private enum Tool { none, standard, study, back };%>
-<!-- Initialization of the context
-  -->
-<%
-       String  barname = request.getParameter("tools");
-    Tool    bar     = Tool.valueOf(barname);
-%>
+
 <s:url id="properties" namespace="/" action="select">
   <s:param name="menu">configuration</s:param>
 </s:url>
@@ -27,29 +19,29 @@
 
 <table width=100% border=0 cellspacing=0 cellpadding=0>
   <tr height=30 valign=middle>
-<%
-       if (bar == Tool.study) {
-      OpenStudy    study = (OpenStudy)session.getAttribute("study.open");
-      PopupMenu    popup = study.getPopup();
-      StudyRights  user  = study.getStudyRights();
-%>
+  
+       <s:if test="toolBarSettings.isToolStudy">
     <td width=30 align=left>
-<%    if (user.canEditProperties()) {
-%>    <s:a href="%{#properties}"><img src="<s:url value="/skin/tool.property.png"/>" border="none" title="<s:text name="tooltip.property"/>" /></s:a>
-<%    } else {
-%>    <s:a href="%{#properties}"><img src="<s:url value="/skin/tool.property.png"/>" border="none" title="<s:text name="tooltip.details"/>" /></s:a>
-<%    }
-%>  </td>  
+               <s:if test="toolBarSettings.canUserEdit">
+               <s:a href="%{#properties}"><img src="<s:url value="/skin/tool.property.png"/>" border="none" title="<s:text name="tooltip.property"/>" /></s:a>
+       </s:if>
+               <s:else>
+                   <s:a href="%{#properties}"><img src="<s:url value="/skin/tool.property.png"/>" border="none" title="<s:text name="tooltip.details"/>" /></s:a>
+               </s:else>
+    </td>  
     <td width=30 align=left>
-<%    if (popup.isEnabled("script")) {
-%>      <s:a href="%{#scenario}"><img src="<s:url value="/skin/tool.scenario.png"/>" border="none" title="<s:text name="tooltip.scenario"/>"/></s:a>
-<%    } else {
-%>    <img src="<s:url value="/skin/disabled.scenario.png"/>" border="none" title="" />
-<%    }
-%>  </td>
+               <s:if test="toolBarSettings.isEnabledScript">
+               <s:a href="%{#scenario}"><img src="<s:url value="/skin/tool.scenario.png"/>" border="none" title="<s:text name="tooltip.scenario"/>"/></s:a>
+       </s:if> 
+               <s:else>
+                   <img src="<s:url value="/skin/disabled.scenario.png"/>" border="none" title="" />
+               </s:else>
+
+    </td>
     <td align=right>
       <img src="<s:url value="/skin/image.vseparator.png"/>" border="none" />
-<%    ToolBar  mbar = study.getModuleBar();
+<%    OpenStudy    study = (OpenStudy)session.getAttribute("study.open");
+         ToolBar  mbar = study.getModuleBar();
       if (study.getSelectedStepRights().canCreateDocument() && mbar != null) {
 %>
       <applet name="perform" id="perform" code="org.splat.launcher.ToolbarApplet.class" archive="../jap/splat-signedlauncher.jar" width=<%=mbar.getWidth()%> height=<%=mbar.getHeight()%>>
@@ -69,18 +61,18 @@
     <td width=30 align=right>
       <s:a href="%{#idea}"><img src="<s:url value="/skin/icon.idea.png"/>" border="none" title="<s:text name="tooltip.search"/>" /></s:a>
     </td>
-<%  }
-    else if (bar == Tool.standard) {
-%>
-    <td width=30 align=left>
-      <s:a href="%{#properties}"><img src="<s:url value="/skin/tool.property.png"/>" border="none" title="<s:text name="tooltip.details"/>" /></s:a>
-    </td>
-<%  }
-    else if (bar == Tool.back) {
-%>
-    <td width=30 align=left>
-      <s:a href="%{#back}"><img src="<s:url value="/skin/icon.back.png"/>" border="none" title="<s:text name="tooltip.back"/>" /></s:a>
-    </td>
-<%  }
-%></tr>
+       </s:if>
+       
+       <s:elseif test="toolBarSettings.isToolStandard">
+           <td width=30 align=left>
+             <s:a href="%{#properties}"><img src="<s:url value="/skin/tool.property.png"/>" border="none" title="<s:text name="tooltip.details"/>" /></s:a>
+           </td>
+       </s:elseif>
+       
+       <s:elseif test="toolBarSettings.isToolBack">
+           <td width=30 align=left>
+             <s:a href="%{#back}"><img src="<s:url value="/skin/icon.back.png"/>" border="none" title="<s:text name="tooltip.back"/>" /></s:a>
+           </td>
+       </s:elseif>
+</tr>
 </table>
\ No newline at end of file