minor css fixes

[tt-rss.git] / include / login_form.php
diff --git a/include/login_form.php b/include/login_form.php

index 7cf975a9e01a78e19aa8090d3613450d6d179538..07e0743c851901f72b3be97c5397aa108f3540f3 100644 (file)
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -1,15 +1,23 @@
+<?php startup_gettext(); ?>
  <html>
  <head>
         <title>Tiny Tiny RSS : Login</title>
-       <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
-       <link rel="stylesheet" type="text/css" href="css/tt-rss.css">
+       <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css") ?>
+       <?php echo stylesheet_tag("css/tt-rss.css") ?>
+       <?php echo stylesheet_tag("css/dijit.css") ?>
         <link rel="shortcut icon" type="image/png" href="images/favicon.png">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-       <script type="text/javascript" src="lib/dojo/dojo.js"></script>
-       <script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
-       <script type="text/javascript" src="lib/prototype.js"></script>
-       <script type="text/javascript" src="js/functions.js"></script>
-       <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
+       <?php
+       foreach (array("lib/prototype.js",
+                               "lib/dojo/dojo.js",
+                               "lib/dojo/tt-rss-layer.js",
+                               "js/functions.js",
+                               "errors.php?mode=js") as $jsfile) {
+
+               echo javascript_tag($jsfile);
+
+       } ?>
+
         <script type="text/javascript">
                 require({cache:{}});
                 Event.observe(window, 'load', function() {
@@ -30,13 +38,13 @@
                 border-width : 0px;
         }
  
-       input.input {
+       /*input.input {
                 font-family : sans-serif;
                 font-size : medium;
                 border-spacing : 2px;
                 border : 1px solid #b5bcc7;
                 padding : 2px;
-       }
+       }*/
  
         label {
                 width : 120px;
@@ -104,20 +112,19 @@
  
  <script type="text/javascript">
  function init() {
-       dojo.require("dijit.form.Button");
-       dojo.require("dijit.form.CheckBox");
-       dojo.require("dijit.form.Form");
-       dojo.require("dijit.form.Select");
-       dojo.require("dijit.form.TextBox");
-       dojo.require("dijit.form.ValidationTextBox");
-
-       dojo.parser.parse();
-
-       fetchProfiles();
  
-       dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true');
+       require(['dojo/parser','dijit/form/Button','dijit/form/CheckBox','dijit/form/Form',
+       'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser){
+               parser.parse();
+               //show tooltip node only after this widget is instaniated.
+               dojo.query('div[dojoType="dijit.Tooltip"]').style({
+                       display:''
+               });
+               fetchProfiles();
+               dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true');
+               document.forms.loginForm.login.focus();
+       });
  
-       document.forms.loginForm.login.focus();
  }
  
  function fetchProfiles() {
@@ -181,7 +188,7 @@ function bwLimitChange(elem) {
                 <?php } ?>
                 <div class="row">
                         <label><?php echo __("Login:") ?></label>
-                       <input name="login" class="input"
+                       <input name="login" class="input input-text" type="text"
                                 onchange="fetchProfiles()" onfocus="fetchProfiles()" onblur="fetchProfiles()"
                                 style="width : 220px"
                                 required="1"
@@ -192,7 +199,7 @@ function bwLimitChange(elem) {
                 <div class="row">
                         <label><?php echo __("Password:") ?></label>
                         <input type="password" name="password" required="1"
-                                       style="width : 220px" class="input"
+                                       style="width : 220px" class="input input-text"
                                         value="<?php echo $_SESSION["fake_password"] ?>"/>
                         <label></label>
                 <?php if (strpos(PLUGINS, "auth_internal") !== FALSE) { ?>
@@ -217,7 +224,7 @@ function bwLimitChange(elem) {
                         <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">
+               <div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below" style="display:none">
  <?php echo __("Does not display images in articles, reduces automatic refreshes."); ?>
                 </div>
  
@@ -246,9 +253,6 @@ function bwLimitChange(elem) {
  
  <div class='footer'>
         <a href="http://tt-rss.org/">Tiny Tiny RSS</a>
-       <?php if (!defined('HIDE_VERSION')) { ?>
-                v<?php echo VERSION ?>
-       <?php } ?>
         &copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
  </div>