Merge branch 'master' of git.fakecake.org:tt-rss

classes/backend.php

@@ -154,10 +154,7 @@ class Backend extends Handler {
 			print "</ul>";
 		}
 
-		print "<footer>";
-		print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/InterfaceTips\")'>
-			<i class='material-icons'>help</i> ".__("More info...")."</button>";
-
+		print "<footer class='text-center'>";
 		print "<button dojoType='dijit.form.Button'
 			onclick=\"return dijit.byId('helpDlg').hide()\">".__('Close this window')."</button>";
 		print "</footer>";

css/cdm.less

@@ -367,6 +367,10 @@ div#floatingTitle.Unread a.title {
 
 }
 
+.cdm.expandable:not(.active) {
+	user-select : none;
+}
+
 .cdm.expandable.Unread {
 	background : white;
 }

css/default.css

@@ -196,6 +196,7 @@ body.ttrss_main .hl {
   flex-wrap: nowrap;
   background: #f5f5f5;
   align-items: center;
+  user-select: none;
 }
 body.ttrss_main .hl > * {
   white-space: nowrap;
@@ -1368,6 +1369,9 @@ div#floatingTitle.Unread a.title {
   font-weight: normal;
   cursor: pointer;
 }
+.cdm.expandable:not(.active) {
+  user-select: none;
+}
 .cdm.expandable.Unread {
   background: white;
 }

css/tt-rss.less

@@ -226,6 +226,7 @@ body.ttrss_main {
 		flex-wrap : nowrap;
 		background : @color-panel-bg;
 		align-items : center;
+		user-select : none;
 
 		> * {
 			white-space : nowrap;

js/Headlines.js

@@ -168,19 +168,40 @@ define(["dojo/_base/declare"], function (declare) {
 			} else {
 				if (App.isCombinedMode()) {
 
-					if (Article.getActive() != id) {
+					if (event.altKey && !in_body) {
+
+						Article.openInNewWindow(id);
+						Headlines.toggleUnread(id, 0);
+
+					} else if (Article.getActive() != id) {
+
+						Headlines.select('none');
 						Article.setActive(id);
 
-						if (!App.getInitParam("cdm_expanded"))
+						if (App.getInitParam("cdm_expanded")) {
+							if (!in_body)
+								Article.openInNewWindow(id);
+
+							Headlines.toggleUnread(id, 0);
+						} else {
 							Article.cdmScrollToId(id);
+						}
 
 					} else if (in_body) {
 						Headlines.toggleUnread(id, 0);
+					} else { /* !in body */
+						Article.openInNewWindow(id);
 					}
 
 					return in_body;
 				} else {
-					Article.view(id);
+					if (event.altKey) {
+						Article.openInNewWindow(id);
+						Headlines.toggleUnread(id, 0);
+					} else {
+						Headlines.select('none');
+						Article.view(id);
+					}
 				}
 			}
 

themes/night.css

@@ -197,6 +197,7 @@ body.ttrss_main .hl {
   flex-wrap: nowrap;
   background: #222;
   align-items: center;
+  user-select: none;
 }
 body.ttrss_main .hl > * {
   white-space: nowrap;
@@ -1369,6 +1370,9 @@ div#floatingTitle.Unread a.title {
   font-weight: normal;
   cursor: pointer;
 }
+.cdm.expandable:not(.active) {
+  user-select: none;
+}
 .cdm.expandable.Unread {
   background: white;
 }

themes/night_blue.css

@@ -197,6 +197,7 @@ body.ttrss_main .hl {
   flex-wrap: nowrap;
   background: #222;
   align-items: center;
+  user-select: none;
 }
 body.ttrss_main .hl > * {
   white-space: nowrap;
@@ -1369,6 +1370,9 @@ div#floatingTitle.Unread a.title {
   font-weight: normal;
   cursor: pointer;
 }
+.cdm.expandable:not(.active) {
+  user-select: none;
+}
 .cdm.expandable.Unread {
   background: white;
 }