Merge branch 'main' into frontend-index-init

Author: 6543

options/locale/locale_en-US.ini

@@ -96,7 +96,6 @@ error = Error
 error404 = The page you are trying to reach either <strong>does not exist</strong> or <strong>you are not authorized</strong> to view it.
 
 never = Never
-color = Color
 
 [error]
 occurred = An error has occurred
@@ -984,6 +983,7 @@ commit_graph = Commit Graph
 commit_graph.select = Select branches
 commit_graph.hide_pr_refs = Hide Pull Requests
 commit_graph.monochrome = Mono
+commit_graph.color = Color
 blame = Blame
 normal_view = Normal View
 line = line
@@ -1100,6 +1100,7 @@ projects.board.set_default = "Set Default"
 projects.board.set_default_desc = "Set this board as default for uncategorized issues and pulls"
 projects.board.delete = "Delete Board"
 projects.board.deletion_desc = "Deleting a project board moves all related issues to 'Uncategorized'. Continue?"
+projects.board.color = "Color"
 projects.open = Open
 projects.close = Close
 
@@ -1803,6 +1804,7 @@ settings.content_type = POST Content Type
 settings.secret = Secret
 settings.slack_username = Username
 settings.slack_icon_url = Icon URL
+settings.slack_color = Color
 settings.discord_username = Username
 settings.discord_icon_url = Icon URL
 settings.event_desc = Trigger On:

templates/repo/graph.tmpl

@@ -47,7 +47,7 @@
 						</div>
 					</div>
 					<button id="flow-color-monochrome" class="ui labelled icon button{{if eq .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "repo.commit_graph.monochrome"}}">{{svg "material-invert-colors" 16 "mr-2"}}{{.i18n.Tr "repo.commit_graph.monochrome"}}</button>
-					<button id="flow-color-colored" class="ui labelled icon button{{if ne .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "color"}}">{{svg "material-palette" 16 "mr-2"}}{{.i18n.Tr "color"}}</button>
+					<button id="flow-color-colored" class="ui labelled icon button{{if ne .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "repo.commit_graph.color"}}">{{svg "material-palette" 16 "mr-2"}}{{.i18n.Tr "repo.commit_graph.color"}}</button>
 				</div>
 			</h2>
 			<div class="ui dividing"></div>

templates/repo/projects/view.tmpl

@@ -23,7 +23,7 @@
 							</div>
 
 							<div class="field color-field">
-								<label for="new_board_color">{{$.i18n.Tr "color"}}</label>
+								<label for="new_board_color">{{$.i18n.Tr "repo.projects.board.color"}}</label>
 								<div class="color picker column">
 									<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color">
 									<div class="column precolors">
@@ -116,7 +116,7 @@
 											</div>
 
 											<div class="field color-field">
-												<label for="new_board_color">{{$.i18n.Tr "color"}}</label>
+												<label for="new_board_color">{{$.i18n.Tr "repo.projects.board.color"}}</label>
 												<div class="color picker column">
 													<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}">
 													<div class="column precolors">

templates/repo/settings/webhook/slack.tmpl

@@ -20,7 +20,7 @@
 			<input id="icon_url" name="icon_url" value="{{.SlackHook.IconURL}}" placeholder="e.g. https://example.com/img/favicon.png">
 		</div>
 		<div class="field">
-			<label for="color">{{.i18n.Tr "color"}}</label>
+			<label for="color">{{.i18n.Tr "repo.settings.slack_color"}}</label>
 			<input id="color" name="color" value="{{.SlackHook.Color}}" placeholder="e.g. #dd4b39, good, warning, danger">
 		</div>
 		{{template "repo/settings/webhook/settings" .}}

web_src/js/features/common-global.js

@@ -119,14 +119,19 @@ export function initGlobalCommon() {
     $($(this).data('target')).slideToggle(100);
   });
 
-  // make table <tr> element clickable like a link
-  $('tr[data-href]').on('click', function () {
-    window.location = $(this).data('href');
-  });
-
-  // make table <td> element clickable like a link
-  $('td[data-href]').click(function () {
-    window.location = $(this).data('href');
+  // make table <tr> and <td> elements clickable like a link
+  $('tr[data-href], td[data-href]').on('click', function (e) {
+    const href = $(this).data('href');
+    if (e.target.nodeName === 'A') {
+      // if a user clicks on <a>, then the <tr> or <td> should not act as a link.
+      return;
+    }
+    if (e.ctrlKey || e.metaKey) {
+      // ctrl+click or meta+click opens a new window in modern browsers
+      window.open(href);
+    } else {
+      window.location = href;
+    }
   });
 }