diff options
| -rwxr-xr-x | classes/pref/feeds.php | 20 | ||||
| -rw-r--r-- | classes/pref/prefs.php | 12 | ||||
| -rw-r--r-- | plugins/share/init.php | 3 |
3 files changed, 15 insertions, 20 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index c763a254a..ed64dba52 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -983,10 +983,6 @@ class Pref_Feeds extends Handler_Protected { private function index_opml() { ?> - <h3><?= __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") ?></h3> - - <?php print_notice("Only main settings profile can be migrated using OPML.") ?> - <form id='opml_import_form' method='post' enctype='multipart/form-data'> <label class='dijitButton'><?= __("Choose file...") ?> <input style='display : none' id='opml_file' name='opml_file' type='file'> @@ -995,20 +991,24 @@ class Pref_Feeds extends Handler_Protected { <input type='hidden' name='csrf_token' value="<?= $_SESSION['csrf_token'] ?>"> <input type='hidden' name='method' value='importOpml'> <button dojoType='dijit.form.Button' class='alt-primary' onclick="return Helpers.OPML.import()" type="submit"> + <?= \Controls\icon("file_upload") ?> <?= __('Import OPML') ?> </button> </form> <hr/> + <?php print_notice("Only main settings profile can be migrated using OPML.") ?> + <form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'> <button dojoType='dijit.form.Button' onclick='Helpers.OPML.export()'> + <?= \Controls\icon("file_download") ?> <?= __('Export OPML') ?> </button> <label class='checkbox'> <?= \Controls\checkbox_tag("include_settings", true, "1") ?> - <?= __("Include settings") ?> + <?= __("Include tt-rss settings") ?> </label> </form> @@ -1016,12 +1016,10 @@ class Pref_Feeds extends Handler_Protected { <h2><?= __("Published OPML") ?></h2> - <p> - <?= __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') ?> - <?= __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") ?> - </p> + <?= format_notice("Your OPML can be published and then subscribed by anyone who knows the URL below. This won't include your settings nor authenticated feeds.") ?> <button dojoType='dijit.form.Button' class='alt-primary' onclick="return Helpers.OPML.publish()"> + <?= \Controls\icon("share") ?> <?= __('Display published OPML URL') ?> </button> @@ -1032,14 +1030,16 @@ class Pref_Feeds extends Handler_Protected { private function index_shared() { ?> - <h3><?= __('Published articles can be subscribed by anyone who knows the following URL:') ?></h3> + <?= format_notice('Published articles can be subscribed by anyone who knows the following URL:') ?></h3> <button dojoType='dijit.form.Button' class='alt-primary' onclick="CommonDialogs.generatedFeed(-2, false)"> + <?= \Controls\icon('share') ?> <?= __('Display URL') ?> </button> <button class='alt-danger' dojoType='dijit.form.Button' onclick='return Helpers.Feeds.clearFeedAccessKeys()'> + <?= \Controls\icon('delete') ?> <?= __('Clear all generated URLs') ?> </button> diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index ea9e6a967..592bdb705 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -384,7 +384,7 @@ class Pref_Prefs extends Handler_Protected { } private function index_auth_app_passwords() { - print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP."); + print_notice("Separate passwords used for API clients. Required if you enable OTP."); ?> <div id='app_passwords_holder'> @@ -454,15 +454,9 @@ class Pref_Prefs extends Handler_Protected { } else { - print_notice("You will need to generate app passwords for the API clients if you enable OTP."); + print "<img src=".($this->_get_otp_qrcode_img()).">"; - if (function_exists("imagecreatefromstring")) { - print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>"; - print "<img src=".($this->_get_otp_qrcode_img()).">"; - } else { - print_error("PHP GD functions are required to generate QR codes."); - print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>"; - } + print_notice("You will need to generate app passwords for API clients if you enable OTP."); $otp_secret = UserHelper::get_otp_secret($_SESSION["uid"]); ?> diff --git a/plugins/share/init.php b/plugins/share/init.php index 452fc6252..8145d51ee 100644 --- a/plugins/share/init.php +++ b/plugins/share/init.php @@ -47,9 +47,10 @@ class Share extends Plugin { ?> <hr/> - <h2><?= __("You can disable all articles shared by unique URLs here.") ?></h2> + <?= format_notice("You can disable all articles shared by unique URLs here.") ?></h2> <button class='alt-danger' dojoType='dijit.form.Button' onclick="return Plugins.Share.clearKeys()"> + <?= \Controls\icon('delete') ?> <?= __('Unshare all articles') ?></button> <?php } |