CSS cleanup, more error checking, better error messages, general cleanup.

2 files changed, 66 insertions, 58 deletions

diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 24484231af4..d548f17172d 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,10 +1,3 @@
-<?php // Include Style and Script
-//OC_Util::addScript('contacts','interface'); // this line caused entry duplication, cause contacts/index.php already inlcudes it
-OC_Util::addScript('contacts','jquery.inview');
-OC_Util::addStyle('contacts','styles');
-OC_Util::addStyle('contacts','formtastic');
-?>
-
 <script type='text/javascript'>
 	var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
 </script>
diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
index 627053547ad..510096a9e81 100644
--- a/apps/contacts/templates/part.addcardform.php
+++ b/apps/contacts/templates/part.addcardform.php
@@ -3,93 +3,108 @@
 		<input type="hidden" name="id" value="<?php echo $_['addressbooks'][0]['id']; ?>">
 	<?php else: ?>
 		<fieldset class="inputs">
-			<ol>
-				<li class="input stringish">
+			<dl class="form">
+				<dt>
 					<label class="label" for="id"><?php echo $l->t('Group'); ?></label>
+				</dt>
+				<dd>
 					<select name="id" size="1">
 						<?php echo html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
 					</select>
-				</li>
-			</ol>
+				</dd>
+			</dl>
 		</fieldset>
 	<?php endif; ?>
 	<fieldset class="inputs">
-		<ol>
-			<li class="input stringish">
+		<dl class="form">
+			<dt>
 				<label class="label" for="fn"><?php echo $l->t('Name'); ?></label>
+			</dd>
+			<dd>
 				<input id="fn" type="text" name="fn" value=""><br>
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="org"><?php echo $l->t('Organization'); ?></label>
+			</dt>
+			<dd>
 				<input id="org" type="text" name="value[ORG]" value="">
-			</li>
-		</ol>
+			</dd>
+		</dl>
 	</fieldset>
 	<fieldset class="inputs">
-		<ol>
-			<li class="input stringish">
+		<dl class="form">
+			<dt>
 				<label class="label" for="email"><?php echo $l->t('Email'); ?></label>
+			</dt>
+			<dd>
 				<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][]" multiple="multiple">
-								<?php echo html_select_options($_['phone_types'], 'CELL') ?>
-							</select>
-						</li>
-					</ol>
-				</fieldset>
-			</li>
-		</ol>
+			</dd>
+			<dt>
+				<label for="tel"><?php echo $l->t('Telephone'); ?></label>
+			</dt>
+			<dd>
+				<input type="phone" id="tel" name="value[TEL]" value="">
+				<select id="TEL" name="parameters[TEL][TYPE][]" multiple="multiple">
+					<?php echo html_select_options($_['phone_types'], 'CELL') ?>
+				</select>
+			</dd>
+		</dl>
 	</fieldset>
 	<fieldset class="inputs">
 		<legend><?php echo $l->t('Address'); ?></legend>
-		<ol>
-			<li class="input">
+		<dl class="form">
+			<dt>
 				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+			</dt>
+			<dd>
 				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
 					<?php echo html_select_options($_['adr_types'], 'HOME') ?>
 				</select>
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_pobox" name="value[ADR][0]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dd>
+			<dt>
 				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_extended" name="value[ADR][1]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_street"><?php echo $l->t('Street'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_street" name="value[ADR][2]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_city" name="value[ADR][3]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_region" name="value[ADR][4]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
+			</dtl>
+			<dd>
 				<input type="text" id="adr_zipcode" name="value[ADR][5]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_country" name="value[ADR][6]" value="">
-			</li>
-		</ol>
+			</dd>
+		</dl>
 	</fieldset>
 	<fieldset class="buttons">
 		<ol>