Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-05 20:11:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-31 11:59:42 -05:00
parent bdd4bb0003 59d1a90820
commit 14b2fd050e
11 changed files with 63 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/language/en_GB/register.json
View File

@@ -12,5 +12,7 @@
"confirm_password": "Confirm Password",
"confirm_password_placeholder": "Confirm Password",
"register_now_button": "Register Now",
"alternative_registration": "Alternative Registration"
"alternative_registration": "Alternative Registration",
"terms_of_use": "Terms of Use",
"agree_to_terms_of_use": "I agree to the Terms of Use"
}

28
public/language/sk/global.json
View File

@@ -18,27 +18,27 @@
"header.admin": "Administrácia",
"header.recent": "Aktuality",
"header.unread": "Neprečítané",
"header.popular": "Popular",
"header.popular": "Populárne",
"header.users": "Užívatelia",
"header.chats": "Chats",
"header.notifications": "Notifications",
"header.chats": "Chaty",
"header.notifications": "Notifikácie",
"header.search": "Hľadať",
"header.profile": "Moj profil",
"notifications.loading": "Načítanie upozornení",
"notifications.loading": "Načítanie notifikácií",
"chats.loading": "Načítanie grafov",
"motd.welcome": "Vítajte na NodeBB, diskusná platforma budúcnosti.",
"motd.get": "Získať NodeBB",
"motd.fork": "Fork",
"motd.like": "To sa mi ľúbi",
"motd.follow": "Sledovať",
"previouspage": "Previous Page",
"nextpage": "Next Page",
"alert.success": "Success",
"alert.error": "Error",
"alert.banned": "Banned",
"alert.banned.message": "You are banned you will be logged out!",
"alert.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"posts": "Posts",
"views": "Views"
"previouspage": "Predchádzajúca strana",
"nextpage": "Ďalšia strana",
"alert.success": "Úspešne",
"alert.error": "Chyba",
"alert.banned": "Zakázany",
"alert.banned.message": "Tvoj prístup bol zakázany a budeš odhlasená/ý!",
"alert.unfollow": "Už nenasleduješ %!",
"alert.follow": "Nasleduješ %1!",
"posts": "Príspevkov",
"views": "Zhliadnutí"
}

2
public/language/sk/notifications.json
View File

