Merge branch 'master' into css-feedtree-counter

[tt-rss.git] / include / login_form.php

diff --git a/include/login_form.php b/include/login_form.php
index af451239d7e42510eb8780f3176adc4e7a9e077b..b7dae10166c77bfaa00d6ad7254baa5a4ac85e14 100644 (file)
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -122,7 +122,7 @@ function init() {
 
 function fetchProfiles() {
        try {
-               var query = "?op=getProfiles&login=" + param_escape(document.forms["loginForm"].login.value);
+               var query = "op=getProfiles&login=" + param_escape(document.forms["loginForm"].login.value);
 
                if (query) {
                        new Ajax.Request("public.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,9 +214,23 @@ function bwLimitChange(elem) {
                        <label>&nbsp;</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) { ?>
+
+               <div class="row">
+                       <label>&nbsp;</label>
+                       <input dojoType="dijit.form.CheckBox" name="remember_me" id="remember_me" type="checkbox">
+                       <label style='display : inline' for="remember_me"><?php echo __("Remember me") ?></label>
+               </div>
+
+               <?php } ?>
+
                <div class="row" style='text-align : right'>
                        <button dojoType="dijit.form.Button" type="submit"><?php echo __('Log in') ?></button>
                        <?php if (defined('ENABLE_REGISTRATION') && ENABLE_REGISTRATION) { ?>