#1334 Update avatars

This commit gives me the feeling that we should unify the styling for avatars one day...
GetLuna · Sep 7, 2015 · bd108c3 · bd108c3
1 parent 225d98f
commit bd108c3
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 69 deletions.
diff --git a/inbox.php b/inbox.php
@@ -92,6 +92,15 @@
 // Start building page
 $page_title = array(luna_htmlspecialchars($luna_config['o_board_title']), __('Private Messages', 'luna'), __('Inbox', 'luna'));
 
+$result = $db->query('SELECT username, title FROM '.$db->prefix.'users WHERE id='.$id) or error('Unable to fetch user info', __FILE__, __LINE__, $db->error());
+if (!$db->num_rows($result))
+	message(__('Bad request. The link you followed is incorrect, outdated or you are simply not allowed to hang around here.', 'luna'), false, '404 Not Found');
+
+$user = $db->fetch_assoc($result);
+
+$user_username = luna_htmlspecialchars($user['username']);
+$user_usertitle = get_title($user);
+
 define('FORUM_ACTIVE_PAGE', 'pm');
 require load_page('header.php');
 

diff --git a/include/version.php b/include/version.php
@@ -8,7 +8,7 @@
 class Version {
 	// See http://getluna.org/docs/version.php for more info
 	const FORUM_VERSION = '1.2-alpha';
-	const FORUM_CORE_VERSION = '1.2.4859';
+	const FORUM_CORE_VERSION = '1.2.4867';
 	const LUNA_CORE_REVISION = 104;
 
 	// The Luna Core code name

diff --git a/notifications.php b/notifications.php
@@ -31,6 +31,7 @@
 $user = $db->fetch_assoc($result);
 
 $user_username = luna_htmlspecialchars($user['username']);
+$user_usertitle = get_title($user);
 $avatar_field = generate_avatar_markup($id);
 $avatar_user_card = draw_user_avatar($id);
 

diff --git a/settings.php b/settings.php
@@ -807,6 +807,9 @@
 		$signature_preview = $parsed_signature;
 	else
 		$signature_preview = __('No signature currently stored in profile.', 'luna');
+
+	$user_username = luna_htmlspecialchars($user['username']);
+	$user_usertitle = get_title($user);
 
 	$page_title = array(luna_htmlspecialchars($luna_config['o_board_title']), __('Profile', 'luna'), __('Settings', 'luna'));
 	define('FORUM_ACTIVE_PAGE', 'me');

diff --git a/themes/Sixteen/inbox.php b/themes/Sixteen/inbox.php
@@ -11,7 +11,7 @@
 	<div class="col-sm-3 profile-nav">
 		<div class="profile-card">
 			<div class="profile-card-head">
-				<div class="user-avatar thumbnail">
+				<div class="user-avatar">
 					<?php echo $avatar_user_card; ?>
 				</div>
 				<h2><?php echo $user_username; ?></h2>

diff --git a/themes/Sixteen/index.php b/themes/Sixteen/index.php
@@ -10,8 +10,10 @@
 	<div class="row first-run-content">
 		<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">
+			<span class="first-run-avatar">
+				<div class="user-avatar">
 				<?php echo $user_avatar ?>
+				</div>
 			</span>
 		</div>
 		<?php if (!$luna_user['is_guest']) { ?>

diff --git a/themes/Sixteen/notifications.php b/themes/Sixteen/notifications.php
@@ -8,7 +8,7 @@
 	<div class="col-sm-3 profile-nav">
 		<div class="profile-card">
 			<div class="profile-card-head">
-				<div class="user-avatar thumbnail">
+				<div class="user-avatar">
 					<?php echo $avatar_user_card; ?>
 				</div>
 				<h2><?php echo $user_username; ?></h2>

diff --git a/themes/Sixteen/objects/comment.php b/themes/Sixteen/objects/comment.php
@@ -3,7 +3,7 @@
 		<div class="col-md-3">
 			<div class="profile-card">
 				<div class="profile-card-head">
-					<div class="user-avatar thumbnail <?php echo $is_online; ?>">
+					<div class="user-avatar <?php echo $is_online; ?>">
 						<?php echo $user_avatar ?>
 					</div>
 					<h2><?php echo $username ?></h2>

diff --git a/themes/Sixteen/objects/user.php b/themes/Sixteen/objects/user.php
@@ -1,6 +1,6 @@
 <div class="row user-row">
 	<div class="col-sm-8 col-xs-9">
-		<span class="user-avatar thumbnail">
+		<span class="user-avatar">
 			<?php echo $user_avatar; ?>
 		</span>
 		<span class="userlist-name"><?php echo '<a href="profile.php?id='.$user_data['id'].'">'.luna_htmlspecialchars($user_data['username']).'</a>' ?> <small><?php echo $user_title_field ?></small></span>

diff --git a/themes/Sixteen/profile.php b/themes/Sixteen/profile.php
@@ -9,7 +9,7 @@
 	<div class="col-sm-3 profile-nav">
 		<div class="profile-card">
 			<div class="profile-card-head">
-				<div class="user-avatar thumbnail">
+				<div class="user-avatar">
 					<?php echo $avatar_user_card; ?>
 				</div>
 				<h2><?php echo $user_username; ?></h2>

diff --git a/themes/Sixteen/settings.php b/themes/Sixteen/settings.php
@@ -16,8 +16,8 @@
 	<div class="col-sm-3 profile-nav">
 		<div class="profile-card">
 			<div class="profile-card-head">
-				<div class="user-avatar thumbnail">
-					<?php echo $avatar_user_card; ?>
+				<div class="user-avatar">
+					<?php echo $user_avatar ?>
 				</div>
 				<h2><?php echo $user_username; ?></h2>
 				<h3><?php echo $user_usertitle; ?></h3>

diff --git a/themes/Sixteen/style.css b/themes/Sixteen/style.css
@@ -188,11 +188,22 @@ hr {
 .first-run-avatar {
 	background: none;
 	border: none;
+	margin-bottom: 0;
+	margin-top: 12px;
+}
+
+.first-run-avatar .user-avatar {
+	height: 120px;
 }
 
 .first-run-avatar img {
-	border-radius: 3px;
+	border-radius: 999px;
 	box-shadow: 0px 0px 13px rgba(0, 0, 0, .2);
+	max-height: 120px;
+	max-width: 120px;
+	margin: 0 auto;
+	margin-top: 18px;
+	vertical-align: bottom;
 }
 
 .first-run-list {
@@ -427,6 +438,10 @@ hr {
 	margin-bottom: 16px;
 }
 
+.tab-pane .img-responsive {
+	border-radius: 999px;
+}
+
 /* Post messages */
 .bblinks {
 	padding-top: 5px;
@@ -532,10 +547,6 @@ hr {
 		margin-bottom: -10px;
 		border-radius: 0 !important;
 	}
-
-	.user-avatar {
-		border-radius: 0 !important;
-	}
 }
 
 #quickpostform > .panel {
@@ -841,12 +852,12 @@ textarea {
 	padding: 0 15px;
 }
 
-.user-row .user-avatar {
+.user-row .user-avatar .img-responsive {
 	max-width: 50px;
 	margin-top: 0;
 	margin-left: -6px;
 	position: absolute;
-	border-radius: 0;
+	border-radius: 999px;
 	height: 50px;
 	min-height: 50px;
 	min-width: 50px;
@@ -864,10 +875,6 @@ textarea {
 	color: #999;
 }
 
-.user-row .thumbnail {
-	padding: 2px;
-}
-
 .user-row {
 	color: #232323;
 	background-color: #fff;
@@ -923,30 +930,19 @@ textarea {
 }
 
 .topic .profile-card-head .user-avatar {
-	max-width: 54px;
+	max-width: 50px;
 	height: 50px;
 	margin-top: 4px;
 	margin-left: 4px;
+	margin-bottom: 4px;
 	position: absolute;
 	border-radius: 0;
 	border-top-left-radius: 3px;
 }
 
-.topic .profile-card-quickpost .user-avatar {
-	border-bottom-left-radius: 3px;
-}
-
 .topic .profile-card-head .user-avatar img {
-	height: 48px;
 	width: 100%;
-}
-
-.topic .profile-card-head .is-online {
-	border-left: 4px #93dd00 solid;
-}
-
-.topic .profile-card-head .is-offline {
-	border-left: 4px #eee solid;
+	height: auto;
 }
 
 .profile-card-head h2 {
@@ -965,6 +961,9 @@ textarea {
 .topic .profile-card-head h3 {
 	padding-left: 64px;
 	padding-bottom: 7px;
+	margin-top: -10px;
+	font-size: 100%;
+	margin-bottom: 0;
 }
 
 .topic hr {
@@ -986,44 +985,47 @@ textarea {
 	height: 59px;
 	background-color: #057ed4;
 	color: #fff;
-	border-top-left-radius: 3px;
-	border-top-right-radius: 3px;
-}
-
-.profile-card-quickpost {
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
 }
 
-.profile-card-head .thumbnail {
+.profile-card-head img {
 	max-width: 100px;
 	max-height: 100px;
-	width: 100px;
-	height: 100px;
-	margin-top: -50px;
-	margin-left: 9px;
-	position: absolute;
-	border-radius: 0;
+	border-radius: 999px;
 }
 
-.thumbnail > .user-avatar {
-	width: 100%;
-	height: 100%;
+.profile-nav .profile-card .profile-card-head {
+	height: auto;
+	text-align: center;
 }
 
-.profile-card-head h2 {
-	padding-left: 120px;
-	padding-top: 3px;
-	margin-top: 0;
-	margin-bottom: 0;
+.profile-nav .profile-card .profile-card-head img {
+	max-width: 128px;
+	max-height: 128px;
+	margin: 0 auto;
 }
 
-.profile-card-head h3 {
-	padding-left: 120px;
-	padding-bottom: 7px;
+.profile-nav .profile-card .profile-card-head {
+	padding-top: 12px;
+}
+
+.profile-nav h2 {
+	padding-top: 10px;
+	margin-bottom: 5px;
+}
+
+.profile-nav h3 {
 	margin-top: 0;
-	font-size: 100%;
 	margin-bottom: 0;
+	padding-bottom: 12px;
+	font-size: 111%;
+}
+
+.postview .user-avatar img {
+	border: 2px solid #ddd;
+}
+
+.postview .user-avatar.is-online img {
+	border: 2px solid #64b450;
 }
 
 .profile-card-body {
@@ -1064,11 +1066,6 @@ textarea {
 	margin-top: 5px;
 }
 
-.topic .thumbnail {
-	padding: 0;
-	border: 1px solid #fff;
-}
-
 @media(max-width:991px) {
 	.topic .panel {
 		margin-top: 0;
@@ -1257,10 +1254,6 @@ blockquote footer {
 		margin-bottom: 10px;
 	}
 
-	.profile-card-head h2 {
-		margin-left: 0;
-	}
-
 	.topic .profile-card {
 		margin-top: 0;
 	}