From b61b166f46296eca5143f3c0b60a4daa39c0e105 Mon Sep 17 00:00:00 2001
From: Konrad Langenberg <konrad@kola-entertainments.de>
Date: Tue, 12 Sep 2017 22:20:57 +0200
Subject: [PATCH] Fixed conflict with timetracking

Signed-off-by: Konrad <konrad@kola-entertainments.de>
---
 public/js/index.js                            |  2 +-
 .../repo/issue/view_content/comments.tmpl     | 39 +++++++++----------
 .../repo/issue/view_content/sidebar.tmpl      |  2 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/public/js/index.js b/public/js/index.js
index e7ce89d58..b4365ff8d 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1832,7 +1832,7 @@ function initVueApp() {
 }
 
 function timeAddManual() {
-    $('.mini.modal')
+    $('.time-add-manual')
         .modal({
             duration: 200,
             onApprove: function() {
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index aec0230b0..ea03975eb 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -149,7 +149,7 @@
 			</a>
 			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.start_tracking_history"  $createdStr | Safe}}</span>
 		</div>
-{{else if eq .Type 13}}
+	{{else if eq .Type 13}}
 		<div class="event">
 			<span class="octicon octicon-primitive-dot"></span>
 			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
@@ -174,7 +174,7 @@
 				<span class="text grey">{{.Content}}</span>
 			</div>
 		</div>
-		{{else if eq .Type 15}}
+	{{else if eq .Type 15}}
 		<div class="event">
 			<span class="octicon octicon-primitive-dot"></span>
 			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
@@ -182,40 +182,37 @@
 			</a>
 			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.cancel_tracking_history"  $createdStr | Safe}}</span>
 		</div>
-
-		{{else if eq .Type 16}}
+	{{else if eq .Type 16}}
 		<div class="event">
 			<span class="octicon octicon-primitive-dot"></span>
 			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
 				<img src="{{.Poster.RelAvatarLink}}">
 			</a>
-			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.cancel_tracking_history"  $createdStr | Safe}}</span>
-		</div>
-
-		<span class="text grey">
-					{{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}}
-					</span>
-		<div class="detail">
 			<span class="text grey">
-				<i class="octicon octicon-trashcan"></i>
-				<a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.Content}}</a>
+				{{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}}
 			</span>
+			<div class="detail">
+				<span class="text grey">
+					<i class="octicon octicon-plus"></i>
+					<a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.Content}}</a>
+				</span>
+			</div>
 		</div>
-
-		{{else if eq .Type 17}}
+	{{else if eq .Type 17}}
 		<div class="event">
 			<span class="octicon octicon-primitive-dot"></span>
 			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
 				<img src="{{.Poster.RelAvatarLink}}">
 			</a>
+
 			<span class="text grey">
-					{{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}}
-					</span>
+				{{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}}
+			</span>
 			<div class="detail">
-						<span class="text grey">
-						<i class="octicon octicon-plus"></i>
-							<a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.Content}}</a>
-						</span>
+				<span class="text grey">
+					<i class="octicon octicon-trashcan"></i>
+					<a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.Content}}</a>
+				</span>
 			</div>
 		</div>
 	{{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 18fceb5c3..b966a0deb 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -149,7 +149,7 @@
 							<div class="ui buttons two fluid start-add">
 								<button onclick="this.disabled=true;toggleStopwatch()" class="ui button poping up start" data-content='{{.i18n.Tr "repo.issues.start_tracking"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.start_tracking_short"}}</button>
 								<button onclick="timeAddManual()" class="ui button green poping up add-time" data-content='{{.i18n.Tr "repo.issues.add_time"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.add_time_short"}}</button>
-								<div class="ui mini modal">
+								<div class="ui mini modal time-add-manual">
 									<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">