hyperzlib
/
nodebb-theme-persona
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into chats-redesign

Browse Source
main
psychobunny 10 years ago
parent 4ecd12c6ef 62cf9688a8
commit 1eabb538fa
18 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File

2
package.json
Unescape Escape View File

@ -1,6 +1,6 @@
{ {
"name": "nodebb-theme-persona", "name": "nodebb-theme-persona",
"version": "2.1.8", "version": "2.1.11",
"nbbpm": { "nbbpm": {
"compatibility": "^0.8.0" "compatibility": "^0.8.0"
}, },

2
templates/account/edit.tpl
Unescape Escape View File

@ -140,5 +140,3 @@
<!-- IMPORT partials/modals/upload_picture_from_url_modal.tpl --> <!-- IMPORT partials/modals/upload_picture_from_url_modal.tpl -->
</div> </div>
<!-- IMPORT partials/variables/account.tpl -->
<!-- IMPORT partials/variables/account/edit.tpl -->

2
templates/account/favourites.tpl
Unescape Escape View File

@ -16,5 +16,3 @@
</div> </div>
</div> </div>
</div> </div>
<!-- IMPORT partials/variables/account.tpl -->

2
templates/account/posts.tpl
Unescape Escape View File

@ -17,5 +17,3 @@
</div> </div>
</div> </div>
</div> </div>
<!-- IMPORT partials/variables/account.tpl -->

3
templates/account/profile.tpl
Unescape Escape View File

@ -167,6 +167,3 @@
<div id="user-action-alert" class="alert alert-success hide"></div> <div id="user-action-alert" class="alert alert-success hide"></div>
</div> </div>
<!-- IMPORT partials/variables/account.tpl -->
<!-- IMPORT partials/variables/account/profile.tpl -->

1
templates/account/settings.tpl
Unescape Escape View File

@ -150,4 +150,3 @@
</div> </div>
</div> </div>
<!-- IMPORT partials/variables/account.tpl -->

2
templates/account/topics.tpl
Unescape Escape View File

@ -12,5 +12,3 @@
<!-- ENDIF config.usePagination --> <!-- ENDIF config.usePagination -->
</div> </div>
</div> </div>
<!-- IMPORT partials/variables/account.tpl -->

2
templates/account/watched.tpl
Unescape Escape View File

@ -12,5 +12,3 @@
<!-- ENDIF config.usePagination --> <!-- ENDIF config.usePagination -->
</div> </div>
</div> </div>
<!-- IMPORT partials/variables/account.tpl -->

1
templates/category.tpl
Unescape Escape View File

@ -45,4 +45,3 @@
</noscript> </noscript>
<!-- ENDIF !config.usePagination --> <!-- ENDIF !config.usePagination -->
<!-- IMPORT partials/variables/category.tpl -->

2
templates/groups/details.tpl
Unescape Escape View File

@ -236,5 +236,3 @@
<div widget-area="right"></div> <div widget-area="right"></div>
</div> </div>
</div> </div>
<!-- IMPORT partials/variables/groups/details.tpl -->

10
templates/header.tpl
Unescape Escape View File

@ -5,7 +5,7 @@
<!-- BEGIN metaTags --> <!-- BEGIN metaTags -->
{function.buildMetaTag} {function.buildMetaTag}
<!-- END metaTags --> <!-- END metaTags -->
<link rel="stylesheet" type="text/css" href="{relative_path}/stylesheet.css?{css-buster}" /> <link rel="stylesheet" type="text/css" href="{relative_path}/stylesheet.css?{config.css-buster}" />
<!-- IF bootswatchCSS --><link id="bootswatchCSS" href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS --> <!-- IF bootswatchCSS --><link id="bootswatchCSS" href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS -->
<!-- BEGIN linkTags --> <!-- BEGIN linkTags -->
<link<!-- IF linkTags.link --> link="{linkTags.link}"<!-- ENDIF linkTags.link --><!-- IF linkTags.rel --> rel="{linkTags.rel}"<!-- ENDIF linkTags.rel --><!-- IF linkTags.type --> type="{linkTags.type}"<!-- ENDIF linkTags.type --><!-- IF linkTags.href --> href="{linkTags.href}"<!-- ENDIF linkTags.href --> /> <link<!-- IF linkTags.link --> link="{linkTags.link}"<!-- ENDIF linkTags.link --><!-- IF linkTags.rel --> rel="{linkTags.rel}"<!-- ENDIF linkTags.rel --><!-- IF linkTags.type --> type="{linkTags.type}"<!-- ENDIF linkTags.type --><!-- IF linkTags.href --> href="{linkTags.href}"<!-- ENDIF linkTags.href --> />
@ -26,9 +26,9 @@
user: JSON.parse('{{userJSON}}') user: JSON.parse('{{userJSON}}')
}; };
</script> </script>
<script src="{relative_path}/nodebb.min.js?{script-buster}"></script> <script src="{relative_path}/nodebb.min.js?{config.script-buster}"></script>
<!-- IMPORT partials/requirejs-config.tpl --> <!-- IMPORT partials/requirejs-config.tpl -->
<!-- IF useCustomJS --> <!-- IF useCustomJS -->
{{customJS}} {{customJS}}
<!-- ENDIF useCustomJS --> <!-- ENDIF useCustomJS -->
@ -49,7 +49,7 @@
<ul class="menu-section-list"></ul> <ul class="menu-section-list"></ul>
</section> </section>
<!-- IF loggedIn --> <!-- IF config.loggedIn -->
<section class="menu-section" data-section="profile"> <section class="menu-section" data-section="profile">
<h3 class="menu-section-title">[[global:header.profile]]</h3> <h3 class="menu-section-title">[[global:header.profile]]</h3>
<ul class="menu-section-list" component="header/usercontrol"></ul> <ul class="menu-section-list" component="header/usercontrol"></ul>
@ -70,7 +70,7 @@
</h3> </h3>
<ul class="menu-section-list chat-list"></ul> <ul class="menu-section-list chat-list"></ul>
</section> </section>
<!-- ENDIF loggedIn --> <!-- ENDIF config.loggedIn -->
</nav> </nav>
<main id="panel"> <main id="panel">

