fixed small frontend issues, upgraded placeholder text.

assets/css/pretendo-common.css

@@ -269,6 +269,7 @@ a.btn, a.btn-alt,
 a.btn:focus, a.btn-alt:focus,
 a.btn:hover, a.btn-alt:hover {
 	text-decoration: none;
+	display: inline-block;
 }
 button, .btn, .btn-alt {
 	margin: 0;

locales/US_en.json

@@ -18,17 +18,26 @@
 	},
 	"progress": {
 		"summary": {
+			"caption": "All in one",
 			"title": "Progress Summary",
 			"text": "We should probably pull this from a database ngl"
 		},
 		"compatability": {
+			"caption": "Usefull info",
 			"title": "Game Compatability"
 		},
 		"misc": {
+			"caption": "Less usefull info",
 			"title": "Other"
 		}
 	},
+	"news": {
+		"caption": "Read up",
+		"title": "All news",
+		"button_text": "Read more"
+	},
 	"contact": {
+		"caption": "Have a question?",
 		"title": "Contact Us",
 		"button_text": "Send Message",
 		"email_placeholder": "email@provider.com",
@@ -37,12 +46,13 @@
 	},
 	"login": {
 		"card": {
+			"caption": "Sign in",
 			"title": "Login",
 			"email_text": "Username or Email",
 			"password_text": "Password",
-			"email_placeholder": "email@provider.com",
-			"password_placeholder": "••••••••",
-			"button_text": "Sign In"
+			"button_text": "Sign In",
+			"link_introduction": "Don't have an account yet?",
+			"link_text": "Click here to register."
 		}
 	},
 	"register": {
@@ -52,23 +62,50 @@
 			"username_text": "Username",
 			"password_text": "Password",
 			"password_confirm_text": "Confirm Password",
-			"email_placeholder": "email@provider.com",
-			"password_placeholder": "••••••••",
-			"caption": "Sign Up"
+			"caption": "Sign Up",
+			"button_text": "Sign up",
+			"link_introduction": "Already have an account?",
+			"link_text": "Click here to login."
 		}
 	},
 	"about": {
+		"caption": "What is this?",
 		"title": "About",
 		"text": "Pretendo is an open source Nintendo Network replacement that aims to build custom servers for the WiiU and 3DS/2DS family of consoles. Our goal is to preserve the online functionality of these consoles, to allow players to continue to play their favorite WiiU and 3DS/2DS games to their fullest capacity."
 	},
 	"credits": {
+		"caption": "Who are responsible?",
 		"title": "Credits"
 	},
+	"latest_news": {
+		"caption": "Catch up",
+		"title": "Latest news",
+		"description": "Pretendo is constantly evolving to create the best possible servers. We release posts to showcase what we have been working on and how far we got with certain things.",
+		"button_text": "All posts",
+		"news_button_text": "Read more"
+	},
 	"errors": {
 		"invalid_login": "Invalid username/password combination",
 		"account_exists": "An account with that username already exists!"
 	},
+	"validate_email_popup": {
+		"text": "Your email has not been validated yet. You are restricted from certain features.",
+		"change_button_text": "Change email",
+		"repeat_button_text": "Send again"
+	},
+	"dashboard": {
+		"navigation": {
+			"links": {
+				"account": "Account",
+				"soon": "Coming soon"
+			}
+		},
+		"account": {
+			"caption": "Pretendo Network ID",
+			"title": "Account information"
+		}
+	},
 	"footer": {
-		"text": "Copyright 2018 PretendoNetwork - Site designed and developed by MrJVS and Jip"
+		"text": "Copyright 2018 PretendoNetwork - Site designed and developed by MrJVS, ben and Jip"
 	}
 }

routes/admin.js

@@ -52,7 +52,6 @@ router.post('/admin/api/v1/login', passport.authenticate('adminUserStrategy'), (
 
 	return apiHelper.sendReturn(response, {
 		username: user.username,
-		locale: user.getLocale(), // calls 'utilHelper.getLocale(user.region, user.language)' maybe?
 		role: user.role ? user.role : undefined
 	});
 });

views/contact.hbs

@@ -13,7 +13,7 @@
             <div class="bgExtrude"></div>
             <section class="bigCardWrapper">
                 <div class="bigCard">
