From 6d3afb3857f30f69fd883bb3f933568a9e2f4115 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jul 2012 13:49:39 +0200
Subject: [PATCH] Moved action buttons down to the add field menu. Fixes
 oc-1155.

---
 apps/contacts/css/contacts.css           |  4 +--
 apps/contacts/templates/part.contact.php | 34 ++++++++++++------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 588a51a4299..5b6ccb7638a 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -15,10 +15,10 @@
 #bottomcontrols img { margin-top: 0.35em; }
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
-#actionbar { height: 30px; width: 60px; position: fixed; right: 0px; top: 4em; margin: 0 0 0 0; padding: 0 0 0 0; z-index: 1000; }
+#actionbar { position: relative; clear: both; height: 30px;}
 #contacts_deletecard {position:relative; float:left; background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; }
 #contacts_downloadcard {position:relative; float:left; background:url('%webroot%/core/img/actions/download.svg') no-repeat center; }
-#contacts_propertymenu { clear: both; max-width: 15em; margin: 2em; }
+#contacts_propertymenu { clear: left; float:left; max-width: 15em; margin: 2em; }
 #contacts_propertymenu_button { position:relative;top:0;left:0; margin: 0; }
 #contacts_propertymenu_dropdown { background-color: #fff; position:relative; right:0; overflow:hidden; text-overflow:ellipsis; border: thin solid #1d2d44; box-shadow: 0 3px 5px #bbb; /* -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000;  box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em;*/ border-radius: 3px; }
 #contacts_propertymenu li { display: block; font-weight: bold; height: 20px; }
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index bb574372e52..4233bffede3 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -9,10 +9,6 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 		<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
 	</form>
-	<div id="actionbar">
-		<button class="svg action" id="contacts_downloadcard" title="<?php echo $l->t('Download contact');?>"></button>
-		<button class="svg action" id="contacts_deletecard" title="<?php echo $l->t('Delete contact');?>"></button>
-	</div>
 
 	<div id="contact_photo" class="contactsection">
 
@@ -108,19 +104,23 @@ $id = isset($_['id']) ? $_['id'] : '';
 	</form>
 	</div> <!-- contact_note -->
 
-	<div id="contacts_propertymenu">
-	<button class="button" id="contacts_propertymenu_button"><?php echo $l->t('Add field'); ?></button>
-	<ul id="contacts_propertymenu_dropdown" role="menu" class="hidden">
-		<li><a role="menuitem" data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
-		<li><a role="menuitem" data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
-		<li><a role="menuitem" data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
-		<li><a role="menuitem" data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
-		<li><a role="menuitem" data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
-		<li><a role="menuitem" data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
-		<li><a role="menuitem" data-type="NOTE"><?php echo $l->t('Note'); ?></a></li>
-		<li><a role="menuitem" data-type="URL"><?php echo $l->t('Web site'); ?></a></li>
-		<li><a role="menuitem" data-type="CATEGORIES"><?php echo $l->t('Groups'); ?></a></li>
-	</ul>
+	<div id="actionbar">
+		<div id="contacts_propertymenu">
+		<button class="button" id="contacts_propertymenu_button"><?php echo $l->t('Add field'); ?></button>
+		<ul id="contacts_propertymenu_dropdown" role="menu" class="hidden">
+			<li><a role="menuitem" data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
+			<li><a role="menuitem" data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
+			<li><a role="menuitem" data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
+			<li><a role="menuitem" data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
+			<li><a role="menuitem" data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
+			<li><a role="menuitem" data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
+			<li><a role="menuitem" data-type="NOTE"><?php echo $l->t('Note'); ?></a></li>
+			<li><a role="menuitem" data-type="URL"><?php echo $l->t('Web site'); ?></a></li>
+			<li><a role="menuitem" data-type="CATEGORIES"><?php echo $l->t('Groups'); ?></a></li>
+		</ul>
+		</div>
+		<button class="svg action" id="contacts_downloadcard" title="<?php echo $l->t('Download contact');?>"></button>
+		<button class="svg action" id="contacts_deletecard" title="<?php echo $l->t('Delete contact');?>"></button>
 	</div>
 
 </div> <!-- card -->
-- 
2.39.5