@@ -1,5 +1,5 @@
{
"title": "Upozornenie",
"title": "Notifikácie",
"back_to_home": "Späť na úvodnú stránku",
"outgoing_link": "Odkaz mimo fórum",
"outgoing_link_message": "Teraz opúšťate fórum",

2
public/language/sk/recent.json
View File

@@ -1,5 +1,5 @@
{
"title": "Recent",
"title": "Nedávne",
"day": "Deň",
"week": "Týždeň",
"month": "Mesiac"

10
public/language/sk/topic.json
View File

@@ -14,12 +14,12 @@
"fork": "Rozdeliť",
"banned": "Zakázaný",
"link": "Odkaz",
"share": "Share",
"tools": "Tools",
"flag": "Flag",
"flag_title": "Flag this post for moderation",
"share": "Zdieľaj",
"tools": "Nástroje",
"flag": "Označiť",
"flag_title": "Označiť príspevok pre moderáciu",
"thread_tools.title": "Nástroje",
"thread_tools.markAsUnreadForAll": "Mark Unread",
"thread_tools.markAsUnreadForAll": "Označ ako neprečítané",
"thread_tools.pin": "Zvýrazniť vlákno",
"thread_tools.lock": "Uzamknúť vlákno",
"thread_tools.move": "Presunúť vlákno",

2
public/language/sk/unread.json
View File

@@ -1,5 +1,5 @@
{
"title": "Unread",
"title": "Neprečítané",
"no_unread_topics": "Nie sú tu žiadne neprečítané témy.",
"mark_all_read": "Označit všetko ako prečítané",
"load_more": "Načítať dalšie"

13
public/src/forum/register.js
View File

@@ -11,6 +11,7 @@ define(function() {
email_notify = $('#email-notify'),
password_notify = $('#password-notify'),
password_confirm_notify = $('#password-confirm-notify'),
agreeTerms = $('#agree-terms'),
validationError = false,
successIcon = '<i class="fa fa-check"></i>';
@@ -154,6 +155,18 @@ define(function() {
e.preventDefault();
}
});
if(agreeTerms.length) {
agreeTerms.on('click', function() {
if ($(this).prop('checked')) {
register.removeAttr('disabled');
} else {
register.attr('disabled', 'disabled');
}
});
register.attr('disabled', 'disabled');
}
};
return Register;

8
public/templates/admin/index.tpl
View File

@@ -3,10 +3,10 @@
<h1>Welcome to NodeBB</h1>
<br />
<p>
<a target="_blank" href="http://www.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-comment"></i> NodeBB Forum</a>
<a target="_blank" href="http://www.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-github-alt"></i> Get Plugins</a>
<a target="_blank" href="http://www.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-github-alt"></i> Get Themes</a>
<a target="_blank" href="http://www.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-twitter"></i> dcplabs</a>
<a target="_blank" href="http://community.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-comment"></i> NodeBB Community Forum</a>
<a target="_blank" href="http://community.nodebb.org/" class="btn btn-default btn-lg"><i class="fa fa-github-alt"></i> Get Plugins and Themes</a>
<a target="_blank" href="http://www.twitter.com/NodeBB" class="btn btn-default btn-lg"><i class="fa fa-twitter"></i> Follow @NodeBB</a>
<a target="_blank" href="https://github.com/designcreateplay/NodeBB/wiki" class="btn btn-default btn-lg"><i class="fa fa-question-circle"></i> NodeBB Wiki</a>
</p>
<p><small>You are running <strong>NodeBB v{version}</strong>. Always make sure that your <strong>NodeBB</strong> is up to date for the latest security patches and bug fixes.</small></p>
</div>

2
public/templates/admin/settings.tpl
View File

@@ -94,6 +94,8 @@
<input type="text" class="form-control" value="6" data-field="minimumPasswordLength"><br />
<strong>Maximum Signature Length</strong><br />
<input type="text" class="form-control" value="255" data-field="maximumSignatureLength"><br />
<strong>Forum Terms of Use <small>(Leave blank to disable)</small></strong><br />
<textarea class="form-control" data-field="termsOfUse"></textarea><br />
</div>
</form>
</div>

15
public/templates/register.tpl
View File

@@ -58,6 +58,21 @@
</div>
</div>
</div>
<!-- IF termsOfUse -->
<div class="form-group">
<label class="col-lg-4 control-label">&nbsp;</label>
<div class="col-lg-8">
<hr />
<strong>[[register:terms_of_use]]</strong>
<textarea readonly class="form-control" rows=6>{termsOfUse}</textarea>
<div class="checkbox">
<label>
<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree_to_terms_of_use]]
</label>
</div>
</div>
</div>
<!-- ENDIF termsOfUse -->
<div class="form-group">
<div class="col-lg-offset-4 col-lg-8">
<hr />

7
src/routes/api.js
View File

@@ -161,9 +161,10 @@ var path = require('path'),
data.authentication = login_strategies;
data.token = res.locals.csrf_token;
data.minimumUsernameLength = meta.config['minimumUsernameLength'];
data.maximumUsernameLength = meta.config['maximumUsernameLength'];
data.minimumPasswordLength = meta.config['minimumPasswordLength'];
data.minimumUsernameLength = meta.config.minimumUsernameLength;
data.maximumUsernameLength = meta.config.maximumUsernameLength;
data.minimumPasswordLength = meta.config.minimumPasswordLength;
data.termsOfUse = meta.config.termsOfUse;
res.json(data);
});