diff --git a/backend.php b/backend.php index cc5fd46c6..350511f28 100644 --- a/backend.php +++ b/backend.php @@ -114,7 +114,7 @@ 90 => __("3 months old")); $update_intervals = array( - 0 => __("Use default"), + 0 => __("Default interval"), -1 => __("Disable updates"), 15 => __("Each 15 minutes"), 30 => __("Each 30 minutes"), @@ -125,7 +125,7 @@ 10080 => __("Weekly")); $update_methods = array( - 0 => __("Use default"), + 0 => __("Default"), 1 => __("Magpie"), 2 => __("SimplePie")); diff --git a/functions.js b/functions.js index ffc0168bc..17aaa238f 100644 --- a/functions.js +++ b/functions.js @@ -1171,9 +1171,9 @@ function appearBlockElement_afh(effect) { function checkboxToggleElement(elem, id) { if (elem.checked) { - Effect.SlideDown(id, {duration : 0.5}); + Effect.Appear(id, {duration : 0.5}); } else { - Effect.SlideUp(id, {duration : 0.5}); + Effect.Fade(id, {duration : 0.5}); } } diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index baead1c37..bdfc62b9f 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -58,30 +58,36 @@ if ($id == "quickAddFeed") { - print "
".__('Subscribe to feed')."
"; + print "
".__('Subscribe to Feed')."
"; print "
"; print "
"; print ""; - /* print ""; */ print ""; print ""; - print " - "; - + + print "
"; + if (get_pref($link, 'ENABLE_FEED_CATS')) { - print ""; } + print ""; + + /* print ""; */ - print "
".__('Feed URL:')." - ".__("Feed").""; + print "
"; + + print __("URL:") . " "; + + print "
".__('Category:').""; + print __('Place in category:') . " "; print_feed_cat_select($link, "cat_id"); - print "
"; print __("Some feeds require authentication. If you subscribe to such @@ -89,36 +95,43 @@ print "
"; - /* print ""; */ print ""; + +
".__("Authentication")."
+
". + + __('Login:') . " ". + __('Password:') . " +
"; + + + print "
+ +
"; print ""; - print "
+ print "
- -
- -
"; - + value=\"".__('Cancel')."\">
"; + return; } @@ -205,7 +218,7 @@ } if ($id == "quickAddLabel") { - print "
".__('Create label')."
"; + print "
".__('Create Label')."
"; print "
"; print "
"; @@ -264,7 +277,7 @@ $active_feed_id = db_escape_string($_GET["param"]); - print "
".__('Create filter')."
"; + print "
".__('Create Filter')."
"; print "
"; print ""; @@ -352,7 +365,7 @@ print "
"; - print "
".__("Perform action")."
"; + print "
".__("Perform Action")."
"; print "
"; @@ -378,6 +391,8 @@ print "
".__("Options")."
"; print "
"; + print "
"; + print "
"; @@ -385,6 +400,7 @@ "; print "
"; + print "
"; print ""; diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 8041b8cc1..bb3670c25 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -138,7 +138,7 @@ $feed_icon = ""; } - print "
".__('Feed editor')."
"; + print "
".__('Feed Editor')."
"; print "
"; @@ -148,26 +148,35 @@ print ""; print ""; - print ""; + print "
".__("Feed")."
"; + print "
"; - print "
"; - print ""; + /* Title */ + + print ""; + + /* Feed URL */ $feed_url = db_fetch_result($result, 0, "feed_url"); $feed_url = htmlspecialchars(db_fetch_result($result, 0, "feed_url")); - - print ""; - print ""; + + print "
"; + + print __('URL:') . " "; + print ""; + + /* Category */ if (get_pref($link, 'ENABLE_FEED_CATS')) { $cat_id = db_fetch_result($result, 0, "cat_id"); - print ""; - print ""; - print ""; - + print_feed_cat_select($link, "cat_id", $cat_id, $disabled); } - $update_interval = db_fetch_result($result, 0, "update_interval"); + /* Link to */ - print ""; + print "
"; - print ""; - - print ""; + + + print ""; + + print "
".__("Updating")."
"; + print "
"; + + /* Update Interval */ + + $update_interval = db_fetch_result($result, 0, "update_interval"); + + print_select_hash("update_interval", $update_interval, $update_intervals); + + /* Update method */ + + if (ALLOW_SELECT_UPDATE_METHOD) { + $update_method = db_fetch_result($result, 0, "update_method"); + + print " " . __('using') . " "; + print_select_hash("update_method", $update_method, $update_methods); + } + + /* Purge intl */ + + print "
"; $purge_interval = db_fetch_result($result, 0, "purge_interval"); - print "
"; + print __('Article purging:') . " "; - print ""; - - if (ALLOW_SELECT_UPDATE_METHOD) { - - $update_method = db_fetch_result($result, 0, "update_method"); - - print ""; - - print ""; - } + print ""; + print "
".__("Authentication")."
"; + print "
"; $auth_login = htmlspecialchars(db_fetch_result($result, 0, "auth_login")); - print "
"; - print ""; + print __('Login:') . " "; + print ""; + + print " " . __("Password:") . " "; $auth_pass = htmlspecialchars(db_fetch_result($result, 0, "auth_pass")); - print ""; - print ""; + value=\"$auth_pass\">"; - $private = sql_bool_to_bool(db_fetch_result($result, 0, "private")); + print ""; + print "
".__("Options")."
"; + print "
"; - if ($private) { - $checked = "checked"; - } else { - $checked = ""; - } + print "
"; - print "
"; - print ""; - print "
".__('Title:')."
".__('Feed URL:')."
".__('Category:').""; + print "
"; + + print __('Place in category:') . " "; $parent_feed = db_fetch_result($result, 0, "parent_feed"); @@ -177,25 +186,14 @@ $disabled = ""; } - print_feed_cat_select($link, "cat_id", $cat_id, "class=\"iedit\" $disabled"); - - print "
".__('Update Interval:').""; - - print_select_hash("update_interval", $update_interval, $update_intervals, - "class=\"iedit\""); - - print "
".__('Link to:').""; + print __('Link to feed:') . " "; $tmp_result = db_query($link, "SELECT COUNT(id) AS count FROM ttrss_feeds WHERE parent_feed = '$feed_id'"); @@ -210,7 +208,7 @@ $disabled = ""; } - print ""; print ""; @@ -242,57 +240,64 @@ } print ""; - print "
".__('Article purging:').""; + print_select_hash("purge_interval", $purge_interval, $purge_intervals); - print_select_hash("purge_interval", $purge_interval, $purge_intervals, - "class=\"iedit\""); - - print "
".__('Update using:').""; - - print_select_hash("update_method", $update_method, $update_methods, - "class=\"iedit\""); - - print "
".__('Login:')."
".__('Password:')."
".__('Options:').""; + print " "; $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content")); @@ -302,8 +307,8 @@ $checked = ""; } - print "
"; + print "
 "; $hidden = sql_bool_to_bool(db_fetch_result($result, 0, "hidden")); @@ -313,8 +318,8 @@ $checked = ""; } - print "
