Merge branch 'base'

roncli · Feb 2, 2015 · ab083e0 · ab083e0
2 parents da665fb + 99a4a85
commit ab083e0
Show file tree

Hide file tree

Showing 12 changed files with 281 additions and 282 deletions.
diff --git a/README.md b/README.md
@@ -128,6 +128,11 @@ The following should be the contents of privateConfig.js:
 Version History
 ===============
 
+0.3
+---
+
+This version implements HTML pages.  Included are page hierarchy with simple navigation, and an administration section.
+
 0.2
 ---
 
@@ -146,11 +151,6 @@ This version introduces the bare bones of the website, including the layout, Twi
 Planned Versions
 ================
 
-0.3
----
-
-* Implement HTML pages.
-
 0.3.1
 -----
 

diff --git a/roncli.com/app/app.js b/roncli.com/app/app.js
diff --git a/roncli.com/app/templates/account/account.hbs b/roncli.com/app/templates/account/account.hbs
@@ -8,21 +8,21 @@
             <span class="input-group-addon">Email:</span>
             <span class="input-group-addon" style="width: 100%; text-align: left; background-color: #f8f8f8; color: #151534;">{{email}}</span>
             <span class="input-group-btn">
-                <button type="button" id="accountChangeEmail" class="btn btn-success">Change Email</button>
+                <button type="button" id="account-change-email" class="btn btn-success">Change Email</button>
             </span>
         </div>
         <div class="input-group">
             <span class="input-group-addon">Password:</span>
             <span class="input-group-addon" style="width: 100%; text-align: left; background-color: #f8f8f8; color: #151534;">&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;</span>
             <span class="input-group-btn">
-                <button type="button" id="accountChangePassword" class="btn btn-success">Change Password</button>
+                <button type="button" id="account-change-password" class="btn btn-success">Change Password</button>
             </span>
         </div>
         <div class="input-group">
             <span class="input-group-addon">Alias:</span>
-            <span class="input-group-addon" style="width: 100%; text-align: left; background-color: #f8f8f8; color: #151534;" id="accountAlias">{{alias}}</span>
+            <span class="input-group-addon" style="width: 100%; text-align: left; background-color: #f8f8f8; color: #151534;" id="account-alias">{{alias}}</span>
             <span class="input-group-btn">
-                <button type="button" id="accountChangeAlias" class="btn btn-success">Change Alias</button>
+                <button type="button" id="account-change-alias" class="btn btn-success">Change Alias</button>
             </span>
         </div>
     </div>

diff --git a/roncli.com/app/templates/account/changeAlias.hbs b/roncli.com/app/templates/account/changeAlias.hbs
@@ -2,19 +2,19 @@
     Please provide the following information below to change your alias:
 </div>
 <div class="panel text-center">
-    <form id="changeAliasForm" class="VaildationForm">
+    <form id="change-alias-form" class="VaildationForm">
         <div class="input-group">
             <span class="input-group-addon">New Alias:</span>
-            <input id="changeAliasAlias" name="changeAliasAlias" type="text" maxlength="20" class="Validate form-control" placeholder="Your Nickname"/>
+            <input id="change-alias-alias" name="change-alias-alias" type="text" maxlength="20" class="Validate form-control" placeholder="Your Nickname"/>
         </div>
-        <button type="button" id="changeAliasButton" class="btn btn-primary">Change Alias</button>
-        <div id="changeAliasErrorList" class="panel panel-danger top-margin-only" hidden>
+        <button type="button" id="change-alias-button" class="btn btn-primary">Change Alias</button>
+        <div id="change-alias-error-list" class="panel panel-danger top-margin-only" hidden>
             <div class="panel-heading">Please correct the following errors before changing your alias:</div>
-            <div id="changeAliasErrors" class="panel-body"></div>
+            <div id="change-alias-errors" class="panel-body"></div>
         </div>
-        <div id="changeAliasServerErrorList" class="panel panel-danger top-margin-only" hidden>
+        <div id="change-alias-server-error-list" class="panel panel-danger top-margin-only" hidden>
             <div class="panel-heading">There was an error while changing your alias:</div>
