Some improvements on the contact application

1 files changed, 106 insertions, 46 deletions

diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
index 9899f552857..8e482cc4eba 100644
--- a/apps/contacts/templates/part.addcardform.php
+++ b/apps/contacts/templates/part.addcardform.php
@@ -1,51 +1,111 @@
-<form id="contacts_addcardform">
+<form class="formtastic" id="contacts_addcardform">
 	<?php if(count($_['addressbooks'])==1): ?>
 		<input type="hidden" name="id" value="<?php echo $_['addressbooks'][0]['id']; ?>">
 	<?php else: ?>
-		<label for="id"><?php echo $l->t('Group'); ?></label>
-		<select name="id" size="1">
-			<?php foreach($_['addressbooks'] as $addressbook): ?>
-				<option value="<?php echo $addressbook['id']; ?>"><?php echo $addressbook['displayname']; ?></option>
-			<?php endforeach; ?>
-		</select>
+		<fieldset class="inputs">
+			<ol>
+				<li class="input stringish">
+					<label class="label" for="id"><?php echo $l->t('Group'); ?></label>
+					<select name="id" size="1">
+						<?php foreach($_['addressbooks'] as $addressbook): ?>
+							<option value="<?php echo $addressbook['id']; ?>"><?php echo $addressbook['displayname']; ?></option>
+						<?php endforeach; ?>
+					</select>
+				</li>
+			</ol>
+		</fieldset>
 	<?php endif; ?>
-	<label for="fn"><?php echo $l->t('Name'); ?></label>
-	<input type="text" name="fn" value=""><br>
-	<label for="ADR"><?php echo $l->t('Address'); ?></label>
-	<div id="contacts_addresspart">
-		<select id="ADR" name="parameters[ADR][TYPE]" size="1">
-			<option value="work"><?php echo $l->t('Work'); ?></option>
-			<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
-		</select>
-		<p><label><?php echo $l->t('PO Box'); ?></label> <input type="text" name="value[ADR][0]" value=""></p>
-		<p><label><?php echo $l->t('Extended'); ?></label> <input type="text" name="value[ADR][1]" value=""></p>
-		<p><label><?php echo $l->t('Street'); ?></label> <input type="text" name="value[ADR][2]" value=""></p>
-		<p><label><?php echo $l->t('City'); ?></label> <input type="text" name="value[ADR][3]" value=""></p>
-		<p><label><?php echo $l->t('Region'); ?></label> <input type="text" name="value[ADR][4]" value=""></p>
-		<p><label><?php echo $l->t('Zipcode'); ?></label> <input type="text" name="value[ADR][5]" value=""></p>
-		<p><label><?php echo $l->t('Country'); ?></label> <input type="text" name="value[ADR][6]" value=""></p>
-	</div>
-	<label for="TEL"><?php echo $l->t('Telephone'); ?></label>
-	<div id="contacts_phonepart">
-		<select id="TEL" name="parameters[TEL][TYPE]" size="1">
-			<option value="home"><?php echo $l->t('Home'); ?></option>
-			<option value="cell" selected="selected"><?php echo $l->t('Mobile'); ?></option>
-			<option value="work"><?php echo $l->t('Work'); ?></option>
-			<option value="text"><?php echo $l->t('Text'); ?></option>
-			<option value="voice"><?php echo $l->t('Voice'); ?></option>
-			<option value="fax"><?php echo $l->t('Fax'); ?></option>
-			<option value="video"><?php echo $l->t('Video'); ?></option>
-			<option value="pager"><?php echo $l->t('Pager'); ?></option>
-		</select>
-		<input type="text" name="value[TEL]" value="">
-	</div>
-	<label for="EMAIL"><?php echo $l->t('Email'); ?></label>
-	<div id="contacts_email">
-		<input id="EMAIL" type="text" name="value[EMAIL]" value="">
-	</div>
-	<label for="ORG"><?php echo $l->t('Organization'); ?></label>
-	<div id="contacts_organisation">
-		<input id="ORG" type="text" name="value[ORG]" value="">
-	</div>
-	<input type="submit" name="submit" value="<?php echo $l->t('Create Contact'); ?>">
+	<fieldset class="inputs">
+		<ol>
+			<li class="input stringish">
+				<label class="label" for="fn"><?php echo $l->t('Name'); ?></label>
+				<input type="text" name="fn" value=""><br>
+			</li>
+			<li class="input stringish">
+				<label class="label" for="org"><?php echo $l->t('Organization'); ?></label>
+				<input id="org" type="text" name="value[ORG]" value="">
+			</li>
+		</ol>
+	</fieldset>
+	<fieldset class="inputs">
+		<ol>
+			<li class="input stringish">
+				<label class="label" for="email"><?php echo $l->t('Email'); ?></label>
+				<input id="email" type="text" name="value[EMAIL]" value="">
+			</li>
+			<li class="input">
+				<fieldset class="fragments">
+					<legend class="label">
+						<label for="tel"><?php echo $l->t('Telephone'); ?></label>
+					</legend>
+					<ol class="fragments-group">
+						<li class="fragment">
+							<label for="tel"><?php echo $l->t('Number'); ?></label>
+							<input type="phone" id="tel" name="value[TEL]" value="">
+						</li>
+						<li class="fragment">
+							<label for="tel_type"><?php echo $l->t('Type'); ?></label>
+							<select id="TEL" name="parameters[TEL][TYPE]" size="1">
+								<option value="home"><?php echo $l->t('Home'); ?></option>
+								<option value="cell" selected="selected"><?php echo $l->t('Mobile'); ?></option>
+								<option value="work"><?php echo $l->t('Work'); ?></option>
+								<option value="text"><?php echo $l->t('Text'); ?></option>
+								<option value="voice"><?php echo $l->t('Voice'); ?></option>
+								<option value="fax"><?php echo $l->t('Fax'); ?></option>
+								<option value="video"><?php echo $l->t('Video'); ?></option>
+								<option value="pager"><?php echo $l->t('Pager'); ?></option>
+							</select>
+						</li>
+					</ol>
+				</fieldset>
+			</li>
+		</ol>
+	</fieldset>
+	<fieldset class="inputs">
+		<legend><?php echo $l->t('Address'); ?></legend>
+		<ol>
+			<li class="input">
+				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
+					<option value="work"><?php echo $l->t('Work'); ?></option>
+					<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
+				</select>
+			</li>
+			<li class="input stringish">
+				<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
+				<input type="text" id="adr_pobox" name="value[ADR][0]" value="">
+			</li>
+			<li class="input stringish">
+				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
+				<input type="text" id="adr_extended" name="value[ADR][1]" value="">
+			</li>
+			<li class="input stringish">
+				<label class="label" for="adr_street"><?php echo $l->t('Street'); ?></label>
+				<input type="text" for="adr_street" name="value[ADR][2]" value="">
+			</li>
+			<li class="input stringish">
+				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
+				<input type="text" for="adr_city" name="value[ADR][3]" value="">
+			</li>
+			<li class="input stringish">
+				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
+				<input type="text" for="adr_region" name="value[ADR][4]" value="">
+			</li>
+			<li class="input stringish">
+				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
+				<input type="text" for="adr_zipcode" name="value[ADR][5]" value="">
+			</li>
+			<li class="input stringish">
+				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
+				<input type="text" id="adr_country" name="value[ADR][6]" value="">
+			</li>
+		</ol>
+	</fieldset>
+	<fieldset class="buttons">
+		<ol>
+			<li class="commit button">
+				<input class="create" type="submit" name="submit" value="<?php echo $l->t('Create Contact'); ?>">
+			</li>
+		</ol>
+	</fieldset>
 </form>