Scarab commit: svn commit: r10215 - branches/release/b21/src: java/org/tigris/scarab/om java/org/tigris/scarab/tools webapp/WEB-INF/templates/macros webapp/WEB-INF/templates/screens
[email protected] 22 Jul 2006 09:53:05 -0000
Newsgroups
gmane.comp.java.scarab.cvs
Message-ID
<[email protected] >
Author: dabbous
Date: 2006-07-22 02:53:05-0700
New Revision: 10215
Added:
branches/release/b21/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm
Modified:
branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabUser.java
branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java
branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java
branches/release/b21/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm
branches/release/b21/src/webapp/WEB-INF/templates/screens/AdvancedQuery.vm
branches/release/b21/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm
branches/release/b21/src/webapp/WEB-INF/templates/screens/Search.vm
Log:
major rework of the query matrix display and underlaying code.
there was an unexpected behaviour concerning the "home page"
which sometimnes changes: i saw following pages as home page
depending on the click history:
- the enter new issue page
- the query matrix
- the simple query page
- the advanced query page
Now only two "home pages" remain:
- the query matrix shows up as home page after it was utilised.
- the enter new issue page shows up as home page after a new issue was created.
all other "home pages" have been removed for the moment.
i cleaned the interfaces (vm templates) so that in near future we can
support a true home page (controlled by the individual user). all assets
are allready there. its only a matter of reorganisation.
in fact i have derived QueryMatrix.vm from IssueTypeList.vm
this part of the templates/macros/MITListMacro.vm[plates needs some refactoring
coming soon)
Modified: branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabUser.java?view=diff&rev=10215&p1=branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabUser.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabUser.java&r1=10214&r2=10215
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabUser.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabUser.java 2006-07-22 02:53:05-0700
@@ -770,6 +770,10 @@
{
homePage = getQueryTarget();
}
+ else if ("matrix".equals(homePage))
+ {
+ homePage = getMatrixTarget();
+ }
// protect against removal of old screens
else if (homePage != null &&
(homePage.endsWith("ModuleQuery.vm") ||
@@ -864,6 +868,12 @@
return target;
}
+ public String getMatrixTarget()
+ {
+ String target = "QueryMatrix.vm";
+ return target;
+ }
+
/**
* @see ScarabUser#setSingleIssueTypeQueryTarget(IssueType, String)
*/
@@ -950,14 +960,49 @@
public List getUnusedRModuleIssueTypes(Module module)
throws TorqueException
{
- Criteria crit = new Criteria();
- crit.add(RModuleIssueTypePeer.MODULE_ID, module.getModuleId())
- .addJoin(RModuleIssueTypePeer.ISSUE_TYPE_ID,
- IssueTypePeer.ISSUE_TYPE_ID)
- .add(IssueTypePeer.PARENT_ID, 0)
- .add(IssueTypePeer.DELETED, false);
- addCurrentMITListExclusion(crit);
- return RModuleIssueTypePeer.doSelect(crit);
+ List result;
+ if(module == null)
+ {
+ result = Collections.EMPTY_LIST;
+ }
+ else
+ {
+ Criteria crit = new Criteria();
+ crit.add(RModuleIssueTypePeer.MODULE_ID, module.getModuleId())
+ .addJoin(RModuleIssueTypePeer.ISSUE_TYPE_ID,
+ IssueTypePeer.ISSUE_TYPE_ID)
+ .add(IssueTypePeer.PARENT_ID, 0)
+ .add(IssueTypePeer.DELETED, false);
+ addCurrentMITListExclusion(crit);
+ result = RModuleIssueTypePeer.doSelect(crit);
+ }
+ return result;
+ }
+
+
+
+ /**
+ * @see ScarabUser#getAllRModuleIssueTypes(Module).
+ */
+ public List getAllRModuleIssueTypes(Module module)
+ throws TorqueException
+ {
+ List result;
+ if(module == null)
+ {
+ result = Collections.EMPTY_LIST;
+ }
+ else
+ {
+ Criteria crit = new Criteria();
+ crit.add(RModuleIssueTypePeer.MODULE_ID, module.getModuleId())
+ .addJoin(RModuleIssueTypePeer.ISSUE_TYPE_ID,
+ IssueTypePeer.ISSUE_TYPE_ID)
+ .add(IssueTypePeer.PARENT_ID, 0)
+ .add(IssueTypePeer.DELETED, false);
+ result = RModuleIssueTypePeer.doSelect(crit);
+ }
+ return result;
}
Modified: branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java?view=diff&rev=10215&p1=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java&r1=10214&r2=10215
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java 2006-07-22 02:53:05-0700
@@ -375,6 +375,12 @@
public List getUnusedRModuleIssueTypes(Module module)
throws TorqueException;
+ /**
+ * returns a list of RModuleIssueTypes for the given module.
+ */
+ public List getAllRModuleIssueTypes(Module module)
+ throws TorqueException;
+
void addRMITsToCurrentMITList(List rmits)
throws TorqueException;
Modified: branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java?view=diff&rev=10215&p1=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java&r1=10214&r2=10215
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java 2006-07-22 02:53:05-0700
@@ -933,6 +933,15 @@
}
/**
+ * @see ScarabUser#getAllRModuleIssueTypes(Module).
+ */
+ public List getAllRModuleIssueTypes(Module module)
+ throws TorqueException
+ {
+ return internalUser.getAllRModuleIssueTypes(module);
+ }
+
+ /**
* @see ScarabUser#addRMITsToCurrentMITList(List)
*/
public void addRMITsToCurrentMITList(List rmits)
Modified: branches/release/b21/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&rev=10215&p1=branches/release/b21/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&p2=branches/release/b21/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&r1=10214&r2=10215
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/tools/ScarabRequestTool.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/tools/ScarabRequestTool.java 2006-07-22 02:53:05-0700
@@ -512,9 +512,20 @@
return user;
}
+ /**
+ * retrieves the user from the current request.
+ * If the current request has no explicit user in it's data section,
+ * retrieve the current user from the current session.
+ * @return
+ */
public ScarabUser getCurrentUser()
{
- return (ScarabUser)data.getUser();
+ ScarabUser result = (ScarabUser)data.getUser();
+ if(user==null)
+ {
+ result = (ScarabUser)data.getUserFromSession();
+ }
+ return result;
}
/**
Modified: branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm?view=diff&rev=10215&p1=branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm&r1=10214&r2=10215
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm 2006-07-22 02:53:05-0700
@@ -30,14 +30,15 @@
##
## Warning: This assumes $scarabR.getSessionAttribute will return something!!!
##
- #set ($mitList = $user.CurrentMITList)
- #set ($editingList = ($mitList && !$mitList.isEmpty()))
+
+#set ($mitList = $user.CurrentMITList)
+#set ($editingList = ($mitList && !$mitList.isEmpty()))
#set ($currentModule = $scarabR.CurrentModule)
#set ($availableAttributes = $currentModule.AllOptionAttributes)
#set ($currentAttributeName = $scarabR.getSessionAttribute("attribute_id") )
#set ($currentAttributeOptions = $currentModule.getAllAttributeOptions($currentAttributeName))
-#set ($currentRmits = $user.getUnusedRModuleIssueTypes($currentModule))
+#set ($currentRmits = $user.getAllRModuleIssueTypes($currentModule))
#set ($savedLists = $user.MITLists)
#set ($isMoreThanOne = $currentRmits.size() > 1)
#set ($atLeastOneRMIT = $currentRmits && !$currentRmits.isEmpty())
@@ -48,6 +49,9 @@
<div class="colbar">
<p>
#if ($atLeastOneSaved)
+ ## -------------------------------------
+ ##Create list of saved queries ...<br/>
+ ## -------------------------------------
<select name="list_id" onclick="allit.checked=false" >
<option value="">$displayText</option>
#foreach ($list in $savedLists)
@@ -65,8 +69,14 @@
</p>
</div>
+
#if ($atLeastOneRMIT)
<table class="" width="100%" border="1" cellspacing="2" cellpadding="3" >
+
+## --------------------------------------------
+##<tr><td>doMatrix header ...</td></tr>
+## --------------------------------------------
+
<tr>
<th style="text-align:left"></th>
<th nowrap="nowrap" style="text-align:right">
@@ -91,6 +101,11 @@
##<th>$l10n.Description</th>
</tr>
+## --------------------------------------------
+##<tr><td>doMatrix sum ...</td></tr>
+## --------------------------------------------
+
+
<tr>
<th style="text-align:left; border-bottom-style:solid;border-bottom-width:1px;border-color:#ABC4DB;">$l10n.Total</th>
<th style="text-align:right; border-bottom-style:solid;border-bottom-width:1px;border-color:#ABC4DB;">
@@ -114,6 +129,9 @@
</tr>
+## --------------------------------------------
+##<tr><td>doMatrix body ...</td></tr>
+## --------------------------------------------
#set ($checked = !$isMoreThanOne)
#foreach ($attrOption in $currentAttributeOptions)
@@ -143,11 +161,18 @@
</tr>
#end
+## --------------------------------------------
+##<tr><td>end doMatrix body</td></tr>
+## --------------------------------------------
+
</table>
+
#else
$l10n.NoMoreIssueTypes
#end
+
+
#if ($atLeastOneRMIT || $atLeastOneSaved)
<div class="functnbar3">
<input type="submit" name="eventSubmit_do$event" value="$buttonName" />
@@ -191,8 +216,6 @@
</div>
#end
-
-
#if ($showOtherModuleSection)
<h3>
Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/AdvancedQuery.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/AdvancedQuery.vm?view=diff&rev=10215&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/AdvancedQuery.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/AdvancedQuery.vm&r1=10214&r2=10215
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/AdvancedQuery.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/AdvancedQuery.vm 2006-07-22 02:53:05-0700
@@ -1,6 +1,6 @@
<div class="app" id="advancedquery">
#set ($user = $data.User)
-$user.setHomePage('query')
+##$user.setHomePage('query')
#set ($mitlist = $user.CurrentMITList)
#if ($mitlist)
<form action="$link.setPage("AdvancedQuery.vm")" method="post">
Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm?view=diff&rev=10215&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm&r1=10214&r2=10215
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm 2006-07-22 02:53:05-0700
@@ -12,101 +12,105 @@
#set ($currentAttributeId = $availableAttributes.get(0).AttributeId )
#end
#end
+
#set ($dummy = $scarabR.setSessionAttribute("attribute_id", $currentAttributeId))
-$user.setHomePage("query")
+$user.setHomePage("matrix")
+
<div class="app" id="xmodulelist">
-#if ($user.hasAnySearchableRMITs())
+ #if ($user.hasAnySearchableRMITs())
- <div class="scarab-canvas">
- <form name="mainform" action="$link.setPage("IssueTypeList.vm")">
- <h3 class="functnbar" style="margin-left:-2px;margin-right:-1px;">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="100%">
- $l10n.QueryControlViewBy
- <select name="attribute_id" onchange="submit()">
- #foreach ($attr in $availableAttributes)
- #set ($atrid = $attr.AttributeId)
- <option value="$attr.AttributeId"#if($currentAttributeId == $atrid) selected="selected"#end>$attr.Name</option>
- #end
- </select>
- </td>
+ <div class="scarab-canvas">
+ <form name="mainform" action="$link.setPage("IssueTypeList.vm")">
+ <h3 class="functnbar" style="margin-left:-2px;margin-right:-1px;">
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td width="100%">
+ $l10n.QueryControlViewBy
+ <select name="attribute_id" onchange="submit()">
+ #foreach ($attr in $availableAttributes)
+ #set ($atrid = $attr.AttributeId)
+ <option value="$attr.AttributeId"#if($currentAttributeId == $atrid) selected="selected"#end>$attr.Name</option>
+ #end
+ </select>
+ </td>
- <td>
- <div class="scarab-toolgroup">
- <div class="scarab-tooltip" id="description" onclick="hideTooltip()" >
- <table>
- <tr>
- <td colspan="2" style="white-space:normal">$l10n.format("ToQuery", $l10n.DefineQuery)</td>
- </tr>
- <tr>
- <td colspan="2" style="white-space:normal">$l10n.ToQuery2</td>
- </tr>
- <tr>
- <td colspan="2" style="white-space:normal">$l10n.ToQuery3</td>
- </tr>
- <tr>
- <td colspan="2" style="white-space:normal">$l10n.ToQuery4</td>
- </tr>
- </table>
- </div>
- </div>
- </td>
+ <td>
+ <div class="scarab-toolgroup">
+ <div class="scarab-tooltip" id="description" onclick="hideTooltip()" >
+ <table>
+ <tr>
+ <td colspan="2" style="white-space:normal">$l10n.format("ToQuery", $l10n.DefineQuery)</td>
+ </tr>
+ <tr>
+ <td colspan="2" style="white-space:normal">$l10n.ToQuery2</td>
+ </tr>
+ <tr>
+ <td colspan="2" style="white-space:normal">$l10n.ToQuery3</td>
+ </tr>
+ <tr>
+ <td colspan="2" style="white-space:normal">$l10n.ToQuery4</td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </td>
- <td><img id="help"
+ <td><img id="help"
src="$imgpath/icon_help_sml.gif"
onClick="showDelayedTooltip('description',0)"
>
- </td>
- </tr>
- </table>
- </h3>
- </form>
- <div class="axial">
-
- <form name="issuetypelist" method="post" action="$link.setPage("IssueTypeList.vm")">
- <input type="hidden" name="attribute_id" value="$currentAttributeId"/>
- <input type="hidden" name="action" value="DefineXModuleList" />
- <input type="hidden" name="queryString" value="$!data.Parameters.getString("queryString")" />
- <input type="hidden" name="queryId" value="$!data.Parameters.getString("queryId")" />
- <input type="hidden" name="$scarabG.Constant.LAST_TEMPLATE" value="IssueTypeList.vm" />
- <input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE" value="AdvancedQuery.vm" />
-
-#createMITList("Finished" $l10n.DefineQuery $user "IssueTypeList.vm" $l10n.SelectSaveXModuleQuery)
-
-## $showOtherModuleSection will be set in the createMITList macro
-#set ($mitList = $user.CurrentMITList)
-#if ((!$mitList || $mitList.isEmpty()) && $showOtherModuleSection)
- <h3>$l10n.PredefinedLists</h3>
- #set($manager = $scarabG.MITListManager)
- #set($key = "pd_list_id")
- #set($checked = !$data.Parameters.getString($key, "").startsWith("oneitallmods"))
- <div class="colbar">
- <p>$l10n.ChoosePredefinedList</p>
- <p><input type="radio" name="$key" value="allmits"
- #if($checked) checked="checked"#end />$l10n.AllModulesAndIssueTypes</p>
-
- #foreach ($issueType in $user.CurrentModule.getIssueTypes(false))
- #set ($issueTypeName = $issueType.getDisplayName($module))
- #set ($value = "oneitallmods_$issueType.QueryKey")
- #set ($checked = $data.Parameters.getString($key, "") == $value)
- <p><input type="radio" name="$key" value="$value"#if($checked) checked="checked"#end />$l10n.format("CurrentIssueTypeAllModules", "$issueTypeName")</p>
- #end
- </div>
-
- <div class="functnbar2">
- <input type="submit" name="eventSubmit_doGotoquerywithinternallist" value="$l10n.DefineQuery" />
- </div>
-#end
+ </td>
+ </tr>
+ </table>
+ </h3>
+ </form>
+
+ <div class="axial">
+
+ <form name="issuetypelist" method="post" action="$link.setPage("IssueTypeList.vm")">
+ <input type="hidden" name="attribute_id" value="$currentAttributeId"/>
+ <input type="hidden" name="action" value="DefineXModuleList" />
+ <input type="hidden" name="queryString" value="$!data.Parameters.getString("queryString")" />
+ <input type="hidden" name="queryId" value="$!data.Parameters.getString("queryId")" />
+ <input type="hidden" name="$scarabG.Constant.LAST_TEMPLATE" value="IssueTypeList.vm" />
+ <input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE" value="AdvancedQuery.vm" />
+
+ #createMITList("Finished" $l10n.DefineQuery $user "IssueTypeList.vm" $l10n.SelectSaveXModuleQuery)
+
+ ## $showOtherModuleSection will be set in the createMITList macro
+ #set ($mitList = $user.CurrentMITList)
+ #if ((!$mitList || $mitList.isEmpty()) && $showOtherModuleSection)
+ <h3>$l10n.PredefinedLists</h3>
+ #set($manager = $scarabG.MITListManager)
+ #set($key = "pd_list_id")
+ #set($checked = !$data.Parameters.getString($key, "").startsWith("oneitallmods"))
+ <div class="colbar">
+ <p>$l10n.ChoosePredefinedList</p>
+ <p><input type="radio" name="$key" value="allmits"
+ #if($checked) checked="checked"#end />$l10n.AllModulesAndIssueTypes</p>
+
+ #foreach ($issueType in $user.CurrentModule.getIssueTypes(false))
+ #set ($issueTypeName = $issueType.getDisplayName($module))
+ #set ($value = "oneitallmods_$issueType.QueryKey")
+ #set ($checked = $data.Parameters.getString($key, "") == $value)
+ <p><input type="radio" name="$key" value="$value"#if($checked) checked="checked"#end />$l10n.format("CurrentIssueTypeAllModules", "$issueTypeName")</p>
+ #end
+ </div>
- $intake.declareGroups()
- </form>
- </div>
-</div>
+ <div class="functnbar2">
+ <input type="submit" name="eventSubmit_doGotoquerywithinternallist" value="$l10n.DefineQuery" />
+ </div>
+ #end
+
+ $intake.declareGroups()
+ </form>
+ </div>
+ </div>
+
+ #else
+ <p><em>$l10n.NoMoreIssueTypes</em></p>
+ #end
-#else
- <p><em>$l10n.NoMoreIssueTypes</em></p>
-#end
</div>
Added: branches/release/b21/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm?view=auto&rev=10215
==============================================================================
--- (empty file)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm 2006-07-22 02:53:05-0700
@@ -0,0 +1,92 @@
+#set ($user = $data.User)
+#set ($imgpath = $staticLink.setPath('/images') )
+
+#set ($currentModule = $scarabR.CurrentModule)
+#set ($availableAttributes = $currentModule.AllOptionAttributes)
+
+#set ($currentAttributeId = $data.Parameters.getInteger("attribute_id", 0) )
+#if ($currentAttributeId == 0)
+ #if ($scarabR.hasSessionAttribute("attribute_id") )
+ #set ($currentAttributeId = $scarabR.getSessionAttribute("attribute_id") )
+ #else
+ #set ($currentAttributeId = $availableAttributes.get(0).AttributeId )
+ #end
+#end
+
+#set ($dummy = $scarabR.setSessionAttribute("attribute_id", $currentAttributeId))
+
+$user.setHomePage("matrix")
+$user.setCurrentMITList(null)
+
+<div class="app" id="xmodulelist">
+
+ #if ($user.hasAnySearchableRMITs())
+
+ <div class="scarab-canvas">
+ <form name="mainform" action="$link.setPage("IssueTypeList.vm")">
+ <h3 class="functnbar" style="margin-left:-2px;margin-right:-1px;">
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td width="100%">
+ $l10n.QueryControlViewBy
+ <select name="attribute_id" onchange="submit()">
+ #foreach ($attr in $availableAttributes)
+ #set ($atrid = $attr.AttributeId)
+ <option value="$attr.AttributeId"#if($currentAttributeId == $atrid) selected="selected"#end>$attr.Name</option>
+ #end
+ </select>
+ </td>
+
+ <td>
+ <div class="scarab-toolgroup">
+ <div class="scarab-tooltip" id="description" onclick="hideTooltip()" >
+ <table>
+ <tr>
+ <td colspan="2" style="white-space:normal">$l10n.format("ToQuery", $l10n.DefineQuery)</td>
+ </tr>
+ <tr>
+ <td colspan="2" style="white-space:normal">$l10n.ToQuery2</td>
+ </tr>
+ <tr>
+ <td colspan="2" style="white-space:normal">$l10n.ToQuery3</td>
+ </tr>
+ <tr>
+ <td colspan="2" style="white-space:normal">$l10n.ToQuery4</td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </td>
+
+ <td><img id="help"
+ src="$imgpath/icon_help_sml.gif"
+ onClick="showDelayedTooltip('description',0)"
+ >
+ </td>
+ </tr>
+ </table>
+ </h3>
+ </form>
+
+ <div class="axial">
+
+ <form name="issuetypelist" method="post" action="$link.setPage("IssueTypeList.vm")">
+ <input type="hidden" name="attribute_id" value="$currentAttributeId"/>
+ <input type="hidden" name="action" value="DefineXModuleList" />
+ <input type="hidden" name="queryString" value="$!data.Parameters.getString("queryString")" />
+ <input type="hidden" name="queryId" value="$!data.Parameters.getString("queryId")" />
+ <input type="hidden" name="$scarabG.Constant.LAST_TEMPLATE" value="IssueTypeList.vm" />
+ <input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE" value="AdvancedQuery.vm" />
+
+ #createMITList("Finished" $l10n.DefineQuery $user "IssueTypeList.vm" $l10n.SelectSaveXModuleQuery)
+
+ $intake.declareGroups()
+ </form>
+ </div>
+ </div>
+
+ #else
+ <p><em>$l10n.NoMoreIssueTypes</em></p>
+ #end
+
+</div>
Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/Search.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/Search.vm?view=diff&rev=10215&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/Search.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/Search.vm&r1=10214&r2=10215
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/Search.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/Search.vm 2006-07-22 02:53:05-0700
@@ -1,6 +1,6 @@
<div class="app" id="search">
#set ($user = $data.User)
-$user.setHomePage("query")
+##$user.setHomePage("query")
#set ($mitlist = $user.CurrentMITList)
#if (!$mitlist.isSingleModuleIssueType())
<p class="infomark"><em>$l10n.IssueTypeListMoreThanOne</em></p>