Add UI to delete tracked times

options/locale/locale_en-US.ini

@@ -1136,6 +1136,7 @@ issues.tracking_already_started = `You have already started time tracking on <a
 issues.stop_tracking = Stop
 issues.stop_tracking_history = `stopped working %s`
 issues.add_time = Manually Add Time
+issues.del_time = Revert Time Log
 issues.add_time_short = Add Time
 issues.add_time_cancel = Cancel
 issues.add_time_history = `added spent time %s`

templates/repo/issue/view_content/delete_time.tmpl

@@ -1,13 +1,20 @@
-{{ if .comment.Time }} <!-- compatibility with pre v1.14 -->
+{{ if .comment.Time }} {{/* compatibility with time comments made before v1.14 */}}
 	{{ if (not .comment.Time.Deleted) }}
 		{{ if (or .ctx.IsAdmin (and .ctx.IsSigned (eq .ctx.SignedUserID .comment.PosterID))) }}
 			<span class="ui float right">
-				<form method="POST" action="{{.ctx.RepoLink}}/issues/{{.ctx.Issue.Index}}/times/{{.comment.TimeID}}/delete">
-					{{.ctx.CsrfTokenHtml}}
-					<button type="submit" class="ui icon button circular small">
-						<i class="icon delete"></i>
-					</button>
-				</form>
+				<div class="ui mini modal issue-delete-time-modal" data-id="{{.comment.Time.ID}}">
+					<form method="POST" class="delete-time-form" action="{{.ctx.RepoLink}}/issues/{{.ctx.Issue.Index}}/times/{{.comment.TimeID}}/delete">
+						{{.ctx.CsrfTokenHtml}}
+					</form>
+					<div class="header">{{.ctx.i18n.Tr "repo.issues.del_time"}}</div>
+					<div class="actions">
+						<div class="ui red approve button">{{.ctx.i18n.Tr "repo.issues.context.delete"}}</div>
+						<div class="ui cancel button">{{.ctx.i18n.Tr "repo.issues.add_time_cancel"}}</div>
+					</div>
+				</div>
+				<button class="ui icon button circular small issue-delete-time poping up" data-id="{{.comment.Time.ID}}" data-content='{{.ctx.i18n.Tr "repo.issues.del_time"}}' data-position="top right" data-variation="small inverted">
+					<i class="icon delete"></i>
+				</button>
 			</span>
 		{{end}}
 	{{end}}

templates/repo/issue/view_content/sidebar.tmpl

@@ -348,7 +348,7 @@
 							{{end}}
 							<div class="ui buttons two fluid">
 								<button class="ui button poping up issue-start-time" data-content='{{.i18n.Tr "repo.issues.start_tracking"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.start_tracking_short"}}</button>
-								<div class="ui mini modal">
+								<div class="ui mini modal issue-start-time-modal">
 									<div class="header">{{.i18n.Tr "repo.issues.add_time"}}</div>
 									<div class="content">
 										<form method="POST" id="add_time_manual_form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/times/add" class="ui action input fluid">

web_src/js/index.js

@@ -1,30 +1,30 @@
 /* exported deleteDependencyModal, cancelCodeComment, onOAuthLoginClick */
 
-import './publicpath.js';
-
-import Vue from 'vue';
-import {htmlEscape} from 'escape-goat';
+import { htmlEscape } from 'escape-goat';
 import 'jquery.are-you-sure';
-import './vendor/semanticdropdown.js';
-
-import initMigration from './features/migration.js';
+import Vue from 'vue';
+import ActivityTopAuthors from './components/ActivityTopAuthors.vue';
+import initClipboard from './features/clipboard.js';
+import { createCodeEditor, createMonaco } from './features/codeeditor.js';
+import createColorPicker from './features/colorpicker.js';
 import initContextPopups from './features/contextpopup.js';
+import createDropzone from './features/dropzone.js';
 import initGitGraph from './features/gitgraph.js';
-import initClipboard from './features/clipboard.js';
 import initHeatmap from './features/heatmap.js';
+import initMigration from './features/migration.js';
+import { initNotificationCount, initNotificationsTable } from './features/notification.js';
 import initProject from './features/projects.js';
 import initServiceWorker from './features/serviceworker.js';
+import initTableSort from './features/tablesort.js';
+import attachTribute from './features/tribute.js';
 import initMarkdownAnchors from './markdown/anchors.js';
 import renderMarkdownContent from './markdown/content.js';
-import attachTribute from './features/tribute.js';
-import createColorPicker from './features/colorpicker.js';
-import createDropzone from './features/dropzone.js';
-import initTableSort from './features/tablesort.js';
-import ActivityTopAuthors from './components/ActivityTopAuthors.vue';
-import {initNotificationsTable, initNotificationCount} from './features/notification.js';
-import {createCodeEditor, createMonaco} from './features/codeeditor.js';
-import {svg, svgs} from './svg.js';
-import {stripTags} from './utils.js';
+import './publicpath.js';
+import { svg, svgs } from './svg.js';
+import { stripTags } from './utils.js';
+import './vendor/semanticdropdown.js';
+
+
 
 const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
 
@@ -3117,7 +3117,7 @@ function initVueApp() {
 
 function initIssueTimetracking() {
   $(document).on('click', '.issue-add-time', () => {
-    $('.mini.modal').modal({
+    $('.issue-start-time-modal').modal({
       duration: 200,
       onApprove() {
         $('#add_time_manual_form').trigger('submit');
@@ -3130,6 +3130,15 @@ function initIssueTimetracking() {
   $(document).on('click', '.issue-cancel-time', () => {
     $('#cancel_stopwatch_form').trigger('submit');
   });
+  $(document).on('click', 'button.issue-delete-time', function () {
+    const sel = `.issue-delete-time-modal[data-id="${$(this).data('id')}"]`
+    $(sel).modal({
+      duration: 200,
+      onApprove() {
+        $(`${sel} form`).trigger('submit');
+      }
+    }).modal('show');
+  });
 }
 
 function initFilterBranchTagDropdown(selector) {