"; + print "
 "; $include_in_digest = sql_bool_to_bool(db_fetch_result($result, 0, "include_in_digest")); @@ -324,9 +329,9 @@ $checked = ""; } - print "
"; + $checked> "; $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images")); @@ -344,18 +349,18 @@ $label_class = "class='insensitive'"; } - print "
"; + print "
"; + print "
"; print ""; - print "
+ print "
".__('Filter editor')."
"; + print "
".__('Filter Editor')."
"; print "
"; print "
"; @@ -125,7 +125,7 @@ print "
"; - print "
".__("Perform action")."
"; + print "
".__("Perform Action")."
"; print "
"; @@ -154,6 +154,8 @@ print "
".__("Options")."
"; print "
"; + print "
"; + if ($enabled) { $checked = "checked"; } else { @@ -173,6 +175,7 @@ "; print "
"; + print "
"; print "
"; diff --git a/modules/pref-labels.php b/modules/pref-labels.php index 9eeb54174..9daff269a 100644 --- a/modules/pref-labels.php +++ b/modules/pref-labels.php @@ -24,7 +24,7 @@ $sql_exp = htmlspecialchars($line["sql_exp"]); $description = htmlspecialchars($line["description"]); - print "
Label editor
"; + print "
Label Editor
"; print "
"; print ""; diff --git a/tt-rss.css b/tt-rss.css index 322d3b678..bda7bdeb0 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -538,8 +538,10 @@ div.helpResponse { border-style : solid; border-color : #99d67a; background-color : #99d67a; - padding : 2px; + padding : 4px 2px 4px 10px; color : white; + font-weight : bold; + font-size : 12px; } /* shadow stuff from http://www.sixapart.com/pronet/articles/ydsf_-_robust_c.html */ @@ -587,11 +589,12 @@ html>body #infoBox { background-image : url("images/shadow.png"); background-position : bottom right; left : 25%; - top : 30%; + top : 100px; width : 50%; z-index : 3; position : absolute; display : none; + min-width : 600px; } div.infoBoxContents { @@ -2018,6 +2021,7 @@ div.dlgSecCont { float : left; font-size : 12px; font-weight : medium; + line-height : 200%; } div.dlgButtons {