Merge branch 'move_addressbook' of https://github.com/johndoh/elastic into johndoh-move_addressbook

skins/elastic/styles/widgets/lists.less

@@ -772,6 +772,21 @@ html.touch {
         font-style: italic;
         margin-left: .5em;
     }
+
+    li {
+        a:before {
+            &:extend(.font-icon-class);
+            margin-right: .5rem;
+        }
+
+        a.addressbook::before {
+            .font-icon-regular(@fa-var-address-book);
+        }
+
+        a.contactgroup::before {
+            .font-icon-solid(@fa-var-users);
+        }
+    }
 }
 
 

skins/elastic/styles/widgets/toolbar.less

@@ -567,6 +567,18 @@
     a.showurl:before {
         content: @fa-var-link;
     }
+    a.qrcode:before {
+        content: @fa-var-qrcode;
+    }
+    a.assigngroup:before {
+        content: @fa-var-user-plus;
+    }
+    a.removegroup:before {
+        content: @fa-var-user-times;
+    }
+    a.vcard:before {
+        content: @fa-var-paperclip;
+    }
 }
 
 .toolbarmenu.listing li {

skins/elastic/templates/addressbook.html

@@ -57,9 +57,6 @@
 			<roundcube:button command="delete" type="link"
 				class="button delete disabled" classAct="button delete"
 				label="delete" title="deletecontact" innerClass="inner" />
-<!-- TODO
-			<roundcube:button command="group-remove-selected" type="link" title="groupremoveselected" class="button removegroup disabled" classAct="button removegroup" innerClass="inner" label="groupremoveselected" />
--->
 			<span class="spacer"></span>
 <!--
 			<roundcube:button command="compose" type="link"
@@ -81,6 +78,9 @@
 					<span class="inner"><roundcube:label name="arialabelcontactexportoptions" /></span>
 				</a>
 			</span>
+			<roundcube:button name="contactmenulink" id="contactmenulink" type="link"
+				class="button more" label="more" title="moreactions"
+				data-popup="contact-menu" innerclass="inner" />
 		</div>
 	</div>
 	<h2 id="aria-label-contact-frame" class="voice"><roundcube:label name="contactproperties" /></h2>
@@ -130,4 +130,20 @@
 	</ul>
 </div>
 
+<div id="contact-menu" class="popupmenu">
+	<h3 id="aria-label-contact-menu" class="voice"><roundcube:label name="arialabelmorecontactactions" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-contact-menu">
+		<roundcube:if condition="env:qrcode" />
+		<roundcube:button type="link-menuitem" command="qrcode" label="qrcode" data-hidden="small" class="qrcode" classAct="qrcode active" />
+		<roundcube:endif />
+		<roundcube:button type="link-menuitem" command="group-assign-selected" label="groupassign" class="assigngroup" classAct="assigngroup active" innerclass="folder-selector-link"  aria-haspopup="true" />
+		<roundcube:button type="link-menuitem" command="group-remove-selected" label="groupremove" class="removegroup" classAct="removegroup active" />
+		<roundcube:if condition="env:writable_source &gt; 1" />
+		<roundcube:button type="link-menuitem" command="move" label="moveto" class="move" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
+		<roundcube:button type="link-menuitem" command="copy" label="copyto" class="copy" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
+		<roundcube:endif />
+		<roundcube:container name="contactmenu" id="contact-menu" />
+	</ul>
+</div>
+
 <roundcube:include file="includes/footer.html" />

skins/elastic/templates/contact.html

@@ -18,9 +18,6 @@
 
 <div class="formbuttons">
 	<roundcube:button command="edit" class="btn btn-primary edit" label="edit" condition="!ENV:readonly" />
-	<roundcube:if condition="env:qrcode" />
-		<roundcube:button command="qrcode" class="btn btn-secondary qrcode" label="qrcode" />
-	<roundcube:endif />
 </div>
 
 <roundcube:include file="includes/footer.html" />

skins/elastic/ui.js

@@ -1948,6 +1948,9 @@ function rcube_elastic_ui()
             if (p.name == 'folder-selector') {
                 content.addClass('listing folderlist');
             }
+            else if (p.name == 'addressbook-selector' || p.name == 'contactgroup-selector') {
+                content.addClass('listing contactlist');
+            }
             else if (content.hasClass('toolbarmenu')) {
                 content.addClass('listing');
             }