From 8df7184cada3390918cd4364c1382603e2ee26c7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Nov 2010 14:49:06 +0300 Subject: [PATCH] rework preferences to use dijit stuff --- modules/pref-feeds.php | 43 +++++++++++++++++++++++----------------- modules/pref-filters.php | 16 +++++++++++---- modules/pref-labels.php | 17 +++++++++++----- modules/pref-prefs.php | 17 +++++++++++++--- modules/pref-users.php | 13 ++++++++++-- prefs.js | 3 +++ tt-rss.css | 23 ++++++++++++++++----- 7 files changed, 95 insertions(+), 37 deletions(-) diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 38f7b5777..d8df49ab3 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -955,6 +955,9 @@ if ($quiet) return; + print "
"; + print "
"; + set_pref($link, "_PREFS_ACTIVE_TAB", "feedConfig"); $result = db_query($link, "SELECT COUNT(id) AS num_errors @@ -976,6 +979,8 @@ $feed_search = $_SESSION["prefs_feed_search"]; } + print "
"; + print "
"; # toolbar + $feeds_sort = db_escape_string($_REQUEST["sort"]); if (!$feeds_sort || $feeds_sort == "undefined") { @@ -1229,17 +1236,9 @@ } - print "

".__('OPML')."

"; + print "
"; # feeds pane -/* print "
-
- ".__('File:')."   - - -
"; - - print " "; */ + print "
"; print "

" . __("Using OPML you can export and import your feeds and Tiny Tiny RSS settings."); @@ -1262,8 +1261,7 @@ "; print "

 "; - print ""; + print ""; print "

".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.'); @@ -1273,9 +1271,11 @@ __('Display URL')." "; - if (strpos($_SERVER['HTTP_USER_AGENT'], "Firefox") !== false) { - - print "

" . __("Firefox Integration") . "

"; + print "
"; # pane + + if (true || strpos($_SERVER['HTTP_USER_AGENT'], "Firefox") !== false) { + + print "
"; print "

" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "

"; @@ -1288,10 +1288,12 @@ ""; print "

"; + + print "
"; # pane } - print "

".__("Subscribing via bookmarklet")."

"; - + print "
"; + print "

" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "

"; $bm_subscribe_url = str_replace('%s', '', add_feed_url()); @@ -1302,7 +1304,9 @@ print "" . __('Subscribe in Tiny Tiny RSS'). ""; - print "

".__("Published articles")."

"; + print "
"; #pane + + print "
"; print "

".__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.')."

"; @@ -1315,6 +1319,9 @@ print " "; + print "
"; #pane + print "
"; #container + } function print_feed_browser($link, $search, $limit, $mode = 1) { diff --git a/modules/pref-filters.php b/modules/pref-filters.php index b50b0410f..d796d84e4 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -298,16 +298,17 @@ } else { $filter_search = $_SESSION["prefs_filter_search"]; } + + print "
"; + print "
"; + print "
"; - print "
+ print "
-   - -
"; print " "; } + print "
"; # toolbar + print "
"; # toolbar-frame + print "
"; + if ($filter_search) { $filter_search = split(' ', db_escape_string($filter_search)); @@ -523,6 +528,9 @@ print "

"; } + + print "
"; #pane + print "
"; #container } ?> diff --git a/modules/pref-labels.php b/modules/pref-labels.php index ac25d01e1..e683ab615 100644 --- a/modules/pref-labels.php +++ b/modules/pref-labels.php @@ -150,7 +150,11 @@ $label_search = $_SESSION["prefs_label_search"]; } - print "
+ print "
"; + print "
"; + print "
"; + + print "
".__('Search')."
"; - print "
"; - print" "; - print " "; print ""; - print "
"; + print "
"; #toolbar + print "
"; #pane + print "
"; if ($label_search) { @@ -269,6 +273,9 @@ print "

"; } + + print "
"; #pane + print "
"; #container } function print_color_picker($id) { diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php index 2133715a2..18a336396 100644 --- a/modules/pref-prefs.php +++ b/modules/pref-prefs.php @@ -195,10 +195,12 @@ $_SESSION["prefs_op_result"] = ""; + print "
"; + print "
"; + print "
"; print ""; - print ""; $result = db_query($link, "SELECT email,full_name, access_level FROM ttrss_users @@ -240,11 +242,13 @@ print "