-            <div id="changeAliasServerErrors" class="panel-body"></div>
+            <div id="change-alias-server-errors" class="panel-body"></div>
         </div>
     </form>
 </div>
diff --git a/roncli.com/app/templates/account/changeEmailRequest.hbs b/roncli.com/app/templates/account/changeEmailRequest.hbs
@@ -3,24 +3,24 @@
     Please provide the following information below:
 </div>
 <div class="panel text-center">
-    <form id="emailChangeRequestForm" class="VaildationForm">
+    <form id="email-change-request-form" class="VaildationForm">
         <div class="input-group">
             <span class="input-group-addon">Password:</span>
-            <input id="emailChangeRequestPassword" name="emailChangeRequestPassword" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
+            <input id="email-change-request-password" name="email-change-request-password" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
         </div>
         <div class="input-group">
             <span class="input-group-addon">Type the characters below:</span>
-            <input id="emailChangeRequestCaptcha" name="emailChangeRequestCaptcha" type="text" maxlength="8" class="Validate form-control" placeholder="Prove you are a human"/>
+            <input id="email-change-request-captcha" name="email-change-request-captcha" type="text" maxlength="8" class="Validate form-control" placeholder="Prove you are a human"/>
         </div>
-        <img id="emailChangeRequestCaptchaImage" alt="[Captcha Image]" class="text-center image-margin" width="180" height="50"/><br/>
-        <button type="button" id="emailChangeRequestButton" class="btn btn-primary">Request Email Change</button>
-        <div id="emailChangeRequestErrorList" class="panel panel-danger top-margin-only" hidden>
+        <img id="email-change-request-captcha-image" alt="[Captcha Image]" class="text-center image-margin" width="180" height="50"/><br/>
+        <button type="button" id="email-change-request-button" class="btn btn-primary">Request Email Change</button>
+        <div id="email-change-request-error-list" class="panel panel-danger top-margin-only" hidden>
             <div class="panel-heading">Please correct the following errors before requesting an email change:</div>
-            <div id="emailChangeRequestErrors" class="panel-body"></div>
+            <div id="email-change-request-errors" class="panel-body"></div>
         </div>
-        <div id="emailChangeRequestServerErrorList" class="panel panel-danger top-margin-only" hidden>
+        <div id="email-change-request-server-error-list" class="panel panel-danger top-margin-only" hidden>
             <div class="panel-heading">There was an error while requesting an email change:</div>
-            <div id="emailChangeRequestServerErrors" class="panel-body"></div>
+            <div id="email-change-request-server-errors" class="panel-body"></div>
         </div>
     </form>
 </div>
diff --git a/roncli.com/app/templates/account/changePassword.hbs b/roncli.com/app/templates/account/changePassword.hbs
@@ -2,32 +2,32 @@
     Please provide the following information below to change your password:
 </div>
 <div class="panel text-center">
-    <form id="changePasswordForm" class="VaildationForm">
+    <form id="change-password-form" class="VaildationForm">
         <div class="input-group">
             <span class="input-group-addon">Current Password:</span>
-            <input id="changePasswordOldPassword" name="changePasswordOldPassword" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
+            <input id="change-password-old-password" name="change-password-old-password" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
         </div>
         <div class="input-group">
             <span class="input-group-addon">New Password:</span>
-            <input id="changePasswordNewPassword" name="changePasswordNewPassword" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
+            <input id="change-password-new-password" name="change-password-new-password" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
         </div>
         <div class="input-group">
             <span class="input-group-addon">Reetype New Password:</span>
-            <input id="changePasswordRetypePassword" name="changePasswordRetypePassword" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
+            <input id="change-password-retype-password" name="change-password-retype-password" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
         </div>
         <div class="input-group">
             <span class="input-group-addon">Type the characters below:</span>
-            <input id="changePasswordCaptcha" name="changePasswordCaptcha" type="text" maxlength="8" class="Validate form-control" placeholder="Prove you are a human"/>
+            <input id="change-password-captcha" name="change-password-captcha" type="text" maxlength="8" class="Validate form-control" placeholder="Prove you are a human"/>
         </div>
