From 4f720f906e1a598d3c18f3de96bca00fa2464549 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 19 Feb 2019 14:27:53 +0300
Subject: simplify login form

---
 include/login_form.php | 141 +++++++++++++++++++++++++------------------------
 1 file changed, 71 insertions(+), 70 deletions(-)
 mode change 100644 => 100755 include/login_form.php

(limited to 'include')

diff --git a/include/login_form.php b/include/login_form.php
old mode 100644
new mode 100755
index 761add8e4..691da7f56
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -62,95 +62,96 @@ function bwLimitChange(elem) {
 
 <?php $return = urlencode($_SERVER["REQUEST_URI"]) ?>
 
-<form action="public.php?return=<?php echo $return ?>"
-	dojoType="dijit.form.Form" method="POST" id="loginForm" name="loginForm">
+<div class="container">
 
-<input dojoType="dijit.form.TextBox" style="display : none" name="op" value="login">
+	<div class="center">
+		<div class="login-form">
 
-<div class='header'>
-	<img src="images/logo_wide.png">
-</div>
+			<form action="public.php?return=<?php echo $return ?>"
+				  dojoType="dijit.form.Form" method="POST">
 
-<div class='form'>
+				<?php print_hidden("op", "login"); ?>
 
-	<fieldset>
-		<?php if ($_SESSION["login_error_msg"]) { ?>
-		<div class="row-error">
-			<?php echo $_SESSION["login_error_msg"] ?>
-		</div>
-			<?php $_SESSION["login_error_msg"] = ""; ?>
-		<?php } ?>
-		<div class="row">
-			<label><?php echo __("Login:") ?></label>
-			<input name="login" id="login" dojoType="dijit.form.TextBox" type="text"
-				onchange="fetchProfiles()" onfocus="fetchProfiles()" onblur="fetchProfiles()"
-				style="width : 220px"
-				required="1"
-				value="<?php echo $_SESSION["fake_login"] ?>" />
-		</div>
+				<?php if ($_SESSION["login_error_msg"]) { ?>
+					<?php echo format_error($_SESSION["login_error_msg"]) ?>
+					<?php $_SESSION["login_error_msg"] = ""; ?>
+				<?php } ?>
 
+				<fieldset>
+					<label><?php echo __("Login:") ?></label>
+					<input name="login" id="login" dojoType="dijit.form.TextBox" type="text"
+						   onchange="fetchProfiles()" onfocus="fetchProfiles()" onblur="fetchProfiles()"
+						   required="1" value="<?php echo $_SESSION["fake_login"] ?>" />
+				</fieldset>
 
-		<div class="row">
-			<label><?php echo __("Password:") ?></label>
-			<input type="password" name="password" required="1"
-                    dojoType="dijit.form.TextBox"
-					style="width : 220px" class="input input-text"
-					value="<?php echo $_SESSION["fake_password"] ?>"/>
-			<label></label>
-		<?php if (strpos(PLUGINS, "auth_internal") !== FALSE) { ?>
-			<a class='forgotpass' href="public.php?op=forgotpass"><?php echo __("I forgot my password") ?></a>
-		<?php } ?>
-		</div>
+				<fieldset>
+					<label><?php echo __("Password:") ?></label>
 
+					<input type="password" name="password" required="1"
+						   dojoType="dijit.form.TextBox"
+						   class="input input-text"
+						   value="<?php echo $_SESSION["fake_password"] ?>"/>
 
-		<div class="row">
-			<label><?php echo __("Profile:") ?></label>
+					<?php if (strpos(PLUGINS, "auth_internal") !== FALSE) { ?>
+						<a href="public.php?op=forgotpass"><?php echo __("I forgot my password") ?></a>
+					<?php } ?>
+				</fieldset>
 
-			<select disabled='disabled' name="profile" id="profile" dojoType='dijit.form.Select'
-				style='width : 220px; margin : 0px'>
-				<option><?php echo __("Default profile") ?></option></select>
+				<fieldset>
+					<label><?php echo __("Profile:") ?></label>
 
-		</div>
+					<select disabled='disabled' name="profile" id="profile" dojoType='dijit.form.Select'>
+						<option><?php echo __("Default profile") ?></option>
+					</select>
+				</fieldset>
 
-		<div class="row">
-			<label>&nbsp;</label>
-			<input dojoType="dijit.form.CheckBox" name="bw_limit" id="bw_limit" type="checkbox"
-				onchange="bwLimitChange(this)">
-			<label id="bw_limit_label" style='display : inline' for="bw_limit"><?php echo __("Use less traffic") ?></label>
-		</div>
+				<fieldset class="narrow">
+					<label> </label>
 
-		<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>
+					<label id="bw_limit_label"><input dojoType="dijit.form.CheckBox" name="bw_limit" id="bw_limit"
+						  type="checkbox" onchange="bwLimitChange(this)">
+						<?php echo __("Use less traffic") ?></label>
+				</fieldset>
 
-		<?php if (SESSION_COOKIE_LIFETIME > 0) { ?>
+				<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>
 
-		<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 if (SESSION_COOKIE_LIFETIME > 0) { ?>
 
-		<?php } ?>
+					<fieldset class="narrow">
+						<label> </label>
+						<label>
+							<input dojoType="dijit.form.CheckBox" name="remember_me" id="remember_me" type="checkbox">
+							<?php echo __("Remember me") ?>
+						</label>
+					</fieldset>
 
-		<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) { ?>
-				<button onclick="return gotoRegForm()" dojoType="dijit.form.Button">
-					<?php echo __("Create new account") ?></button>
-			<?php } ?>
-		</div>
+				<?php } ?>
 
-	</fieldset>
+				<hr/>
 
+				<fieldset class="align-right">
+					<label> </label>
 
-</div>
+					<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?php echo __('Log in') ?></button>
 
-<div class='footer'>
-	<a href="http://tt-rss.org/">Tiny Tiny RSS</a>
-	&copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
-</div>
+					<?php if (defined('ENABLE_REGISTRATION') && ENABLE_REGISTRATION) { ?>
+						<button onclick="return gotoRegForm()" dojoType="dijit.form.Button">
+							<?php echo __("Create new account") ?></button>
+					<?php } ?>
+				</fieldset>
 
-</form>
+			</form>
+		</div>
+	</div>
+
+	<div class="footer">
+		<a href="https://tt-rss.org/">Tiny Tiny RSS</a>
+		&copy; 2005&ndash;<?php echo date('Y') ?> <a href="https://fakecake.org/">Andrew Dolgov</a>
+	</div>
+
+</div>
 
-</body></html>
+</body>
+</html>
-- 
cgit v1.2.3