Dotclear


Ignore:
Timestamp:
10/08/13 15:27:39 (12 years ago)
Author:
Dsls
Branch:
twig
Parents:
1524:913f5a36bbb0 (diff), 2312:d01c85eaa37d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Twig merge - lots of things to adapt yet

File:
1 edited

Legend:

Unmodified
Added
Removed
  • inc/admin/default-templates/auth.html.twig

    r1517 r2313  
    11{% import "js_helpers.html.twig" as js %} 
    22<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
    3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $dlang; ?>" lang="en"> 
     3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{dlang}}" lang="{{dlang}}"> 
    44<head> 
    55  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 
    66  <meta http-equiv="Content-Script-Type" content="text/javascript" /> 
    77  <meta http-equiv="Content-Style-Type" content="text/css" /> 
    8   <meta http-equiv="Content-Language" content="en" /> 
     8  <meta http-equiv="Content-Language" content="{{dlang}}" /> 
    99  <meta name="ROBOTS" content="NOARCHIVE,NOINDEX,NOFOLLOW" /> 
    1010  <meta name="GOOGLEBOT" content="NOSNIPPET" /> 
    1111  <meta name="viewport" content="width=device-width, initial-scale=1.0" /> 
    1212  <title>{{vendor_name}}</title> 
    13   <link rel="stylesheet" href="{{theme_url}}style/default.css" type="text/css" media="screen" /> 
     13  <link rel="icon" type="image/png" href="images/favicon96-logout.png" /> 
     14  <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />  
    1415  {{ js.load_IE7 }} 
    1516  {{ js.common }} 
    16   <script type="text/javascript" src="{{theme_url}}js/_auth.js"></script> 
     17  <link rel="stylesheet" href="{{theme_url}}style/default.css" type="text/css" media="screen" /> 
     18   <script type="text/javascript"> 
     19  //<![CDATA[ 
     20  $(window).load(function() { 
     21    var uid = $('input[name=user_id]'); 
     22    var upw = $('input[name=user_pwd]'); 
     23    uid.focus(); 
     24     
     25    if (upw.length == 0) { return; } 
     26     
     27    uid.keypress(processKey); 
     28 
     29    function processKey(evt) { 
     30      if (evt.which == 13 && upw.val() == '') { 
     31         upw.focus(); 
     32         return false; 
     33      } 
     34      return true; 
     35    }; 
     36    $.cookie('dc_admin_test_cookie',true); 
     37    if ($.cookie('dc_admin_test_cookie')) { 
     38      $('#cookie_help').hide(); 
     39      $.cookie('dc_admin_test_cookie', '', {'expires': -1}); 
     40    } else { 
     41      $('#cookie_help').show(); 
     42    } 
     43    $('#issue #more').toggleWithLegend($('#issue').children().not('#more')); 
     44  }); 
     45  //]]> 
     46  </script> 
    1747</head> 
    1848 
    1949<body id="dotclear-admin" class="auth"> 
    2050 
    21 {% form 'auth' %} 
    22 <div id="login-screen"> 
     51{% form 'auth' with {'id':'login-screen'} %} 
     52 
    2353<h1>{{vendor_name}}</h1> 
    2454{% if messages.alert is not empty %} 
     
    6494               <p>{{ form_field('user_id') }}</p> 
    6595               <p>{{ form_field('user_pwd') }}</p> 
    66                <p>{{ form_field('user_remember',{},{'nestedlabel':true, 'labelclass':'classic'}) }}</p> 
    67                <p>{{ form_field('auth_login',{"class":"add button"}) }}</p> 
     96               <p>{{ form_field('user_remember',{},{'nestedlabel':false}) }}</p> 
     97               <p>{{ form_field('auth_login',{"class":"login"}) }}{{ form_hidden() }}</p> 
    6898     {% if safe_mode %} 
    6999          </fieldset> 
     
    84114          </div> 
    85115{% endif %} 
    86 </div> 
    87116{% endform %} 
    88117</body> 
Note: See TracChangeset for help on using the changeset viewer.

Sites map