#1334 Update First Run

GetLuna · Aug 28, 2015 · dd5b174 · dd5b174
1 parent 7dfc73f
commit dd5b174
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 34 deletions.
diff --git a/themes/Sixteen/index.php b/themes/Sixteen/index.php
@@ -6,20 +6,20 @@
 
 if ($luna_user['first_run'] == '0') {
 ?>
-<div class="first-run panel panel-default hidden-xs hidden-sm">
+<div class="first-run panel panel-default">
 	<div class="row first-run-content">
-		<div class="col-md-4 col-sm-6 first-run-profile">
-			<h3 class="first-run-title"><?php echo sprintf(__('Hi there, %s', 'luna'), luna_htmlspecialchars($luna_user['username'])) ?></h3>
+		<div class="col-md-4 col-sm-6 col-xs-5 first-run-profile">
+			<h3 class="first-run-title"><span class="hidden-xs"><?php echo sprintf(__('Hi there, %s', 'luna'), luna_htmlspecialchars($luna_user['username'])) ?></span><span class="visible-xs-block"><?php echo luna_htmlspecialchars($luna_user['username']) ?></span></h3>
 			<span class="first-run-avatar thumbnail">
 				<?php echo $user_avatar ?>
 			</span>
 		</div>
 		<?php if (!$luna_user['is_guest']) { ?>
-		<div class="col-md-4 hidden-sm">
+		<div class="col-md-4 hidden-sm hidden-xs">
 			<h3 class="first-run-forumtitle"><?php echo sprintf(__('Welcome to %s', 'luna'), $luna_config['o_board_title']) ?></h3>
 			<p><?php echo $luna_config['o_first_run_message']; ?></p>
 		</div>
-		<div class="col-md-4 col-sm-6">
+		<div class="col-md-4 col-sm-6 col-xs-7">
 			<div class="list-group first-run-list">
 				<a href="settings.php" class="list-group-item"><?php _e('Extend your details', 'luna') ?></a>
 				<a href="help.php" class="list-group-item"><?php _e('Get help', 'luna') ?></a>
@@ -28,18 +28,20 @@
 			</div>
 		</div>
 		<?php } else { ?>
-		<div class="col-md-4 hidden-sm">
+		<?php $redirect_url = check_url(); ?>
+		<div class="col-md-4 hidden-sm hidden-xs">
 			<h3 class="first-run-forumtitle"><?php echo sprintf(__('Welcome to %s', 'luna'), $luna_config['o_board_title']) ?></h3>
 			<div class="list-group first-run-list">
 				<a href="register.php" class="list-group-item"><?php _e('Register', 'luna') ?></a>
 				<a href="#" data-toggle="modal" data-target="#reqpass" class="list-group-item"><?php _e('Forgotten password', 'luna') ?></a>
 			</div>
 		</div>
-		<div class="col-md-4 col-sm-6">
+		<div class="col-md-4 col-sm-6 col-xs-7">
 			<form class="form form-first-run" id="login" method="post" action="login.php?action=in" onsubmit="return process_form(this)">
 				<fieldset>
 					<h3><?php _e('Login', 'luna') ?></h3>
 					<input type="hidden" name="form_sent" value="1" />
+					<input type="hidden" name="redirect_url" value="<?php echo luna_htmlspecialchars($redirect_url) ?>" />
 					<div class="first-run-login">
 						<input class="form-control top-form" type="text" name="req_username" maxlength="25" tabindex="1" placeholder="<?php _e('Username', 'luna') ?>" />
 						<input class="form-control bottom-form" type="password" name="req_password" tabindex="2" placeholder="<?php _e('Password', 'luna') ?>" />
@@ -54,8 +56,7 @@
 		<?php } ?>
 	</div>
 </div>
-<?php
-}
+<?php }
 	// Announcement
 	if ($luna_config['o_announcement'] == '1') {
 ?>

diff --git a/themes/Sixteen/style.css b/themes/Sixteen/style.css
@@ -203,31 +203,6 @@ hr {
 	text-align: center;
 }
 
-@media screen and (max-width: 767px) {
-	.first-run-content {
-		padding-right: 15px;
-	}
-
-	.first-run-profile {
-		margin-top: -15px;
-		border-bottom-left-radius: 0;
-		border-top-right-radius: 3px;
-	}
-
-	.first-run-title {
-		padding-top: 15px;
-	}
-
-	.first-run-list {
-		margin-left: 0;
-		margin-right: 0;
-	}
-
-	.first-run-login {
-		margin-right: 0;
-	}
-}
-
 /* Welcome box and header */
 #header .container p {
 	border-bottom-style: dotted;