From 2fb2d6ece5f60fd17e8255f034cad23ef99e52ac Mon Sep 17 00:00:00 2001 From: Adam Zammit Date: Tue, 18 Aug 2015 16:00:25 +1000 Subject: [PATCH] bootstrapify login screen --- css/signin.css | 40 ++++++++++++++++++++++++ include/limesurvey/admin/admin.php | 33 ++++++++++++++++--- include/limesurvey/admin/login_check.php | 40 ++++++++++-------------- 3 files changed, 85 insertions(+), 28 deletions(-) create mode 100644 css/signin.css diff --git a/css/signin.css b/css/signin.css new file mode 100644 index 00000000..f9a1623f --- /dev/null +++ b/css/signin.css @@ -0,0 +1,40 @@ +body { + padding-top: 40px; + padding-bottom: 40px; + background-color: #eee; +} + +.form-signin { + max-width: 330px; + padding: 15px; + margin: 0 auto; +} +.form-signin .form-signin-heading, +.form-signin .checkbox { + margin-bottom: 10px; +} +.form-signin .checkbox { + font-weight: normal; +} +.form-signin .form-control { + position: relative; + height: auto; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 10px; + font-size: 16px; +} +.form-signin .form-control:focus { + z-index: 2; +} +.form-signin input[type="user"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} diff --git a/include/limesurvey/admin/admin.php b/include/limesurvey/admin/admin.php index 7100d16f..f4fb9c6f 100644 --- a/include/limesurvey/admin/admin.php +++ b/include/limesurvey/admin/admin.php @@ -792,12 +792,35 @@ if(isset($_SESSION['loginID'])) else { //not logged in - sendcacheheaders(); - if (!isset($_SESSION['metaHeader'])) {$_SESSION['metaHeader']='';} - //$adminoutput = getAdminHeader($_SESSION['metaHeader']).$adminoutput.$loginsummary; // All future output is written into this and then outputted at the end of file - $adminoutput =$loginsummary; + sendcacheheaders(); + $adminoutput = << + + + + + + + + + + queXS Authentication + + + + + + + + + + +
+EOD; + + $adminoutput .= $loginsummary; + $adminoutput .= "
"; unset($_SESSION['metaHeader']); - $adminoutput.= "\n";//.getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")); } if (($action=='showphpinfo') && ($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)) { diff --git a/include/limesurvey/admin/login_check.php b/include/limesurvey/admin/login_check.php index fe619694..0a621678 100644 --- a/include/limesurvey/admin/login_check.php +++ b/include/limesurvey/admin/login_check.php @@ -154,15 +154,13 @@ if(!isset($_SESSION['loginID']) && $action != "forgotpass" && ($action != "logou { $loginsummary = ' -
-

'.$clang->gT('You have to enter user name and email.').'

- -
    -
    • -
    • -

    - -

    '.$clang->gT('Main Admin Screen').' + +

    '.$clang->gT('You have to enter user name and email.').'

    + + + + +

    '.$clang->gT('Main Admin Screen').'

     

    '; @@ -211,21 +209,19 @@ if(!isset($_SESSION['loginID']) && $action != "forgotpass" && ($action != "logou { if (!isset($logoutsummary)) { - $loginsummary = "

    ".$clang->gT("You have to login first.")."

    "; + $loginsummary = "

    ".$clang->gT("You have to login first.")."



    "; } else { - $loginsummary = "
    ".$logoutsummary."

    "; + $loginsummary = "
    ".$logoutsummary."

    "; } - $loginsummary .= " -

      -
    • -
      • -
    • -
      • -
    • - + + + + \n" - . "
      • -
    + $loginsummary .= "\t\t\t\n

    -
     \n
    "; + "; } else{ $loginsummary .= "

    ".sprintf($clang->gT("You have exceeded you maximum login attempts. Please wait %d minutes before trying again"),($timeOutTime/60))."

    ";