diff options
author | Andrew Dolgov <[email protected]> | 2013-05-07 15:36:14 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-05-07 15:36:14 +0400 |
commit | 82076ce53113be9cc053f8740356e7e1b81e5643 (patch) | |
tree | 5eba36805f593ec7dd0aad671b5bcca0ae01cf53 /include/login_form.php | |
parent | 66af65f14b4f3c670bb3f9ca7b1c80081f9281d1 (diff) | |
parent | 23923fb29b345c1eea5b70a6df4d30395425bf37 (diff) |
Merge branch 'master' into css-feedtree-counter
Conflicts:
tt-rss.css
Diffstat (limited to 'include/login_form.php')
-rw-r--r-- | include/login_form.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/login_form.php b/include/login_form.php index 7ac7111c8..b7dae1016 100644 --- a/include/login_form.php +++ b/include/login_form.php @@ -188,6 +188,8 @@ function bwLimitChange(elem) { value="<?php echo $_SESSION["fake_login"] ?>" /> </div> + <?php if (strpos(PLUGINS, "auth_internal") !== FALSE) { ?> + <div class="row"> <label><?php echo __("Password:") ?></label> <input type="password" name="password" required="1" @@ -197,13 +199,7 @@ function bwLimitChange(elem) { <a class='forgotpass' href="public.php?op=forgotpass"><?php echo __("I forgot my password") ?></a> </div> - <div class="row"> - <label><?php echo __("Language:") ?></label> - <?php - print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(), - "style='width : 220px; margin : 0px' dojoType='dijit.form.Select'"); - ?> - </div> + <?php } ?> <div class="row"> <label><?php echo __("Profile:") ?></label> @@ -218,7 +214,11 @@ function bwLimitChange(elem) { <label> </label> <input dojoType="dijit.form.CheckBox" name="bw_limit" id="bw_limit" type="checkbox" onchange="bwLimitChange(this)"> - <label style='display : inline' for="bw_limit"><?php echo __("Use less traffic") ?></label> + <label id="bw_limit_label" style='display : inline' for="bw_limit"><?php echo __("Use less traffic") ?></label> + </div> + + <div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below"> +<?php echo __("Does not display images in articles, reduces automatic refreshes."); ?> </div> <?php if (SESSION_COOKIE_LIFETIME > 0) { ?> |