Index: /views/mods/mod_packagetracking/order_view_switchStatus.phtml
===================================================================
--- /views/mods/mod_packagetracking/order_view_switchStatus.phtml	(revision 6350)
+++ /views/mods/mod_packagetracking/order_view_switchStatus.phtml	(revision 6351)
@@ -1,29 +1,33 @@
-<?php
+<?php 
+/**
+ * Integration in das Formular fÌr die StatusÀnderung einer Bestellung
+ */
+?>
 
-	/**
-	 * Integration in das Formular fÌr die StatusÀnderung einer Bestellung
-	 */
+<div class="wpsg_form_field wpsg_mod_packagetracking">
 
-?>
-<div class="wpsg_form_field wpsg_mod_packagetracking">
-	<div class="wpsg_form_left">
-		<?php echo __('Paketverfolgung', 'wpsg'); ?>:
-	</div>
-	<div class="wpsg_form_right">
-		<input placeholder="<?php echo __('Tracking ID', 'wpsg'); ?>" type="text" id="wpsg_mod_packagetracking_code" value="<?php echo wpsg_hspc($this->view['wpsg_mod_packagetracking']['oOrder']->wpsg_mod_packagetracking_code); ?>" name="wpsg_mod_packagetracking_code" />
-		<select name="wpsg_mod_packagetracking_provider" id="wpsg_mod_packagetracking_provider">
-			<option value="0"><?php echo __('Keine Paketverfolgung', 'wpsg'); ?></option>
-			<?php if (wpsg_isSizedArray($this->view['wpsg_mod_packagetracking']['provider'])) { ?>
-			<?php foreach ($this->view['wpsg_mod_packagetracking']['provider'] as $p) { ?>
-			<option value="<?php echo wpsg_hspc($p['id']); ?>" <?php echo (($this->view['wpsg_mod_packagetracking']['preset'] == $p['id'])?'selected="selected"':''); ?>><?php echo wpsg_hspc($p['name']); ?></option>
-			<?php } ?>
-			<?php } ?>
-		</select>
-		<div class="wpsg_clear"></div>
-		<?php if (wpsg_isSizedString($this->view['wpsg_mod_packagetracking']['oOrder']->wpsg_mod_packagetracking_code)) { ?>
-		<a href="<?php echo $this->callMod('wpsg_mod_packagetracking', 'getTrackingURL', array(&$_REQUEST['edit_id'])); ?>"><?php echo __('Paketverfolgung', 'wpsg'); ?></a>
-		<?php } ?>
-	</div>
-	<div class="wpsg_clear"></div> 
+	<?php 
+	$tcode = $this->view['wpsg_mod_packagetracking']['oOrder']->wpsg_mod_packagetracking_code;
+	$prov = array();
+	foreach ($this->view['wpsg_mod_packagetracking']['provider'] as $p) $prov[] = $p['name'];
+
+	echo wpsg_drawForm_Input('wpsg_mod_packagetracking_code', __('Tracking-ID', 'wpsg'), $tcode);
+	echo wpsg_drawForm_Select('wpsg_mod_packagetracking_provider', __('Provider', 'wpsg'), $prov, $this->view['wpsg_mod_packagetracking']['preset'], array());
+	?>
+
+	<?php 
+
+        $temp = $this->view['wpsg_mod_packagetracking']['oOrder']->wpsg_mod_packagetracking_code;
+		if (wpsg_isSizedString($temp)) {
+			
+			$link =	'<a href="';
+			$link .= $this->callMod('wpsg_mod_packagetracking', 'getTrackingURL', array(&$_REQUEST['edit_id']));
+			$link .= '">';
+			$link .= __('Paketverfolgung', 'wpsg');
+			$link .= '</a>';
+		
+            echo wpsg_drawForm_Text('', $link, 'wpsg_trackingurl', array());
+		}
+	?>
 </div>		
 
@@ -51,3 +55,2 @@
 
 /* ]]> */</script>
-