From f9be55a833ca6974749ce49a035c5f10208a770d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 7 May 2013 14:57:59 +0200
Subject: [PATCH] Pixel pushing setting components.

---
 css/contacts.css       | 16 ++++++++++++----
 js/addressbooks.js     |  4 ++--
 templates/contacts.php |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/css/contacts.css b/css/contacts.css
index 86426ca8..3b975aad 100644
--- a/css/contacts.css
+++ b/css/contacts.css
@@ -146,9 +146,13 @@
 .form dd { display: inline-block; clear: right; float: left; margin: 0; padding: 0; white-space: nowrap; vertical-align: text-bottom; }
 
 /* override the default margin on share dropdown */
-#dropdown { margin: 1.5em 0; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; width: 100%; }
+#dropdown {
+	margin: 0;
+	-webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box;
+	width: 100%;
+}
 #dropdown label { display: list-item; }
-
+#dropdown input[type="text"] { width: 90%; }
 /* reset box-sizing for multiSelect */
 #content div.multiselect, #content div.multiselect > * { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; }
 
@@ -407,8 +411,8 @@ dt[data-element="org"] { margin-top: 4px; }
 */
 .addressbooklist .actions { position: absolute; right: 5px; }
 
-#contacts-settings .addressbooklist {
-	max-height: 250px;
+#app-settings-content {
+	overflow-x: hidden;
 	overflow-y: auto;
 }
 
@@ -437,6 +441,10 @@ dt[data-element="org"] { margin-top: 4px; }
 .import-upload, .import-status {
 	height: 60px;
 }
+.import-upload select {
+	width: 80%; height: 30px;
+	margin: 5px;
+}
 .import-status {
 	display: none;
 }
diff --git a/js/addressbooks.js b/js/addressbooks.js
index f6f77f86..1779a3fd 100644
--- a/js/addressbooks.js
+++ b/js/addressbooks.js
@@ -27,8 +27,8 @@ OC.Contacts = OC.Contacts || {};
 		this.$li.find('a.action.globe').on('click keypress', function() {
 			var uri = (self.book.owner === oc_current_user ) ? self.book.uri : self.book.uri + '_shared_by_' + self.book.owner;
 			var link = OC.linkToRemote('carddav')+'/addressbooks/'+encodeURIComponent(oc_current_user)+'/'+encodeURIComponent(uri);
-			var $dropdown = $('<li><div id="dropdown" class="drop"><input type="text" value="' + link + '" readonly /></div></li>');
-			$dropdown.insertAfter(self.$li);
+			var $dropdown = $('<li><div id="dropdown" class="drop"><input type="text" value="{link}" readonly /></div></li>')
+				.octemplate({link:link}).insertAfter(self.$li);
 			var $input = $dropdown.find('input');
 			$input.focus().get(0).select();
 			$input.on('blur', function() {
diff --git a/templates/contacts.php b/templates/contacts.php
index 0fe2ef84..47793724 100644
--- a/templates/contacts.php
+++ b/templates/contacts.php
@@ -7,7 +7,7 @@
 				</a>
 			</li>
 			<li class="special">
-				<input class="add-group" type="text" tabindex="0" autofocus placeholder="<?php p($l->t('Group name')); ?>" title="<?php p($l->t('New Group')); ?>" />
+				<input class="add-group hidden" type="text" tabindex="0" autofocus placeholder="<?php p($l->t('Group name')); ?>" title="<?php p($l->t('New Group')); ?>" />
 			</li>
 		</ul>
 		<div id="app-settings">