From 7eb4a7c913e8ebe055ecf44c9fd3c7dddf301f70 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 7 Jul 2016 14:33:47 -0400
Subject: [PATCH] theme changes re: nodebb/nodebb#4827

---
 less/account.less                   | 38 ++++++++++++++++
 templates/account/info.tpl          | 69 +++++++++++++++++++++++++++++
 templates/account/settings.tpl      |  9 ----
 templates/partials/account/menu.tpl |  1 +
 4 files changed, 108 insertions(+), 9 deletions(-)
 create mode 100644 templates/account/info.tpl

diff --git a/less/account.less b/less/account.less
index b38874e..b276c69 100644
--- a/less/account.less
+++ b/less/account.less
@@ -300,4 +300,42 @@
 		line-height: 46px;
 		margin: 0;
 	}
+}
+
+.page-user-info {
+	.recent-flags {
+		padding-left: 0;
+
+		li {
+			list-style-type: none;
+		}
+
+		.title {
+			font-weight: bold;
+		}
+
+		.timestamp {
+			font-size: 1.25rem;
+			font-style: italic;
+			color: @gray-light;
+		}
+	}
+
+	.ban-history {
+		padding-left: 0;
+
+		li {
+			list-style-type: none;
+		}
+
+		.timestamp {
+			font-weight: bold;
+		}
+
+		.expiry {
+			font-size: 1.25rem;
+			font-style: italic;
+			color: @gray-light;
+		}
+	}
 }
\ No newline at end of file
diff --git a/templates/account/info.tpl b/templates/account/info.tpl
new file mode 100644
index 0000000..ecfc7f9
--- /dev/null
+++ b/templates/account/info.tpl
@@ -0,0 +1,69 @@
+<div class="account">
+	<!-- IMPORT partials/account/header.tpl -->
+
+	<div class="row">
+		<div class="col-sm-6">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					<h3 class="panel-title">[[global:recentips]]</h3>
+				</div>
+				<div class="panel-body">
+					<ul>
+						<!-- BEGIN ips -->
+						<li>@value</li>
+						<!-- END ips -->
+					</ul>
+				</div>
+			</div>
+		</div>
+		<div class="col-sm-6">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					<h3 class="panel-title">[[user:info.latest-flags]]</h3>
+				</div>
+				<div class="panel-body">
+					<!-- IF history.flags.length -->
+					<ul class="recent-flags">
+						<!-- BEGIN history.flags -->
+						<li>
+							<p>
+								<a class="title" href="{config.relative_path}/post/{../value}">{../title}</a><br />
+								<span class="timestamp">Flagged <span class="timeago" title="{../timestampISO}"></span> ({../timestampReadable})</span>
+							</p>
+						</li>
+						<!-- END history.flags -->
+					</ul>
+					<!-- ELSE -->
+					<div class="alert alert-success">[[user:info.no-flags]]</div>
+					<!-- ENDIF history.flags.length -->
+				</div>
+			</div>
+
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					<h3 class="panel-title">[[user:info.ban-history]]</h3>
+				</div>
+				<div class="panel-body">
+					<!-- IF history.bans.length -->
+					<ul class="ban-history">
+						<!-- BEGIN history.bans -->
+						<li>
+							<p>
+								<span class="timestamp timeago" title="{../timestampISO}"></span> &mdash; {../timestampReadable}<br />
+								<!-- IF ../until -->
+								<span class="expiry">[[user:info.banned-until, {../untilReadable}]]</span>
+								<!-- ELSE -->
+								<span class="expiry">[[user:info.banned-permanently]]</span>
+								<!-- ENDIF ../until -->
+							</p>
+						</li>
+						<!-- END history.bans -->
+					</ul>
+					<!-- ELSE -->
+					<div class="alert alert-success">[[user:info.no-ban-history]]</div>
+					<!-- ENDIF history.bans.length -->
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index 5c31bed..6365a72 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -112,15 +112,6 @@
 			</ul>
 			<!-- ENDIF sessions.length -->
 
-			<!-- IF ips.length -->
-			<h4>[[global:recentips]]</h4>
-			<div class="well">
-				<!-- BEGIN ips -->
-					<div>{ips.ip}</div>
-				<!-- END ips -->
-			</div>
-			<!-- ENDIF ips.length -->
-
 			<!-- BEGIN customSettings -->
 			<h4>{customSettings.title}</h4>
 			<div class="well">
diff --git a/templates/partials/account/menu.tpl b/templates/partials/account/menu.tpl
index 645efe3..c2b7cea 100644
--- a/templates/partials/account/menu.tpl
+++ b/templates/partials/account/menu.tpl
@@ -19,6 +19,7 @@
 		<!-- IF showHidden -->
 		<li><a href="{config.relative_path}/user/{userslug}/settings">[[user:settings]]</a></li>
 		<li><a href="{config.relative_path}/user/{userslug}/edit">[[user:edit]]</a></li>
+		<li><a href="{config.relative_path}/user/{userslug}/info">[[user:account_info]] <i class="fa fa-lock"></i></a></li>
 		<!-- ENDIF showHidden -->
 
 		<!-- IF !isSelf -->