Some more fixes. It basically works but looks ugly

6 files changed, 38 insertions, 31 deletions

diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index e6dd45739bc..6a29c7bd68e 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -22,6 +22,6 @@ OC_Util::addStyle('contacts','styles');
 	</ul>
 	<a id="contacts_newcontact"><?php echo $l->t('Add Contact'); ?></a>
 </div>
-<div id="contacts_details" class="rightcontent" x-id="<?php echo $_['id']; ?>">
+<div id="contacts_details" class="rightcontent" data-id="<?php echo $_['id']; ?>">
 	<?php echo $this->inc("part.details"); ?>
 </div>
diff --git a/apps/contacts/templates/part.addpropertyform.php b/apps/contacts/templates/part.addpropertyform.php
index ff9090b76d8..32affde9526 100644
--- a/apps/contacts/templates/part.addpropertyform.php
+++ b/apps/contacts/templates/part.addpropertyform.php
@@ -1,7 +1,6 @@
 <form id="contacts_addpropertyform">
 	<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
 	<select name="name" size="1">
-		<option value="BDAY"><?php echo $l->t('Birthday'); ?></option>
 		<option value="ADR"><?php echo $l->t('Address'); ?></option>
 		<option value="TEL"><?php echo $l->t('Telephone'); ?></option>
 		<option value="EMAIL" selected="selected"><?php echo $l->t('Email'); ?></option>
@@ -15,8 +14,8 @@
 <div id="contacts_addcontactsparts" style="display:none;">
 	<div id="contacts_addresspart">
 		<select name="parameters[TYPE]" size="1">
-			<option value="WORK"><?php echo $l->t('Work'); ?></option>
-			<option value="HOME" selected="selected"><?php echo $l->t('Home'); ?></option>
+			<option value="adr_work"><?php echo $l->t('Work'); ?></option>
+			<option value="adr_home" selected="selected"><?php echo $l->t('Home'); ?></option>
 		</select>
 		<?php echo $l->t('PO Box'); ?> <input type="text" name="value[0]" value="">
 		<?php echo $l->t('Extended Address'); ?> <input type="text" name="value[1]" value="">
@@ -28,15 +27,17 @@
 	</div>
 	<div id="contacts_phonepart">
 		<select name="parameters[TYPE]" size="1">
-			<option value="WORK"><?php echo $l->t('Work'); ?></option>
-			<option value="CELL" selected="selected"><?php echo $l->t('Mobile'); ?></option>
-			<option value="HOME"><?php echo $l->t('Home'); ?></option>
+			<option value="home"><?php echo $l->t('tel_home'); ?></option>
+			<option value="cell" selected="selected"><?php echo $l->t('tel_cell'); ?></option>
+			<option value="work"><?php echo $l->t('tel_work'); ?></option>
+			<option value="text"><?php echo $l->t('tel_text'); ?></option>
+			<option value="voice"><?php echo $l->t('tel_voice'); ?></option>
+			<option value="fax"><?php echo $l->t('tel_fax'); ?></option>
+			<option value="video"><?php echo $l->t('tel_video'); ?></option>
+			<option value="pager"><?php echo $l->t('tel_pager'); ?></option>
 		</select>
 		<input type="text" name="value" value="">
 	</div>
-	<div id="contacts_fieldpart">
-		<textarea type="text" name="value"></textarea>
-	</div>
 	<div id="contacts_generic">
 		<input type="text" name="value" value="">
 	</div>
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index fa6d4790cfc..6664a3671ac 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -1,3 +1,3 @@
 <?php foreach( $_['contacts'] as $contact ): ?>
-	<li x-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $contact['name']; ?></a> </li>
+	<li data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $contact['name']; ?></a> </li>
 <?php endforeach; ?>
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 4aca8dbc790..0d738b5a0a4 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -17,6 +17,7 @@
 		<?php endforeach; ?>
 	<?php endif; ?>
 <?php endforeach; ?>