-                    <p class="txt-highlight">ERROR</p>
+                    <p class="txt-highlight">{{ locale.contact.caption }}</p>
 				    <h1 class="txt-title">{{ locale.contact.title }}</h1>
                     <div id="errorBox" class="error hide"></div>
                     <div id="successBox" class="success hide"></div>

views/dashboard.hbs

@@ -7,12 +7,12 @@
     </head>
     <body class="flex">
         {{> nav-default }}
-        <div id="email_validation_popup" class="email_popup{{#if_eq user.email_validated true}} hide{{/if_eq}}"><p>Your email has not been validated yet. You are restricted from certain features.</p><span><button class="btn-alt small">Change email</button> <button class="btn small">Send again</button></span></div>
+        <div id="email_validation_popup" class="email_popup{{#if_eq user.email_validated true}} hide{{/if_eq}}"><p>{{ locale.validate_email_popup.text }}</p><span><button class="btn-alt small">{{ locale.validate_email_popup.change_button_text }}</button> <button class="btn small">{{ locale.validate_email_popup.repeat_button_text }}</button></span></div>
         <div class="contentWrapper userPage">
             {{> nav-dashboard }}
             <section class="contentCard">
-                <p class="txt-highlight">ERROR</p>
-                <h1 class="txt-title small">ERROR</h1>
+                <p class="txt-highlight">{{ locale.dashboard.account.caption }}</p>
+                <h1 class="txt-title small">{{ locale.dashboard.account.title }}</h1>
             </section>
         </div>  
         {{> footer-default }}

views/home.hbs

@@ -18,7 +18,7 @@
             <div class="bgExtrude"></div>
             <section class="bigCardWrapper">
                 <div class="bigCard">
-                    <p class="txt-highlight">ERROR</p>
+                    <p class="txt-highlight">{{ locale.about.caption }}</p>
 				    <h1 class="txt-title">{{ locale.about.title }}</h1>
 				    <p>{{ locale.about.text }}</p>
                 </div>
@@ -26,7 +26,7 @@
 
             <section class="bigCardWrapper">
                 <div class="bigCard">
-                    <p class="txt-highlight">ERROR</p>
+                    <p class="txt-highlight">{{ locale.about.caption }}</p>
 				    <h1 class="txt-title">{{ locale.credits.title }}</h1>
 				    <div class="cardProfiles">
                         <!-- profile -->
@@ -79,18 +79,18 @@
             <section class="bigCardWrapper">
                 <div class="bigCard lessPadding cont-flex">
                     <div class="flex-item">
-                        <p class="txt-highlight">ERROR</p>
-					    <h1 class="txt-title">ERROR</h1>
-					    <p>ERROR</p>
-                        <button class="btn">ERROR</button>
+                        <p class="txt-highlight">{{ locale.latest_news.caption }}</p>
+					    <h1 class="txt-title">{{ locale.latest_news.title }}</h1>
+					    <p>{{ locale.latest_news.description }}</p>
+                        <a href="/news" class="btn">{{ locale.latest_news.button_text }}</a>
                     </div>
                     <div class="cont-flex">
