Scarab commit: svn commit: r10161 - trunk: src/java/org/tigris/scarab/actions src/java/org/tigris/scarab/notification src/java/org/tigris/scarab/om src/java/org/tigris/scarab/tools src/java/org/tigris/scarab/util/word src/sql/mysql/upgrade src/webapp/WEB-INF/templates/layouts src/webapp/WEB-INF/templates/macros xdocs

[email protected]
Newsgroups gmane.comp.java.scarab.cvs
Message-ID <[email protected]>
Author: dabbous
Date: 2006-06-11 00:59:19-0700
New Revision: 10161

Modified:
   trunk/src/java/org/tigris/scarab/actions/Search.java
   trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
   trunk/src/java/org/tigris/scarab/om/Issue.java
   trunk/src/java/org/tigris/scarab/om/ScarabModule.java
   trunk/src/java/org/tigris/scarab/om/Transition.java
   trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
   trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java
   trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-1.sql
   trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql
   trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql
   trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
   trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm
   trunk/xdocs/faqs.fml

Log:
merged all modifications in b21 branch back to trunk.

Modified: trunk/src/java/org/tigris/scarab/actions/Search.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/Search.java?view=diff&rev=10161&p1=trunk/src/java/org/tigris/scarab/actions/Search.java&p2=trunk/src/java/org/tigris/scarab/actions/Search.java&r1=10160&r2=10161
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/Search.java	(original)
+++ trunk/src/java/org/tigris/scarab/actions/Search.java	2006-06-11 00:59:19-0700
@@ -744,7 +744,8 @@
                          + "&intake-grp=attv"
                          + "&intake-grp=search"
                          + "&searchsp=asc"
-                         + "&searchtype=advanced";
+                         + "&searchtype=advanced"
+                         + "&searchallattributes=true";
 
         final String queryEnd = "&searchsctoi=0"
                               +  "&resultsperpage=25"

Modified: trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java?view=diff&rev=10161&p1=trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&p2=trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&r1=10160&r2=10161
==============================================================================
--- trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	(original)
+++ trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	2006-06-11 00:59:19-0700
@@ -621,17 +621,45 @@
         context.setSubjectTemplate("notification/IssueActivitySubject.vm");
         Set toUsers = new HashSet();
         toUsers.add(user);
+        
+        String[] fromUser    = getFromUser(issue, context);
         String[] replyToUser = issue.getModule().getSystemEmail();
         Email.sendEmail(
                 context,
                 issue.getModule(),
-                replyToUser,
+                fromUser,
                 replyToUser,
                 toUsers,
                 null,
                 "notification/IssueActivity.vm");
     }
 
