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

public/language/en_GB/register.json

@@ -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"
 }

public/language/sk/global.json

@@ -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.chats": "Chaty",
-    "header.notifications": "Notifications",
+    "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",
+    "previouspage": "Predchádzajúca strana",
-    "nextpage": "Next Page",
+    "nextpage": "Ďalšia strana",
-    "alert.success": "Success",
+    "alert.success": "Úspešne",
-    "alert.error": "Error",
+    "alert.error": "Chyba",
-    "alert.banned": "Banned",
+    "alert.banned": "Zakázany",
-    "alert.banned.message": "You are banned you will be logged out!",
+    "alert.banned.message": "Tvoj prístup bol zakázany a budeš odhlasená/ý!",
-    "alert.unfollow": "You are no longer following %1!",
+    "alert.unfollow": "Už nenasleduješ %!",
-    "alert.follow": "You are now following %1!",
+    "alert.follow": "Nasleduješ %1!",
-    "posts": "Posts",
+    "posts": "Príspevkov",
-    "views": "Views"
+    "views": "Zhliadnutí"
 }

public/language/sk/notifications.json

@@ -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",

public/language/sk/recent.json

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

public/language/sk/topic.json

@@ -14,12 +14,12 @@
     "fork": "Rozdeliť",
     "banned": "Zakázaný",
     "link": "Odkaz",
-    "share": "Share",
+    "share": "Zdieľaj",
-    "tools": "Tools",
+    "tools": "Nástroje",
-    "flag": "Flag",
+    "flag": "Označiť",
-    "flag_title": "Flag this post for moderation",
+    "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",

public/language/sk/unread.json

@@ -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"

public/src/forum/register.js

@@ -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;

public/templates/admin/index.tpl

@@ -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://community.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-comment"></i> NodeBB Community 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://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.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-github-alt"></i> Get 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="http://www.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-twitter"></i> dcplabs</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>

public/templates/admin/settings.tpl

@@ -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>

public/templates/register.tpl

@@ -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 />

src/routes/api.js

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