From fab7fb65b330c2c84722b3cafa7d78b2b2cb96a7 Mon Sep 17 00:00:00 2001
From: Henry Wright <henrywright@gmail.com>
Date: Wed, 26 Aug 2015 18:11:20 +0100
Subject: [PATCH 1/4] Removed some of the inline styles
---
templates/account/edit.tpl | 64 ++++++++++++------------
templates/groups/details.tpl | 2 +-
templates/partials/move_thread_modal.tpl | 2 +-
templates/partials/post_bar.tpl | 4 +-
templates/reset.tpl | 4 +-
templates/reset_code.tpl | 4 +-
6 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index c1f2da9..d3f4cf2 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -3,7 +3,7 @@
<div class="account">
<div class="row">
- <div class="col-md-2" style="text-align: center; margin-bottom:20px;">
+ <div class="col-md-2">
<div class="account-picture-block text-center">
<img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br /><br />
<a id="changePictureBtn" href="#" class="btn btn-primary">[[user:change_picture]]</a>
@@ -98,43 +98,41 @@
</div>
<div class="col-md-5">
- <div style="vertical-align:top;">
- <form class='form-horizontal'>
- <!-- IF isSelf -->
- <div class="control-group">
- <label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
- <div class="controls">
- <input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword-->>
- </div>
- </div>
- <!-- ENDIF isSelf -->
-
- <div class="control-group">
- <label class="control-label" for="inputNewPassword">[[user:password]]</label>
- <div class="input-group">
- <input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
- <span class="input-group-addon">
- <span id="password-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
- </span>
- </div>
+ <form class='form-horizontal'>
+ <!-- IF isSelf -->
+ <div class="control-group">
+ <label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
+ <div class="controls">
+ <input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword-->>
</div>
+ </div>
+ <!-- ENDIF isSelf -->
- <div class="control-group">
- <label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label>
- <div class="input-group">
- <input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm_password]]" value="">
- <span class="input-group-addon">
- <span id="password-confirm-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
- </span>
- </div>
+ <div class="control-group">
+ <label class="control-label" for="inputNewPassword">[[user:password]]</label>
+ <div class="input-group">
+ <input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
+ <span class="input-group-addon">
+ <span id="password-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
+ </span>
</div>
- <br/>
- <div class="form-actions">
- <a id="changePasswordBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label>
+ <div class="input-group">
+ <input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm_password]]" value="">
+ <span class="input-group-addon">
+ <span id="password-confirm-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
+ </span>
</div>
+ </div>
+ <br/>
+ <div class="form-actions">
+ <a id="changePasswordBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
+ </div>
- </form>
- </div>
+ </form>
</div>
</div>
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index 062f9c1..d473629 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -188,7 +188,7 @@
<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_colour]]</button>
<input type="hidden" name="labelColor" value="<!-- IF group.labelColor -->{group.labelColor}<!-- ENDIF group.labelColor -->" />
<input type="hidden" name="icon" value="<!-- IF group.icon -->{group.icon}<!-- ENDIF group.icon -->" />
- <div id="icons" style="display:none;">
+ <div id="icons" class="hidden">
<div class="icon-container">
<div class="row fa-icons">
<i class="fa fa-doesnt-exist"></i>
diff --git a/templates/partials/move_thread_modal.tpl b/templates/partials/move_thread_modal.tpl
index 9c98c5b..d2d4b69 100644
--- a/templates/partials/move_thread_modal.tpl
+++ b/templates/partials/move_thread_modal.tpl
@@ -10,7 +10,7 @@
<p>
[[topic:disabled_categories_note]]
</p>
- <div id="move-confirm" style="display: none;">
+ <div id="move-confirm" class="hidden">
<hr />
<div class="alert alert-info">[[topic:topic_will_be_moved_to]] <strong><span id="confirm-category-name"></span></strong></div>
</div>
diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index 982f7ec..a6a37e5 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -7,7 +7,7 @@
</span>
<div class="topic-main-buttons pull-right">
- <span class="loading-indicator btn pull-left" done="0" style="display:none;">
+ <span class="loading-indicator btn pull-left hidden" done="0">
<span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
</span>
@@ -25,6 +25,6 @@
<!-- IMPORT partials/thread_tools.tpl -->
</div>
-<div style="clear:both;"></div>
+<div class="clearfix"></div>
<hr />
\ No newline at end of file
diff --git a/templates/reset.tpl b/templates/reset.tpl
index 5e93591..0a6f079 100644
--- a/templates/reset.tpl
+++ b/templates/reset.tpl
@@ -6,11 +6,11 @@
</div>
<div class="well">
- <div class="alert alert-success" id="success" style="display:none">
+ <div class="alert alert-success hidden" id="success">
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>[[reset_password:password_reset_sent]]</strong>
</div>
- <div class="alert alert-danger" id="error" style="display:none">
+ <div class="alert alert-danger hidden" id="error">
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>[[reset_password:invalid_email]]</strong>
</div>
diff --git a/templates/reset_code.tpl b/templates/reset_code.tpl
index 062cb65..0fa84b7 100644
--- a/templates/reset_code.tpl
+++ b/templates/reset_code.tpl
@@ -7,12 +7,12 @@
[[reset_password:password_expired]]
</div>
<!-- ENDIF displayExpiryNotice -->
- <div class="alert alert-success" id="success" style="display:none">
+ <div class="alert alert-success hidden" id="success">
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>[[reset_password:password_changed.title]]</strong>
<p>[[reset_password:password_changed.message]]</p>
</div>
- <div class="alert alert-warning" id="notice" style="display:none">
+ <div class="alert alert-warning hidden" id="notice">
<strong></strong>
<p></p>
</div>
From 574135090e1275830b46f2449310507fd825ff2b Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 26 Aug 2015 13:38:22 -0400
Subject: [PATCH 2/4] 2.0.27
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 03523de..c0c68e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "nodebb-theme-persona",
- "version": "2.0.26",
+ "version": "2.0.27",
"nbbpm": {
"compatibility": "^0.7.1"
},
From 01dbe5d5dbbd1ec7f8c3969857b62304f80f1885 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 26 Aug 2015 15:06:56 -0400
Subject: [PATCH 3/4] https://github.com/NodeBB/NodeBB/issues/3499
---
templates/header.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/header.tpl b/templates/header.tpl
index 013aaab..2a823ca 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="{defaultLang}">
+<html lang="{function.localeToHTML, defaultLang}">
<head>
<title>{browserTitle}</title>
<!-- BEGIN metaTags -->
From ead1698c4f04c885c25144b04a3386bc231815dc Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 26 Aug 2015 15:07:02 -0400
Subject: [PATCH 4/4] 2.0.28
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index c0c68e8..9507f2e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "nodebb-theme-persona",
- "version": "2.0.27",
+ "version": "2.0.28",
"nbbpm": {
"compatibility": "^0.7.1"
},