Ticket #3357 - 'Set Role' popup and related fixes for menus in popup in templates.

modules/base/groups/classes/BxBaseModGroupsGridConnections.php

@@ -115,7 +115,8 @@ class BxBaseModGroupsGridConnections extends BxDolGridConnections
         else
             $sPopupContent = $this->_oModule->_oTemplate->getPopupSetRole($this->_aRoles, $iId, $iRole);
 
-        return echoJson(array('popup' => BxTemplFunctions::getInstance()->transBox(str_replace('_', '-', $this->_sContentModule) . '-set-role-popup', $sPopupContent)));
+        $oFunctions = BxTemplFunctions::getInstance();
+        return echoJson(array('popup' => $oFunctions->transBox(str_replace('_', '-', $this->_sContentModule) . '-set-role-popup', $oFunctions->simpleBoxContent($sPopupContent))));
     }
 
     public function performActionSetRoleSubmit()

modules/boonex/groups/template/css/main.css

@@ -1,7 +1 @@
-@import url(../../../../base/groups/template/css/main.css);
-
-
-/*-- Group Roles --*/
-#bx-groups-set-role-popup .bx-menu-ver {
-    margin: 0;
-}
+@import url(../../../../base/groups/template/css/main.css);

modules/boonex/protean/data/template/system/css/menu.less

@@ -53,6 +53,10 @@ ul.bx-menu-ver.bx-menu-profile-stats li.bx-menu-item-profile-stats-profile .bx-m
     margin-bottom: 0;
     border-top: @bx-border-width @bx-border-type @bx-border-color-hr;
 }
+.bx-popup ul.bx-menu-ver li,
+.bx-popup ul.bx-menu-custom.bx-menu-custom-ver li.bx-def-round-corners {
+    border-radius: 0;
+}
 .bx-popup ul.bx-menu-custom.bx-menu-custom-ver.bx-menu-submenu-more-auto li.bx-menu-item,
 .bx-menu-custom.bx-menu-custom-hor.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-item {
     padding: 0;

template/popup_content_indent.html

@@ -0,0 +1 @@
+<div class="bx-popup-content-indent bx-def-padding">__content__</div>

template/scripts/BxBaseFunctions.php

@@ -125,12 +125,13 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
     	return $this->simpleBox($sName, $sContent, $isHiddenByDefault, false, 'popup_slide.html');
     }
 
-	function inlineBox($sName, $sContent, $isHiddenByDefault = false)
+    function inlineBox($sName, $sContent, $isHiddenByDefault = false)
     {
         return $this->simpleBox($sName, $sContent, $isHiddenByDefault, false, 'popup_inline.html');
     }
 
-    protected function simpleBox($sName, $sContent, $isHiddenByDefault, $isPlaceInCenter, $sTemplate) {
+    protected function simpleBox($sName, $sContent, $isHiddenByDefault, $isPlaceInCenter, $sTemplate) 
+    {
     	$iId = !empty($sName) ? $sName : time();
 
         if(!is_array($sContent))
@@ -149,6 +150,16 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
         return $sContent;
     }
 
+    function simpleBoxContent($sContent, $bWithIndent = true)
+    {
+        if(!$bWithIndent)
+            return $sContent;
+
+        return $this->_oTemplate->parseHtmlByName('popup_content_indent.html', array(
+            'content' => $sContent
+        ));
+    }
+
     function getTemplateIcon($sName)
     {
         $sUrl = $this->_oTemplate->getIconUrl($sName);