From c7cd74232d7e4f82698d470a426fd164c338fd9e Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 14 Jul 2015 16:51:18 -0400
Subject: [PATCH 1/4] https://github.com/NodeBB/NodeBB/issues/3039
---
less/users.less | 13 +++++++++++++
templates/users.tpl | 1 +
templates/usersMap.tpl | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+)
create mode 100644 templates/usersMap.tpl
diff --git a/less/users.less b/less/users.less
index 1aaceec..62aca64 100644
--- a/less/users.less
+++ b/less/users.less
@@ -30,6 +30,11 @@
.users-container {
padding: 0;
+ list-style-type: none;
+
+ li {
+ padding-bottom: 10px;
+ }
.users-box{
display: inline-block;
@@ -61,4 +66,12 @@
display: inline-block;
}
}
+
+ .user-img {
+ border-radius: 50%;
+ width: 20px;
+ height: 20px;
+ vertical-align: middle;
+ }
+
}
\ No newline at end of file
diff --git a/templates/users.tpl b/templates/users.tpl
index 2155cae..f71ab29 100644
--- a/templates/users.tpl
+++ b/templates/users.tpl
@@ -5,6 +5,7 @@
<li class=''><a href='{config.relative_path}/users/latest'>[[users:latest_users]]</a></li>
<li class=''><a href='{config.relative_path}/users/sort-posts'>[[users:top_posters]]</a></li>
<li class=''><a href='{config.relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
+ <li class=''><a href='{config.relative_path}/users/map'>[[users:map]]</a></li>
<!-- IF function.displayUserSearch, {config.allowGuestUserSearching} -->
<li class=''><a href='{config.relative_path}/users/search'>[[users:search]]</a></li>
<!-- ENDIF function.displayUserSearch -->
diff --git a/templates/usersMap.tpl b/templates/usersMap.tpl
new file mode 100644
index 0000000..eab93e0
--- /dev/null
+++ b/templates/usersMap.tpl
@@ -0,0 +1,34 @@
+<div class="users">
+
+ <ul class="nav nav-pills">
+ <li><a href='{config.relative_path}/users/online'>[[global:online]]</a></li>
+ <li><a href='{config.relative_path}/users/latest'>[[users:latest_users]]</a></li>
+ <li><a href='{config.relative_path}/users/sort-posts'>[[users:top_posters]]</a></li>
+ <li><a href='{config.relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
+ <li class='active'><a href='{config.relative_path}/users/map'>[[users:map]]</a></li>
+ <!-- IF function.displayUserSearch, {config.allowGuestUserSearching} -->
+ <li><a href='{config.relative_path}/users/search'>[[users:search]]</a></li>
+ <!-- ENDIF function.displayUserSearch -->
+ <!-- IF inviteOnly -->
+ <button component="user/invite" class="btn btn-success pull-right"><i class="fa fa-users"></i> [[users:invite]]</button>
+ <!-- ENDIF inviteOnly -->
+ </ul>
+
+ <br />
+
+ <ul id="users-container" class="users-container rooms">
+
+ <!-- BEGIN rooms -->
+ <!-- IF rooms.total -->
+ <li>
+ <a href="{config.relative_path}{rooms.link}">[[users:{rooms.room}]]</a><br/>
+ <!-- BEGIN rooms.users -->
+ <a href="{rooms.users.userslug}"><img class="user-img" src="{rooms.users.picture}" title="{rooms.users.username}"/></a>
+ <!-- END rooms.users -->
+ </li>
+ <!-- ENDIF rooms.total -->
+ <!-- END rooms -->
+
+ </ul>
+
+</div>
From 0e4b7a075350303dfcefc013ec9117f7b17d0b1a Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 14 Jul 2015 17:05:35 -0400
Subject: [PATCH 2/4] 1.0.6
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 83b6f25..272e8c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "nodebb-theme-persona",
- "version": "1.0.5",
+ "version": "1.0.6",
"nbbpm": {
"compatibility": "^0.7.1"
},
From 8eef97b8ac83d99739561dd8624e4aa92e762174 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 15 Jul 2015 14:11:50 -0400
Subject: [PATCH 3/4] minor stylistic change to account posts listing
---
templates/account/posts.tpl | 2 +-
templates/account/profile.tpl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/account/posts.tpl b/templates/account/posts.tpl
index 6b22f27..e5d12a6 100644
--- a/templates/account/posts.tpl
+++ b/templates/account/posts.tpl
@@ -4,7 +4,7 @@
<div class="favourites">
<!-- IF !posts.length -->
- <div class="alert alert-warning">[[user:has_no_posts]]</div>
+ <div class="alert alert-info">[[user:has_no_posts]]</div>
<!-- ENDIF !posts.length -->
<div class="row">
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 26999fd..e109cd4 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -154,7 +154,7 @@
<div class="col-md-7">
<!-- IF !posts.length -->
- <span>[[user:has_no_posts]]</span>
+ <div class="alert alert-info">[[user:has_no_posts]]</div>
<!-- ENDIF !posts.length -->
<!-- IMPORT partials/posts_list.tpl -->
</div>
From f16e3cffafad612033a19068c742809a15cd753b Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 15 Jul 2015 14:11:53 -0400
Subject: [PATCH 4/4] 1.0.7
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 272e8c3..692ef4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "nodebb-theme-persona",
- "version": "1.0.6",
+ "version": "1.0.7",
"nbbpm": {
"compatibility": "^0.7.1"
},