20
templates/partials/menu.tpl
Unescape Escape View File

@ -9,11 +9,11 @@
<a href="<!-- IF brand:logo:url -->{brand:logo:url}<!-- ELSE -->{relative_path}/<!-- ENDIF brand:logo:url -->"> <a href="<!-- IF brand:logo:url -->{brand:logo:url}<!-- ELSE -->{relative_path}/<!-- ENDIF brand:logo:url -->">
<img alt="{brand:logo:alt}" class="{brand:logo:display} forum-logo" src="{brand:logo}" /> <img alt="{brand:logo:alt}" class="{brand:logo:display} forum-logo" src="{brand:logo}" />
</a> </a>
<!-- IF showSiteTitle --> <!-- IF config.showSiteTitle -->
<a href="{relative_path}/"> <a href="{relative_path}/">
<h1 class="navbar-brand forum-title">{title}</h1> <h1 class="navbar-brand forum-title">{title}</h1>
</a> </a>
<!-- ENDIF showSiteTitle --> <!-- ENDIF config.showSiteTitle -->
<div component="navbar/title" class="visible-xs"> <div component="navbar/title" class="visible-xs">
<span></span> <span></span>
@ -22,7 +22,7 @@
<div id="nav-dropdown" class="hidden-xs"> <div id="nav-dropdown" class="hidden-xs">
<!-- IF !maintenanceHeader --> <!-- IF !maintenanceHeader -->
<!-- IF loggedIn --> <!-- IF config.loggedIn -->
<ul id="logged-in-menu" class="nav navbar-nav navbar-right"> <ul id="logged-in-menu" class="nav navbar-nav navbar-right">
<li id="user_label" class="dropdown"> <li id="user_label" class="dropdown">
@ -81,7 +81,7 @@
</ul> </ul>
</li> </li>
<!-- IF !disableChat --> <!-- IF !config.disableChat -->
<li class="chats dropdown"> <li class="chats dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="[[global:header.chats]]" id="chat_dropdown" component="chat/dropdown"> <a class="dropdown-toggle" data-toggle="dropdown" href="#" title="[[global:header.chats]]" id="chat_dropdown" component="chat/dropdown">
<i component="chat/icon" class="fa fa-comment-o fa-fw"></i> <span class="visible-xs-inline">[[global:header.chats]]</span> <i component="chat/icon" class="fa fa-comment-o fa-fw"></i> <span class="visible-xs-inline">[[global:header.chats]]</span>
@ -97,18 +97,18 @@
<li class="notif-dropdown-link"><a href="{relative_path}/chats">[[modules:chat.see_all]]</a></li> <li class="notif-dropdown-link"><a href="{relative_path}/chats">[[modules:chat.see_all]]</a></li>
</ul> </ul>
</li> </li>
<!-- ENDIF !disableChat --> <!-- ENDIF !config.disableChat -->
</ul> </ul>
<!-- ELSE --> <!-- ELSE -->
<ul id="logged-out-menu" class="nav navbar-nav navbar-right"> <ul id="logged-out-menu" class="nav navbar-nav navbar-right">
<!-- IF allowRegistration --> <!-- IF config.allowRegistration -->
<li> <li>
<a href="{relative_path}/register"> <a href="{relative_path}/register">
<i class="fa fa-pencil visible-xs-inline"></i> <i class="fa fa-pencil visible-xs-inline"></i>
<span>[[global:register]]</span> <span>[[global:register]]</span>
</a> </a>
</li> </li>
<!-- ENDIF allowRegistration --> <!-- ENDIF config.allowRegistration -->
<li> <li>
<a href="{relative_path}/login"> <a href="{relative_path}/login">
<i class="fa fa-sign-in visible-xs-inline"></i> <i class="fa fa-sign-in visible-xs-inline"></i>
@ -116,8 +116,8 @@
</a> </a>
</li> </li>
</ul> </ul>
<!-- ENDIF loggedIn --> <!-- ENDIF config.loggedIn -->
<!-- IF searchEnabled --> <!-- IF config.searchEnabled -->
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li> <li>
<form id="search-form" class="navbar-form navbar-right hidden-xs" role="search" method="GET" action=""> <form id="search-form" class="navbar-form navbar-right hidden-xs" role="search" method="GET" action="">
@ -136,7 +136,7 @@
</a> </a>
</li> </li>
</ul> </ul>
<!-- ENDIF searchEnabled --> <!-- ENDIF config.searchEnabled -->
<ul class="nav navbar-nav navbar-right hidden-xs"> <ul class="nav navbar-nav navbar-right hidden-xs">
<li> <li>