-                        {{#each posts }}
+                        {{#each posts as |post| }}
                         <div class="smallCardWidth">
                             <div class="smallCard">
-                                <h3 class="txt-smallHeading">{{ this.title }}</h3>
-                                <p>{{ this.content }}</p>
-                                <a href="/news/{{ this.url }}" class="btn-alt">ERROR</a>
+                                <h3 class="txt-smallHeading">{{ post.title }}</h3>
+                                <p>{{ post.content }}</p>
+                                <a href="/news/{{ post.url }}" class="btn-alt">{{ ../locale.latest_news.news_button_text }}</a>
                             </div>
                         </div>
                         {{/each }}

views/login.hbs

@@ -13,7 +13,7 @@
         <div class="card">
             <h2 class="head">{{ locale.nav.brand }}</h2>
             <div class="content">
-                <p class="txt-highlight">ERROR</p>
+                <p class="txt-highlight">{{ locale.login.card.caption }}</p>
                 <h1 class="txt-title small">{{ locale.login.card.title }}</h1>
                 <div id="errorBox" class="error hide"></div>
                 <form method="POST">
@@ -23,7 +23,7 @@
                     <input type="password" class="hasLabel" id="password_input" name="password">
                 </form>
                 <button class="btn btnMargin" onclick="login();">{{ locale.login.card.button_text }}</button>
-                <p class="lowText">ERROR <a href="#">ERROR</a></p>
+                <p class="lowText">{{ locale.login.card.link_introduction }} <a href="/pnid/register">{{ locale.login.card.link_text }}</a></p>
             </div>
         </div>
         {{> footer-default }}

views/partials/nav-dashboard.hbs

@@ -4,9 +4,7 @@
         <p class="name">{{ user.user.pnid.username }}</p>
     </div>
     <div class="links">
-       <a class="navItem active" href="#">ERROR</a>
-       <a class="navItem" href="#">ERROR</a>
-       <a class="navItem" href="#">ERROR</a>
-       <a class="navItem" href="#">ERROR</a>
+       <a class="navItem active" href="#">{{ locale.dashboard.navigation.links.account }}</a>
+       <a class="navItem" href="#">{{ locale.dashboard.navigation.links.soon }}</a>
     </div>
 </nav>

views/post-collection.hbs

@@ -11,13 +11,13 @@
             <div class="bgExtrude"></div>
             <section class="bigCardWrapper">
                 <div class="bigCard lessPadding">
-                    <p class="txt-highlight">ERROR</p>
-				    <h1 class="txt-title">ERROR</h1><!--
-                    {{#each posts }}
+                    <p class="txt-highlight">{{ locale.news.caption }}</p>
+				    <h1 class="txt-title">{{ locale.news.title }}</h1><!--
+                    {{#each posts as |post| }}
                     --><article class="smallCard">
-                        <h3 class="txt-smallHeading">{{ this.title }}</h3>
-                        <p>{{ this.content }}</p>
-                        <a class="btn-alt" href="/news/{{ this.url }}">ERROR</a>
+                        <h3 class="txt-smallHeading">{{ post.title }}</h3>
+                        <p>{{ post.content }}</p>
+                        <a class="btn-alt" href="/news/{{ post.url }}">{{ ../locale.news.button_text }}</a>
                     </article><!--
                     {{/each}}
                     -->

views/progress.hbs

@@ -11,15 +11,15 @@
             <div class="bgExtrude"></div>
             <section class="bigCardWrapper">
                 <div class="bigCard">
-                    <p class="txt-highlight">ERROR</p>
-				    <h1 class="txt-title">ERROR</h1>
-                    <p>{{ summary }}</p>
+                    <p class="txt-highlight">{{ locale.progress.summary.caption }}</p>
+				    <h1 class="txt-title">{{ locale.progress.summary.title }}</h1>
+                    <p>{{ locale.progress.summary.text }}</p>
                 </div>
             </section>
             <section class="bigCardWrapper double">
                 <div class="bigCard">
-                    <p class="txt-highlight">ERROR</p>
-				    <h1 class="txt-title">ERROR</h1>
+                    <p class="txt-highlight">{{ locale.progress.compatability.caption }}</p>
+				    <h1 class="txt-title">{{ locale.progress.compatability.title }}</h1>
                     {{#each games }}
                     <div class="listItem state{{ this.state }}">
                         <h2>{{ this.title }}</h2>
@@ -28,8 +28,8 @@
                     {{/each}}
                 </div>
                 <div class="bigCard">
-                    <p class="txt-highlight">ERROR</p>
-				    <h1 class="txt-title">ERROR</h1>
+                    <p class="txt-highlight">{{ locale.progress.misc.caption }}</p>
+				    <h1 class="txt-title">{{ locale.progress.misc.title }}</h1>
                     {{#each backends }}
                     <div class="listItem">
                         <h2>{{ this.title }}</h2>

views/register.hbs

@@ -30,8 +30,8 @@
 
                     <div class="g-recaptcha" data-sitekey="{{ recaptcha_sitekey }}"></div>
                 </form>
-                <button class="btn btnMargin" onclick="register()">ERROR</button>
-                <p class="lowText">ERROR <a href="#">ERROR</a></p>
+                <button class="btn btnMargin" onclick="register()">{{ locale.register.card.button_text }}</button>
+                <p class="lowText">{{ locale.register.card.link_introduction }} <a href="/pnid/login">{{ locale.register.card.link_text }}</a></p>
             </div>
         </div>
         {{> footer-default }}