diff options
author | Andrew Dolgov <[email protected]> | 2018-12-02 11:25:32 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2018-12-02 11:25:32 +0300 |
commit | e23b6e397dbbbba90f9a15a6fe2d45eb862efdc5 (patch) | |
tree | a53d6bc59b069ac0a6a97b742f4f586cfdbde33e /classes/pref | |
parent | aa2f119eb656cc2064da691328239010f51afb98 (diff) |
prefs: store active tab for reload, remove most old table row functions
Diffstat (limited to 'classes/pref')
-rwxr-xr-x | classes/pref/feeds.php | 22 | ||||
-rw-r--r-- | classes/pref/prefs.php | 11 | ||||
-rw-r--r-- | classes/pref/users.php | 9 |
3 files changed, 16 insertions, 26 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index efc76701e..0a7fed7b2 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1412,9 +1412,9 @@ class Pref_Feeds extends Handler_Protected { print "<div dojoType=\"dijit.form.DropDownButton\">". "<span>" . __('Select')."</span>"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; - print "<div onclick=\"selectTableRows('prefInactiveFeedList', 'all')\" + print "<div onclick=\"Tables.select('prefInactiveFeedList', true)\" dojoType=\"dijit.MenuItem\">".__('All')."</div>"; - print "<div onclick=\"selectTableRows('prefInactiveFeedList', 'none')\" + print "<div onclick=\"Tables.select('prefInactiveFeedList', false)\" dojoType=\"dijit.MenuItem\">".__('None')."</div>"; print "</div></div>"; print "</div>"; #toolbar @@ -1428,15 +1428,12 @@ class Pref_Feeds extends Handler_Protected { while ($line = $sth->fetch()) { $feed_id = $line["id"]; - $this_row_id = "id=\"FUPDD-$feed_id\""; - # class needed for selectTableRows() - print "<tr class=\"placeholder\" $this_row_id>"; + print "<tr class=\"placeholder\" data-row-id='$feed_id'>"; - # id needed for selectTableRows() print "<td width='5%' align='center'><input onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\" - type=\"checkbox\" id=\"FUPDC-$feed_id\"></td>"; + type=\"checkbox\"></td>"; print "<td>"; print "<a class=\"visibleLink\" href=\"#\" ". @@ -1477,9 +1474,9 @@ class Pref_Feeds extends Handler_Protected { print "<div dojoType=\"dijit.form.DropDownButton\">". "<span>" . __('Select')."</span>"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; - print "<div onclick=\"selectTableRows('prefErrorFeedList', 'all')\" + print "<div onclick=\"Tables.select('prefErrorFeedList', true)\" dojoType=\"dijit.MenuItem\">".__('All')."</div>"; - print "<div onclick=\"selectTableRows('prefErrorFeedList', 'none')\" + print "<div onclick=\"Tables.select('prefErrorFeedList', false)\" dojoType=\"dijit.MenuItem\">".__('None')."</div>"; print "</div></div>"; print "</div>"; #toolbar @@ -1493,15 +1490,12 @@ class Pref_Feeds extends Handler_Protected { while ($line = $sth->fetch()) { $feed_id = $line["id"]; - $this_row_id = "id=\"FERDD-$feed_id\""; - # class needed for selectTableRows() - print "<tr class=\"placeholder\" $this_row_id>"; + print "<tr class=\"placeholder\" data-row-id='$feed_id'>"; - # id needed for selectTableRows() print "<td width='5%' align='center'><input onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\" - type=\"checkbox\" id=\"FERDC-$feed_id\"></td>"; + type=\"checkbox\"></td>"; print "<td>"; print "<a class=\"visibleLink\" href=\"#\" ". diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 017f2e06c..ccbc829a3 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -992,9 +992,9 @@ class Pref_Prefs extends Handler_Protected { print "<div dojoType=\"dijit.form.DropDownButton\">". "<span>" . __('Select')."</span>"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; - print "<div onclick=\"selectTableRows('prefFeedProfileList', 'all')\" + print "<div onclick=\"Tables.select('prefFeedProfileList', true)\" dojoType=\"dijit.MenuItem\">".__('All')."</div>"; - print "<div onclick=\"selectTableRows('prefFeedProfileList', 'none')\" + print "<div onclick=\"Tables.select('prefFeedProfileList', false)\" dojoType=\"dijit.MenuItem\">".__('None')."</div>"; print "</div></div>"; @@ -1019,10 +1019,9 @@ class Pref_Prefs extends Handler_Protected { print "<table width=\"100%\" class=\"prefFeedProfileList\" cellspacing=\"0\" id=\"prefFeedProfileList\">"; - print "<tr class=\"placeholder\" id=\"FCATR-0\">"; #odd + print "<tr class=\"placeholder\">"; # data-row-id='0' <-- no point, shouldn't be removed print "<td width='5%' align='center'><input - id='FCATC-0' onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\" type=\"checkbox\"></td>"; @@ -1043,15 +1042,13 @@ class Pref_Prefs extends Handler_Protected { while ($line = $sth->fetch()) { $profile_id = $line["id"]; - $this_row_id = "id=\"FCATR-$profile_id\""; - print "<tr class=\"placeholder\" $this_row_id>"; + print "<tr class=\"placeholder\" data-row-id='$profile_id'>"; $edit_title = htmlspecialchars($line["title"]); print "<td width='5%' align='center'><input onclick='Tables.onRowChecked(this);' - id='FCATC-$profile_id' dojoType=\"dijit.form.CheckBox\" type=\"checkbox\"></td>"; diff --git a/classes/pref/users.php b/classes/pref/users.php index eda3e1a0e..fb7afcf04 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -354,9 +354,9 @@ class Pref_Users extends Handler_Protected { print "<div dojoType=\"dijit.form.DropDownButton\">". "<span>" . __('Select')."</span>"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; - print "<div onclick=\"selectTableRows('prefUserList', 'all')\" + print "<div onclick=\"Tables.select('prefUserList', true)\" dojoType=\"dijit.MenuItem\">".__('All')."</div>"; - print "<div onclick=\"selectTableRows('prefUserList', 'none')\" + print "<div onclick=\"Tables.select('prefUserList', false)\" dojoType=\"dijit.MenuItem\">".__('None')."</div>"; print "</div></div>"; @@ -412,7 +412,7 @@ class Pref_Users extends Handler_Protected { $uid = $line["id"]; - print "<tr id=\"UMRR-$uid\">"; + print "<tr data-row-id=\"$uid\">"; $line["login"] = htmlspecialchars($line["login"]); @@ -420,8 +420,7 @@ class Pref_Users extends Handler_Protected { $line["last_login"] = make_local_datetime($line["last_login"], false); print "<td align='center'><input onclick='Tables.onRowChecked(this);' - dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" - id=\"UMCHK-$uid\"></td>"; + dojoType=\"dijit.form.CheckBox\" type=\"checkbox\"></td>"; $onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'"; |