[Bugzilla-ru-commit] bugzilla-ru/template/ru/default/bug comments.html.tmpl,1.2,1.3

[dpupkov <dp...@us...>]

Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28350

Modified Files:
	comments.html.tmpl 
Log Message:
updated to 2.18

Index: comments.html.tmpl
===================================================================
RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/comments.html.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- comments.html.tmpl	2 Dec 2002 03:57:02 -0000	1.2
+++ comments.html.tmpl	10 Mar 2005 11:41:46 -0000	1.3
@@ -1,28 +1,30 @@
-<!-- 1....@bu... -->
+[%# 1....@bu... %]
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
   # the License at http://www.mozilla.org/MPL/
-  #
+  # 
   # Software distributed under the License is distributed on an "AS
   # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
   # implied. See the License for the specific language governing
   # rights and limitations under the License.
-  #
+  # 
   # The Original Code is the Bugzilla Bug Tracking System.
-  #
+  # 
   # The Initial Developer of the Original Code is Netscape Communications
   # Corporation. Portions created by Netscape are
   # Copyright (C) 1998 Netscape Communications Corporation. All
   # Rights Reserved.
-  #
+  # 
   # Contributor(s): Gervase Markham <ge...@ge...>
-  #
   # Russian translation: Vitaly Fedrushkov <fed...@us...>
+  #                      Dmitry Pupkov <dp...@mc...>
+  # 
   #%]
 
-[% DEFAULT start_at = 0 %]
+[% DEFAULT start_at = 0 mode = "show" %]
 [% count = 0 %]
+[% isinsider = Param("insidergroup") && UserInGroup(Param("insidergroup")) %]
 [% FOREACH comment = comments %]
   [% IF count >= start_at %]
     [% PROCESS a_comment %]
@@ -31,25 +33,61 @@
   [% count = count + 1 %]
 [% END %]
 
+[% PROCESS bug/time.html.tmpl %]
+
+[%# Note: this template is used in multiple places; if you use this hook,
+  # make sure you are aware of this fact.
+  #%]  
+[% Hook.process("aftercomments") %]
 
 [%############################################################################%]
 [%# Block for individual comments                                            #%]
 [%############################################################################%]
 
 [% BLOCK a_comment %]
-  [% IF count > 0 %]
-    <br>
-    <i>------- ëÏÍÍÅÎÔÁÒÉÊ 
-      <a name="c[% count %]" href="#c[% count %]">#[% count %]</a> ÏÔ 
-      <a href="mailto:[% comment.email FILTER html %]">[% comment.name FILTER html %]</a>
-      [%+ comment.time %] -------
-    </i>
-  [% END %]
-    
+  [% IF NOT comment.isprivate || isinsider %]
+    <div [% "class=\"bz_private\"" IF comment.isprivate %]>
+      [% IF count > 0 %]
+        <br>
+        <span class="bz_comment">
+          ------- <i> ëÏÍÍÅÎÔÁÒÉÊ
+          <a name="c[% count %]" href="#c[% count %]">#[% count %]</a> ÏÔ 
+          <a href="mailto:[% comment.email FILTER html %]">
+            [% comment.name FILTER html %]</a>
+          [%+ comment.time FILTER time %] 
+          </i>
+          [% IF mode == "edit" %]
+          <script type="text/javascript" language="JavaScript"><!-- 
+            addReplyLink([% count %]); //--></script>
+          [% END %]
+          -------
+        </span>
+      [% END %]
+        
+      [% IF mode == "edit" && isinsider %]
+        <i>
+          <input type="hidden" name="oisprivate-[% count %]" 
+                 value="[% comment.isprivate %]">
+          <input type="hidden" name="when-[% count %]" value="[% comment.when %]">
+          <input type="checkbox" name="isprivate-[% count %]" value="1"
+                 id="isprivate-[% count %]"
+          [% " checked=\"checked\"" IF comment.isprivate %]> þÁÓÔÎÙÅ <!-- FIXME: private -->
+        </i>
+      [% END %]
+      [% IF UserInGroup(Param('timetrackinggroup')) &&
+            (comment.work_time > 0 || comment.work_time < 0) %]
+         <br>
+           äÏÐÏÌÎÉÔÅÌØÎÏÅ ×ÒÅÍÑ ÒÁÂÏÔÙ:
+<!--FIXME:         Additional hours worked:  -->
+         [% PROCESS formattimeunit time_unit=comment.work_time %]
+      [% END %]
+
 [%# Don't indent the <pre> block, since then the spaces are displayed in the
   # generated HTML
   #%]
-<pre>
-  [%- quoteUrls(comment.body) -%]
+<pre[% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]>
+  [%- comment.body FILTER quoteUrls -%]
 </pre>
+    </div>
+  [% END %]
 [% END %]