From a68b15060195b42eea36f29d2837bb920e35f07a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 7 Dec 2018 14:03:33 +0300 Subject: remove separate classes for various panels, unify under .panel remove a few other unnecessary css classes/ids --- classes/dlg.php | 11 ++++------- classes/pref/feeds.php | 28 +++++++++++++--------------- classes/pref/filters.php | 14 +++++++------- classes/pref/labels.php | 10 +++++----- classes/pref/prefs.php | 28 ++++++++++------------------ classes/pref/users.php | 11 +++++------ 6 files changed, 44 insertions(+), 58 deletions(-) (limited to 'classes') diff --git a/classes/dlg.php b/classes/dlg.php index 7ac18bb90..ed0d16322 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -16,15 +16,12 @@ class Dlg extends Handler_Protected { function importOpml() { print __("If you have imported labels and/or filters, you might need to reload preferences to see your new data.") . "

"; - print "
"; - - print ""; print "
"; print "
"; @@ -43,7 +40,7 @@ class Dlg extends Handler_Protected { print __("Your Public OPML URL is:"); - print "
"; + print "
"; print "$url_path"; print "
"; @@ -94,7 +91,7 @@ class Dlg extends Handler_Protected { } function printTagCloud() { - print "
"; + print "
"; // from here: http://www.roscripts.com/Create_tag_cloud-71.html @@ -170,7 +167,7 @@ class Dlg extends Handler_Protected { print "
".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."
"; - print "
"; + print "
"; print "$url_path"; print "
"; diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index b834d0de1..71379a12b 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1132,8 +1132,8 @@ class Pref_Feeds extends Handler_Protected { function index() { - print "
"; - print "
"; + print "
rss_feed ".__('Feeds')."\">"; $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors @@ -1222,7 +1222,7 @@ class Pref_Feeds extends Handler_Protected { print "
"; # toolbar //print '
'; - print '
'; + print '
'; print "
". @@ -1423,16 +1423,15 @@ class Pref_Feeds extends Handler_Protected { print "
". "" . __('Select').""; print "
"; - print "
".__('All')."
"; - print "
".__('None')."
"; print "
"; print "
"; #toolbar - print "
"; - - print ""; + print "
"; + print "
"; $lnum = 1; @@ -1440,7 +1439,7 @@ class Pref_Feeds extends Handler_Protected { $feed_id = $line["id"]; - print ""; + print ""; print "
". "" . __('Select').""; print "
"; - print "
".__('All')."
"; - print "
".__('None')."
"; print "
"; print ""; #toolbar - print "
"; - - print ""; + print "
"; + print "
"; $lnum = 1; @@ -1502,7 +1500,7 @@ class Pref_Feeds extends Handler_Protected { $feed_id = $line["id"]; - print ""; + print ""; print "
 Looking for articles..."; - print "
"; - print ""; + print "
"; + print "
"; print "
"; print "
"; @@ -772,9 +772,9 @@ class Pref_Filters extends Handler_Protected { $filter_search = $_SESSION["prefs_filter_search"]; } - print "
"; - print "
"; - print "
"; + print "
"; + print "
"; + print "
"; if (array_key_exists("search", $_REQUEST)) { $_SESSION["prefs_filter_search"] = $filter_search; @@ -816,9 +816,9 @@ class Pref_Filters extends Handler_Protected { print "
"; # toolbar print "
"; # toolbar-frame - print "
"; + print "
"; - print "
+ print "
". __("Loading, please wait...")."
"; diff --git a/classes/pref/labels.php b/classes/pref/labels.php index 0414a7f8e..a58e33ac9 100644 --- a/classes/pref/labels.php +++ b/classes/pref/labels.php @@ -255,11 +255,11 @@ class Pref_Labels extends Handler_Protected { function index() { - print "
"; - print "
"; - print "
"; + print "
"; + print "
"; + print "
"; - print "
". + print "
". "" . __('Select').""; print "
"; print "
"; #toolbar print "
"; #pane - print "
"; + print "
"; print "
". diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index ac3eae13f..6c7a45953 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -1015,9 +1015,9 @@ class Pref_Prefs extends Handler_Protected { print "
". "" . __('Select').""; print "
"; - print "
".__('All')."
"; - print "
".__('None')."
"; print "
"; @@ -1035,19 +1035,15 @@ class Pref_Prefs extends Handler_Protected { WHERE owner_uid = ? ORDER BY title"); $sth->execute([$_SESSION['uid']]); - print "
"; + print "
"; - print "
"; + print ""; - print ""; + print "
"; - print ""; # data-row-id='0' <-- no point, shouldn't be removed + print ""; # data-row-id='0' <-- no point, shouldn't be removed - print ""; + print ""; if (!$_SESSION["profile"]) { $is_active = __("(active)"); @@ -1055,8 +1051,7 @@ class Pref_Prefs extends Handler_Protected { $is_active = ""; } - print ""; + print ""; print ""; @@ -1066,14 +1061,11 @@ class Pref_Prefs extends Handler_Protected { $profile_id = $line["id"]; - print ""; + print ""; $edit_title = htmlspecialchars($line["title"]); - print ""; + print ""; if ($_SESSION["profile"] == $line["id"]) { $is_active = __("(active)"); diff --git a/classes/pref/users.php b/classes/pref/users.php index 6fedddf1d..206dc34d5 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -153,7 +153,7 @@ class Pref_Users extends Handler_Protected { WHERE owner_uid = ? ORDER BY title"); $sth->execute([$id]); - print "
    "; + print "
      "; while ($line = $sth->fetch()) { @@ -326,10 +326,9 @@ class Pref_Users extends Handler_Protected { global $access_level_names; - print "
      "; - print "
      "; - - print "
      "; + print "
      "; + print "
      "; + print "
      "; $user_search = trim(clean($_REQUEST["search"])); @@ -376,7 +375,7 @@ class Pref_Users extends Handler_Protected { print "
      "; #toolbar print "
      "; #pane - print "
      "; + print "
      "; $sort = validate_field($sort, ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login"); -- cgit v1.2.3-54-g00ecf
" . - __("Default profile") . " $is_active" . __("Default profile") . " $is_active