-
-<a id="contacts_deletecard"><img src="../../core/img/actions/delete.png"></a>
-<a id="contacts_addproperty"><img src="../../core/img/actions/download.png"></a>
+<div id="contacts_cardoptions">
+	<a id="contacts_deletecard"><img src="../../core/img/actions/delete.png"></a>
+	<a id="contacts_addproperty"><img src="../../core/img/actions/download.png"></a>
+</div>
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php
index 1a4266b3a2b..1611e54b65f 100644
--- a/apps/contacts/templates/part.property.php
+++ b/apps/contacts/templates/part.property.php
@@ -1,40 +1,48 @@
-<div class="contacts_property" x-line="<?php echo $_['property']['line']; ?>" x-checksum="<?php echo $_['property']['checksum']; ?>">
+<div class="contacts_property" data-checksum="<?php echo $_['property']['checksum']; ?>">
 	<?php if($_['property']['name'] == 'FN'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Name'); ?></div>
 		<div class="contacts_propertyvalue">
-			<span style="display:none;" x-use="edit"><img src="../../core/img/actions/rename.png"></span>
 			<?php echo $_['property']['value']; ?>
+			<span style="display:none;" data-use="edit"><img src="../../core/img/actions/rename.png"></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'BDAY'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Birthday'); ?></div>
 		<div class="contacts_propertyvalue">
 		<?php echo $l->l('date',new DateTime($_['property']['value'])); ?>
-			<span style="display:none;" x-use="edit"><img src="../../core/img/actions/rename.png"></span>
-			<span style="display:none;" x-use="delete"><img src="../../core/img/actions/delete.png"></span>
+			<span style="display:none;" data-use="delete"><img src="../../core/img/actions/delete.png"></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'ORG'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Organisation'); ?></div>
 		<div class="contacts_propertyvalue">
 			<?php echo $_['property']['value']; ?>
-			<span style="display:none;" x-use="edit"><img src="../../core/img/actions/rename.png"></span>
-			<span style="display:none;" x-use="delete"><img src="../../core/img/actions/delete.png"></span>
+			<span style="display:none;" data-use="edit"><img src="../../core/img/actions/rename.png"></span>
+			<span style="display:none;" data-use="delete"><img src="../../core/img/actions/delete.png"></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'EMAIL'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Email'); ?></div>
 		<div class="contacts_propertyvalue">
 			<?php echo $_['property']['value']; ?>
-			<span style="display:none;" x-use="edit"><img src="../../core/img/actions/rename.png"></span>
-			<span style="display:none;" x-use="delete"><img src="../../core/img/actions/delete.png"></span>
+			<span style="display:none;" data-use="edit"><img src="../../core/img/actions/rename.png"></span>
+			<span style="display:none;" data-use="delete"><img src="../../core/img/actions/delete.png"></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'TEL'): ?>
-		<div class="contacts_propertyname"><?php echo $l->t('Telefon'); ?></div>
+		<div class="contacts_propertyname"><?php echo $l->t('Telephone'); ?></div>
 		<div class="contacts_propertyvalue">
 			<?php echo $_['property']['value']; ?>
-			<span style="display:none;" x-use="edit"><img src="../../core/img/actions/rename.png"></span>
-			<span style="display:none;" x-use="delete"><img src="../../core/img/actions/delete.png"></span>
+			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
+				(<?php echo $l->t('tel_'.strtolower($_['property']['parameters']['TYPE'])); ?>)
+			<?php endif; ?>
+			<span style="display:none;" data-use="edit"><img src="../../core/img/actions/rename.png"></span>
+			<span style="display:none;" data-use="delete"><img src="../../core/img/actions/delete.png"></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'ADR'): ?>
-		<div class="contacts_propertyname"><?php echo $l->t('Address'); ?></div>
+		<div class="contacts_propertyname">
+			<?php echo $l->t('Address'); ?>
+			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
+				<br>
+				(<?php echo $l->t('adr_'.strtolower($_['property']['parameters']['TYPE'])); ?>)
+			<?php endif; ?>
+		</div>
 		<div class="contacts_propertyvalue">
 			<?php echo $l->t('PO Box'); ?> <?php echo $_['property']['value'][0]; ?><br>
 			<?php echo $l->t('Extended Address'); ?> <?php echo $_['property']['value'][1]; ?><br>
@@ -43,8 +51,8 @@
 			<?php echo $l->t('Region'); ?> <?php echo $_['property']['value'][4]; ?><br>
 			<?php echo $l->t('Postal Code'); ?> <?php echo $_['property']['value'][5]; ?><br>
 			<?php echo $l->t('Country'); ?> <?php echo $_['property']['value'][6]; ?> 
-			<span style="display:none;" x-use="edit"><img src="../../core/img/actions/rename.png"></span>
-			<span style="display:none;" x-use="delete"><img src="../../core/img/actions/delete.png"></span>
+			<span style="display:none;" data-use="edit"><img src="../../core/img/actions/rename.png"></span>
+			<span style="display:none;" data-use="delete"><img src="../../core/img/actions/delete.png"></span>
 		</div>
 	<?php endif; ?>
 </div>
diff --git a/apps/contacts/templates/part.setpropertyform.php b/apps/contacts/templates/part.setpropertyform.php
index cd774ee6593..d8127bb08b0 100644
--- a/apps/contacts/templates/part.setpropertyform.php
+++ b/apps/contacts/templates/part.setpropertyform.php
@@ -1,6 +1,5 @@
 <form id="contacts_setpropertyform">
 	<input type="hidden" name="checksum" value="<?php echo $_['property']['checksum']; ?>">
-	<input type="hidden" name="line" value="<?php echo $_['property']['line']; ?>">
 	<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
 	<?php if($_['property']['name']=='ADR'): ?>
 		<?php echo $l->t('PO Box'); ?> <input type="text" name="value[0]" value="<?php echo $_['property']['value'][0]; ?>">
@@ -12,8 +11,6 @@
 		<?php echo $l->t('Country'); ?> <input type="text" name="value[6]" value="<?php echo $_['property']['value'][6]; ?>">
 	<?php elseif($_['property']['name']=='TEL'): ?>
 		<input type="text" name="value" value="<?php echo $_['property']['value']; ?>">
-	<?php elseif($_['property']['name']=='NOTE'): ?>
-		<textarea type="text" name="value"><?php echo $_['property']['value']; ?></textarea>
 	<?php else: ?>
 		<input type="text" name="value" value="<?php echo $_['property']['value']; ?>">
 	<?php endif; ?>