+    private String[] getFromUser(Issue issue, EmailContext context) throws TorqueException
+    {
+        String[] replyToUser = null;
+    
+        Set creators = (Set)context.get("creators");
+        if (creators.size()==1)
+        {
+            // exactly one contributor to this E-Mail
+            boolean exposeSender = Turbine.getConfiguration()
+            .getBoolean("scarab.email.replyto.sender",false);
+
+            if(exposeSender)
+            {
+                ScarabUser creator = (ScarabUser)creators.toArray()[0];
+                replyToUser = new String[] { creator.getName(), creator.getEmail() };
+            }
+        }
+        
+        if(replyToUser == null)
+        {
+         replyToUser = issue.getModule().getSystemEmail();
+        }
+        
+        return replyToUser;
+    }
+
     private static Map typeDescriptions = new HashMap();
     
     /*

Modified: trunk/src/java/org/tigris/scarab/om/Issue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Issue.java?view=diff&rev=10161&p1=trunk/src/java/org/tigris/scarab/om/Issue.java&p2=trunk/src/java/org/tigris/scarab/om/Issue.java&r1=10160&r2=10161
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Issue.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/Issue.java	2006-06-11 00:59:19-0700
@@ -833,13 +833,15 @@
         if (obj == null) 
         {        
             List attributes = null;
+            Module module = getModule();
+            IssueType issueType = getIssueType();
             if (isActive)
             {
-                attributes = getIssueType().getActiveAttributes(getModule());
+                attributes = issueType.getActiveAttributes(module);
             }
             else
             {
-                attributes = getModule().getAttributes(getIssueType());
+                attributes = module.getAttributes(issueType);
             }
             Map siaValuesMap = getAttributeValuesMap();
             result = new LinkedMap((int)(1.25*attributes.size() + 1));

Modified: trunk/src/java/org/tigris/scarab/om/ScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/ScarabModule.java?view=diff&rev=10161&p1=trunk/src/java/org/tigris/scarab/om/ScarabModule.java&p2=trunk/src/java/org/tigris/scarab/om/ScarabModule.java&r1=10160&r2=10161
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ScarabModule.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/ScarabModule.java	2006-06-11 00:59:19-0700
@@ -650,7 +650,7 @@
         crit.add(IssuePeer.DELETED, 0);
         crit.add(IssuePeer.ID_COUNT, 0, SqlEnum.GREATER_THAN);
         crit.addJoin(AttributeValuePeer.ISSUE_ID, IssuePeer.ISSUE_ID);
-
+        crit.add(AttributeValuePeer.DELETED,0);
         int count = AttributeValuePeer.count(crit);
         return count;
     }

Modified: trunk/src/java/org/tigris/scarab/om/Transition.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Transition.java?view=diff&rev=10161&p1=trunk/src/java/org/tigris/scarab/om/Transition.java&p2=trunk/src/java/org/tigris/scarab/om/Transition.java&r1=10160&r2=10161
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Transition.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/Transition.java	2006-06-11 00:59:19-0700
@@ -95,6 +95,30 @@
         return role;
     }
 
+    /**
+     * Get the FromOptionId
+     * Note: This method overwrites the generated base method.
+     * @return Integer
+     */
+    public Integer getFromOptionId()
+    {
+        Integer result = super.getFromOptionId();
+        if (result == null) result = new Integer(0);
+        return result;
+    }
+    
+    /**
+     * Get the ToOptionId
+     * Note: This method overwrites the generated base method.
+     * @return Integer
+     */
+    public Integer getToOptionId()
+    {
+        Integer result = super.getToOptionId();
+        if (result == null) result = new Integer(0);
+        return result;
+    }
+    
     public AttributeOption getFrom()
     {
         AttributeOption from = null;

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&rev=10161&p1=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&p2=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&r1=10160&r2=10161
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	(original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	2006-06-11 00:59:19-0700
@@ -1709,6 +1709,7 @@
         StringValueParser parser = new StringValueParser();
         parser.parse(query, '&', '=', true);
         String[] userList = parser.getStrings("user_list");
+        boolean searchInAllAttributes = parser.getBoolean("searchallattributes",false);
         if (userList != null && userList.length > 0)
         {
             for (int i = 0; i < userList.length; i++)
@@ -1782,7 +1783,16 @@
         }
         
         // Set attribute values to search on
-        LinkedMap avMap = search.getCommonAttributeValuesMap();
+        LinkedMap avMap;
+        if(searchInAllAttributes)
+        {
+            avMap = search.getAllAvailableAttributeValuesMap();           
+        }
+        else
+        {
+            avMap = search.getCommonAttributeValuesMap();           
+        }
+
         Iterator i = avMap.mapIterator();
         while (i.hasNext()) 
         {

Modified: trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java?view=diff&rev=10161&p1=trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java&p2=trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java&r1=10160&r2=10161
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java	(original)
+++ trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java	2006-06-11 00:59:19-0700
@@ -420,20 +420,54 @@
         return userIdList;
     }
 
+    /**
+     * returns the list of attribute values
+     * for all attributes in the current module
+     * and defined for all currently searched issueTypes.
+     * @return
+     * @throws Exception
+     */
     public LinkedMap getCommonAttributeValuesMap()
-        throws Exception
+    throws Exception
     {
-    	LinkedMap result = null;
+        return internalGetAttributeValuesMap(true);
+    }
+    
+    /**
+     * returns the list of attribute values
+     * for all attributes in the current module.
+     * @return
+     * @throws Exception
+     */
+    public LinkedMap getAllAvailableAttributeValuesMap()
+    throws Exception
+    {
+        return internalGetAttributeValuesMap(false);
+    }
+        
+    /**
+     * returns the list of attribute values
+     * for all attributes in the current module.
+     * 
+     * if(commonOnly==true) 
+     * return only attribute values which are
+     * commonly defined for all searched issueTypes.
+     * @return
+     * @throws Exception
+     */
+    private LinkedMap internalGetAttributeValuesMap(boolean commonOnly) throws Exception
+    {
+        LinkedMap result = null;
         if (isXMITSearch()) 
         {
-            result = getMITAttributeValuesMap();
+            result = getMITAttributeValuesMap(commonOnly);
         }
         else 
         {
             result = super.getModuleAttributeValuesMap(false);
         }
         return result;
-    }
+    }   
 
     /**
      * AttributeValues that are relevant to the issue's current module.
@@ -441,13 +475,21 @@
      * not been set for the issue are included.  The values are ordered
      * according to the module's preference
      */
-    private LinkedMap getMITAttributeValuesMap() 
+    private LinkedMap getMITAttributeValuesMap(boolean commonOnly) 
         throws Exception
     {
     	LinkedMap result = null;
 
-        List attributes = mitList.getCommonAttributes(false);
-        //List attributes = mitList.getAttributes(false,false);
+        List attributes;
+        if(commonOnly)
+        {
+            attributes = mitList.getCommonAttributes(false);
+        }
+        else
+        {
+            attributes = mitList.getAttributes(false,false);
+        }
+
         Map siaValuesMap = getAttributeValuesMap();
         if (attributes != null) 
         {

Modified: trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-1.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-1.sql?view=diff&rev=10161&p1=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-1.sql&p2=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-1.sql&r1=10160&r2=10161
==============================================================================
--- trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-1.sql	(original)
+++ trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-1.sql	2006-06-11 00:59:19-0700
@@ -1,35 +1,34 @@
-/*
- * b20-b21 Migration.
- *
- * Creates new fields to allow deleting issues
- * Creates new permissions for commenting and deleting issues
- *
- */
+--
+-- b20-b21 Migration.
+--
+-- Creates new fields to allow deleting issues
+-- Creates new permissions for commenting and deleting issues
+--
  
-/**
-  * Adds the field to describe ActivityType for every activity record.
-  */
+-- 
+--  Adds the field to describe ActivityType for every activity record.
+--  
 ALTER TABLE SCARAB_ACTIVITY ADD ACTIVITY_TYPE varchar(30) null;
 
-/**
-  * Adds the field to mark an issue as 'moved'. The 'deleted' will now be
-  * used just for the deletions.
-  */
+-- 
+--  Adds the field to mark an issue as 'moved'. The 'deleted' will now be
+--  used just for the deletions.
+--  
 ALTER TABLE SCARAB_ISSUE ADD MOVED INTEGER(1);
 
-/**
-  * Move the 'deleted' values into 'moved' field.
-  */
+-- 
+--  Move the 'deleted' values into 'moved' field.
+--  
 update SCARAB_ISSUE SET MOVED=DELETED;
 
-/**
-  * Reset the 'deleted' issue.
-  */
+-- 
+--  Reset the 'deleted' issue.
+--  
 update SCARAB_ISSUE SET DELETED=0;
 
-/**
-  * Insert new permissions (delete & comment)
-  */
+-- 
+--  Insert new permissions (delete & comment)
+--  
 INSERT INTO TURBINE_PERMISSION (PERMISSION_ID, PERMISSION_NAME) VALUES (21, 'Issue | Comment');
  
 INSERT INTO TURBINE_PERMISSION (PERMISSION_ID, PERMISSION_NAME) VALUES (20, 'Issue | Delete');

Modified: trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql?view=diff&rev=10161&p1=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql&p2=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql&r1=10160&r2=10161
==============================================================================
--- trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql	(original)
+++ trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql	2006-06-11 00:59:19-0700
@@ -1,15 +1,15 @@
-/*
- * b20-b21 Migration.
- *
- * Creates new tables for the notification system.
- *
- */
+--
+-- b20-b21 Migration.
+--
+-- Creates new tables for the notification system.
+--
  
+SET FOREIGN_KEY_CHECKS = 0; 
+
+--
+-- SCARAB_NOTIFICATION_STATUS
+--
 
-/*
- * SCARAB_NOTIFICATION_STATUS
- *
- */
 CREATE TABLE SCARAB_NOTIFICATION_STATUS
 (
     ACTIVITY_ID BIGINT NOT NULL,
@@ -26,10 +26,10 @@
     INDEX IX_NOTIF_STATUS (STATUS)
 );
 
-/*
- * SCARAB_NOTIFICATION_FILTER
- *
- */
+--
+-- SCARAB_NOTIFICATION_FILTER
+--
+
 CREATE TABLE SCARAB_NOTIFICATION_FILTER
 (
     MODULE_ID MEDIUMINT NOT NULL,
@@ -44,10 +44,10 @@
     FOREIGN KEY (MODULE_ID) REFERENCES SCARAB_MODULE (MODULE_ID)
 );
 
-/*
- * SCARAB_DEFAULT_NOTIFICATION_FILTER
- *
- */
+--
+-- SCARAB_DEFAULT_NOTIFICATION_FILTER
+--
+
 CREATE TABLE SCARAB_DEFAULT_NOTIFICATION_FILTER (
   MODULE_ID mediumint(9) NOT NULL,
   ROLE_ID mediumint(9) NOT NULL,
@@ -57,3 +57,5 @@
   MODIFYABlE int(1) NOT NULL default '1',
   PRIMARY KEY  (MODULE_ID,ROLE_ID,ACTIVITY_TYPE,MANAGER_ID)
 );
+
+SET FOREIGN_KEY_CHECKS = 1; 

Modified: trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql?view=diff&rev=10161&p1=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql&p2=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql&r1=10160&r2=10161
==============================================================================
--- trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql	(original)
+++ trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql	2006-06-11 00:59:19-0700
@@ -1,38 +1,56 @@
-/*
- * b20-b21 Migration.
- *
- * SCB1565: Include 'last modified' and 'creation' information in search results
- *  - Modifications on SCARAB_R_MODULE_USER_ATTRIBUTE
- *  - Dump and recreate SCARAB_ISSUE with the new field (LAST_TRANS_ID) loaded
- *
- */
-
-/*
- * SCB1565: Creation and Last Modification date and users in Query Results
- *
- * - Add new column to SCARAB_R_MODULE_USER_ATTRIBUTE and modify the unique constraint
- *
- */
+--
+-- b20-b21 Migration.
+--
+-- SCB1565: Include 'last modified' and 'creation' information in search results
+--  - Modifications on SCARAB_R_MODULE_USER_ATTRIBUTE
+--  - Dump and recreate SCARAB_ISSUE with the new field (LAST_TRANS_ID) loaded
+--
+
+--
+-- SCB1565: Creation and Last Modification date and users in Query Results
+--
+-- - Add new column to SCARAB_R_MODULE_USER_ATTRIBUTE and modify the unique constraint
+--
 
 ALTER TABLE SCARAB_R_MODULE_USER_ATTRIBUTE ADD (INTERNAL_ATTRIBUTE VARCHAR(20) NULL);
 
+--
+-- Drop index may fail, if it does not yet exist.
+-- The related error message can safely be ignored.
+-- 
 DROP INDEX LIST_ID ON SCARAB_R_MODULE_USER_ATTRIBUTE;
 
 CREATE UNIQUE INDEX LIST_ID ON SCARAB_R_MODULE_USER_ATTRIBUTE (LIST_ID,MODULE_ID,USER_ID,ISSUE_TYPE_ID,ATTRIBUTE_ID,INTERNAL_ATTRIBUTE);
 
-/*
- * Add new column to SCARAB_ISSUE with LAST_TRANS_ID, setting its value to
- * the older activity ID related to every issue
- *
- */
-
-ALTER TABLE SCARAB_ISSUE ADD COLUMN LAST_TRANS_ID BIGINT AFTER CREATED_TRANS_ID;
-
-ALTER TABLE SCARAB_ISSUE
-  ADD FOREIGN KEY (LAST_TRANS_ID) REFERENCES SCARAB_TRANSACTION (TRANSACTION_ID);
-
-UPDATE SCARAB_ISSUE i set i.LAST_TRANS_ID = ( 
-   SELECT MAX(a.TRANSACTION_ID)
-   FROM SCARAB_ACTIVITY a 
-   WHERE i.ISSUE_ID = a.ISSUE_ID 
-);
+--
+-- Add new column to SCARAB_ISSUE with LAST_TRANS_ID, setting its value to
+-- the older activity ID related to every issue
+--
+-- 
+
+CREATE TABLE SCARAB_ISSUE_BACKUP_b20_b21
+SELECT * FROM SCARAB_ISSUE;
+
+DROP TABLE SCARAB_ISSUE;
+
+SET FOREIGN_KEY_CHECKS = 0; 
+
+CREATE TABLE SCARAB_ISSUE
+(
+    PRIMARY KEY(ISSUE_ID),
+    FOREIGN KEY (MODULE_ID) REFERENCES SCARAB_MODULE (MODULE_ID),
+    FOREIGN KEY (TYPE_ID) REFERENCES SCARAB_ISSUE_TYPE (ISSUE_TYPE_ID),
+    FOREIGN KEY (CREATED_TRANS_ID) REFERENCES SCARAB_TRANSACTION
+(TRANSACTION_ID),
+    INDEX IX_TYPE_MODULE (TYPE_ID, MODULE_ID),
+    INDEX IX_COUNT_PREFIX (ID_COUNT, ID_PREFIX)
+)
+SELECT i.ISSUE_ID, i.ID_PREFIX, i.ID_COUNT, i.ID_DOMAIN, i.TYPE_ID,
+       i.MODULE_ID, i.CREATED_TRANS_ID,
+       max(a.transaction_id) LAST_TRANS_ID, 
+       i.DELETED, i.MOVED
+FROM SCARAB_ISSUE_BACKUP_b20_b21 i LEFT OUTER JOIN SCARAB_ACTIVITY a ON
+       (i.ISSUE_ID = a.ISSUE_ID)
+GROUP BY i.ISSUE_ID;
+
+SET FOREIGN_KEY_CHECKS = 1; 

Modified: trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/layouts/Default.vm?view=diff&rev=10161&p1=trunk/src/webapp/WEB-INF/templates/layouts/Default.vm&p2=trunk/src/webapp/WEB-INF/templates/layouts/Default.vm&r1=10160&r2=10161
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/layouts/Default.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/layouts/Default.vm	2006-06-11 00:59:19-0700
@@ -5,6 +5,7 @@
   <title>${l10n.ScarabWordMark}#if ($title): ${title}#end</title>
   <meta http-equiv="Content-type" content="$data.ContentType" />
   <link rel="shortcut icon" href="/scarab/images/favicon.ico" type="image/x-icon" />
+  <link rel="icon" type="image/x-icon" href="/scarab/images/favicon.ico" />
   #if ($updateFrequency && $updateFrequency.length() > 0)
   <meta http-equiv="refresh" content="$updateFrequency" />
   #end

Modified: trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm?view=diff&rev=10161&p1=trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm&p2=trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm&r1=10160&r2=10161
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm	2006-06-11 00:59:19-0700
@@ -78,13 +78,6 @@
         
       $l10n.AllForAttribute
 
-      #set ($itemCount = $module.getIssueCount($user))
-      #if ($itemCount == 0)
-      
-      #else
-      <a href="$link.setPage("IssueList.vm").addPathInfo("eventSubmit_doGetissues","foo").setAction("Search").toString()">$itemCount</a>
-      #end      
-    
     </th>
     #foreach ($rmit in $currentRmits)
       <th nowrap="nowrap" style="text-align:right">
@@ -92,16 +85,34 @@
       <input type="checkbox" name="rmitid" value="$rmit.QueryKey" 
           onclick="allit.checked=false" #checked($checked) />
       #end
-      <a href="$link.setPage("Search.vm").addPathInfo("rmitid", $rmit.QueryKey).addPathInfo("eventSubmit_do$event", "foo").setAction("DefineXModuleList")">$rmit.DisplayName</a>
+      <a href="$link.setPage("Search.vm").addPathInfo("rmitid", $rmit.QueryKey).addPathInfo("eventSubmit_do$event", "foo").setAction("DefineXModuleList")" style="text-decoration:none;color:#003366;">$rmit.DisplayName</a>
+      </th>
+    #end
+    ##<th>$l10n.Description</th>
+  </tr>
+
+<tr>
+<th style="text-align:left; border-bottom-style:solid;border-bottom-width:1px;border-color:#ABC4DB;">total</th>
+<th style="text-align:right; border-bottom-style:solid;border-bottom-width:1px;border-color:#ABC4DB;">
+      #set ($itemCount = $module.getIssueCount($user))
+      #if ($itemCount == 0)
+
+      #else
+      <a href="$link.setPage("IssueList.vm").addPathInfo("eventSubmit_doGetissues","foo").setAction("Search").toString()" style="text-decoration:none;color:#003366;font-weight:bold;">$itemCount</a>
+      #end
+</th>
+
+    #foreach ($rmit in $currentRmits)
+      <th nowrap="nowrap" style="text-align:right; border-bottom-style:solid;border-bottom-width:1px;border-color:#ABC4DB;">
       #set ($mitItem = $scarabR.convertToMITListItem($rmit) )
       #set ($itemCount = $mitItem.getIssueCount($user))
       #if ($itemCount > 0)
-      <a href="$link.setPage("IssueList.vm").addPathInfo("eventSubmit_doGetissues", "foo").addPathInfo("issueType", $mitItem.getIssueTypeId()).setAction("Search").toString()">$itemCount</a>
+      <a href="$link.setPage("IssueList.vm").addPathInfo("eventSubmit_doGetissues", "foo").addPathInfo("issueType", $mitItem.getIssueTypeId()).setAction("Search").toString()" style="text-decoration:none;color:#003366;font-weight:bold;">$itemCount</a>
       #end
       </th>
     #end
-    ##<th>$l10n.Description</th>
-  </tr>
+
+</tr>
 
  
  #set ($checked = !$isMoreThanOne)
@@ -114,7 +125,7 @@
       #if ($itemCount == 0)
       -
       #else
-      <a href="$link.setPage("IssueList.vm").addPathInfo("eventSubmit_doGetissues","foo").addPathInfo("attribute",$attrOption.getAttributeId()).addPathInfo("option",$attrOption.getOptionId()).setAction("Search").toString()">$itemCount</a>
+      <a href="$link.setPage("IssueList.vm").addPathInfo("eventSubmit_doGetissues","foo").addPathInfo("attribute",$attrOption.getAttributeId()).addPathInfo("option",$attrOption.getOptionId()).setAction("Search").toString()" style="text-decoration:none;color:#003366;font-weight:bold;">$itemCount</a>
       ##$itemCount
       #end
     </td>
@@ -125,7 +136,7 @@
       #if ($itemCount == 0)
       -
       #else
-      <a href="$link.setPage("IssueList.vm").addPathInfo("eventSubmit_doGetissues","foo").addPathInfo("issueType", $mitItem.getIssueTypeId()).addPathInfo("attribute",$attrOption.getAttributeId()).addPathInfo("option",$attrOption.getOptionId()).setAction("Search").toString()">$itemCount</a>
+      <a href="$link.setPage("IssueList.vm").addPathInfo("eventSubmit_doGetissues","foo").addPathInfo("issueType", $mitItem.getIssueTypeId()).addPathInfo("attribute",$attrOption.getAttributeId()).addPathInfo("option",$attrOption.getOptionId()).setAction("Search").toString()" style="text-decoration:none;color:#003366;font-weight:bold;">$itemCount</a>
       #end
     </td>  
     #end

Modified: trunk/xdocs/faqs.fml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/faqs.fml?view=diff&rev=10161&p1=trunk/xdocs/faqs.fml&p2=trunk/xdocs/faqs.fml&r1=10160&r2=10161
==============================================================================
--- trunk/xdocs/faqs.fml	(original)
+++ trunk/xdocs/faqs.fml	2006-06-11 00:59:19-0700
@@ -19,7 +19,7 @@
     <faq id="1">

     

       <question><b>

-        Is there suitable 'propaganda' material that I could use in my company demo to try to convince my boss that it is a good idea to use Scarab?

+        Is there suitable 'propaganda' material that I could use to convince my boss to use Scarab?

       </b></question>

       <answer>

 The website and use of Scarab itself are all we currently have.
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.