From: Alan Knowles <alan@roojs.com>
Date: Mon, 31 Dec 2018 04:38:54 +0000 (+0800)
Subject: Uncommited changes synced
X-Git-Url: http://git.roojs.org/?p=Pman.MTrack;a=commitdiff_plain;h=33f0808c2076cacffd49fa61f20509694d4b5248

Uncommited changes synced
---

diff --git a/jtemplates/change_comment.html b/jtemplates/change_comment.html
index f5642dd..f330a05 100644
--- a/jtemplates/change_comment.html
+++ b/jtemplates/change_comment.html
@@ -11,24 +11,10 @@
         <div class="timelinetext">
             <div class="timelinereason">
                 <span class="mtrack-ticket-link">
-{if(t.rev.length)}
-    {script:}
-        for(var fn in t.commit.files) {
-            var diff = t.commit.files[fn];
-    {end:}
-    <div class="showdown"
-                    style="white-space: pre-wrap;font-family: 'Consolas', 'Bitstream Vera Sans Mono', 'Monaco', 'Courier New', 'Courier'">
-    {Roo.util.Format.htmlEncode(diff).replace(/\n/g,'<br/>'):h}
-    </div>
-      {script:}
-            }
-    {end:} 
-{else:}
                 <div class="bubble-wrap"><div class="showdown"
                     style="white-space: pre-wrap;font-family: 'Consolas', 'Bitstream Vera Sans Mono', 'Monaco', 'Courier New', 'Courier'">
 {Roo.util.Format.htmlEncode(t.reason).replace(/\n/g,'<br/>'):h}
  </div><p>Comment Added by <B>{t.person_id_name}</B>  on {t.changedate}</p></div>
-{end:}                
                 </span>
             </div>
         </div>    
diff --git a/jtemplates/change_commit.html b/jtemplates/change_commit.html
index 3b53bce..3d4d565 100644
--- a/jtemplates/change_commit.html
+++ b/jtemplates/change_commit.html
@@ -1,22 +1,32 @@
                              
 
 
-
+{script:}
+    for(var fn in t.commit.files) {
+        var diff = t.commit.files[fn];
+{end:}
 <li class="change-log-item" id="change-expander-{t.id}">
-    <span class="change" > - {t.reason}</span>
-    <span class="change-log-rev" ><a  class="changesetlink browse-link"  href="{baseURL}/Changeset/default/{t.object_shortname}/t.rev}">{t.rev}</a> {t.by}</span>
+    <span class="change" > - {fn} change by {t.person_id_name}</span>
+    
     <div style="display:none" class="change-log-details" id="change-expand-{t.id}">
         <ul>    
             <li class="change-log-item" id="change-expander-{t.id}-a">
             </li>
         </ul>
-        
-        <PRE>xxxxx
-        {JSON.stringify(t.audit, null,4)}
-        </PRE>
+    
+    <div class="showdown"
+         style="white-space: pre-wrap;font-family: 'Consolas', 'Bitstream Vera Sans Mono', 'Monaco', 'Courier New', 'Courier'">
+    {Roo.util.Format.htmlEncode(diff).replace(/\n/g,'<br/>'):h}
+    </div>
+      
+           
+            
+            
         
     </div>
 </li>
 
                   
-       
\ No newline at end of file
+       {script:}
+           } 
+    {end:} 
\ No newline at end of file