diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index c3e18adfdea276d7454245248721e2fc72a9765a..5df82f991f4015ceb86cf7a58c25ec57856eb417 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -19,6 +19,19 @@
             showElementById('attachment_false'); showElementById('btn_no_attachment');"
 %]
 
+[% PROCESS etersoft/timersplash.html.tmpl %]
+
+<script type="text/javascript">
+  function myform() {
+    if (!validateEnterBug(document.Create)) {
+      return false;
+    }
+    mysubmitnew();
+    return false;
+  }
+</script>
+
+
 <script type="text/javascript">
 <!--
 
@@ -149,7 +162,7 @@ TUI_hide_default('attachment_text_field');
 
 <form name="Create" id="Create" method="post" action="post_bug.cgi"
       class="enter_bug_form" enctype="multipart/form-data"
-      onsubmit="return validateEnterBug(this)">
+      onsubmit="return myform();">
 <input type="hidden" name="product" value="[% product.name FILTER html %]">
 <input type="hidden" name="token" value="[% token FILTER html %]">
 
@@ -311,7 +324,7 @@ TUI_hide_default('attachment_text_field');
       <td colspan="2">&nbsp;</td>
     [% END %]
 
-    [% IF Param('letsubmitterchoosepriority') %]
+    [% IF Param('letsubmitterchoosepriority') && user.in_group('Etersoft') %]
       [% INCLUDE bug/field.html.tmpl
         bug = default, field = bug_fields.priority, editable = 1, 
         value = default.priority %]
@@ -432,6 +445,7 @@ TUI_hide_default('attachment_text_field');
     %]
     <td colspan="2">
       <input name="estimated_time" size="6" maxlength="6" value="[% estimated_time FILTER html %]">
+      <input name="work_time" id="work_time" value="0" hidden>
     </td>
   </tr>
   <tr>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 7b7c0dfc5ccc6e87eeaa20d28ea3f6aa08df811c..a1a48162dd68eee5d13f117786b83275d92e6633 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -8,6 +8,8 @@
 
 [% PROCESS bug/time.html.tmpl %]
 
+[% PROCESS etersoft/timersplash.html.tmpl %]
+
 <script type="text/javascript">
 <!--
 [% IF user.is_timetracker %]
@@ -177,6 +179,11 @@
       [% END %]
      </span>
   
+    <!-- Etersoft -->
+    &nbsp;&nbsp;<a title="Создать копию текущей [% terms.bug_gen %] по основным параметрам"
+    href="enter_bug.cgi?product=[% bug.product %]&component=[% bug.component %]&blocked=[% bug_blocked_string %]&assigned_to=[% bug.assigned_to.email %]&cc=[% bug_cc_string %]&qa_contact=[% bug.qa_contact.email %]">Создать подобную</a>
+    <!-- Etersoft END -->
+
        
     <div id="summary_alias_input">
       <table id="summary"> 
@@ -252,6 +259,16 @@
     [%###############%]    
     [%#  Component  #%]
     [%###############%]
+    <tr>
+      <th class="field_label">
+        List:
+      </th>
+      <td>
+        <a title="Displays a list of all [% terms.bugs_gen %] on this component"
+         href="buglist.cgi?product=[% bug.product %]&component=[% bug.product %]&component=[% bug.component %]">Display</a>
+      </td>
+    </tr>
+
     <tr>
       [% INCLUDE bug/field.html.tmpl
           bug = bug, field = bug_fields.component, value = bug.component
@@ -1000,7 +1017,7 @@
         [% PROCESS formattimeunit time_unit=bug.actual_time %] +
         <input name="work_time" id="work_time"
                value="0" size="3" maxlength="6"
-               onchange="adjustRemainingTime();">
+               onchange="adjustRemainingTime();" readonly>
       </td>
       <td>
         <input name="remaining_time" id="remaining_time"
@@ -1165,8 +1182,8 @@
 [% BLOCK commit_button %]
   [% IF user.id %]
     <div class="knob-buttons">
-      <input type="submit" value="Save Changes" 
-             id="commit[% id FILTER css_class_quote %]">
+      <input type="button" value="Save Changes" 
+             id="commit[% id FILTER css_class_quote %]" onclik="mysubmit();">
     </div>
   [% END %]
 [% END %]
diff --git a/template/en/default/etersoft/timersplash.html.tmpl b/template/en/default/etersoft/timersplash.html.tmpl
new file mode 100644
index 0000000000000000000000000000000000000000..753df237b22f1fb8e162e47eb63cc17786b4808c
--- /dev/null
+++ b/template/en/default/etersoft/timersplash.html.tmpl
@@ -0,0 +1,45 @@
+<link rel="stylesheet" type="text/css" href="js/etersoft/timersplash.css" />
+
+<div style="display: none;" id="useremail" class="[% user.email FILTER html %]"></div>
+<div style="display: none;" id="assigntoemail" class="[% bug.assigned_to.email FILTER html %]"></div>
+
+<!-- Таймер -->
+<div id="timerblock" title="Время на странице">
+	<img src="js/etersoft/control_pause.gif" id="timer_pause" onclick="controlTimer()" title="Пауза" />
+	<img src="js/etersoft/control_right.gif" id="timer_play" onclick="controlTimer()" title="Продолжить" />
+	<img src="js/etersoft/control_stop.gif" id="timer_stop" onclick="if (confirm('Вы точно хотите сбросить таймер?')) {resetTimer();}" title="Сбросить таймер" />
+	<input type="text" size="10" title="Время на странице" id='timespent' name="timespent" value="" readonly="readonly">
+</div>
+
+<!-- Сохранение времени -->
+<div id="timeQuestionDiv">
+	<strong>Укажите отработанное время</strong>
+
+	<div name="worktimediv">
+		<nobr>Отработанное время (в минутах): 
+			<input type="text" id='realworktime' name="realworktime" onchange='update_remain();' onkeydown="javascript:if(13==event.keyCode){premysubmit(-1); return false;}; if(27==event.keyCode){getElementById('timeQuestionDiv').style.display = 'none'; return false;}" />
+			<a onclick="premysubmit(-1);">Сохранить</a></p>
+		</nobr>
+		
+		<div id='id_remain_time' class='div_hide'>Оставшееся время (в часах): 
+			<input type="text" id="realremaintime" name="realremaintime" onchange='changed_remain = 1; update_remain();' onkeydown="javascript:if(13==event.keyCode){return false;}" />
+		</div>
+		
+		<div id='message' class='div_hide'>
+			<p>Отслеживайте корректность оставшегося времени.</p>
+		</div>
+		
+		<div id='message_warning' class='div_hide' color='red'>
+			<p>Внимание! Оставшееся время равно 0.<br>Если задача ещё не решена, то укажите необходимое для её решения время.</p>
+		</div>
+	</div>
+	<div>
+		<p><a onclick="premysubmit(-1);">Сохранить значение из поля</a></p>
+		<p><a onclick="premysubmit(5);">Сохранить 5 минут</a></p>
+		<p><a onclick="premysubmit(15);">Сохранить 15 минут</a></p>
+		<p><a onclick="premysubmit(30);">Сохранить 30 минут</a></p>
+		<p><a onclick="closeDiv();">Закрыть</a></p>
+	</div>
+</div>
+
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js"></script>