Move contacts under account in settings. Update contacts manager button text.

static/partials/contactsmanager.html

@@ -1,7 +1,7 @@
 <div class="modal-body">
   <div class="row head">
      <div class="col-xs-7" ng-if="contacts.length === 0">
-      <h4>{{_('You have no contacts.')}}</h4>
+      <p>{{_('You have no contacts.')}}</p>
     </div>
   </div>
   <div class="row" ng-if="contacts.length > 0">

static/partials/contactsmanagerbutton.html

@@ -1,8 +1,6 @@
-<div>
+<div class="form-group" ng-if="userid">
-  <legend>{{_('Contacts')}}</legend>
+  <label class="col-xs-4 control-label">{{_('Contacts')}}</label>
-  <div class="form-group">
+  <div class="col-xs-8">
-    <div class="col-xs-8 col-xs-offset-4">
+    <button class="btn btn-success" ng-click="contactsManager()">{{_('Manage Contacts')}}</button>
-      <button class="btn btn-success" ng-click="contactsManager()">{{_('Contacts Manager')}}</button>
-    </div>
   </div>
 </div>

static/partials/settings.html

@@ -67,11 +67,9 @@
               </div>
             </div>
           </div>
+          <contacts-manager/>
         </div>
       </div>
-      <div ng-if="userid">
-        <contacts-manager/>
-      </div>
       <div ng-show="mediaSources.supported || isChrome">
         <legend>{{_('Media')}}</legend>
         <div ng-show="mediaSources.supported">
@@ -137,9 +135,9 @@
             <label class="col-xs-4 control-label">{{_('Stereo audio')}}</label>
             <div class="col-xs-8">
               <div class="checkbox">
-              	<label>
+               <label>
-                	<input type="checkbox" ng-model="user.settings.stereo"/>
+                  <input type="checkbox" ng-model="user.settings.stereo"/>
-            	</label>
+               </label>
               </div>
             </div>
           </div>
@@ -171,7 +169,7 @@
       </div>
 
       <div class="form-group">
-      	<div class="col-xs-4 control-label"></div>
+         <div class="col-xs-4 control-label"></div>
         <div class="col-xs-8">
           <a ng-click="showAdvancedSettings = !showAdvancedSettings"><span ng-show="showAdvancedSettings">{{_('Show advanced settings')}}</span><span ng-hide="showAdvancedSettings">{{_('Hide advanced settings')}}</span></a>
         </div>
@@ -180,12 +178,12 @@
       <hr/>
 
       <div class="form-group">
-      	<div class="col-xs-4 control-label"></div>
+         <div class="col-xs-4 control-label"></div>
-      	<div class="col-xs-8">
+         <div class="col-xs-8">
           <div class="checkbox" style="padding-bottom:1em">
-          	<label>
+            <label>
-            	<input type="checkbox" ng-model="rememberSettings"> {{_('Remember settings')}}
+               <input type="checkbox" ng-model="rememberSettings"> {{_('Remember settings')}}
-        	  </label>
+           </label>
             <p class="text-warning" style="margin-top:4px" ng-show="userid &&!rememberSettings && loadedUserlogin"><strong>{{_('Your ID will still be kept - press the log out button above to delete the ID.')}}</strong></p>
           </div>
           <a ng-click="layout.settings=false" class="btn btn-default">{{_('Close')}}</a>