[Rt-commit] rt branch, 4.4/ticket-timer, updated. rt-4.2.11-188-gc48baf1

[Shawn Moore]

The branch, 4.4/ticket-timer has been updated
       via  c48baf170f35240a1123e1e77506a05d5430d11b (commit)
      from  ff1fea1fb617bb0e9b3263edd5bccac3f3706c76 (commit)

Summary of changes:
 share/html/Elements/EditTimeValue | 5 -----
 share/html/Elements/Tabs          | 3 ++-
 share/html/Ticket/Update.html     | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit c48baf170f35240a1123e1e77506a05d5430d11b
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Mon Sep 21 23:39:47 2015 +0000

    Move timer link to tab bar

diff --git a/share/html/Elements/EditTimeValue b/share/html/Elements/EditTimeValue
index bee4760..d7b1511 100644
--- a/share/html/Elements/EditTimeValue
+++ b/share/html/Elements/EditTimeValue
@@ -47,17 +47,12 @@
 %# END BPS TAGGED BLOCK }}}
 <input name="<% $ValueName %>" value="<% $Default || '' %>" size="5" />
 <& /Elements/SelectTimeUnits, Name => $UnitName, Default => $InUnits &>
-
-% if ($TimerForTicket) {
-<& /Ticket/Elements/PopupTimerLink, id => $TimerForTicket->id &>
-% }
 <%ARGS>
 $Default    => ''
 $Name       => ''
 $ValueName  => ''
 $UnitName   => ''
 $InUnits => ''
-$TimerForTicket => undef
 </%ARGS>
 <%INIT>
 $ValueName ||= $Name;
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index afdced1..d38c48d 100644
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -631,7 +631,8 @@ my $build_main_nav = sub {
             if ( $obj and $obj->id ) {
                 my $actions = PageMenu()->child( actions => title => loc('Actions'), sort_order  => 95 );
                 my $tabs = PageMenu();
-                $tabs->child( bookmark => raw_html => $m->scomp( '/Ticket/Elements/Bookmark', id => $id ), sort_order => 99 );
+                $tabs->child( bookmark => raw_html => $m->scomp( '/Ticket/Elements/Bookmark', id => $id ), sort_order => 98 );
+                $tabs->child( timer => raw_html => $m->scomp( '/Ticket/Elements/PopupTimerLink', id => $id ), sort_order => 99 );
                 $tabs->child( display => title => loc('Display'), path => "/Ticket/Display.html?id=" . $id );
                 $tabs->child( history => title => loc('History'), path => "/Ticket/History.html?id=" . $id );
 
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index 48ff54f..d8c9575 100644
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -111,7 +111,6 @@
             args => {
                 Name => 'UpdateTimeWorked',
                 Default => $ARGS{UpdateTimeWorked}||'',
-                TimerForTicket => $TicketObj,
             }
         },
     ]

-----------------------------------------------------------------------