Moved action buttons down to the add field menu. Fixes oc-1155.

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 588a51a42996c99b05a29700485d89dc4f6181e8..5b6ccb7638a681846f55b8edc79e2906297231bc 100644 (file)
--- 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 bb574372e52a749d08e3562d6e2063533dcda332..4233bffede34d7daffd57746a98e074277a40aa5 100644 (file)
--- 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 -->