diff options
Diffstat (limited to 'extensions/BugModal/template')
3 files changed, 91 insertions, 2 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl index 0fe644584..9efd601e9 100644 --- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl @@ -48,7 +48,7 @@ PROCESS activity_header activities=change_set.activity id=change_set.id; END; - IF change_set.comment; + IF change_set.comment != ""; PROCESS comment_body comment=change_set.comment; END; FOREACH activity IN change_set.activity; diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index 06b6c801d..9ed5f28b7 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -1054,6 +1054,90 @@ [% END %] [% END %] +[%# === timetracking === %] +[% IF user.is_timetracker %] + [% + PROCESS bug/time.html.tmpl; + sub = []; + IF bug.estimated_time > 0; + estimated_time = PROCESS formattimeunit time_unit = bug.estimated_time; + sub.push("Estimated: $estimated_time"); + END; + IF bug.remaining_time > 0; + remaining_time = PROCESS formattimeunit time_unit = bug.remaining_time; + sub.push("Remaining: $remaining_time"); + END; + IF bug.deadline; + sub.push("Deadline: " _ bug.deadline); + END; + %] + [% WRAPPER bug_modal/module.html.tmpl + title = "Time Tracking" + collapsed = 1 + no_collapse_persist = 1 + subtitle = sub + %] + [% WRAPPER fields_lhs %] + [% estimated_time = PROCESS formattimeunit time_unit = bug.estimated_time %] + [% INCLUDE bug_modal/field.html.tmpl + field = bug_fields.estimated_time + field_type = constants.FIELD_TYPE_FREETEXT + value = estimated_time + hide_on_view = 0 + short_width = 1 + %] + [% current_estimate = PROCESS formattimeunit time_unit = (bug.actual_time + bug.remaining_time) %] + [% INCLUDE bug_modal/field.html.tmpl + label = "Current Est" + value = current_estimate + view_only = 1 + %] + [% hours_worked = PROCESS formattimeunit time_unit = bug.actual_time %] + [% WRAPPER bug_modal/field.html.tmpl + field_type = constants.FIELD_TYPE_FREETEXT + label = "Hours Worked" + name = "work_time" + value = '0.0' + short_width = 1 + %] + [% PROCESS formattimeunit time_unity = bug.actual_time %] + [% END %] + [% hours_left = PROCESS formattimeunit time_unit = bug.remaining_time %] + [% INCLUDE bug_modal/field.html.tmpl + field = bug_fields.remaining_time + field_type = constants.FIELD_TYPE_FREETEXT + value = hours_left + short_width = 1 + %] + [% END %] + + [% WRAPPER fields_rhs %] + [% percentage_complete = PROCESS calculatepercentage act = bug.actual_time rem = bug.remaining_time %] + [% INCLUDE bug_modal/field.html.tmpl + label = "% Complete" + value = percentage_complete + view_only = 1 + %] + [% time_gain = PROCESS formattimeunit time_unit = bug.estimated_time - (bug.actual_time + bug.remaining_time) %] + [% INCLUDE bug_modal/field.html.tmpl + label = "Gain" + value = time_gain + view_only = 1 + %] + [% INCLUDE bug_modal/field.html.tmpl + field = bug_fields.deadline + field_type = constants.FIELD_TYPE_DATE + value = bug.deadline + %] + <div> + <a href="summarize_time.cgi?id=[% bug.bug_id FILTER none %]&do_depends=1"> + Summarize time (including time for [% terms.bugs %] + blocking this [% terms.bug %])</a> + </div> + [% END %] + [% END %] +[% END %] + [%# === extensions which are modules === %] [% Hook.process('module') %] diff --git a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl index 48064f06c..e32f4c546 100644 --- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl @@ -66,7 +66,7 @@ "extensions/BugModal/web/bug_modal.css", "skins/custom/bug_groups.css", "js/jquery/plugins/datetimepicker/datetimepicker.css", - "js/jquery/plugins/contextMenu/contextMenu.css", + "js/jquery/plugins/contextMenu/contextMenu.css" ); IF user.in_group('canconfirm'); @@ -99,6 +99,7 @@ id: [% user.id FILTER none %], login: '[% user.login FILTER js %]', is_insider: [% user.is_insider ? "true" : "false" %], + is_timetracker: [% user.is_timetracker ? "true" : "false" %], can_tag: [% user.can_tag_comments ? "true" : "false" %], settings: { quote_replies: '[% user.settings.quote_replies.value FILTER js %]', @@ -112,6 +113,10 @@ BUGZILLA.constant.min_comment_tag_length = [% constants.MIN_COMMENT_TAG_LENGTH FILTER none %]; BUGZILLA.constant.max_comment_tag_length = [% constants.MAX_COMMENT_TAG_LENGTH FILTER none %]; [% END %] + + [% IF user.is_timetracker %] + BUGZILLA.remaining_time = [% bug.remaining_time FILTER js %]; // holds the original value + [% END %] [% END %] [% Hook.process("end") %] |