diff --git a/public/less/admin/general/navigation.less b/public/less/admin/general/navigation.less
index 3e10639b89..583ec382e1 100644
--- a/public/less/admin/general/navigation.less
+++ b/public/less/admin/general/navigation.less
@@ -1,10 +1,10 @@
#navigation {
#active-navigation {
- width: 100%;
+ float: none;
min-height: 50px;
border: 1px solid #eee;
overflow: auto;
-
+
.active {
background-color: #eee;
}
diff --git a/src/views/admin/advanced/cache.tpl b/src/views/admin/advanced/cache.tpl
index 70f82ab5db..126cba8db0 100644
--- a/src/views/admin/advanced/cache.tpl
+++ b/src/views/admin/advanced/cache.tpl
@@ -1,5 +1,5 @@
-<div class="post-cache">
+<div class="row post-cache">
<div class="col-lg-9">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-calendar-o"></i> [[admin/advanced/cache:post-cache]]</div>
diff --git a/src/views/admin/advanced/database.tpl b/src/views/admin/advanced/database.tpl
index 973cacf1aa..c9003e52f9 100644
--- a/src/views/admin/advanced/database.tpl
+++ b/src/views/admin/advanced/database.tpl
@@ -1,4 +1,4 @@
-<div class="database">
+<div class="row database">
<div class="col-sm-9">
<!-- IF mongo -->
<div class="panel panel-default">
diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl
index b80f56ed6e..65c707920f 100644
--- a/src/views/admin/advanced/events.tpl
+++ b/src/views/admin/advanced/events.tpl
@@ -1,4 +1,4 @@
-<div class="events">
+<div class="row events">
<div class="col-lg-9">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-calendar-o"></i> [[admin/advanced/events:events]]</div>
diff --git a/src/views/admin/advanced/logs.tpl b/src/views/admin/advanced/logs.tpl
index a8f8a501a3..4f7772bd22 100644
--- a/src/views/admin/advanced/logs.tpl
+++ b/src/views/admin/advanced/logs.tpl
@@ -1,4 +1,4 @@
-<div class="logs">
+<div class="row logs">
<div class="col-lg-9">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-file-text-o"></i> [[admin/advanced/logs:logs]]</div>
diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tpl
index c5d1355f08..6e87580557 100644
--- a/src/views/admin/appearance/skins.tpl
+++ b/src/views/admin/appearance/skins.tpl
@@ -1,4 +1,4 @@
-<div id="skins" class="row skins">
+<div id="skins" class="skins">
<div class="directory row" id="bootstrap_themes">
<i class="fa fa-refresh fa-spin"></i> [[admin/appearance/skins:loading]]
</div>
diff --git a/src/views/admin/development/logger.tpl b/src/views/admin/development/logger.tpl
index 7b33625931..dc8704a52b 100644
--- a/src/views/admin/development/logger.tpl
+++ b/src/views/admin/development/logger.tpl
@@ -1,4 +1,4 @@
-<div class="logger">
+<div class="row logger">
<div class="col-lg-9">
<div class="panel panel-default">
<div class="panel-heading">[[admin/development/logger:logger-settings]]</div>
diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl
index b4256a41d3..5177d1a77e 100644
--- a/src/views/admin/extend/rewards.tpl
+++ b/src/views/admin/extend/rewards.tpl
@@ -1,4 +1,4 @@
-<div id="rewards">
+<div id="rewards" class="row">
<div class="col-lg-9">
<div class="panel panel-default">
<div class="panel-heading">[[admin/extend/rewards:rewards]]</div>
diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl
index 3d3d17f096..5b5f95cfb1 100644
--- a/src/views/admin/general/navigation.tpl
+++ b/src/views/admin/general/navigation.tpl
@@ -1,4 +1,4 @@
-<div id="navigation">
+<div class="row" id="navigation">
<div class="col-lg-9">
<div class="clearfix">
<ul id="active-navigation" class="nav navbar-nav">
@@ -74,7 +74,7 @@
</div>
<div class="checkbox">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
- <input class="mdl-switch__input" type="checkbox" name="property:loggedIn" <!-- IF enabled.properties.loggedIn -->checked<!-- ENDIF enabled.properties.loggedIn -->/>
+ <input class="mdl-switch__input" type="checkbox" name="property:loggedIn" <!-- IF enabled.properties.loggedIn -->checked<!-- ENDIF enabled.properties.loggedIn -->/>
<span class="mdl-switch__label"><strong>[[admin/general/navigation:only-logged-in]]</strong></span>
</label>
</div>
diff --git a/src/views/admin/general/social.tpl b/src/views/admin/general/social.tpl
index 152dcef3fa..63f16ab9be 100644
--- a/src/views/admin/general/social.tpl
+++ b/src/views/admin/general/social.tpl
@@ -1,4 +1,4 @@
-<div class="social settings" class="row">
+<div class="social settings">
<form role="form">
<div class="row">
<div class="col-sm-2 col-xs-12 settings-header">[[admin/general/social:post-sharing]]</div>
diff --git a/src/views/admin/general/sounds.tpl b/src/views/admin/general/sounds.tpl
index 79b99229f5..c7b8df97a7 100644
--- a/src/views/admin/general/sounds.tpl
+++ b/src/views/admin/general/sounds.tpl
@@ -1,4 +1,4 @@
-<div class="sounds settings" class="row">
+<div class="sounds settings row">
<div class="col-xs-12">
<form role="form">
<div class="row">
@@ -74,13 +74,13 @@
<div class="input-group">
<span class="input-group-btn">
- <input
+ <input
data-action="upload"
data-title="Upload Sound"
data-route="{config.relative_path}/api/admin/upload/sound"
data-accept="audio/*"
- type="button"
- class="btn btn-primary"
+ type="button"
+ class="btn btn-primary"
value="[[admin/general/sounds:upload-new-sound]]"
></input>
</span>
diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl
index c267b84dd5..995dd13a8f 100644
--- a/src/views/admin/manage/flags.tpl
+++ b/src/views/admin/manage/flags.tpl
@@ -1,5 +1,4 @@
-<div class="flags">
-
+<div class="row flags">
<div class="col-lg-12">
<div class="text-center">
@@ -106,7 +105,7 @@
</div>
<small>
<span class="pull-right">
- [[posted-in, <a href="{config.relative_path}/category/{posts.category.slug}" target="_blank"><i class="fa {posts.category.icon}"></i> {posts.category.name}</a>]],
+ [[posted-in, <a href="{config.relative_path}/category/{posts.category.slug}" target="_blank"><i class="fa {posts.category.icon}"></i> {posts.category.name}</a>]],
<span class="timeago" title="{posts.timestampISO}"></span> •
<a href="{config.relative_path}/post/{posts.pid}" target="_blank">[[admin/manage/flags:read-more]]</a>
</span>
@@ -114,7 +113,7 @@
</div>
</div>
<div class="col-sm-4">
- <i class="fa fa-flag"></i>
+ <i class="fa fa-flag"></i>
[[admin/manage/flags:flagged-x-times, {posts.flags}]]
<blockquote class="flag-reporters">
<ul>
diff --git a/src/views/admin/manage/ip-blacklist.tpl b/src/views/admin/manage/ip-blacklist.tpl
index 23f54ff04a..8ec7e72733 100644
--- a/src/views/admin/manage/ip-blacklist.tpl
+++ b/src/views/admin/manage/ip-blacklist.tpl
@@ -1,4 +1,4 @@
-<div class="flags">
+<div class="row ip-blacklist">
<div class="col-lg-12">
<p class="lead">
[[admin/manage/ip-blacklist:lead]]
diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tpl
index f8504fb31d..961d4863f7 100644
--- a/src/views/admin/manage/registration.tpl
+++ b/src/views/admin/manage/registration.tpl
@@ -1,109 +1,121 @@
-<div class="registration panel panel-primary">
- <div class="panel-heading">
- [[admin/manage/registration:queue]]
- </div>
- <!-- IF !users.length -->
- <p class="panel-body">
- [[admin/manage/registration:description, {config.relative_path}/admin/settings/user]]
- </p>
- <!-- ENDIF !users.length -->
- <div class="table-responsive">
- <table class="table table-striped users-list">
- <tr>
- <th>[[admin/manage/registration:list.name]]</th>
- <th>[[admin/manage/registration:list.email]]</th>
- <th class="hidden-xs">[[admin/manage/registration:list.ip]]</th>
- <th class="hidden-xs">[[admin/manage/registration:list.time]]</th>
- <!-- BEGIN customHeaders -->
- <th class="hidden-xs">{customHeaders.label}</th>
- <!-- END customHeaders -->
- <th></th>
- </tr>
- <!-- BEGIN users -->
- <tr data-username="{users.username}">
- <td>
- <!-- IF users.usernameSpam -->
- <i class="fa fa-times-circle text-danger" title="[[admin/manage/registration:list.username-spam, {users.spamData.username.frequency}, {users.spamData.username.appears}, {users.spamData.username.confidence}]]"></i>
- <!-- ELSE -->
- <i class="fa fa-check text-success"></i>
- <!-- ENDIF users.usernameSpam -->
- {users.username}
- </td>
- <td>
- <!-- IF users.emailSpam -->
- <i class="fa fa-times-circle text-danger" title="[[admin/manage/registration:list.email-spam, {users.spamData.email.frequency}, {users.spamData.email.appears}]]"></i>
- <!-- ELSE -->
- <i class="fa fa-check text-success"></i>
- <!-- ENDIF users.emailSpam -->
- {users.email}
- </td>
- <td class="hidden-xs">
- <!-- IF users.ipSpam -->
- <i class="fa fa-times-circle text-danger" title="[[admin/manage/registration:list.ip-spam, {users.spamData.ip.frequency}, {users.spamData.ip.appears}]]"></i>
- <!-- ELSE -->
- <i class="fa fa-check text-success"></i>
- <!-- ENDIF users.ipSpam -->
- {users.ip}
- <!-- BEGIN users.ipMatch -->
- <br>
- <!-- IF users.ipMatch.picture -->
- <img src="{users.ipMatch.picture}" class="user-img"/>
- <!-- ELSE -->
- <div class="user-img avatar avatar-sm" style="background-color: {users.ipMatch.icon:bgColor};">{users.ipMatch.icon:text}</div>
- <!-- ENDIF users.ipMatch.picture -->
- <a href="/uid/{users.ipMatch.uid}">{users.ipMatch.username}</a>
- <!-- END users.ipMatch -->
- </td>
- <td class="hidden-xs">
- <span class="timeago" title="{users.timestampISO}"></span>
- </td>
-
- <!-- BEGIN users.customRows -->
- <td class="hidden-xs">{users.customRows.value}</td>
- <!-- END users.customRows -->
-
- <td>
- <div class="btn-group pull-right">
- <button class="btn btn-success btn-xs" data-action="accept"><i class="fa fa-check"></i></button>
- <button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-times"></i></button>
- </div>
- </td>
- </tr>
- <!-- END users -->
- </table>
- </div>
+<div class="row">
+ <div class="col-xs-12">
+ <div class="registration panel panel-primary">
+ <div class="panel-heading">
+ [[admin/manage/registration:queue]]
+ </div>
+ <!-- IF !users.length -->
+ <p class="panel-body">
+ [[admin/manage/registration:description, {config.relative_path}/admin/settings/user]]
+ </p>
+ <!-- ENDIF !users.length -->
+ <div class="table-responsive">
+ <table class="table table-striped users-list">
+ <thead>
+ <tr>
+ <th>[[admin/manage/registration:list.name]]</th>
+ <th>[[admin/manage/registration:list.email]]</th>
+ <th class="hidden-xs">[[admin/manage/registration:list.ip]]</th>
+ <th class="hidden-xs">[[admin/manage/registration:list.time]]</th>
+ <!-- BEGIN customHeaders -->
+ <th class="hidden-xs">{customHeaders.label}</th>
+ <!-- END customHeaders -->
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- BEGIN users -->
+ <tr data-username="{users.username}">
+ <td>
+ <!-- IF users.usernameSpam -->
+ <i class="fa fa-times-circle text-danger" title="[[admin/manage/registration:list.username-spam, {users.spamData.username.frequency}, {users.spamData.username.appears}, {users.spamData.username.confidence}]]"></i>
+ <!-- ELSE -->
+ <i class="fa fa-check text-success"></i>
+ <!-- ENDIF users.usernameSpam -->
+ {users.username}
+ </td>
+ <td>
+ <!-- IF users.emailSpam -->
+ <i class="fa fa-times-circle text-danger" title="[[admin/manage/registration:list.email-spam, {users.spamData.email.frequency}, {users.spamData.email.appears}]]"></i>
+ <!-- ELSE -->
+ <i class="fa fa-check text-success"></i>
+ <!-- ENDIF users.emailSpam -->
+ {users.email}
+ </td>
+ <td class="hidden-xs">
+ <!-- IF users.ipSpam -->
+ <i class="fa fa-times-circle text-danger" title="[[admin/manage/registration:list.ip-spam, {users.spamData.ip.frequency}, {users.spamData.ip.appears}]]"></i>
+ <!-- ELSE -->
+ <i class="fa fa-check text-success"></i>
+ <!-- ENDIF users.ipSpam -->
+ {users.ip}
+ <!-- BEGIN users.ipMatch -->
+ <br>
+ <!-- IF users.ipMatch.picture -->
+ <img src="{users.ipMatch.picture}" class="user-img"/>
+ <!-- ELSE -->
+ <div class="user-img avatar avatar-sm" style="background-color: {users.ipMatch.icon:bgColor};">{users.ipMatch.icon:text}</div>
+ <!-- ENDIF users.ipMatch.picture -->
+ <a href="/uid/{users.ipMatch.uid}">{users.ipMatch.username}</a>
+ <!-- END users.ipMatch -->
+ </td>
+ <td class="hidden-xs">
+ <span class="timeago" title="{users.timestampISO}"></span>
+ </td>
- <!-- IMPORT partials/paginator.tpl -->
-</div>
+ <!-- BEGIN users.customRows -->
+ <td class="hidden-xs">{users.customRows.value}</td>
+ <!-- END users.customRows -->
-<div class="invitations panel panel-success">
- <div class="panel-heading">
- [[admin/manage/registration:invitations]]
- </div>
- <p class="panel-body">
- [[admin/manage/registration:invitations.description]]
- </p>
- <div class="table-responsive">
- <table class="table table-striped invites-list">
- <tr>
- <th>[[admin/manage/registration:invitations.inviter-username]]</th>
- <th>[[admin/manage/registration:invitations.invitee-email]]</th>
- <th>[[admin/manage/registration:invitations.invitee-username]]</th>
- </tr>
- <!-- BEGIN invites -->
- <!-- BEGIN invites.invitations -->
- <tr data-invitation-mail="{invites.invitations.email}"
- data-invited-by="{invites.username}">
- <td class ="invited-by"><!-- IF @first -->{invites.username}<!-- ENDIF @first --></td>
- <td>{invites.invitations.email}</td>
- <td>{invites.invitations.username}
- <div class="btn-group pull-right">
- <button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-times"></i></button>
- </div>
- </td>
- </tr>
- <!-- END invites.invitations -->
- <!-- END invites -->
- </table>
+ <td>
+ <div class="btn-group pull-right">
+ <button class="btn btn-success btn-xs" data-action="accept"><i class="fa fa-check"></i></button>
+ <button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-times"></i></button>
+ </div>
+ </td>
+ </tr>
+ <!-- END users -->
+ </tbody>
+ </table>
+ </div>
+
+ <!-- IMPORT partials/paginator.tpl -->
+ </div>
+
+ <div class="invitations panel panel-success">
+ <div class="panel-heading">
+ [[admin/manage/registration:invitations]]
+ </div>
+ <p class="panel-body">
+ [[admin/manage/registration:invitations.description]]
+ </p>
+ <div class="table-responsive">
+ <table class="table table-striped invites-list">
+ <thead>
+ <tr>
+ <th>[[admin/manage/registration:invitations.inviter-username]]</th>
+ <th>[[admin/manage/registration:invitations.invitee-email]]</th>
+ <th>[[admin/manage/registration:invitations.invitee-username]]</th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- BEGIN invites -->
+ <!-- BEGIN invites.invitations -->
+ <tr data-invitation-mail="{invites.invitations.email}"
+ data-invited-by="{invites.username}">
+ <td class ="invited-by"><!-- IF @first -->{invites.username}<!-- ENDIF @first --></td>
+ <td>{invites.invitations.email}</td>
+ <td>{invites.invitations.username}
+ <div class="btn-group pull-right">
+ <button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-times"></i></button>
+ </div>
+ </td>
+ </tr>
+ <!-- END invites.invitations -->
+ <!-- END invites -->
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl
index d2b3310f81..41851df893 100644
--- a/src/views/admin/manage/tags.tpl
+++ b/src/views/admin/manage/tags.tpl
@@ -1,5 +1,4 @@
<div class="tags row">
-
<div class="col-lg-9">
<div class="panel panel-default tag-management">
<div class="panel-body">
@@ -76,5 +75,4 @@
</div>
</div>
</div>
-
</div>
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index 356870d604..7d7fdbbe28 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -71,37 +71,41 @@
<div class="table-responsive">
<table class="table table-striped users-table">
- <tr>
- <th><input component="user/select/all" type="checkbox"/></th>
- <th>[[admin/manage/users:users.uid]]</th>
- <th>[[admin/manage/users:users.username]]</th>
- <th>[[admin/manage/users:users.email]]</th>
- <th class="text-right">[[admin/manage/users:users.postcount]]</th>
- <th class="text-right">[[admin/manage/users:users.reputation]]</th>
- <th class="text-right">[[admin/manage/users:users.flags]]</th>
- <th>[[admin/manage/users:users.joined]]</th>
- <th>[[admin/manage/users:users.last-online]]</th>
- <th>[[admin/manage/users:users.banned]]</th>
- </tr>
- <!-- BEGIN users -->
- <tr class="user-row">
- <th><input component="user/select/single" data-uid="{users.uid}" type="checkbox"/></th>
- <td class="text-right">{users.uid}</td>
- <td><i class="administrator fa fa-shield text-success<!-- IF !users.administrator --> hidden<!-- ENDIF !users.administrator -->"></i><a href="{config.relative_path}/user/{users.userslug}"> {users.username}</a></td>
-
- <td>
- <!-- IF config.requireEmailConfirmation -->
- <i class="validated fa fa-check text-success<!-- IF !users.email:confirmed --> hidden<!-- ENDIF !users.email:confirmed -->" title="validated"></i>
- <i class="notvalidated fa fa-times text-danger<!-- IF users.email:confirmed --> hidden<!-- ENDIF users.email:confirmed -->" title="not validated"></i>
- <!-- ENDIF config.requireEmailConfirmation --> {users.email}</td>
- <td class="text-right">{users.postcount}</td>
- <td class="text-right">{users.reputation}</td>
- <td class="text-right"><!-- IF users.flags -->{users.flags}<!-- ELSE -->0<!-- ENDIF users.flags --></td>
- <td><span class="timeago" title="{users.joindateISO}"></span></td>
- <td><span class="timeago" title="{users.lastonlineISO}"></span></td>
- <td class="text-center"><i class="ban fa fa-gavel text-danger<!-- IF !users.banned --> hidden<!-- ENDIF !users.banned -->"></i></td>
- </tr>
- <!-- END users -->
+ <thead>
+ <tr>
+ <th><input component="user/select/all" type="checkbox"/></th>
+ <th>[[admin/manage/users:users.uid]]</th>
+ <th>[[admin/manage/users:users.username]]</th>
+ <th>[[admin/manage/users:users.email]]</th>
+ <th class="text-right">[[admin/manage/users:users.postcount]]</th>
+ <th class="text-right">[[admin/manage/users:users.reputation]]</th>
+ <th class="text-right">[[admin/manage/users:users.flags]]</th>
+ <th>[[admin/manage/users:users.joined]]</th>
+ <th>[[admin/manage/users:users.last-online]]</th>
+ <th>[[admin/manage/users:users.banned]]</th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- BEGIN users -->
+ <tr class="user-row">
+ <th><input component="user/select/single" data-uid="{users.uid}" type="checkbox"/></th>
+ <td class="text-right">{users.uid}</td>
+ <td><i class="administrator fa fa-shield text-success<!-- IF !users.administrator --> hidden<!-- ENDIF !users.administrator -->"></i><a href="{config.relative_path}/user/{users.userslug}"> {users.username}</a></td>
+
+ <td>
+ <!-- IF config.requireEmailConfirmation -->
+ <i class="validated fa fa-check text-success<!-- IF !users.email:confirmed --> hidden<!-- ENDIF !users.email:confirmed -->" title="validated"></i>
+ <i class="notvalidated fa fa-times text-danger<!-- IF users.email:confirmed --> hidden<!-- ENDIF users.email:confirmed -->" title="not validated"></i>
+ <!-- ENDIF config.requireEmailConfirmation --> {users.email}</td>
+ <td class="text-right">{users.postcount}</td>
+ <td class="text-right">{users.reputation}</td>
+ <td class="text-right"><!-- IF users.flags -->{users.flags}<!-- ELSE -->0<!-- ENDIF users.flags --></td>
+ <td><span class="timeago" title="{users.joindateISO}"></span></td>
+ <td><span class="timeago" title="{users.lastonlineISO}"></span></td>
+ <td class="text-center"><i class="ban fa fa-gavel text-danger<!-- IF !users.banned --> hidden<!-- ENDIF !users.banned -->"></i></td>
+ </tr>
+ <!-- END users -->
+ </tbody>
</table>
</div>