From 35d7f2e5f39904d85299c1a126d2ad8b7fc4c254 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 6 Oct 2016 21:54:54 -0400
Subject: [PATCH] added apps/extensions to sidebar menu as well as get help
 link. some formatting cleanup

---
 src/Web/less/vault.less                       |   4 +
 .../app/accounts/views/accountsLoginInfo.html |   2 +-
 .../app/accounts/views/accountsRegister.html  |  10 +-
 .../wwwroot/app/settings/views/settings.html  |  12 +-
 src/Web/wwwroot/app/views/backendLayout.html  | 120 ++++++++++++++++--
 5 files changed, 125 insertions(+), 23 deletions(-)

diff --git a/src/Web/less/vault.less b/src/Web/less/vault.less
index 85187adc35..1175adabba 100644
--- a/src/Web/less/vault.less
+++ b/src/Web/less/vault.less
@@ -27,6 +27,10 @@ h1, h2, h3, h4, h5, h6,
     }
 }
 
+.sidebar-menu li.header {
+    padding-right: 15px;
+}
+
 .sidebar-form .form-group {
     margin-bottom: 0;
 
diff --git a/src/Web/wwwroot/app/accounts/views/accountsLoginInfo.html b/src/Web/wwwroot/app/accounts/views/accountsLoginInfo.html
index 68e2723ce4..f0abe6d295 100644
--- a/src/Web/wwwroot/app/accounts/views/accountsLoginInfo.html
+++ b/src/Web/wwwroot/app/accounts/views/accountsLoginInfo.html
@@ -35,7 +35,7 @@
     </div>
     <hr />
     <ul>
-        <li><a ui-sref="frontend.register">Register a new account</a></li>
+        <li><a ui-sref="frontend.register">Create a new account</a></li>
         <li><a ui-sref="frontend.passwordHint">Get master password hint</a></li>
     </ul>
 </form>
\ No newline at end of file
diff --git a/src/Web/wwwroot/app/accounts/views/accountsRegister.html b/src/Web/wwwroot/app/accounts/views/accountsRegister.html
index 5fa9cea21d..5e3689f429 100644
--- a/src/Web/wwwroot/app/accounts/views/accountsRegister.html
+++ b/src/Web/wwwroot/app/accounts/views/accountsRegister.html
@@ -3,10 +3,10 @@
         <i class="fa fa-shield"></i> <b>bit</b>warden
     </div>
     <div class="register-box-body">
-        <p class="login-box-msg">Register for a new account.</p>
+        <p class="login-box-msg">Create a new account.</p>
         <div class="text-center" ng-show="success">
             <div class="callout callout-success">
-                <h4>You're Registered!</h4>
+                <h4>Account Created!</h4>
                 <p>You may now log in to your new account.</p>
             </div>
             <a ui-sref="frontend.login.info">Ready to log in?</a>
@@ -28,8 +28,8 @@
             </div>
             <div class="form-group has-feedback" show-errors>
                 <label for="name" class="sr-only">Your Name</label>
-                <input type="text" id="name" name="Name" class="form-control" ng-model="model.name" placeholder="Your Name"
-                       required api-field>
+                <input type="text" id="name" name="Name" class="form-control" ng-model="model.name"
+                       placeholder="Your Name" api-field>
                 <span class="fa fa-user form-control-feedback"></span>
                 <p class="help-block">What should we call you?</p>
             </div>
@@ -64,7 +64,7 @@
                 </div>
                 <div class="col-xs-5">
                     <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="registerForm.$loading">
-                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="registerForm.$loading"></i>Register
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="registerForm.$loading"></i>Submit
                     </button>
                 </div>
             </div>
diff --git a/src/Web/wwwroot/app/settings/views/settings.html b/src/Web/wwwroot/app/settings/views/settings.html
index 998b5f0897..d6037e2680 100644
--- a/src/Web/wwwroot/app/settings/views/settings.html
+++ b/src/Web/wwwroot/app/settings/views/settings.html
@@ -21,7 +21,8 @@
                         </div>
                         <div class="form-group" show-errors>
                             <label for="name">Name</label>
-                            <input type="text" id="name" name="Name" ng-model="model.name" class="form-control" required api-field />
+                            <input type="text" id="name" name="Name" ng-model="model.name" class="form-control"
+                                   required api-field />
                         </div>
                         <div class="form-group">
                             <label for="email">Email - <a href="javascript:void(0)" ng-click="changeEmail()">change</a></label>
@@ -29,7 +30,8 @@
                         </div>
                         <div class="form-group" show-errors>
                             <label for="hint">Master Password Hint</label>
-                            <input type="text" id="hint" name="MasterPasswordHint" ng-model="model.masterPasswordHint" class="form-control" api-field />
+                            <input type="text" id="hint" name="MasterPasswordHint" ng-model="model.masterPasswordHint"
+                                   class="form-control" api-field />
                         </div>
                         <div class="form-group" show-errors>
                             <label for="culture">Language/Culture</label>
@@ -40,9 +42,11 @@
                     </div>
                     <div class="col-sm-3 settings-photo">
                         <a href="http://www.gravatar.com/" target="_blank">
-                            <img src="//www.gravatar.com/avatar/{{ main.userProfile.email | gravatar }}.jpg?s=150&d=mm" class="img-rounded img-responsive" alt="User Image">
+                            <img src="//www.gravatar.com/avatar/{{ main.userProfile.email | gravatar }}.jpg?s=150&d=mm"
+                                 class="img-rounded img-responsive" alt="User Image">
                         </a>
-                        <a href="http://www.gravatar.com/" target="_blank" class="btn btn-link">Update Photo</a>
+                        <a href="http://www.gravatar.com/" target="_blank" class="btn btn-link"
+                           analytics-on="click" analytics-event="Clicked Update Photo">Update Photo</a>
                     </div>
                 </div>
             </div>
diff --git a/src/Web/wwwroot/app/views/backendLayout.html b/src/Web/wwwroot/app/views/backendLayout.html
index 4588e0048d..90e72f163f 100644
--- a/src/Web/wwwroot/app/views/backendLayout.html
+++ b/src/Web/wwwroot/app/views/backendLayout.html
@@ -23,7 +23,8 @@
         <section class="sidebar">
             <div class="user-panel">
                 <div class="pull-left image">
-                    <img src="//www.gravatar.com/avatar/{{ main.userProfile.email | gravatar }}.jpg?s=45&d=mm" class="img-circle" alt="User Image">
+                    <img src="//www.gravatar.com/avatar/{{ main.userProfile.email | gravatar }}.jpg?s=45&d=mm"
+                         class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
                     <p>{{main.userProfile.extended && main.userProfile.extended.name ? main.userProfile.extended.name : main.userProfile.email}}</p>
@@ -33,36 +34,129 @@
             <form class="sidebar-form">
                 <label for="search" class="sr-only">Search</label>
                 <div class="form-group has-feedback">
-                    <input type="text" id="search" class="form-control" placeholder="Search vault..." ng-focus="searchVault()" ng-model="main.searchVaultText" />
+                    <input type="text" id="search" class="form-control" placeholder="Search vault..."
+                           ng-focus="searchVault()" ng-model="main.searchVaultText" />
                     <span class="fa fa-search form-control-feedback" aria-hidden="true"></span>
                 </div>
             </form>
             <ul class="sidebar-menu">
+                <li class="header">WEB VAULT</li>
                 <li class="treeview" ng-class="{active: $state.includes('backend.vault')}">
                     <a ui-sref="backend.vault"><i class="fa fa-lock"></i> <span>My Vault</span></a>
                     <ul class="treeview-menu menu-open">
-                        <li><a href="javascript:void(0)" ng-click="addSite()"><i class="fa fa-plus"></i> New Site</a></li>
-                        <li><a href="javascript:void(0)" ng-click="addFolder()"><i class="fa fa-folder"></i> New Folder</a></li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="addSite()">
+                                <i class="fa fa-plus"></i> New Site
+                            </a>
+                        </li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="addFolder()">
+                                <i class="fa fa-folder"></i> New Folder
+                            </a>
+                        </li>
                     </ul>
                 </li>
                 <li class="treeview" ng-class="{active: $state.includes('backend.settings')}">
                     <a ui-sref="backend.settings"><i class="fa fa-cogs"></i> <span>Settings</span></a>
                     <ul class="treeview-menu">
-                        <li><a href="javascript:void(0)" ng-click="changePassword()"><i class="fa fa-circle-o"></i> Change Password</a></li>
-                        <li><a href="javascript:void(0)" ng-click="changeEmail()"><i class="fa fa-circle-o"></i> Change Email</a></li>
-                        <li><a href="javascript:void(0)" ng-click="sessions()"><i class="fa fa-circle-o"></i> Deauthorize Sessions</a></li>
-                        <li><a href="javascript:void(0)" ng-click="twoFactor()"><i class="fa fa-circle-o"></i> Two-step Login</a></li>
-                        <li><a href="javascript:void(0)" ng-click="delete()"><i class="fa fa-circle-o"></i> Delete Account</a></li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="changePassword()">
+                                <i class="fa fa-circle-o"></i> Change Password
+                            </a>
+                        </li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="changeEmail()">
+                                <i class="fa fa-circle-o"></i> Change Email
+                            </a>
+                        </li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="sessions()">
+                                <i class="fa fa-circle-o"></i> Deauthorize Sessions
+                            </a>
+                        </li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="twoFactor()">
+                                <i class="fa fa-circle-o"></i> Two-step Login
+                            </a>
+                        </li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="delete()">
+                                <i class="fa fa-circle-o"></i> Delete Account
+                            </a>
+                        </li>
                     </ul>
                 </li>
                 <li class="treeview" ng-class="{active: $state.includes('backend.tools')}">
                     <a ui-sref="backend.tools"><i class="fa fa-wrench"></i> <span>Tools</span></a>
                     <ul class="treeview-menu">
-                        <li><a href="javascript:void(0)" ng-click="import()"><i class="fa fa-circle-o"></i> Import</a></li>
-                        <li><a href="javascript:void(0)" ng-click="export()"><i class="fa fa-circle-o"></i> Export</a></li>
-                        <li><a href="javascript:void(0)" ng-click="audits()"><i class="fa fa-circle-o"></i> Audits</a></li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="import()">
+                                <i class="fa fa-circle-o"></i> Import
+                            </a>
+                        </li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="export()">
+                                <i class="fa fa-circle-o"></i> Export
+                            </a>
+                        </li>
+                        <li>
+                            <a href="javascript:void(0)" ng-click="audits()">
+                                <i class="fa fa-circle-o"></i> Audits
+                            </a>
+                        </li>
                     </ul>
                 </li>
+                <li>
+                    <a href="https://bitwarden.com/contact/" target="_blank"
+                       analytics-on="click" analytics-event="Clicked Get Help">
+                        <i class="fa fa-info-circle"></i> <span>Get Help</span>
+                    </a>
+                </li>
+                <li class="header">
+                    MOBILE APPS<small class="label pull-right bg-green">FREE</small>
+                </li>
+                <li>
+                    <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8"
+                       target="_blank" analytics-on="click" analytics-event="Clicked iOS">
+                        <i class="fa fa-apple"></i> <span>iOS</span>
+                    </a>
+                </li>
+                <li>
+                    <a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
+                       target="_blank" analytics-on="click" analytics-event="Clicked Android">
+                        <i class="fa fa-android"></i> <span>Android</span>
+                    </a>
+                </li>
+                <li class="header">
+                    BROWSER EXTENSIONS <small class="label pull-right bg-green">FREE</small>
+                </li>
+                <li>
+                    <a href="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb"
+                       target="_blank" analytics-on="click" analytics-event="Clicked Chrome">
+                        <i class="fa fa-chrome"></i> <span>Chrome</span>
+                    </a>
+                </li>
+                <li>
+                    <a href="javascript:void(0)"
+                       target="_blank" analytics-on="click" analytics-event="Clicked Firefox">
+                        <i class="fa fa-firefox"></i> <span>Firefox</span>
+                        <small class="label pull-right bg-gray">coming very soon</small>
+                    </a>
+                </li>
+                <li>
+                    <a href="javascript:void(0)"
+                       target="_blank" analytics-on="click" analytics-event="Clicked Opera">
+                        <i class="fa fa-opera"></i> <span>Opera</span>
+                        <small class="label pull-right bg-gray">coming very soon</small>
+                    </a>
+                </li>
+                <li>
+                    <a href="javascript:void(0)"
+                       target="_blank" analytics-on="click" analytics-event="Clicked Edge">
+                        <i class="fa fa-edge"></i> <span>Edge</span>
+                        <small class="label pull-right bg-gray">coming soon</small>
+                    </a>
+                </li>
             </ul>
         </section>
     </aside>
@@ -76,4 +170,4 @@
         </div>
         <strong>Copyright &copy; <span ng-bind="currentYear"></span></strong>, bitwarden.com
     </footer>
-</div>
\ No newline at end of file
+</div>