Merge pull request #107 from owncloud/further-field-adjustments-2

adding types selects to email, impp and tel
owncloud · Mar 3, 2016 · ad89f0a · ad89f0a
2 parents 45b4eb6 + da0ef06
commit ad89f0a
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 5 deletions.
diff --git a/js/public/script.js b/js/public/script.js
@@ -1154,17 +1154,39 @@ app.service('vCardPropertiesService', [function() {
 		email: {
 			multiple: true,
 			readableName: t('contacts', 'Email'),
-			template: 'text'
+			template: 'text',
+			defaultValue: {
+				value:[''],
+				meta:{type:['HOME']}
+			},
+			options: [
+				{id: 'HOME', name: t('contacts', 'Home')},
+				{id: 'WORK', name: t('contacts', 'Work')},
+				{id: 'OTHER', name: t('contacts', 'Other')}
+			]
 		},
 		impp: {
 			multiple: true,
 			readableName: t('contacts', 'Instant messaging'),
-			template: 'text'
+			template: 'text',
+			defaultValue: {
+				value:[''],
+				meta:{type:['HOME']}
+			},
+			options: [
+				{id: 'HOME', name: t('contacts', 'Home')},
+				{id: 'WORK', name: t('contacts', 'Work')},
+				{id: 'OTHER', name: t('contacts', 'Other')}
+			]
 		},
 		tel: {
 			multiple: true,
 			readableName: t('contacts', 'Phone'),
 			template: 'tel',
+			defaultValue: {
+				value:[''],
+				meta:{type:['HOME,VOICE']}
+			},
 			options: [
 				{id: 'HOME,VOICE', name: t('contacts', 'Home')},
 				{id: 'WORK,VOICE', name: t('contacts', 'Work')},

diff --git a/js/services/vCardProperties.js b/js/services/vCardProperties.js
@@ -60,17 +60,39 @@ app.service('vCardPropertiesService', [function() {
 		email: {
 			multiple: true,
 			readableName: t('contacts', 'Email'),
-			template: 'text'
+			template: 'text',
+			defaultValue: {
+				value:[''],
+				meta:{type:['HOME']}
+			},
+			options: [
+				{id: 'HOME', name: t('contacts', 'Home')},
+				{id: 'WORK', name: t('contacts', 'Work')},
+				{id: 'OTHER', name: t('contacts', 'Other')}
+			]
 		},
 		impp: {
 			multiple: true,
 			readableName: t('contacts', 'Instant messaging'),
-			template: 'text'
+			template: 'text',
+			defaultValue: {
+				value:[''],
+				meta:{type:['HOME']}
+			},
+			options: [
+				{id: 'HOME', name: t('contacts', 'Home')},
+				{id: 'WORK', name: t('contacts', 'Work')},
+				{id: 'OTHER', name: t('contacts', 'Other')}
+			]
 		},
 		tel: {
 			multiple: true,
 			readableName: t('contacts', 'Phone'),
 			template: 'tel',
+			defaultValue: {
+				value:[''],
+				meta:{type:['HOME,VOICE']}
+			},
 			options: [
 				{id: 'HOME,VOICE', name: t('contacts', 'Home')},
 				{id: 'WORK,VOICE', name: t('contacts', 'Work')},

diff --git a/templates/detailItems/text.html b/templates/detailItems/text.html
@@ -1,7 +1,11 @@
-<label for="details-{{ctrl.name}}">{{ctrl.meta.readableName}}</label>
+<select ng-if="ctrl.availableOptions.length > 0" 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>
+<label ng-if="ctrl.availableOptions.length === 0" for="details-{{ctrl.name}}">{{ctrl.meta.readableName}}</label>
 <input type="text" id="details-{{ctrl.name}}" name="{{ctrl.name}}"
 	   ng-model="ctrl.data.value" 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="Delete"></button>