From 4e253add8c78bb185911ffdffbb50ef318386a3c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 21 Feb 2019 16:21:16 +0300 Subject: [PATCH] UI: add some more info links to relevant wiki pages; minor layout updates --- classes/backend.php | 100 ++++++++++++++++++++++++---------- classes/dlg.php | 9 ++- classes/feeds.php | 5 +- classes/pref/feeds.php | 47 +++++++--------- classes/pref/filters.php | 7 ++- classes/pref/prefs.php | 20 +++++-- css/cdm.less | 4 ++ css/default.css | 8 ++- css/default.css.map | 2 +- css/defines.less | 3 +- css/tt-rss.less | 7 +++ plugins/bookmarklets/init.php | 13 +++-- plugins/share/init.php | 6 +- themes/night.css | 8 ++- themes/night.css.map | 2 +- themes/night_blue.css | 8 ++- themes/night_blue.css.map | 2 +- 17 files changed, 166 insertions(+), 85 deletions(-) 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("". - __("Other interface tips are available in the Tiny Tiny RSS wiki.") . - ""); - print ""; + + } function help() { - $topic = basename(clean($_REQUEST["topic"])); + $topic = basename(clean($_REQUEST["topic"])); // only one for now - switch ($topic) { - case "main": - $this->display_main_help(); - break; - case "prefs": - //$this->display_prefs_help(); - break; - default: - print "

".__("Help topic not found.")."

"; + 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 ""; } - print "
"; - print ""; + print "
"; + print ""; + + print ""; print "
"; - /* if (file_exists("help/$topic.php")) { - include("help/$topic.php"); - } else { - print "

".__("Help topic not found.")."

"; - } */ - /* print "
-
"; */ - } -} \ No newline at end of file +} diff --git a/classes/dlg.php b/classes/dlg.php index cd8de206b..89b88825e 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -177,12 +177,15 @@ class Dlg extends Handler_Protected { print "
"; print ""; - print "
"; + print "
"; - print ""; + + print " "; - print ""; print "
"; diff --git a/classes/feeds.php b/classes/feeds.php index a7a138992..aac9b627f 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -806,9 +806,8 @@ class Feeds extends Handler_Protected { print "
"; if (count(PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH)) == 0) { - print "
- ".__("Search syntax")." -
"; + print ""; } print " diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 10f6f057b..a033bf04f 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1357,42 +1357,39 @@ class Pref_Feeds extends Handler_Protected { print "
"; # feeds pane - print "
import_export ".__('OPML')."\">"; + print "
"; - print __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . - __("Only main settings profile can be migrated using OPML."); + print "

" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "

"; - print "

"; + print_notice("Only main settings profile can be migrated using OPML."); print ""; - print "

-