Merge branch 'dev' into calendar_merge

This commit is contained in:
Mario Vavti
2019-04-19 19:37:06 +02:00
2 changed files with 33 additions and 6 deletions

View File

@@ -125,14 +125,15 @@
<div id="profile-photo-submit-wrapper">
<button type="submit" class="btn btn-outline-primary" name="submit" id="profile-photo-submit">{{$submit}}</button>
<button type="submit" class="btn btn-outline-danger" name="remove" id="profile-photo-remove">{{$remove}}</button>
</div>
</div>
</form>
<br />
<div id="profile-photo-link-select-wrapper">
<button id="embed-photo-wrapper" class="btn btn-default btn-primary" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
<i id="embed-photo" class="fa fa-file-image-o"></i> {{$select}}
<button id="embed-photo-wrapper" class="btn btn-default btn-primary" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
<i id="embed-photo" class="fa fa-file-image-o"></i> {{$select}}
</button>
</div>
</div>