Browse Source

Fix take picture button issue with other languages.

pull/40/head
Evan Theurer 11 years ago
parent
commit
04ab1ae7e2
  1. 11
      src/styles/components/_buddypicture.scss
  2. 34
      static/partials/buddypicture.html

11
src/styles/components/_buddypicture.scss

@ -24,21 +24,24 @@
display: block; display: block;
margin-bottom: 5px; margin-bottom: 5px;
} }
.showTakePicture { .videoPicture {
position: relative; position: relative;
}
.showTakePicture {
.btn { .btn {
margin: 5px 0px; margin: 5px 0px;
} }
} }
.btn-takePicture { .btn-takePicture,
.btn-retakePicture {
position: absolute; position: absolute;
right: 90px; left: 85px;
top: 110px; top: 110px;
} }
.countdownPicture { .countdownPicture {
color: $componentbg; color: $componentbg;
font-size: 45px; font-size: 45px;
left: 95px; left: 90px;
position: absolute; position: absolute;
top: 55px; top: 55px;
} }

34
static/partials/buddypicture.html

@ -1,20 +1,18 @@
<div class="buddyPicture"> <div class="buddyPicture">
<img class="picture" ng-show="user.buddyPicture" ng-src="{{user.buddyPicture}}" alt="" /> <img class="picture" ng-show="user.buddyPicture" ng-src="{{user.buddyPicture}}" alt="" />
<div class="collapse showTakePicture" collapse="!showTakePicture"> <div class="collapse showTakePicture" collapse="!showTakePicture">
<div class="countdownPicture" ng-show="countdown.num"> <div class="videoPicture">
<span ng-bind="countdown.num"></span> <div class="countdownPicture" ng-show="countdown.num" ng-bind="countdown.num"></div>
</div> <video autoplay="autoplay" width="200"></video>
<video autoplay="autoplay" width="200"></video> <canvas style="display:none" width="46" height="46"></canvas>
<canvas style="display:none" width="46" height="46"></canvas> <a class="btn btn-xs btn-success btn-takePicture" ng-disabled="countingDown" ng-show="!previewPicture" ng-click="takePicture()"> {{_('Take')}}</a>
<a class="btn btn-xs btn-success btn-takePicture" ng-disabled="countingDown" ng-show="!previewPicture" ng-click="takePicture()"> {{_('Take')}}</a> <a class="btn btn-xs btn-success btn-retakePicture" ng-show="previewPicture" ng-click="retakePicture()"> {{_('Retake')}}</a>
<a class="btn btn-xs btn-success btn-takePicture" ng-show="previewPicture" ng-click="retakePicture()"> {{_('Retake')}}</a> </div>
<div> <a class="btn btn-small btn-default" ng-click="cancelPicture()"> {{_('Cancel')}}</a>
<a class="btn btn-small btn-default" ng-click="cancelPicture()"> {{_('Cancel')}}</a> <a class="btn btn-small btn-primary" ng-disabled="!previewPicture" ng-click="setAsProfilePicture()"> {{_('Set as Profile Picture')}}</a>
<a class="btn btn-small btn-primary" ng-disabled="!previewPicture" ng-click="setAsProfilePicture()"> {{_('Set as Profile Picture')}}</a> </div>
</div> <a class="btn btn-small btn-success" ng-show="!showTakePicture" ng-disabled="!showTakePictureReady" ng-click="initPicture()"> {{_('Take picture')}}</a>
</div> <span ng-show="!showTakePictureReady">
<a class="btn btn-small btn-success" ng-show="!showTakePicture" ng-disabled="!showTakePictureReady" ng-click="initPicture()"> {{_('Take picture')}}</a> <i class="fa fa-spinner fa-spin"></i> {{_('Waiting for camera')}}
<span ng-show="!showTakePictureReady"> </span>
<i class="fa fa-spinner fa-spin"></i> {{_('Waiting for camera')}}
</span>
</div> </div>

Loading…
Cancel
Save