Scarab commit: svn commit: r10776 - trunk/src: java/org/tigris/scarab/actions java/org/tigris/scarab/om java/org/tigris/scarab/tools webapp/WEB-INF/templates/navigations webapp/WEB-INF/templates/screens webapp/WEB-INF/templates/viewIssue webapp/scripts webapp/skins webapp/skins/images
Hussayn Dabbous <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2009-07-10 07:32:20-0700
New Revision: 10776
Added:
trunk/src/webapp/skins/images/button3_passive_begin.jpg (contents, props changed)
trunk/src/webapp/skins/images/button3_passive_end.jpg (contents, props changed)
Modified:
trunk/src/java/org/tigris/scarab/actions/Login.java
trunk/src/java/org/tigris/scarab/actions/QueryList.java
trunk/src/java/org/tigris/scarab/actions/ReportIssue.java
trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java
trunk/src/java/org/tigris/scarab/om/QueryPeer.java
trunk/src/java/org/tigris/scarab/om/ScarabUser.java
trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java
trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm
trunk/src/webapp/WEB-INF/templates/screens/Login.vm
trunk/src/webapp/WEB-INF/templates/screens/QueryList.vm
trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm
trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm
trunk/src/webapp/scripts/scarabutil.js
trunk/src/webapp/skins/classic.css
Log:
SCB2675: Added a first imprvement for scarab start page behaviour:
now start p[ages are:
- removed fuzzy startpage selection from QueryList, ReportIssue
- either a definable public query (per module)
- or if no public query is defined, the empty home page (for lack of a better choice)
- added a bit of layout too (currently just to see visually where things are in progress.)
Modified: trunk/src/java/org/tigris/scarab/actions/Login.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/Login.java?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/Login.java (original)
+++ trunk/src/java/org/tigris/scarab/actions/Login.java 2009-07-10 07:32:20-0700
@@ -52,7 +52,9 @@
import org.apache.turbine.TemplateContext;
import org.apache.turbine.RunData;
+import org.apache.fulcrum.parser.ParameterParser;
import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.modules.Action;
import org.apache.turbine.tool.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.security.util.DataBackendException;
@@ -67,6 +69,9 @@
import org.tigris.scarab.tools.localization.Localizable;
import org.tigris.scarab.util.ScarabConstants;
import org.tigris.scarab.util.Log;
+import org.tigris.scarab.om.MITList;
+import org.tigris.scarab.om.Query;
+import org.tigris.scarab.om.QueryPeer;
import org.tigris.scarab.om.ScarabUser;
import org.tigris.scarab.om.Module;
import org.tigris.scarab.om.ScarabUserManager;
@@ -169,8 +174,30 @@
&& user.hasPermission(ScarabSecurity.ISSUE__ENTER, uniqueModule ))
{
data.getParameters().remove(ScarabConstants.NEXT_TEMPLATE);
- data.getParameters().add(ScarabConstants.NEXT_TEMPLATE,
- "home,EnterNew.vm");
+
+ Query defaultQuery = QueryPeer.getDefaultQuery(uniqueModule);
+ ParameterParser pp = data.getParameters();
+ if(defaultQuery != null)
+ {
+ String qkey = defaultQuery.getQueryKey();
+ pp.add(ScarabConstants.NEXT_TEMPLATE, "IssueList.vm");
+ //pp.add("queryId", qkey);
+ //pp.add("query", qkey);
+ //data.setAction("Search");
+ pp.setString("eventSubmit_doSelectquery", "foo");
+ pp.setString("go",qkey);
+ Search action = new Search();
+ action.doSelectquery(data, context);
+
+ MITList mitList = defaultQuery.getMITList();
+ user.setCurrentMITList(mitList);
+ String mitListId = Long.toString(mitList.getListId());
+ pp.setString(ScarabConstants.CURRENT_MITLIST_ID, mitListId);
+ }
+ else
+ {
+ pp.add(ScarabConstants.NEXT_TEMPLATE, "home,EnterNew.vm");
+ }
}
}
}
Modified: trunk/src/java/org/tigris/scarab/actions/QueryList.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/QueryList.java?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/QueryList.java (original)
+++ trunk/src/java/org/tigris/scarab/actions/QueryList.java 2009-07-10 07:32:20-0700
@@ -46,11 +46,13 @@
* individuals on behalf of Collab.Net.
*/
+import java.util.Iterator;
import java.util.List;
import org.apache.fulcrum.intake.model.Field;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.parser.ParameterParser;
+import org.apache.torque.TorqueException;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
@@ -191,4 +193,46 @@
getScarabRequestTool(context).resetSelectedUsers();
setTarget(data, user.getQueryTarget());
}
+
+
+ /**
+ * This method is used by the "save startage" button.
+ * Note: The start page is declared per module.
+ * The declaration per user/module would be more appealing
+ * but is not yet implemented.
+ *
+ * @param data
+ * @param context
+ * @throws Exception
+ */
+ public void doSetstartpage(RunData data, TemplateContext context) throws Exception
+ {
+ ParameterParser pp = data.getParameters();
+ String queryId = pp.get("startpage");
+
+ List<Query> globalQueries = getScarabRequestTool(context).getGlobalQueries();
+ List<Query> privateQueries = getScarabRequestTool(context).getUserAllQueries();
+ Query newStartQuery = QueryManager.getInstance(new NumberKey(queryId), false);
+
+ setStartpage(globalQueries, newStartQuery);
+ setStartpage(privateQueries, newStartQuery);
+ }
+
+ private void setStartpage(List<Query> queries, Query newStartQuery) throws TorqueException
+ {
+ Iterator<Query> iter = queries.iterator();
+ while(iter.hasNext())
+ {
+ Query query = iter.next();
+ if (query.getQueryId().equals(newStartQuery.getQueryId()))
+ {
+ query.setHomePage(true);
+ }
+ else
+ {
+ query.setHomePage(false);
+ }
+ query.save();
+ }
+ }
}
Modified: trunk/src/java/org/tigris/scarab/actions/ReportIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/ReportIssue.java?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/ReportIssue.java (original)
+++ trunk/src/java/org/tigris/scarab/actions/ReportIssue.java 2009-07-10 07:32:20-0700
@@ -924,6 +924,6 @@
data.getParameters().remove(ScarabConstants.REPORTING_ISSUE);
user.setReportingIssue(key, null);
}
- user.setHomePage("home,EnterNew.vm");
+ //user.setHomePage("home,EnterNew.vm");
}
}
Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java (original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java 2009-07-10 07:32:20-0700
@@ -72,6 +72,7 @@
import org.tigris.scarab.services.cache.ScarabCache;
import org.tigris.scarab.util.Log;
import org.tigris.scarab.util.ScarabConstants;
+import org.tigris.scarab.util.ScarabLink;
/**
* This class contains common code for the use in ScarabUser implementations.
@@ -751,6 +752,30 @@
}
/**
+ * Prepare the HomePageLink
+ * @param link
+ * @param module
+ * @return
+ * @throws TorqueException
+ */
+ public String getDefaultQueryId(Module module) throws TorqueException
+ {
+ String homePage = getHomePage(module);
+ String result;
+ if(homePage.equals("IssueList.vm"))
+ {
+ Query q = QueryPeer.getDefaultQuery(module);
+ if(q != null)
+ {
+ homePage="IssueList.vm";
+ long cnt = (q.getQueryId());
+ return Long.toString(cnt);
+ }
+ }
+ return "";
+ }
+
+ /**
* @see ScarabUser#getHomePage(Module)
*/
public String getHomePage(Module module)
@@ -771,30 +796,40 @@
{
homePage = "SelectModule.vm";
}
- else if ("query".equals(homePage))
- {
- homePage = getQueryTarget();
- }
- else if ("matrix".equals(homePage))
- {
- homePage = getMatrixTarget();
- }
- // protect against removal of old screens
- else if (homePage != null &&
- (homePage.endsWith("ModuleQuery.vm") ||
- homePage.endsWith("XModuleList.vm")))
- {
- homePage = getQueryTarget();
- }
-
- int i = 0;
- while (homePage == null || !isHomePageValid(homePage, module))
+ else
{
- homePage = HOME_PAGES[i++];
- if ("query".equals(homePage))
+
+ Query q = QueryPeer.getDefaultQuery(module);
+ if(q != null)
+ {
+ homePage="IssueList.vm";
+ }
+
+ if ("query".equals(homePage))
{
homePage = getQueryTarget();
}
+ else if ("matrix".equals(homePage))
+ {
+ homePage = getMatrixTarget();
+ }
+ // protect against removal of old screens
+ else if (homePage != null &&
+ (homePage.endsWith("ModuleQuery.vm") ||
+ homePage.endsWith("XModuleList.vm")))
+ {
+ homePage = getQueryTarget();
+ }
+
+ int i = 0;
+ while (homePage == null || !isHomePageValid(homePage, module))
+ {
+ homePage = HOME_PAGES[i++];
+ if ("query".equals(homePage))
+ {
+ homePage = getQueryTarget();
+ }
+ }
}
}
}
@@ -1368,7 +1403,12 @@
}
private String getMostRecentQuery(Object key)
{
- setCurrentMITList(key, (MITList)mostRecentQueryMITMap.get(key));
+ MITList mostRecentQuery = (MITList)mostRecentQueryMITMap.get(key);
+ if(mostRecentQuery != null)
+ {
+ // There was a recent query, so (re-)use it ...
+ setCurrentMITList(key, mostRecentQuery);
+ }
return (String)mostRecentQueryMap.get(key);
}
Modified: trunk/src/java/org/tigris/scarab/om/QueryPeer.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/QueryPeer.java?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/QueryPeer.java (original)
+++ trunk/src/java/org/tigris/scarab/om/QueryPeer.java 2009-07-10 07:32:20-0700
@@ -388,4 +388,44 @@
return crit;
}
+
+ /**
+ * Return the
+ * @param module
+ * @param user
+ * @return
+ * @throws TorqueException
+ */
+ public static Query getDefaultQuery(Module module) throws TorqueException
+ {
+ List<Query> queries = null;
+ Object obj = QueryManager.getMethodResult()
+ .get(QUERY_PEER, GET_MODULE_QUERIES, module, "homePage");
+ if (obj == null)
+ {
+ Criteria crit = new Criteria()
+ .add(QueryPeer.DELETED, 0);
+ crit.add(QueryPeer.HOME_PAGE, 1);
+ crit.add(QueryPeer.MODULE_ID, module.getModuleId());
+ queries = QueryPeer.doSelect(crit);
+ QueryManager.getMethodResult()
+ .put(queries, QUERY_PEER, GET_MODULE_QUERIES, module, "homePage");
+ }
+ else
+ {
+ queries = (List)obj;
+ }
+
+ Query result;
+ if(queries != null &&queries.size() == 1)
+ {
+ result = queries.get(0);
+ }
+ else
+ {
+ result = null;
+ }
+ return result;
+ }
+
}
Modified: trunk/src/java/org/tigris/scarab/om/ScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/ScarabUser.java?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ScarabUser.java (original)
+++ trunk/src/java/org/tigris/scarab/om/ScarabUser.java 2009-07-10 07:32:20-0700
@@ -330,6 +330,17 @@
String getHomePage(Module module)
throws TorqueException;
+
+ /**
+ * Returns the QueryId of the modules HomePage (if the HomePage is a query)
+ * Otherwise null;
+ * @param module
+ * @return
+ * @throws TorqueException
+ */
+ String getDefaultQueryId(Module module)
+ throws TorqueException;
+
/**
* The template/tab to show for the home page.
*/
Modified: trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java (original)
+++ trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java 2009-07-10 07:32:20-0700
@@ -821,7 +821,13 @@
{
internalUser.setEnterIssueRedirect(templateCode);
}
-
+
+ public String getDefaultQueryId(Module module) throws TorqueException
+ {
+ return internalUser.getDefaultQueryId(module);
+ }
+
+
/**
* @see ScarabUser#getHomePage()
*/
Modified: trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java 2009-07-10 07:32:20-0700
@@ -2160,6 +2160,29 @@
null, (ScarabUser)data.getUser(),
"name", "asc", QueryPeer.TYPE_ALL_USER);
}
+
+ /**
+ * Return the default query for the current module.
+ * Typical usage as home page for that module.
+ * @return
+ * @throws Exception
+ */
+ public Query getDefaultQuery() throws Exception
+ {
+ return getDefaultQuery(getCurrentModule());
+ }
+
+ /**
+ * Return the default query for the given module.
+ * Typical usage as home page for the given module.
+ * @param module
+ * @return
+ * @throws Exception
+ */
+ public Query getDefaultQuery(Module module) throws Exception
+ {
+ return QueryPeer.getDefaultQuery(module);
+ }
/**
* a report helper class
Modified: trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm 2009-07-10 07:32:20-0700
@@ -45,7 +45,11 @@
<div class="scarab-toolgroup">
<div class="body">
- <strong><a href="$link.setPage($data.User.HomePage)">$l10n.IssueTrackingHome</a></strong> |
+ #set ($queryId = $data.User.getDefaultQueryId($module))
+ #set ($homePage= $data.User.getHomePage($module))
+ #set ($dummy = $data.Parameters.setString("query",$queryId) )
+ #set ($dummy = $data.Parameters.setString("queryId",$queryId) )
+ <strong><a href="$link.setPage($homePage).addPathInfo("query","$queryId")">$l10n.IssueTrackingHome</a></strong> |
<strong><a href="$link.setPage("SelectModule.vm")">$l10n.Modules ...</a></strong>
</div>
</div>
Modified: trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm 2009-07-10 07:32:20-0700
@@ -7,7 +7,7 @@
##
#set ($user = $data.User)
-$user.setHomePage("matrix")
+##$user.setHomePage("matrix")
<div class="app" id="xmodulelist">
Modified: trunk/src/webapp/WEB-INF/templates/screens/Login.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/Login.vm?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/Login.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/Login.vm 2009-07-10 07:32:20-0700
@@ -113,9 +113,10 @@
#if (!$module.isGlobalModule())
#set ($currentDisplayCount = 1 + $currentDisplayCount)
#if ($currentDisplayCount <= $scarabG.publicModulesDisplayCount)
+ #set ($query = $scarabR.getDefaultQuery($module))
#indexedRows($velocityCount)
<td nowrap="nowrap">
- $modulelink.setPage("$module.ModuleId").setLabel($module.Name)
+ $modulelink.setPage("$module.ModuleId").addPathInfo("query","$query.QueryId").setLabel($module.Name)
</td>
<td nowrap="nowrap">
$module.Description
Modified: trunk/src/webapp/WEB-INF/templates/screens/QueryList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/QueryList.vm?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/QueryList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/QueryList.vm 2009-07-10 07:32:20-0700
@@ -20,6 +20,7 @@
#set ($queryType = $data.Parameters.getString("go"))
#if ($queryType.equals("publicQueries"))
+ <input type="hidden" name="go" value="$queryType"/>
#set ($queryType = "PublicQueries")
#set ($queries = $scarabR.GlobalQueries)
#set ($privateQueries = false)
@@ -66,6 +67,7 @@
## <th>$l10n.SubscribeFrequency</th>
<th>#sort ("name" "$l10n.Name")</th>
<th>#sort ("desc" "$l10n.Description")</th>
+ <th>Startpage</th>
<th>#sort ("avail" "$l10n.Availability")</th>
#if ($privateQueries)
<th>#sort ("module" "$l10n.Module")</th>
@@ -80,7 +82,8 @@
#set ($rquGroup = $intake.RQueryUser.mapTo($rqu))
#set ($canDelete = $query.canDelete($user))
#set ($canEdit = $query.canEdit($user))
- #if ($canDelete) #set ($canDeleteAtLeastOne = true) #end
+ #if ($canDelete) #set ($canDeleteAtLeastOne = true) #end
+
#indexedRows($velocityCount)
<td>
@@ -106,6 +109,15 @@
#end
<td>#if($query.Description) $query.Description #else   #end</td>
+ <td>
+ <input type="radio"
+ #if($query.HomePage)
+ checked="checked"
+ #end
+ name="startpage"
+ value="$query.QueryId"/>
+ </td>
+
<td>
#if (!$query.Approved)
<a href="$link.setPathInfo("query", "$query.QueryId" ).setPage("IssueList.vm")">$l10n.Personal ($l10n.UntilApproved)</a>
@@ -131,13 +143,27 @@
#end
</table>
-<div class="functnbar3">
+## ==============================================
+## The function bar footer
+## ==============================================
+
+
+<div class="functnbar3" style="white-space:nowrap;min-height:23px;height:23px; overflow:visible;">
## <input type="submit" value="$l10n.Save" name="eventSubmit_doSave" /> 
-<input type="submit" value="$l10n.CopySelected" name="eventSubmit_doCopyquery" />
- #if ($canDeleteAtLeastOne)
-  <input type="submit" value="$l10n.DeleteSelected" name="eventSubmit_doDeletequeries" />
- #end
-  <input type="submit" value="$l10n.CreateNewQuery" name="eventSubmit_doGotoadvancedquery" />
+
+ <span style="float:left; margin:1px;padding:0px;overflow:visible;display:inline;">
+ <input type="submit" value="$l10n.CopySelected" name="eventSubmit_doCopyquery" class="button3"/>
+
+ #if ($canDeleteAtLeastOne)
+ <input type="submit" value="$l10n.DeleteSelected" name="eventSubmit_doDeletequeries" class="button3"/>
+ #end
+
+ <input type="submit" value="$l10n.CreateNewQuery" name="eventSubmit_doGotoadvancedquery" class="button3"/>
+
+ <input type="submit" value="Startpage $l10n.Save" name="eventSubmit_doSetstartpage" class="button3"/>
+
+ </span>
+
</div>
#end
Modified: trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm 2009-07-10 07:32:20-0700
@@ -5,8 +5,9 @@
##
## TODO: Where is this template used from? Is it redundant with IssueTypeList.vm?
##
+
#set ($user = $data.User)
-$user.setHomePage("matrix")
+##$user.setHomePage("matrix")
$user.setCurrentMITList(null)
<div class="app" id="xmodulelist">
Modified: trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm 2009-07-10 07:32:20-0700
@@ -41,8 +41,9 @@
#foreach ($module in $userModules)
#if (!($module.isGlobalModule() && $userModules.size() > 1))
#indexedRows($velocityCount)
- <td>
- $modulelink.setPage("$module.ModuleId").setLabel($module.Name)
+ <td>
+ #set ($queryId = $user.getDefaultQueryId($module))
+ $modulelink.setPage("$module.ModuleId").addPathInfo("query","$queryId").setLabel($module.Name)
</td>
<td>
$module.Description
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm 2009-07-10 07:32:20-0700
@@ -124,7 +124,6 @@
## ---------------------------------------------------------------------
#macro (watchingUsers $myselfInList $assignedUserId $watchedRMA $watchedAttrib)
-
#set ($users = $module.getUsers("Issue | View"))
## Create a selection box
#foreach ($user in $users)
@@ -165,7 +164,7 @@
#end
#end
#end
- </select>
+ </select>
<input type="submit" name="eventSubmit_doAddwatchers" title="Hier können Sie andere Mitarbeiter als $watchedRMA.DisplayValue hinzufügen " value="als $watchedRMA.DisplayValue" class="button" />
#end
@@ -263,7 +262,7 @@
## Issue remove
## ==========================================================================
<div class="functnbar2" style="white-space:nowrap;min-height:28px;height:28px; overflow:visible;">
- <span style="float:left; margin:1px;padding:0px;">
+ <span style="float:left; margin:1px;padding:0px;overflow:visible;display:inline;">
#if ($canEdit)
<span style="white-space:nowrap;margin-right:0px;margin-left:5px;">
Modified: trunk/src/webapp/scripts/scarabutil.js
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/scripts/scarabutil.js?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/webapp/scripts/scarabutil.js (original)
+++ trunk/src/webapp/scripts/scarabutil.js 2009-07-10 07:32:20-0700
@@ -122,6 +122,7 @@
collapseAll(["ol"]);
//openBookMark();
buttonEndings("button");
+ buttonEndings("button3");
buttonEndings("buttonNotify");
buttonEndings("buttonPassive");
buttonEndings("buttonActive");
Modified: trunk/src/webapp/skins/classic.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/classic.css?view=diff&pathrev=10776&r1=10775&r2=10776
==============================================================================
--- trunk/src/webapp/skins/classic.css (original)
+++ trunk/src/webapp/skins/classic.css 2009-07-10 07:32:20-0700
@@ -172,7 +172,7 @@
/* Button section ... */
/* ====================================================== */
-input.button, input.buttonActive, input.buttonPassive, input.buttonNotify, .watch_on, .watch_off {
+input.button, input.button3, input.buttonActive, input.buttonPassive, input.buttonNotify, .watch_on, .watch_off {
width:auto;
padding-right: 5px;
padding-left :10px;
@@ -186,7 +186,7 @@
cursor: pointer;
}
-.buttonEnding, .buttonActiveEnding, .buttonPassiveEnding, .buttonNotifyEnding {
+.buttonEnding, .button3Ending, .buttonActiveEnding, .buttonPassiveEnding, .buttonNotifyEnding {
position: absolute;
display: inline;
margin-left: -12px;
@@ -211,6 +211,10 @@
background: url(images/button_passive_begin.jpg) no-repeat;
}
+input.button3 {
+ background: url(images/button3_passive_begin.jpg) no-repeat;
+}
+
input.buttonActive {
background: url(images/button_active_begin.png) no-repeat;
}
@@ -229,6 +233,12 @@
background: url(images/button_passive_end.jpg) no-repeat;
}
+.button3Ending {
+ margin-left: -10px;
+ width: 10px;
+ background: url(images/button3_passive_end.jpg) no-repeat;
+}
+
.buttonActiveEnding {
background: url(images/button_active_checked.png) no-repeat;
}
Added: trunk/src/webapp/skins/images/button3_passive_begin.jpg
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/images/button3_passive_begin.jpg?view=markup&pathrev=10776
==============================================================================
Binary file. No diff available.
Added: trunk/src/webapp/skins/images/button3_passive_end.jpg
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/images/button3_passive_end.jpg?view=markup&pathrev=10776
==============================================================================
Binary file. No diff available.
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2369738