4
templates/partials/modals/change_picture_modal.tpl
Unescape Escape View File

@ -1,9 +1,9 @@
<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true"> <div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="change-picture" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="myModalLabel">[[user:change_picture]]</h3> <h3 id="change-picture">[[user:change_picture]]</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div id="gravatar-box"> <div id="gravatar-box">

4
templates/partials/modals/upload_picture_from_url_modal.tpl
Unescape Escape View File

@ -1,9 +1,9 @@
<div id="upload-picture-from-url-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Upload Picture From Url" aria-hidden="true"> <div id="upload-picture-from-url-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="upload-picture-url" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3>[[user:upload_picture]]</h3> <h3 id="upload-picture-url">[[user:upload_picture]]</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<input id="uploadFromUrl" class="form-control" type="text"/> <input id="uploadFromUrl" class="form-control" type="text"/>

4
templates/partials/modals/upload_picture_modal.tpl
Unescape Escape View File

@ -1,9 +1,9 @@
<div id="upload-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Upload Picture" aria-hidden="true"> <div id="upload-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="upload-picture" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="myModalLabel">[[user:upload_picture]]</h3> <h3 id="upload-picture">[[user:upload_picture]]</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form id="uploadForm" action="" method="post" enctype="multipart/form-data"> <form id="uploadForm" action="" method="post" enctype="multipart/form-data">

1
templates/reset_code.tpl
Unescape Escape View File

@ -30,7 +30,6 @@
</div> </div>
</form> </form>
</div> </div>
<!-- IMPORT partials/variables/reset_code.tpl -->
<!-- ELSE --> <!-- ELSE -->
<div class="panel panel-default panel-danger"> <div class="panel panel-default panel-danger">
<div class="panel-heading"> <div class="panel-heading">

2
templates/tag.tpl
Unescape Escape View File

@ -12,5 +12,3 @@
<button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button> <button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button>
</div> </div>
</div> </div>
<!-- IMPORT partials/variables/tag.tpl -->

2
templates/topic.tpl
Unescape Escape View File

@ -62,5 +62,3 @@
<!-- IMPORT partials/paginator.tpl --> <!-- IMPORT partials/paginator.tpl -->
</noscript> </noscript>
<!-- ENDIF !config.usePagination --> <!-- ENDIF !config.usePagination -->
<!-- IMPORT partials/variables/topic.tpl -->
Write Preview
Loading…
Cancel
Save