List groups in address detail view and allow to subscribe/unsubscribe from there (#1486753)

3 files changed, 25 insertions, 14 deletions

diff --git a/skins/default/common.css b/skins/default/common.css
index 53e07e12d..2c365141b 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -843,6 +843,18 @@ span.tablink-selected a
   background-position: right -23px;
 }
 
+fieldset
+{
+  margin-bottom: 1em;
+  border: 1px solid #999999;
+  padding: 4px 8px 9px 8px; 
+}
+
+legend
+{
+  color: #999999;
+}
+
 fieldset.tabbed
 {
   margin-top: 22px;
diff --git a/skins/default/settings.css b/skins/default/settings.css
index e4718d40e..c902740a6 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -149,18 +149,6 @@ input.disabled
   bottom: 0;
 }
 
-fieldset
-{
-  margin-bottom: 0.5em;
-  border: 1px solid #999999;
-  padding: 4px 8px 9px 8px; 
-}
-
-legend
-{
-  color: #999999;
-}
-
 #identities-list,
 #sectionslist
 {
diff --git a/skins/default/templates/showcontact.html b/skins/default/templates/showcontact.html
index be663a78b..a6819f376 100644
--- a/skins/default/templates/showcontact.html
+++ b/skins/default/templates/showcontact.html
@@ -9,9 +9,20 @@
 <div id="contact-title" class="boxtitle"><roundcube:object name="contactdetails" part="name" /></div>
 
 <div id="contact-details" class="boxcontent">
-<roundcube:object name="contactdetails" />
+<fieldset>
+  <legend><roundcube:label name="contactproperties" /></legend>
+  <roundcube:object name="contactdetails" />
+
+  <p><br /><roundcube:button command="edit" type="input" class="button" label="editcontact" condition="!ENV:readonly" /></p>
+</fieldset>
+
+<roundcube:if condition="ENV:groups" />
+<fieldset>
+  <legend><roundcube:label name="groups" /></legend>
+  <roundcube:object name="contactgroups" />
+</fieldset>
+<roundcube:endif />
 
-<p><br /><roundcube:button command="edit" type="input" class="button" label="editcontact" condition="!ENV:readonly" /></p>
 </div>
 
 </body>