[Erp5-report] r6642 - in /erp5/trunk/bt5/erp5_forge: CatalogRelatedKeyTemplateItem/ SkinTem...

[nobody at svn.erp5.org]

Author: chris
Date: Fri Apr 14 13:39:38 2006
New Revision: 6642

URL: http://svn.erp5.org?rev=6642&view=rev
Log:
- added support for conflicted/replaced files

Added:
    erp5/trunk/bt5/erp5_forge/CatalogRelatedKeyTemplateItem/related_key_list.xml
Modified:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml

Added: erp5/trunk/bt5/erp5_forge/CatalogRelatedKeyTemplateItem/related_key_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/CatalogRelatedKeyTemplateItem/related_key_list.xml?rev=6642&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_forge/CatalogRelatedKeyTemplateItem/related_key_list.xml (added)
+++ erp5/trunk/bt5/erp5_forge/CatalogRelatedKeyTemplateItem/related_key_list.xml Fri Apr 14 13:39:38 2006
@@ -1,0 +1,6 @@
+<key_list>
+ <key>bug_group_title | category,catalog/title/z_related_bug_group_title</key>
+ <key>bug_priority_title | category,catalog/title/z_related_bug_priority_title</key>
+ <key>bug_severity_title | category,catalog/title/z_related_bug_severity_title</key>
+ <key>bug_type_title | category,catalog/title/z_related_bug_type_title</key>
+</key_list>

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml?rev=6642&r1=6641&r2=6642&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml Fri Apr 14 13:39:38 2006
@@ -125,7 +125,8 @@
                 <tr><td>  </td></tr>\n
                 <tr><td><font color="green" size="1">Added File</font></td></tr>\n
                 <tr><td><font color="orange" size="1">Modified File</font></td></tr>\n
-                <tr><td><font color="red" size="1">Deleted File</font></td></tr></table>\n
+                <tr><td><font color="red" size="1">Deleted File</font></td></tr>\n
+                <tr><td><font color="grey" size="1">Conflicted File</font></td></tr></table>\n
                 <br><br>\n
                 </td>\n
 \t</tr>\n