testing ui

sapk-fork · May 21, 2019 · 2f453e7 · 2f453e7
1 parent 8f937fa
commit 2f453e7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -1313,7 +1313,7 @@ settings.unarchive.error = An error occured while trying to un-archive the repo.
 diff.browse_source = Browse Source
 diff.parent = parent
 diff.commit = commit
-diff.git-notes = git-notes:
+diff.git-notes = Notes
 diff.data_not_available = Diff Content Not Available
 diff.show_diff_stats = Show Diff Stats
 diff.show_split_view = Split View

diff --git a/templates/repo/diff/page.tmpl b/templates/repo/diff/page.tmpl
@@ -52,41 +52,38 @@
 			</div>
 			{{if .Commit.Signature}}
 				{{if .Verification.Verified }}
-					<div class="ui bottom attached positive message">
+					<div class="ui bottom attached positive message"{{if .Note}} style="margin-bottom: 0; border-radius: 0;"{{end}}>
 					  <i class="green lock icon"></i>
 						<span>{{.i18n.Tr "repo.commits.signed_by"}}:</span>
 						<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a> <{{.Commit.Committer.Email}}>
 						<span class="pull-right"><span>{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> {{.Verification.SigningKey.KeyID}}</span>
 					</div>
 				{{else}}
-					<div class="ui bottom attached message">
+					<div class="ui bottom attached message"{{if .Note}} style="margin-bottom: 0; border-radius: 0;"{{end}}>
 					  <i class="grey unlock icon"></i>
 					  {{.i18n.Tr .Verification.Reason}}
 					</div>
 				{{end}}
 			{{end}}
 			{{if .Note}}
-				<div class="ui top attached info clearing segment">
-					<h3>{{.i18n.Tr "repo.diff.git-notes"}}</h3>
-					<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
-				</div>
-				<div class="ui bottom attached info segment">
-					<div class="ui stackable grid">
-						<div class="nine wide column">
-							{{if .NoteAuthor}}
-								<img class="ui avatar image" src="{{.NoteAuthor.RelAvatarLink}}" />
+				<div class="ui attached bottom message" style="margin-bottom: 0; border-radius: 0;">
+					<i class="sticky note icon"></i>
+					<span style="color: black;">{{.i18n.Tr "repo.diff.git-notes"}}:</span>
+					{{if .NoteAuthor}}
+						<a href="{{.NoteAuthor.HomeLink}}">
 							{{if .NoteAuthor.FullName}}
-							<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteAuthor.FullName}}</strong></a>
-							{{else}}
-							<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteCommit.Author.Name}}</strong></a>
-							{{end}}
+							  <strong>{{.NoteAuthor.FullName}}</strong>
 							{{else}}
-								<img class="ui avatar image" src="{{AvatarLink .NoteCommit.Author.Email}}" />
-								<strong>{{.NoteCommit.Author.Name}}</strong>
+							  <strong>{{.NoteCommit.Author.Name}}</strong>
 							{{end}}
-							<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span>
-						</div>
-					</div><!-- end grid -->
+						</a>
+					{{else}}
+						<strong>{{.NoteCommit.Author.Name}}</strong>
+					{{end}}
+					<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span>
+				</div>
+				<div class="ui bottom attached info segment">
+					<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
 				</div>
 			{{end}}
 		{{end}}