Merge pull request #310 from pichalite/login-sessions

Move login sessions to account info route

templates/account/info.tpl

@@ -1,6 +1,32 @@
 <div class="account">
 	<!-- IMPORT partials/account/header.tpl -->
 
+	<!-- IF sessions.length -->
+	<div class="row">
+		<div class="col-xs-12 col-md-12">
+			<h4>[[global:sessions]]</h4>
+			<ul class="list-group" component="user/sessions">
+				<!-- BEGIN sessions -->
+				<li class="list-group-item" data-uuid="{../uuid}">
+					<div class="pull-right">
+						<!-- IF !../current -->
+						<button class="btn btn-xs btn-default" type="button" data-action="revokeSession">Revoke Session</button>
+						<!-- ENDIF !../current -->
+						{function.userAgentIcons}
+						<i class="fa fa-circle text-<!-- IF ../current -->success<!-- ELSE -->muted<!-- ENDIF ../current -->"></i>
+					</div>
+					{../browser} {../version} on {../platform}<br />
+					<small class="timeago text-muted" title="{../datetimeISO}"></small>
+					<ul>
+						<li><strong>[[global:ip_address]]</strong>: {../ip}</li>
+					</ul>
+				</li>
+				<!-- END sessions -->
+			</ul>
+		</div>
+	</div>
+	<!-- ENDIF sessions.length -->
+	
 	<div class="row">
 		<div class="col-sm-6">
 			<div class="panel panel-default">

templates/account/settings.tpl

@@ -90,28 +90,6 @@
 			</div>
 			<!-- ENDIF !disableEmailSubscriptions -->
 
-			<!-- IF sessions.length -->
-			<h4>[[global:sessions]]</h4>
-			<ul class="list-group" component="user/sessions">
-				<!-- BEGIN sessions -->
-				<li class="list-group-item" data-uuid="{../uuid}">
-					<div class="pull-right">
-						<!-- IF !../current -->
-						<button class="btn btn-xs btn-default" type="button" data-action="revokeSession">Revoke Session</button>
-						<!-- ENDIF !../current -->
-						{function.userAgentIcons}
-						<i class="fa fa-circle text-<!-- IF ../current -->success<!-- ELSE -->muted<!-- ENDIF ../current -->"></i>
-					</div>
-					{../browser} {../version} on {../platform}<br />
-					<small class="timeago text-muted" title="{../datetimeISO}"></small>
-					<ul>
-						<li><strong>[[global:ip_address]]</strong>: {../ip}</li>
-					</ul>
-				</li>
-				<!-- END sessions -->
-			</ul>
-			<!-- ENDIF sessions.length -->
-
 			<!-- BEGIN customSettings -->
 			<h4>{customSettings.title}</h4>
 			<div class="well">