From 4e253add8c78bb185911ffdffbb50ef318386a3c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 21 Feb 2019 16:21:16 +0300
Subject: UI: add some more info links to relevant wiki pages; minor layout
 updates

---
 classes/backend.php | 102 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 73 insertions(+), 29 deletions(-)

(limited to 'classes/backend.php')

diff --git a/classes/backend.php b/classes/backend.php
index 29b2d5048..bd6b1ff19 100644
--- a/classes/backend.php
+++ b/classes/backend.php
@@ -27,10 +27,6 @@ class Backend extends Handler {
 			array_push($omap[$action], $sequence);
 		}
 
-		print_notice("<a target=\"_blank\" href=\"http://tt-rss.org/wiki/InterfaceTips\">".
-			__("Other interface tips are available in the Tiny Tiny RSS wiki.") .
-			"</a>");
-
 		print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
 
 		print "<h2>" . __("Keyboard Shortcuts") . "</h2>";
@@ -82,36 +78,84 @@ class Backend extends Handler {
 		}
 
 		print "</ul>";
+
+
 	}
 
 	function help() {
-		$topic = basename(clean($_REQUEST["topic"]));
-
-		switch ($topic) {
-		case "main":
-			$this->display_main_help();
-			break;
-		case "prefs":
-			//$this->display_prefs_help();
-			break;
-		default:
-			print "<p>".__("Help topic not found.")."</p>";
+		$topic = basename(clean($_REQUEST["topic"])); // only one for now
+
+		if ($topic == "main") {
+			$info = get_hotkeys_info();
+			$imap = get_hotkeys_map();
+			$omap = array();
+
+			foreach ($imap[1] as $sequence => $action) {
+				if (!isset($omap[$action])) $omap[$action] = array();
+
+				array_push($omap[$action], $sequence);
+			}
+
+			print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
+
+			$cur_section = "";
+			foreach ($info as $section => $hotkeys) {
+
+				if ($cur_section) print "<li>&nbsp;</li>";
+				print "<li><h3>" . $section . "</h3></li>";
+				$cur_section = $section;
+
+				foreach ($hotkeys as $action => $description) {
+
+					if (is_array($omap[$action])) {
+						foreach ($omap[$action] as $sequence) {
+							if (strpos($sequence, "|") !== FALSE) {
+								$sequence = substr($sequence,
+									strpos($sequence, "|")+1,
+									strlen($sequence));
+							} else {
+								$keys = explode(" ", $sequence);
+
+								for ($i = 0; $i < count($keys); $i++) {
+									if (strlen($keys[$i]) > 1) {
+										$tmp = '';
+										foreach (str_split($keys[$i]) as $c) {
+											switch ($c) {
+												case '*':
+													$tmp .= __('Shift') . '+';
+													break;
+												case '^':
+													$tmp .= __('Ctrl') . '+';
+													break;
+												default:
+													$tmp .= $c;
+											}
+										}
+										$keys[$i] = $tmp;
+									}
+								}
+								$sequence = join(" ", $keys);
+							}
+
+							print "<li>";
+							print "<div class='hk'><code>$sequence</code></div>";
+							print "<div class='desc'>$description</div>";
+							print "</li>";
+						}
+					}
+				}
+			}
+
+			print "</ul>";
 		}
 
-		print "<div align='center'>";
-		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"return dijit.byId('helpDlg').hide()\">".
-			__('Close this window')."</button>";
-		print "</div>";
+		print "<div class='dlgButtons'>";
+		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>";
 
-		/* if (file_exists("help/$topic.php")) {
-			include("help/$topic.php");
-		} else {
-			print "<p>".__("Help topic not found.")."</p>";
-		} */
-		/* print "<div align='center'>
-			<button onclick=\"javascript:window.close()\">".
-			__('Close this window')."</button></div>"; */
+		print "<button dojoType='dijit.form.Button'
+			onclick=\"return dijit.byId('helpDlg').hide()\">".__('Close this window')."</button>";
+		print "</div>";
 
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf