Browse Source

Fixed a couple of errors in boostrap usage.

pull/71/head
Simon Eisenmann 12 years ago
parent
commit
226803a63f
  1. 2
      static/partials/buddypicture.html
  2. 6
      static/partials/settings.html

2
static/partials/buddypicture.html

@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
<a class="btn btn-small btn-primary" ng-disabled="!previewPicture || waitingForPermission" ng-click="setAsProfilePicture()"> {{_('Set as Profile Picture')}}</a>
</div>
</div>
<a class="btn btn-small btn-success" ng-show="!showTakePicture" ng-disabled="waitingForPermission" ng-click="initPicture()"> {{_('Take picture')}}</a>
<a class="btn btn-small btn-primary" ng-show="!showTakePicture" ng-disabled="waitingForPermission" ng-click="initPicture()"> {{_('Take picture')}}</a>
<span ng-show="waitingForPermission">
<i class="fa fa-circle-o-notch fa-spin"></i> {{_('Waiting for camera')}}
</span>

6
static/partials/settings.html

@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
<div class="form-group" ng-if="userid">
<label class="col-xs-4 control-label">{{_('Contacts')}}</label>
<div class="col-xs-8">
<button class="btn btn-success" ng-click="openContactsManager()">{{_('Manage Contacts')}}</button>
<p class="form-control-static"><a ng-click="openContactsManager()">{{_('Manage contacts')}}</a></p>
</div>
</div>
</div>
@ -120,11 +120,11 @@ @@ -120,11 +120,11 @@
<div class="form-group" ng-show="desktopNotify.supported">
<label class="col-xs-4 control-label">{{_('Desktop notification')}}</label>
<div class="col-xs-8">
<label style="padding-top:5px" ng-switch="desktopNotify.level">
<p class="form-control-static" ng-switch="desktopNotify.level">
<a ng-switch-when="default" class="btn btn-small btn-success" ng-click="requestDesktopNotifyPermission()">{{_('Enable')}}</a>
<span class="text-error" ng-switch-when="denied"><i class="fa fa-exclamation-triangle"></i>{{_('Denied - check your browser settings')}}</span>
<span class="text-success" ng-switch-when="granted"><i class="fa fa-ok"></i>{{_('Allowed')}}</span>
</label>
</p>
</div>
</div>

Loading…
Cancel
Save