Scarab commit: svn commit: r10589 - trunk/src: conf/classes webapp/WEB-INF/templates/macros webapp/WEB-INF/templates/viewIssue webapp/style

Author: ronvoe122
Date: 2008-05-25 09:31:59-0700
New Revision: 10589

Modified:
   trunk/src/conf/classes/ScarabBundle_de.properties
   trunk/src/webapp/WEB-INF/templates/macros/ViewIssueMacro.vm
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
   trunk/src/webapp/style/scarab.css

Log:
SCB1454: shortened the change-summary-line:
- no line break in user/timestamp.
- shortened the German translations for created_by and changed_by 

Modified: trunk/src/conf/classes/ScarabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_de.properties?view=diff&rev=10589&p1=trunk/src/conf/classes/ScarabBundle_de.properties&p2=trunk/src/conf/classes/ScarabBundle_de.properties&r1=10588&r2=10589
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_de.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties	2008-05-25 09:31:59-0700
@@ -404,7 +404,7 @@
 ChooseRelation=Auswahl ...
 HideCommentList=Vollständige Kommentarliste verstecken
 ShowCommentList=Vollständige Kommentarliste anzeigen
-LastModified=Datum/Uhrzeit der letzten Änderung
+LastModified=Geändert von
 NoAttributesDefinedForIssueType=Es sind keine Attribute für den Ticket-Typ "{0}" definiert. Ein neues Ticket kann nur erzeugt werden, wenn mindestens ein Ticket-Attribut definiert wurde.
 NoAttributesDefinedForTemplate=Es sind keine Attribute für den Ticket-Typ "{0}" definiert. Eine neue Vorlage kann nur erstellen werden, wenn mindestens ein Template-Attribut definiert wurde.
 ApplyTemplate={0} Vorlage verwenden
@@ -522,7 +522,7 @@
 NoDestinationModuleAvailable=Es stehen keine Module als Ziel-Modul für dieses Ticket zur Verfügung.
 IssueToBeCopied=Zu kopierendes/verschiebendes Ticket
 ChooseCopyMoveDestination=Einen Zielort auswählen
-DateCommitted=Datum/Uhrzeit der Erstellung
+DateCommitted=Erstellt von
 Destination=Zielort
 SameModule=Gleiches Modul ({0})
 MapIssueAttributes=Ticketeigenschaften abbilden
@@ -1035,7 +1035,7 @@
 CollabNet=CollabNet
 Scarab=Scarab
 Debugging=Debugging:
-IssueId=Ticketnummer
+IssueId=Ticket Nr.
 JumpToIssueId=Ticket Nr.
 SelectQuery=Abfrage auswählen...
 NewQuery=Neue Abfrage

Modified: trunk/src/webapp/WEB-INF/templates/macros/ViewIssueMacro.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/ViewIssueMacro.vm?view=diff&rev=10589&p1=trunk/src/webapp/WEB-INF/templates/macros/ViewIssueMacro.vm&p2=trunk/src/webapp/WEB-INF/templates/macros/ViewIssueMacro.vm&r1=10588&r2=10589
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/ViewIssueMacro.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/macros/ViewIssueMacro.vm	2008-05-25 09:31:59-0700
@@ -30,3 +30,9 @@
         #end
     #end
 #end
+
+#macro (userTimeStamp $user $date)
+    <a href="mailto:$user.Email">$!user.Name</a>
+    - <small>$format.getDate($scarabR.DateFormat, $date)</small>
+#end
+

Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm?view=diff&rev=10589&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&r1=10588&r2=10589
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	2008-05-25 09:31:59-0700
@@ -4,12 +4,12 @@
 <h3 onClick=smartToggleVisibility('properties')><img name="properties.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.IssueAttributesNavi</h3>

 <div id='properties'>

 

-  <div class="axial">

+  <div class="axial2">

 

     <table cellpadding="3" cellspacing="2" border="0" width="100%">

       <tr>

         <th>$l10n.IssueId</th>

-        <td colspan="2"><b>$currentIssue.UniqueId ($currentIssue.RModuleIssueType.DisplayName)</b><br/>

+        <td><b>$currentIssue.UniqueId ($currentIssue.RModuleIssueType.DisplayName)</b><br/>

           #if ($currentIssue.isBlocked())

             &nbsp;&nbsp;<a class="blockedmark" STYLE="text-decoration: none" title="$l10n.IssueCurrentlyBlocked" href='$tabLink.addPathInfo("tab", "6")'>$l10n.BlockedWarning</a>  

           #end

@@ -17,14 +17,10 @@
             &nbsp;&nbsp;<a class="blockingmark" STYLE="text-decoration: none" title="$l10n.IssueDoesBlockOtherIssues" href='$tabLink.addPathInfo("tab", "6")'>$l10n.BlockingWarning</a>

           #end

         </td>

-      #if ($currentIssue.CreatedDate)

-          <th>$l10n.DateCommitted</th>

-          <td colspan="2"><a href="mailTo:$currentIssue.CreatedBy.Email">$!currentIssue.CreatedBy.Name</a><br/>$format.getDate($scarabR.DateFormat, $currentIssue.CreatedDate) </td>

-      #end

-      #if ($currentIssue.ModifiedDate)

-          <th>$l10n.LastModified</th>

-          <td colspan="2"><a href="mailTo:$currentIssue.ModifiedBy.Email">$!currentIssue.ModifiedBy.Name</a><br/>$format.getDate($scarabR.DateFormat, $currentIssue.ModifiedDate) </td>

-      #end

+        <th>$l10n.DateCommitted</th>

+        <td>#userTimeStamp( $currentIssue.CreatedBy $currentIssue.CreatedDate)</td>

+        <th>$l10n.LastModified</th>

+        <td>#userTimeStamp( $currentIssue.ModifiedBy $currentIssue.ModifiedDate)</td>

       </tr>

     </table>

     


Modified: trunk/src/webapp/style/scarab.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/style/scarab.css?view=diff&rev=10589&p1=trunk/src/webapp/style/scarab.css&p2=trunk/src/webapp/style/scarab.css&r1=10588&r2=10589
==============================================================================
--- trunk/src/webapp/style/scarab.css	(original)
+++ trunk/src/webapp/style/scarab.css	2008-05-25 09:31:59-0700
@@ -312,6 +312,11 @@
 	color: black;

 }

 

+.axial2 th {

+    background-color: #E9F1F9;

+    color: black;

+}

+

 .axial h4{

 background-color:#E9F1F9;

 color:#003163