Merge branch 'master' of git.fakecake.org:tt-rss into pdo-experimental

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

index b401fdac05142a3fea1cda7d42b2db7bff8b52a5..41c3f173e02785c4d462139ca4e6acfd4698b795 100644 (file)
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -1,15 +1,22 @@
+<?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/default.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 +37,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;
@@ -49,7 +56,7 @@
         div.header {
                 border-width : 0px 0px 1px 0px;
                 border-style : solid;
-               border-color : #88b0f0;
+               border-color : #0088cc;
                 margin-bottom : 1em;
                 padding-bottom : 5px;
         }
@@ -59,7 +66,7 @@
                 padding-top : 5px;
                 border-width : 1px 0px 0px 0px;
                 border-style : solid;
-               border-color : #88b0f0;
+               border-color : #0088cc;
                 text-align : center;
                 color : gray;
                 font-size : 12px;
@@ -72,11 +79,18 @@
         }
  
         a {
-               color : #4684ff;
+               color : #0088cc;
+       }
+
+       a {
+               color: #0088cc;
+               text-decoration: none;
         }
  
-       a:hover {
-               color : black;
+       a:hover,
+       a:focus {
+               color: #005580;
+               text-decoration: underline;
         }
  
         div.footer a {
@@ -84,7 +98,7 @@
         }
  
         div.footer a:hover {
-               color : #88b0f0;
+               color : #0088cc;
         }
  
         div.row {
@@ -108,14 +122,14 @@ function init() {
         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. 
+               //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();
-       });     
+       });
  
  }
  
@@ -180,7 +194,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"
@@ -191,7 +205,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) { ?>
@@ -245,9 +259,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>