-        <img id="changePasswordCaptchaImage" alt="[Captcha Image]" class="text-center image-margin" width="180" height="50"/><br/>
-        <button type="button" id="changePasswordButton" class="btn btn-primary">Change Password</button>
-        <div id="changePasswordErrorList" class="panel panel-danger top-margin-only" hidden>
+        <img id="change-password-captcha-image" alt="[Captcha Image]" class="text-center image-margin" width="180" height="50"/><br/>
+        <button type="button" id="change-password-button" class="btn btn-primary">Change Password</button>
+        <div id="change-password-error-list" class="panel panel-danger top-margin-only" hidden>
             <div class="panel-heading">Please correct the following errors before changing your password:</div>
-            <div id="changePasswordErrors" class="panel-body"></div>
+            <div id="change-password-errors" class="panel-body"></div>
         </div>
-        <div id="changePasswordServerErrorList" class="panel panel-danger top-margin-only" hidden>
+        <div id="change-password-server-error-list" class="panel panel-danger top-margin-only" hidden>
             <div class="panel-heading">There was an error while changing your password:</div>
-            <div id="changePasswordServerErrors" class="panel-body"></div>
+            <div id="change-password-server-errors" class="panel-body"></div>
         </div>
     </form>
 </div>
diff --git a/roncli.com/app/templates/site/emailChange.hbs b/roncli.com/app/templates/site/emailChange.hbs
@@ -2,23 +2,23 @@
     To change your email address, please provide the following information below:
 </div>
 <div class="panel text-center">
-    <form id="emailChangeForm" class="VaildationForm">
+    <form id="email-change-form" class="VaildationForm">
         <div class="input-group">
             <span class="input-group-addon">New email:</span>
-            <input id="emailChangeNewEmail" name="emailChangeNewEmail" type="text" maxlength="256" class="Validate form-control" placeholder="[email protected]"/>
+            <input id="email-change-new-email" name="email-change-new-email" type="text" maxlength="256" class="Validate form-control" placeholder="[email protected]"/>
         </div>
         <div class="input-group">
             <span class="input-group-addon">Password:</span>
-            <input id="emailChangePassword" name="emailChangePassword" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
+            <input id="email-change-password" name="email-change-password" type="password" maxlength="20" class="Validate form-control" placeholder="Secure123!"/>
         </div>
-        <button type="button" id="emailChangeButton" class="btn btn-primary">Change Email Address</button>
-        <div id="emailChangeErrorList" class="panel panel-danger top-margin-only" hidden>
+        <button type="button" id="email-change-button" class="btn btn-primary">Change Email Address</button>
+        <div id="email-change-error-list" class="panel panel-danger top-margin-only" hidden>
             <div class="panel-heading">Please correct the following errors before changing your email address:</div>
-            <div id="emailChangeErrors" class="panel-body"></div>
+            <div id="email-change-errors" class="panel-body"></div>
         </div>
-        <div id="emailChangeServerErrorList" class="panel panel-danger top-margin-only" hidden>
+        <div id="email-change-server-error-list" class="panel panel-danger top-margin-only" hidden>
             <div class="panel-heading">There was an error while changing your email address:</div>
-            <div id="emailChangeServerErrors" class="panel-body"></div>
+            <div id="email-change-server-errors" class="panel-body"></div>
         </div>
     </form>
 </div>
diff --git a/roncli.com/app/templates/site/loggedIn.hbs b/roncli.com/app/templates/site/loggedIn.hbs
@@ -18,7 +18,7 @@
             </div>
             <div class="navbar-right">
                 <ul class="nav navbar-nav">
-                    <li class="navbar-text">You are logged in as <span id="loggedInUserAlias" class="text-success" style="font-weight: bold;">{{attributes.alias}}</span>.</li>
+                    <li class="navbar-text">You are logged in as <span id="logged-in-user-alias" class="text-success" style="font-weight: bold;">{{attributes.alias}}</span>.</li>
                     <li><a id="logout" href="javascript:;">Logout</a></li>
                 </ul>
             </div>