summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rwxr-xr-xclasses/feeds.php96
-rwxr-xr-xclasses/handler/public.php23
-rwxr-xr-xclasses/pref/feeds.php10
-rwxr-xr-xclasses/pref/filters.php8
-rw-r--r--classes/pref/labels.php2
-rw-r--r--classes/pref/prefs.php12
-rw-r--r--classes/pref/system.php2
-rw-r--r--classes/pref/users.php2
8 files changed, 61 insertions, 94 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index e6e88f441..a5cd05a46 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -15,22 +15,6 @@ class Feeds extends Handler_Protected {
$feed_id, $is_cat, $search,
$error, $feed_last_updated) {
- $catchup_sel_link = "Headlines.catchupSelection()";
-
- $archive_sel_link = "Headlines.archiveSelection()";
- $delete_sel_link = "Headlines.deleteSelection()";
-
- $sel_all_link = "Headlines.select('all')";
- $sel_unread_link = "Headlines.select('unread')";
- $sel_none_link = "Headlines.select('none')";
- $sel_inv_link = "Headlines.select('invert')";
-
- $tog_unread_link = "Headlines.selectionToggleUnread()";
- $tog_marked_link = "Headlines.selectionToggleMarked()";
- $tog_published_link = "Headlines.selectionTogglePublished()";
-
- $set_score_link = "Article.selectionSetScore()";
-
if ($is_cat) $cat_q = "&is_cat=$is_cat";
if ($search) {
@@ -39,23 +23,20 @@ class Feeds extends Handler_Protected {
$search_q = "";
}
- $reply = "<span class=\"holder\">";
+ $reply = "";
$rss_link = htmlspecialchars(get_self_url_prefix() .
"/public.php?op=rss&id=$feed_id$cat_q$search_q");
- // right part
-
$error_class = $error ? "error" : "";
- $reply .= "<span class='r'>
- <a href=\"#\"
+ $reply .= "<span class='left'>";
+
+ $reply .= "<a href=\"#\"
title=\"".__("Show as feed")."\"
onclick=\"App.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">
- <img class=\"noborder\" src=\"images/pub_set.png\"></a>";
-
+ <img src=\"images/pub_set.png\"></a>";
-# $reply .= "<span>";
$reply .= "<span id='feed_title' class='$error_class'>";
if ($feed_site_url) {
@@ -75,52 +56,37 @@ class Feeds extends Handler_Protected {
$reply .= strip_tags($feed_title);
}
- $reply .= "</span>";
-
- $reply .= "</span>";
-
-# $reply .= "</span>";
-
- // left part
+ $reply .= "</span></span>";
- $reply .= "<span class=\"main\">";
+ $reply .= "<span class=\"right\">";
$reply .= "<span id='selected_prompt'></span>";
-
- /*$reply .= "<span class=\"sel_links\">
- <a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
- <a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>,
- <a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>,
- <a href=\"#\" onclick=\"$sel_none_link\">".__('None')."</a></li>";
-
- $reply .= "</span> "; */
-
+ $reply .= "&nbsp;";
$reply .= "<select dojoType=\"dijit.form.Select\"
onchange=\"Headlines.onActionChanged(this)\">";
$reply .= "<option value=\"0\" disabled='1'>".__('Select...')."</option>";
- $reply .= "<option value=\"$sel_all_link\">".__('All')."</option>";
- $reply .= "<option value=\"$sel_unread_link\">".__('Unread')."</option>";
- $reply .= "<option value=\"$sel_inv_link\">".__('Invert')."</option>";
- $reply .= "<option value=\"$sel_none_link\">".__('None')."</option>";
+ $reply .= "<option value=\"Headlines.select('all')\">".__('All')."</option>";
+ $reply .= "<option value=\"Headlines.select('unread')\">".__('Unread')."</option>";
+ $reply .= "<option value=\"Headlines.select('invert')\">".__('Invert')."</option>";
+ $reply .= "<option value=\"Headlines.select('none')\">".__('None')."</option>";
$reply .= "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
- $reply .= "<option value=\"$tog_unread_link\">".__('Unread')."</option>
- <option value=\"$tog_marked_link\">".__('Starred')."</option>
- <option value=\"$tog_published_link\">".__('Published')."</option>";
+ $reply .= "<option value=\"Headlines.selectionToggleUnread()\">".__('Unread')."</option>
+ <option value=\"Headlines.selectionToggleMarked()\">".__('Starred')."</option>
+ <option value=\"Headlines.selectionTogglePublished()\">".__('Published')."</option>";
$reply .= "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";
- $reply .= "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";
- $reply .= "<option value=\"$set_score_link\">".__('Set score')."</option>";
+ $reply .= "<option value=\"Headlines.catchupSelection()\">".__('Mark as read')."</option>";
+ $reply .= "<option value=\"Article.selectionSetScore()\">".__('Set score')."</option>";
- if ($feed_id != "0") {
- $reply .= "<option value=\"$archive_sel_link\">".__('Archive')."</option>";
+ if ($feed_id == 0 && !$is_cat) {
+ $reply .= "<option value=\"Headlines.archiveSelection()\">".__('Move back')."</option>";
+ $reply .= "<option value=\"Headlines.deleteSelection()\">".__('Delete')."</option>";
} else {
- $reply .= "<option value=\"$archive_sel_link\">".__('Move back')."</option>";
- $reply .= "<option value=\"$delete_sel_link\">".__('Delete')."</option>";
-
+ $reply .= "<option value=\"Headlines.archiveSelection()\">".__('Archive')."</option>";
}
if (PluginHost::getInstance()->get_plugin("mail")) {
@@ -148,7 +114,7 @@ class Feeds extends Handler_Protected {
$reply .= $p->hook_headline_toolbar_button($feed_id, $is_cat);
}
- $reply .= "</span></span>";
+ $reply .= "</span>";
return $reply;
}
@@ -401,7 +367,7 @@ class Feeds extends Handler_Protected {
}
}
- $reply['content'] .= "<div class='hl hlMenuAttach $class' data-orig-feed-id='$feed_id' data-article-id='$id' id='RROW-$id' $mouseover_attrs>";
+ $reply['content'] .= "<div class='hl $class' data-orig-feed-id='$feed_id' data-article-id='$id' id='RROW-$id' $mouseover_attrs>";
$reply['content'] .= "<div class='left'>";
@@ -415,7 +381,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "</div>";
$reply['content'] .= "<div onclick='return Headlines.click(event, $id)'
- class=\"title\"><span class='hl-content $hlc_suffix'>";
+ class=\"title\"><span data-article-id=\"$id\" class='hl-content hlMenuAttach $hlc_suffix'>";
$reply['content'] .= "<a class=\"title $hlc_suffix\"
href=\"" . htmlspecialchars($line["link"]) . "\"
onclick=\"\">" .
@@ -502,7 +468,7 @@ class Feeds extends Handler_Protected {
id=\"RROW-$id\" data-content=\"$content_encoded\" data-article-id='$id' data-orig-feed-id='$feed_id' $mouseover_attrs>";
$tmp_content .= "<div class=\"header\">";
- $tmp_content .= "<div style=\"vertical-align : middle\">";
+ $tmp_content .= "<div class=\"buttons\">";
$tmp_content .= "<input dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" onclick=\"Headlines.onRowChecked(this)\"
@@ -562,7 +528,7 @@ class Feeds extends Handler_Protected {
$tmp_content .= "<span class='updated' title='$date_entered_fmt'>$updated_fmt</span>";
- $tmp_content .= "<div style=\"vertical-align : middle\">";
+ $tmp_content .= "<div class='right'>";
$tmp_content .= "$score_pic";
if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
@@ -631,7 +597,7 @@ class Feeds extends Handler_Protected {
$tags_str = Article::format_tags_string($tags, $id);
- $tmp_content .= "<span class='left'>";
+ $tmp_content .= "<div class='left'>";
$tmp_content .= "<img src='images/tag.png' alt='Tags' title='Tags'>
<span id=\"ATSTR-$id\">$tags_str</span>
@@ -659,8 +625,8 @@ class Feeds extends Handler_Protected {
if ($entry_comments) $tmp_content .= "&nbsp;($entry_comments)";
- $tmp_content .= "</span>";
- $tmp_content .= "<div>";
+ $tmp_content .= "</div>";
+ $tmp_content .= "<div class='right'>";
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
$tmp_content .= $p->hook_article_button($line);
@@ -1019,7 +985,7 @@ class Feeds extends Handler_Protected {
__('This feed requires authentication.')."</div>";
print "<div class=\"dlgButtons\">
- <button dojoType=\"dijit.form.Button\" class=\"btn-primary\" type=\"submit\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>";
+ <button dojoType=\"dijit.form.Button\" class=\"alt-primary\" type=\"submit\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>";
if (!(defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER)) {
print "<button dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.feedBrowser()\">".__('More feeds')."</button>";
@@ -1115,7 +1081,7 @@ class Feeds extends Handler_Protected {
</div>";
}
- print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
+ print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button>
</div>";
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 531392c84..e216d7a36 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -262,23 +262,24 @@ class Handler_Public extends Handler {
function getProfiles() {
$login = clean($_REQUEST["login"]);
+ $rv = [];
- $sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
+ if ($login) {
+ $sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = ? ORDER BY title");
- $sth->execute([$login]);
-
- print "<select dojoType='dijit.form.Select' style='width : 220px; margin : 0px' name='profile'>";
+ $sth->execute([$login]);
- print "<option value='0'>" . __("Default profile") . "</option>";
+ $rv = [ [ "value" => 0, "label" => __("Default profile") ] ];
- while ($line = $sth->fetch()) {
- $id = $line["id"];
- $title = $line["title"];
+ while ($line = $sth->fetch()) {
+ $id = $line["id"];
+ $title = $line["title"];
- print "<option value='$id'>$title</option>";
- }
+ array_push($rv, [ "label" => $title, "value" => $id ]);
+ }
+ }
- print "</select>";
+ print json_encode($rv);
}
function logout() {
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index ab5ef7890..d29cf70f5 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -747,7 +747,7 @@ class Pref_Feeds extends Handler_Protected {
<input type=\"hidden\" name=\"method\" value=\"uploadicon\">
<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.uploadFeedIcon();\"
type=\"submit\">".__('Replace')."</button>
- <button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.removeFeedIcon($feed_id);\"
+ <button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.removeFeedIcon($feed_id);\"
type=\"submit\">".__('Remove')."</button>
</form>";
@@ -765,7 +765,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div class='dlgButtons'>
<div style=\"float : left\">
- <button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
+ <button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
__('Unsubscribe')."</button>";
print "</div>";
@@ -1335,7 +1335,7 @@ class Pref_Feeds extends Handler_Protected {
print "<button dojoType=\"dijit.form.Button\" onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
__('Display URL')."</button> ";
- print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
+ print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
__('Clear all generated URLs')."</button> ";
print "</p>";
@@ -1463,7 +1463,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div class='dlgButtons'>";
print "<div style='float : left'>";
- print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
+ print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
.__('Unsubscribe from selected feeds')."</button> ";
print "</div>";
@@ -1527,7 +1527,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div class='dlgButtons'>";
print "<div style='float : left'>";
- print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+ print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
.__('Unsubscribe from selected feeds')."</button> ";
print "</div>";
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index ef18e8058..0bb1493e5 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -514,14 +514,14 @@ class Pref_Filters extends Handler_Protected {
print "<div class=\"dlgButtons\">";
print "<div style=\"float : left\">";
- print "<button dojoType=\"dijit.form.Button\" class=\"btn-danger\" onclick=\"return dijit.byId('filterEditDlg').removeFilter()\">".
+ print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return dijit.byId('filterEditDlg').removeFilter()\">".
__('Remove')."</button>";
print "</div>";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">".
__('Test')."</button> ";
- print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
+ print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
__('Save')."</button> ";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".
@@ -1015,7 +1015,7 @@ class Pref_Filters extends Handler_Protected {
</div>";
- print "<button dojoType=\"dijit.form.Button\" class=\"btn-primary \" type=\"submit\" onclick=\"return dijit.byId('filterNewRuleDlg').execute()\">".
+ print "<button dojoType=\"dijit.form.Button\" class=\"alt-primary \" type=\"submit\" onclick=\"return dijit.byId('filterNewRuleDlg').execute()\">".
($rule ? __("Save rule") : __('Add rule'))."</button> ";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterNewRuleDlg').hide()\">".
@@ -1108,7 +1108,7 @@ class Pref_Filters extends Handler_Protected {
print "<div class=\"dlgButtons\">";
- print "<button dojoType=\"dijit.form.Button\" class=\"btn-primary\" type=\"submit\" onclick=\"return dijit.byId('filterNewActionDlg').execute()\">".
+ print "<button dojoType=\"dijit.form.Button\" class=\"alt-primary\" type=\"submit\" onclick=\"return dijit.byId('filterNewActionDlg').execute()\">".
($action ? __("Save action") : __('Add action'))."</button> ";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterNewActionDlg').hide()\">".
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 49118ab4a..1e297818c 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -78,7 +78,7 @@ class Pref_Labels extends Handler_Protected {
# print "</form>";
print "<div class=\"dlgButtons\">";
- print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"dijit.byId('labelEditDlg').execute()\">".
+ print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"dijit.byId('labelEditDlg').execute()\">".
__('Save')."</button>";
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelEditDlg').hide()\">".
__('Cancel')."</button>";
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 161b0acb6..5a42884c7 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -227,7 +227,7 @@ class Pref_Prefs extends Handler_Protected {
print_hidden("op", "pref-prefs");
print_hidden("method", "changeemail");
- print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\">".
+ print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\">".
__("Save data")."</button>";
print "</form>";
@@ -298,7 +298,7 @@ class Pref_Prefs extends Handler_Protected {
print_hidden("op", "pref-prefs");
print_hidden("method", "changepassword");
- print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\">".
+ print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\">".
__("Change password")."</button>";
print "</form>";
@@ -403,7 +403,7 @@ class Pref_Prefs extends Handler_Protected {
print "</td></tr>";
print "</table>";
- print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\">".
+ print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\">".
__("Enable OTP")."</button>";
print "</form>";
@@ -653,7 +653,7 @@ class Pref_Prefs extends Handler_Protected {
print_hidden("op", "pref-prefs");
print_hidden("method", "saveconfig");
- print "<div dojoType=\"dijit.form.ComboButton\" type=\"submit\" class=\"btn-primary\">
+ print "<div dojoType=\"dijit.form.ComboButton\" type=\"submit\" class=\"alt-primary\">
<span>".__('Save configuration')."</span>
<div dojoType=\"dijit.DropDownMenu\">
<div dojoType=\"dijit.MenuItem\"
@@ -665,7 +665,7 @@ class Pref_Prefs extends Handler_Protected {
print "<button dojoType=\"dijit.form.Button\" onclick=\"return Helpers.editProfiles()\">".
__('Manage profiles')."</button> ";
- print "<button dojoType=\"dijit.form.Button\" class=\"btn-danger\" onclick=\"return Helpers.confirmReset()\">".
+ print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return Helpers.confirmReset()\">".
__('Reset to defaults')."</button>";
print "&nbsp;";
@@ -1096,7 +1096,7 @@ class Pref_Prefs extends Handler_Protected {
print "<div class='dlgButtons'>
<div style='float : left'>
- <button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
+ <button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
__('Remove selected profiles')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').activateProfile()\">".
__('Activate profile')."</button>
diff --git a/classes/pref/system.php b/classes/pref/system.php
index d60b419cf..ef2ca98b0 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -40,7 +40,7 @@ class Pref_System extends Handler_Protected {
onclick=\"Helpers.updateEventLog()\">".__('Refresh')."</button> ";
print "&nbsp;<button dojoType=\"dijit.form.Button\"
- class=\"btn-danger\" onclick=\"Helpers.clearEventLog()\">".__('Clear')."</button> ";
+ class=\"alt-danger\" onclick=\"Helpers.clearEventLog()\">".__('Clear')."</button> ";
print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
diff --git a/classes/pref/users.php b/classes/pref/users.php
index aeab28153..9a9feac92 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -99,7 +99,7 @@ class Pref_Users extends Handler_Protected {
print '</div>';
print "<div class=\"dlgButtons\">
- <button dojoType=\"dijit.form.Button\" class=\"btn-primary\" type=\"submit\" onclick=\"dijit.byId('userEditDlg').execute()\">".
+ <button dojoType=\"dijit.form.Button\" class=\"alt-primary\" type=\"submit\" onclick=\"dijit.byId('userEditDlg').execute()\">".
__('Save')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('userEditDlg').hide()\">".
__('Cancel')."</button></div>";
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-15 06:12:08 +0000