summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-02-18 18:12:31 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-02-18 19:12:50 +0100
commit6960c768832486e30aa11890fc973e8ddb9106f9 (patch)
tree5fd036c7fe736020a8486699f5a2d7724979c6ff /templates
parent666a87aac68364f0d8adb9ff35e13c1a765a62fe (diff)
Fix link clipboard, fix design and fix tooltips
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/addressBook.html19
-rw-r--r--templates/addressBookList.html2
2 files changed, 14 insertions, 7 deletions
diff --git a/templates/addressBook.html b/templates/addressBook.html
index 5ed7bb55..92e3a1f1 100644
--- a/templates/addressBook.html
+++ b/templates/addressBook.html
@@ -20,11 +20,10 @@
outside-if-not=".openMenuButton, .popovermenu">
<ul>
<li>
- <button class="addressbookurl-copy btn" ngclipboard ngclipboard-success="onSuccess(e);" ngclipboard-error="onError(e);"
- tooltip-placement="auto right" uib-tooltip="{{ctrl.t.clickToCopy}}"
- tooltip-append-to-body="true"
- data-clipboard-target="#addressBookUrl_{{$id}}"
- title="{{ctrl.t.clickToCopy}}">
+ <button class="addressbookurl-copy btn"
+ ngclipboard ngclipboard-success="ctrl.clipboardSuccess()" ngclipboard-error="ctrl.clipboardError()"
+ data-clipboard-text="{{ctrl.addressBook.url}}"
+ tooltip-placement="right" uib-tooltip="{{ctrl.tooltipTitle}}" tooltip-append-to-body="true">
<span class="icon icon-public"></span>
<span>{{ctrl.t.copyURL}}</span>
</button>
@@ -44,7 +43,15 @@
</ul>
</div>
</span>
-<input id="addressBookUrl_{{$id}}" class="addressBookUrl hidden" type="url" value="{{ctrl.addressBook.url}}" readonly />
+
+<div class="addressBookUrlContainer" ng-show="ctrl.showInputUrl">
+ <input id="addressBookUrl_{{ctrl.addressBook.ctag}}" class="addressBookUrl"
+ uib-tooltip="{{ctrl.InputUrlTooltip}}"
+ tooltip-is-open="true" tooltip-append-to-body="true"
+ type="url" value="{{ctrl.addressBook.url}}" readonly />
+ <input type="button" class="inline-button icon-close action pull-right" ng-click="ctrl.showInputUrl=false" uib-tooltip="{{ctrl.t.close}}">
+</div>
+
<div class="addressBookShares" ng-show="ctrl.editingShares">
<i ng-show="ctrl.loadingSharees" class="glyphicon glyphicon-refresh"></i>
<input
diff --git a/templates/addressBookList.html b/templates/addressBookList.html
index a195c90c..472584e7 100644
--- a/templates/addressBookList.html
+++ b/templates/addressBookList.html
@@ -4,7 +4,7 @@
<li>
<form ng-submit="ctrl.createAddressBook()">
<input id="newList" placeholder="{{ctrl.t.addressBookName}}" class="newAddressBookInput" ng-model="ctrl.newAddressBookName" type="text" />
- <input type="submit" value="" class="newAddressBookSubmit icon-confirm action pull-right" />
+ <input type="submit" value="" class="newAddressBookSubmit inline-button icon-confirm action pull-right" />
</form>
</li>
</ul>