From 0a0bec90028307b952589e3eafb20d5fa876dfde Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <alexwegoo@gmail.com>
Date: Wed, 19 Apr 2017 09:54:23 +0200
Subject: Added tel link to tel field.

---
 css/public/style.css           | 5 +++--
 templates/detailItems/tel.html | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/css/public/style.css b/css/public/style.css
index a48ee65f..fc45da8a 100644
--- a/css/public/style.css
+++ b/css/public/style.css
@@ -262,7 +262,8 @@ detailsitem .icon-delete {
 	opacity: .2;
 }
 
-detailsitem .url-link {
+detailsitem .url-link,
+detailsitem .tel-link {
 	position: absolute;
 	padding: 8px 10px;
 	margin-left: -30px;
@@ -334,7 +335,7 @@ ul.addressBook-share-list li .utils {
 /* override core apps css */
 #app-navigation ul.addressBookList > li span.utils {
 	position: relative;
-	padding: 0; 
+	padding: 0;
 	flex-shrink: 0;
 	height: 20px;
 }
diff --git a/templates/detailItems/tel.html b/templates/detailItems/tel.html
index fa886f38..b11e9a06 100644
--- a/templates/detailItems/tel.html
+++ b/templates/detailItems/tel.html
@@ -8,3 +8,4 @@
        focus-expression="$parent.ctrl.focus === ctrl.name"
 />
 <button ng-click="ctrl.deleteField()" class="icon-delete" title="{{ctrl.t.delete}}"></button>
+<a ng-if="ctrl.data.value.length" class="tel-link" href="tel:{{ctrl.data.value}}">📞</a>
-- 
cgit v1.2.3


From 6abcedf6e916bdcfc04ea1346e4bf9585614d02f Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <alexwegoo@gmail.com>
Date: Wed, 19 Apr 2017 16:43:04 +0200
Subject: The default value of tel is 'a single free-form text value'.

---
 js/services/vCardProperties.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/services/vCardProperties.js b/js/services/vCardProperties.js
index 11e9c145..1d54d75e 100644
--- a/js/services/vCardProperties.js
+++ b/js/services/vCardProperties.js
@@ -107,7 +107,7 @@ angular.module('contactsApp')
 			readableName: t('contacts', 'Phone'),
 			template: 'tel',
 			defaultValue: {
-				value:[''],
+				value:'',
 				meta:{type:['HOME,VOICE']}
 			},
 			options: [
-- 
cgit v1.2.3


From 513acdf6327b6c37e3841608ae21202beb476672 Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <alexwegoo@gmail.com>
Date: Wed, 19 Apr 2017 17:10:25 +0200
Subject: Single class for item-action.

---
 css/public/style.css           | 3 +--
 templates/detailItems/tel.html | 2 +-
 templates/detailItems/url.html | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/css/public/style.css b/css/public/style.css
index fc45da8a..5c81d0d3 100644
--- a/css/public/style.css
+++ b/css/public/style.css
@@ -262,8 +262,7 @@ detailsitem .icon-delete {
 	opacity: .2;
 }
 
-detailsitem .url-link,
-detailsitem .tel-link {
+detailsitem .item-action {
 	position: absolute;
 	padding: 8px 10px;
 	margin-left: -30px;
diff --git a/templates/detailItems/tel.html b/templates/detailItems/tel.html
index b11e9a06..c522976c 100644
--- a/templates/detailItems/tel.html
+++ b/templates/detailItems/tel.html
@@ -8,4 +8,4 @@
        focus-expression="$parent.ctrl.focus === ctrl.name"
 />
 <button ng-click="ctrl.deleteField()" class="icon-delete" title="{{ctrl.t.delete}}"></button>
-<a ng-if="ctrl.data.value.length" class="tel-link" href="tel:{{ctrl.data.value}}">📞</a>
+<a ng-if="ctrl.data.value.length" class="item-action" href="tel:{{ctrl.data.value}}">📞</a>
diff --git a/templates/detailItems/url.html b/templates/detailItems/url.html
index 4d8e783a..d8cdd2e5 100644
--- a/templates/detailItems/url.html
+++ b/templates/detailItems/url.html
@@ -6,4 +6,4 @@
 	   focus-expression="$parent.ctrl.focus === ctrl.name"
 />
 <button ng-click="ctrl.deleteField()" class="icon-delete" title="{{ctrl.t.delete}}"></button>
-<a ng-if="ctrl.data.value.length" class="url-link" target="_blank" href="{{ctrl.data.value}}">↗</a>
+<a ng-if="ctrl.data.value.length" class="item-action" target="_blank" href="{{ctrl.data.value}}">↗</a>
-- 
cgit v1.2.3


From cee4e8b760bf336352cb82c840785ec1419f6c8b Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <alexwegoo@gmail.com>
Date: Wed, 19 Apr 2017 17:12:19 +0200
Subject: Add action item-action for e-mail addresses.

---
 js/services/vCardProperties.js   |  2 +-
 templates/detailItems/email.html | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 templates/detailItems/email.html

diff --git a/js/services/vCardProperties.js b/js/services/vCardProperties.js
index 1d54d75e..4da3fc35 100644
--- a/js/services/vCardProperties.js
+++ b/js/services/vCardProperties.js
@@ -77,7 +77,7 @@ angular.module('contactsApp')
 		email: {
 			multiple: true,
 			readableName: t('contacts', 'Email'),
-			template: 'text',
+			template: 'email',
 			defaultValue: {
 				value:'',
 				meta:{type:['HOME']}
diff --git a/templates/detailItems/email.html b/templates/detailItems/email.html
new file mode 100644
index 00000000..dc190e48
--- /dev/null
+++ b/templates/detailItems/email.html
@@ -0,0 +1,11 @@
+<select ng-model="ctrl.type" ng-model-options="{ debounce: 500 }" ng-change="ctrl.changeType(ctrl.type)">
+    <option ng-repeat="option in ctrl.availableOptions" value="{{option.id}}">{{option.name}}</option>
+</select>
+<input type="email" id="details-{{ctrl.name}}-{{ctrl.index}}" name="email"
+       ng-model="ctrl.data.value" email-model ng-model-options="{ debounce: 500 }"
+       ng-change="ctrl.model.updateContact()" value=""
+       placeholder="{{ctrl.meta.readableName}}"
+       focus-expression="$parent.ctrl.focus === ctrl.name"
+/>
+<button ng-click="ctrl.deleteField()" class="icon-delete" title="{{ctrl.t.delete}}"></button>
+<a ng-if="ctrl.data.value.length" class="item-action" href="mailto:{{ctrl.data.value}}">📧</a>
-- 
cgit v1.2.3


From 8ab9cb4b2f84b8b27db63a2cefb60f014712d6c4 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Wed, 19 Apr 2017 17:43:47 +0200
Subject: use mail icon instead of utf8 character

---
 css/public/style.css             | 6 ++++++
 templates/detailItems/email.html | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/css/public/style.css b/css/public/style.css
index 5c81d0d3..8f7759ae 100644
--- a/css/public/style.css
+++ b/css/public/style.css
@@ -271,6 +271,12 @@ detailsitem .item-action {
 	right: 33px;
 }
 
+detailsitem .item-action i {
+	display: block;
+	height: 20px;
+	width: 20px;
+}
+
 detailsitem.details-item-adr .icon-delete, detailsitem.details-item-n .icon-delete {
 	vertical-align: middle;
 	left: 251px;
diff --git a/templates/detailItems/email.html b/templates/detailItems/email.html
index dc190e48..c31f629f 100644
--- a/templates/detailItems/email.html
+++ b/templates/detailItems/email.html
@@ -8,4 +8,6 @@
        focus-expression="$parent.ctrl.focus === ctrl.name"
 />
 <button ng-click="ctrl.deleteField()" class="icon-delete" title="{{ctrl.t.delete}}"></button>
-<a ng-if="ctrl.data.value.length" class="item-action" href="mailto:{{ctrl.data.value}}">📧</a>
+<a ng-if="ctrl.data.value.length" class="item-action" href="mailto:{{ctrl.data.value}}">
+    <i class="icon-mail"></i>
+</a>
-- 
cgit v1.2.3


From b6d62f3b758c9ee14f6db425870ef39da0b04530 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Wed, 19 Apr 2017 18:46:43 +0200
Subject: prettier item-action overflow

---
 css/public/style.css             | 10 +++++++---
 templates/detailItems/email.html |  6 +++---
 templates/detailItems/tel.html   |  4 +++-
 templates/detailItems/url.html   |  4 +++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/css/public/style.css b/css/public/style.css
index 8f7759ae..f5764886 100644
--- a/css/public/style.css
+++ b/css/public/style.css
@@ -264,11 +264,15 @@ detailsitem .icon-delete {
 
 detailsitem .item-action {
 	position: absolute;
-	padding: 8px 10px;
-	margin-left: -30px;
+	padding: 8px 5px;
 	opacity: .5;
 	top: 2px;
-	right: 33px;
+	right: 30px;
+}
+
+detailsitem .item-action ~ input {
+	padding-right: 30px;
+	text-overflow: ellipsis;
 }
 
 detailsitem .item-action i {
diff --git a/templates/detailItems/email.html b/templates/detailItems/email.html
index c31f629f..d297bf9d 100644
--- a/templates/detailItems/email.html
+++ b/templates/detailItems/email.html
@@ -1,6 +1,9 @@
 <select ng-model="ctrl.type" ng-model-options="{ debounce: 500 }" ng-change="ctrl.changeType(ctrl.type)">
     <option ng-repeat="option in ctrl.availableOptions" value="{{option.id}}">{{option.name}}</option>
 </select>
+<a ng-if="ctrl.data.value.length" class="item-action" href="mailto:{{ctrl.data.value}}">
+    <i class="icon-mail"></i>
+</a>
 <input type="email" id="details-{{ctrl.name}}-{{ctrl.index}}" name="email"
        ng-model="ctrl.data.value" email-model ng-model-options="{ debounce: 500 }"
        ng-change="ctrl.model.updateContact()" value=""
@@ -8,6 +11,3 @@
        focus-expression="$parent.ctrl.focus === ctrl.name"
 />
 <button ng-click="ctrl.deleteField()" class="icon-delete" title="{{ctrl.t.delete}}"></button>
-<a ng-if="ctrl.data.value.length" class="item-action" href="mailto:{{ctrl.data.value}}">
-    <i class="icon-mail"></i>
-</a>
diff --git a/templates/detailItems/tel.html b/templates/detailItems/tel.html
index c522976c..340d90cc 100644
--- a/templates/detailItems/tel.html
+++ b/templates/detailItems/tel.html
@@ -1,6 +1,9 @@
 <select ng-model="ctrl.type" ng-model-options="{ debounce: 500 }" ng-change="ctrl.changeType(ctrl.type)">
     <option ng-repeat="option in ctrl.availableOptions" value="{{option.id}}">{{option.name}}</option>
 </select>
+<a ng-if="ctrl.data.value.length" class="item-action" href="tel:{{ctrl.data.value}}">
+    <i class="icon-comment"></i>
+</a>
 <input type="tel" id="details-{{ctrl.name}}-{{ctrl.index}}" name="phone"
        ng-model="ctrl.data.value" tel-model ng-model-options="{ debounce: 500 }"
        ng-change="ctrl.model.updateContact()" value=""
@@ -8,4 +11,3 @@
        focus-expression="$parent.ctrl.focus === ctrl.name"
 />
 <button ng-click="ctrl.deleteField()" class="icon-delete" title="{{ctrl.t.delete}}"></button>
-<a ng-if="ctrl.data.value.length" class="item-action" href="tel:{{ctrl.data.value}}">📞</a>
diff --git a/templates/detailItems/url.html b/templates/detailItems/url.html
index d8cdd2e5..e3bf47f0 100644
--- a/templates/detailItems/url.html
+++ b/templates/detailItems/url.html
@@ -1,4 +1,7 @@
 <label for="details-{{ctrl.name}}-{{ctrl.index}}">{{ctrl.meta.readableName}}</label>
+<a ng-if="ctrl.data.value.length" class="item-action" target="_blank" href="{{ctrl.data.value}}">
+	<i class="icon-external"></i>
+</a>
 <input type="url" id="details-{{ctrl.name}}-{{ctrl.index}}" name="{{ctrl.name}}"
 	   ng-model="ctrl.data.value" ng-model-options="{ debounce: 500, allowInvalid: true }"
 	   ng-change="ctrl.model.updateContact()" value=""
@@ -6,4 +9,3 @@
 	   focus-expression="$parent.ctrl.focus === ctrl.name"
 />
 <button ng-click="ctrl.deleteField()" class="icon-delete" title="{{ctrl.t.delete}}"></button>
-<a ng-if="ctrl.data.value.length" class="item-action" target="_blank" href="{{ctrl.data.value}}">↗</a>
-- 
cgit v1.2.3