"; + print ""; # pane + print "

"; + print ""; print "

".__("Personal data")."

"; - print ""; print ""; print "

".__("Authentication")."

".__("Old password").""; + + print ""; #pane } + print "
"; + if ($_SESSION["profile"]) { initialize_user_prefs($link, $_SESSION["uid"], $_SESSION["profile"]); $profile_qpart = "profile = '" . $_SESSION["profile"] . "'"; @@ -325,7 +333,7 @@ print "
"; } - print "

"; + print "
"; $active_section = $line["section_name"]; @@ -434,6 +442,9 @@ print ""; + print ""; #pane + print ""; #container + } } ?> diff --git a/modules/pref-users.php b/modules/pref-users.php index f1f25c665..a97bd3108 100644 --- a/modules/pref-users.php +++ b/modules/pref-users.php @@ -347,6 +347,10 @@ } } + print "
"; + print "
"; + print "
"; + set_pref($link, "_PREFS_ACTIVE_TAB", "userConfig"); $user_search = db_escape_string($_REQUEST["search"]); @@ -357,7 +361,7 @@ $user_search = $_SESSION["prefs_user_search"]; } - print "
+ print "
". __('Reset password').""; - print "
"; + print "
"; #toolbar + print "
"; #pane + print "
"; if ($user_search) { @@ -485,5 +491,8 @@ } + print "
"; #pane + print "
"; #container + } ?> diff --git a/prefs.js b/prefs.js index e9cb8d364..db84a210d 100644 --- a/prefs.js +++ b/prefs.js @@ -1148,8 +1148,11 @@ function init() { dojo.require("dijit.layout.TabContainer"); dojo.require("dijit.layout.BorderContainer"); + dojo.require("dijit.layout.AccordionContainer"); dojo.require("dijit.layout.ContentPane"); dojo.require("dijit.Dialog"); + dojo.require("dijit.form.Button"); + dojo.require("dijit.Toolbar"); loading_set_progress(30); diff --git a/tt-rss.css b/tt-rss.css index 40ea68099..b1d3ea582 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -312,6 +312,10 @@ table.prefPrefsList tr:hover td.prefValue input { color : #88b0f0; } +table.prefPrefsList h3 { + margin-top : 0px; +} + tr.title td { border-width : 0px 0px 1px 0px; border-color : #ecf4ff; @@ -396,7 +400,7 @@ table.prefFeedList td.feedSelect { div.prefFeedCatHolder { height : 250px; overflow : auto; - border : 1px solid #99d67a; + border : 1px solid gray; margin : 5px 0px 5px 0px; background-color : white; } @@ -679,7 +683,7 @@ div.tagCloudContainer { } div.errorExplained { - border : 1px solid #99d67a; + border : 1px solid gray; background-color : white; margin : 5px 0px 5px 0px; padding : 5px; @@ -689,7 +693,7 @@ ul.feedErrorsList { height : 300px; overflow : auto; list-style-type : none; - border : 1px solid #99d67a; + border : 1px solid gray; background-color : white; margin : 0px 0px 5px 0px; padding : 0px; @@ -699,7 +703,7 @@ ul.userFeedList { height : 300px; overflow : auto; list-style-type : none; - border : 1px solid #99d67a; + border : 1px solid gray; background-color : white; margin : 0px 0px 5px 0px; padding : 0px; @@ -711,7 +715,7 @@ ul.browseFeedList { list-style-type : none; margin : 0px 0px 5px 0px; padding : 0px; - border : 1px solid #99d67a; + border : 1px solid gray; background-color : white; } @@ -1547,3 +1551,12 @@ div#pref-tabs .dijitContentPane h3 { } */ +#pref-filter-wrap, #pref-filter-header, #pref-filter-content, +#pref-label-wrap, #pref-label-header, #pref-label-content, +#pref-user-wrap, #pref-user-header, #pref-user-content { + margin : 0px; + padding : 0px; + border-width : 0px; +} + +