From 228832d9547780d909afc1d91977549bf615b31d Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 2 Sep 2012 20:55:08 +0000
Subject: [PATCH] Fix some bookmark import styles

---
 settings.php           | 8 ++------
 templates/settings.php | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/settings.php b/settings.php
index 4892f19c..cc46cd19 100644
--- a/settings.php
+++ b/settings.php
@@ -20,16 +20,12 @@ if (isset($_POST['bm_import'])) {
 			'hint' => '');
 	}
 
+	$tmpl = new OCP\Template('bookmarks', 'settings');
 	// Any problems?
 	if(count($error)){
-		$tmpl = new OCP\Template('bookmarks', 'settings');
 		$tmpl->assign('error',$error);
-			//return $tmpl->fetchPage();
-	} else {
-		// Went swimmingly!
-		$tmpl = new OCP\Template('bookmarks', 'settings');
-			//return $tmpl->fetchPage();
 	}
+	return $tmpl->fetchPage();
 } else {
 	$tmpl = new OCP\Template( 'bookmarks', 'settings');
 	return $tmpl->fetchPage();
diff --git a/templates/settings.php b/templates/settings.php
index 1d45c0e1..41a432d1 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -25,8 +25,8 @@
 
 		<legend><strong><?php echo $l->t('Import bookmarks');?></strong></legend>
 		</p>
-		<p><input type="file" id="bm_import" name="bm_import" style="width:180px;"><label for="bm_import"> <?php echo $l->t('Bookmark html file');?></label>
+		<p><input type="file" id="bm_import" name="bm_import" style="width:280px;"><label for="bm_import"> <?php echo $l->t('Bookmark html file');?></label>
 		</p>
 		<input type="submit" name="bm_import" value="<?php echo $l->t('Import'); ?>" />
 	</fieldset>
-</form>
+</form>
\ No newline at end of file