Improved bootstrap theme

Aurora0000 · Jun 20, 2015 · 0e11a9b · 0e11a9b
1 parent 176ad7a
commit 0e11a9b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/static/descant/templates/bootstrap/pages/user-cp.html b/static/descant/templates/bootstrap/pages/user-cp.html
@@ -1,7 +1,18 @@
-<h1 translate="USER_CP_HEADER"></h1>
-<locale-selector></locale-selector>
-<theme-selector></theme-selector>
-<br />
-<hr />
-<br />
-<user-cp-settings></user-cp-settings>
+<div class="container-fluid">
+  <div class="col-md-3">
+    <span ng-init="langThemeTab = true"></span>
+    <ul class="nav nav-pills nav-stacked">
+      <li role="presentation" ng-class="{'active': langThemeTab }" ng-click="langThemeTab = true; userCpTab = false;"><a translate="LANGUAGE_THEME"></a></li>
+      <li role="presentation" ng-class="{'active': userCpTab }" ng-click="langThemeTab = false; userCpTab = true;"><a translate="USER_CP_HEADER"></a></li>
+    </ul>
+  </div>
+  <div class="col-md-9">
+    <div ng-show="langThemeTab">
+      <locale-selector></locale-selector>
+      <theme-selector></theme-selector>
+    </div>
+    <div ng-show="userCpTab">
+      <user-cp-settings></user-cp-settings>
+    </div>
+  </div>
+</div>
diff --git a/static/descant/templates/bootstrap/settings/user-cp-settings.html b/static/descant/templates/bootstrap/settings/user-cp-settings.html
@@ -1,3 +1,4 @@
+<h2 ng-show="!cpCtrl.logged_in"><a href="#/login" translate="LOGIN"></a>!</h2>
 <form ng-hide="cpCtrl.options || !cpCtrl.logged_in">
 	<div class="form-group">
 		<label translate="ENTER_CURRENT_PASSWD"></label>

diff --git a/static/descant/templates/bootstrap/users/register-box.html b/static/descant/templates/bootstrap/users/register-box.html
@@ -3,10 +3,10 @@
 	<div class="body">
 		<form>
 			<div class="form-group">
-				<input class="form-control" placeholder="{{'USERNAME' | translate}}" ng-model="user">
+				<input class="form-control" autocomplete="username" placeholder="{{'USERNAME' | translate}}" ng-model="user">
 			</div>
 			<div class="form-group">
-				<input type="email" class="form-control" placeholder="{{'EMAIL_ADDR' | translate}}" ng-model="email">
+				<input type="email" class="form-control" autocomplete="email" placeholder="{{'EMAIL_ADDR' | translate}}" ng-model="email">
 			</div>
 			<div class="form-group">
 				<input type="password" class="form-control" placeholder="{{'PASSWORD' | translate}}" ng-model="pass">

diff --git a/static/descant/translations/lang-en.json b/static/descant/translations/lang-en.json
@@ -50,6 +50,7 @@
     "BY_NEWEST_REPLY": "By Newest Reply",
     "NOT_REGISTERED": "Don't have an account?",
     "CHECK_EMAIL_RESET": "You'll need to check your email and follow the instructions there in order to reset your password.",
+    "LANGUAGE_THEME": "Language & Theme",
     "ACTIVATE": "Activate your Account",
     "ACTIVATE_INFO": "Before you can log in and post, you need to activate your account with the email we've sent you. You may need to wait up to 10 minutes, and check Junk, Spam or Deleted folders just in case. If you still can't find the email, please contact the board administrators.",
     "just_now":    "just now",