Bladeren bron

Ticket #3073 - Settings popup.

AntonLV 5 jaren geleden
bovenliggende
commit
697070d225

+ 10 - 4
studio/template/css/launcher.css

@@ -195,10 +195,7 @@ div.bx-std-widget-actions-cnt {
     flex-direction: column;
 }
 div.bx-std-widget-action {
-    position: relative;
-    float: none;
-    width: 30px;
-    height: 30px;
+    
     margin-top: 0.25rem;
 
     background-color: #fdfeff;
@@ -210,6 +207,15 @@ div.bx-std-widget-action {
 div.bx-std-widget-action:first-child {
     margin-top: 0;
 }
+div.bx-std-widget-action,
+div.bx-std-widget-action > a {
+    position: relative;
+    display: block;
+    float: none;
+
+    width: 30px;
+    height: 30px;
+}
 div.bx-std-widget-action i.sys-icon {
     font-size: 20px;
     text-shadow: none;

+ 15 - 1
studio/template/css/menu_top.css

@@ -201,10 +201,14 @@ div.bx-std-menu-top-right li.bx-menu-tab-active i.sys-icon {
     text-shadow: 0 0 4px #ffe900;
 }
 
-/*--- Account popup ---*/
+/*--- Account and Settings popups ---*/
+body > .bx-popup-wrapper.bx-std-mod-popup-settings-wrapper,
+#bx-std-pcap-menu-popup-actions,
 #bx-popup-ajax-wrapper-sys_studio_account_popup {
     overflow: visible;
 }
+.bx-std-mod-popup-settings-wrapper::before,
+#bx-std-pcap-menu-popup-actions:before,
 #bx-popup-ajax-wrapper-sys_studio_account_popup::before {
     position: absolute;
     display: block;
@@ -220,10 +224,18 @@ div.bx-std-menu-top-right li.bx-menu-tab-active i.sys-icon {
 
     transform: rotate(45deg);
 }
+.bx-std-mod-popup-settings-wrapper::before,
+#bx-std-pcap-menu-popup-actions:before {
+    right: 0.75rem;
+}
+.bx-std-mod-popup-settings-wrapper .bx-popup,
+#bx-std-pcap-menu-popup-actions .bx-popup,
 #bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup {
     box-shadow: inset -1px -1px 0px rgba(240, 240, 240, 0.2), inset 1px 1px 0px rgba(240, 240, 240, 0.2);
     background-color: #001529;
 }
+.bx-std-mod-popup-settings-wrapper .bx-popup-content-indent,
+#bx-std-pcap-menu-popup-actions .bx-popup-content-indent,
 #bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-content-indent {
     padding: 0;
 }
@@ -239,6 +251,8 @@ div.bx-std-menu-top-right li.bx-menu-tab-active i.sys-icon {
     font-weight: 400;
     overflow: hidden;
 }
+.bx-std-mod-popup-settings-wrapper,
+#bx-std-pcap-menu-popup-actions .bx-popup-color-bg,
 #bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-color-bg li a,
 #bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-color-bg li .sys-icon {
     color: rgba(255, 255, 255, 0.7);

+ 1 - 1
studio/template/mod_popup_settings.html

@@ -1,4 +1,4 @@
-<div class="bx-mod-popup-settings bx-def-popup-width bx-def-color-bg-block">
+<div class="bx-mod-popup-settings bx-def-popup-width">
     <div class="bx-mod-popup-settings-cnt bx-def-padding">
         __content__
     </div>

+ 1 - 1
studio/template/page_caption_actions.html

@@ -1 +1 @@
-<div class="bx-def-padding bx-def-color-bg-block">__content__</div>
+<div class="bx-def-padding">__content__</div>

+ 6 - 2
studio/template/scripts/BxBaseStudioModule.php

@@ -103,12 +103,16 @@ class BxBaseStudioModule extends BxDolStudioModule
         if(empty($sActions))
             return '';
 
-        $sName = 'bx-std-mod-popup-settings-' . $sPage;
+        $sPrefix = 'bx-std-mod-popup-settings';
+        $sName = $sPrefix . '-' . $sPage;
         $sContent = BxDolStudioTemplate::getInstance()->parseHtmlByName($this->sTmplNamePopupSettings, array(
             'content' => $sActions
         ));
 
-        return BxTemplStudioFunctions::getInstance()->transBox($sName, $sContent);
+        return BxTemplStudioFunctions::getInstance()->transBox($sName, array(
+            'wrapper_class' => $sPrefix . '-wrapper',
+            'content' => $sContent
+        ));
     }
 
     protected function getPopupConfirmUninstall($iWidgetId, &$aModule)

+ 1 - 1
template/popup_trans.html

@@ -1,4 +1,4 @@
-<div  id="__id__" class="bx-popup-wrapper bx-popup-responsive bx-popup-trans-wrapper bx-def-box-sizing" style="__wrapper_style__" role="alert">
+<div  id="__id__" class="bx-popup-wrapper bx-popup-responsive bx-popup-trans-wrapper bx-def-box-sizing __wrapper_class__" style="__wrapper_style__" role="alert">
     <!--<div class="bx-popup-box-pointer"><i class="bx-popup-border"></i></div>-->
     <div class="bx-popup bx-popup-trans bx-popup-border bx-popup-color-bg bx-def-round-corners">
         <div class="bx-popup-close-wrapper bx-def-padding bx-def-media-desktop-hide bx-def-media-tablet-hide">

+ 8 - 4
template/scripts/BxBaseFunctions.php

@@ -131,14 +131,18 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
     protected function simpleBox($sName, $sContent, $isHiddenByDefault, $isPlaceInCenter, $sTemplate) {
     	$iId = !empty($sName) ? $sName : time();
 
-		$sContent = $this->_oTemplate->parseHtmlByName($sTemplate, array(
+        if(!is_array($sContent))
+            $sContent = array('content' => $sContent);
+
+        $sContent = $this->_oTemplate->parseHtmlByName($sTemplate, array_merge(array(
             'id' => $iId,
+            'wrapper_class' => '',
             'wrapper_style' => $isHiddenByDefault ? 'display:none;' : '',
-            'content' => $sContent
-        ));
+            'content' => ''
+        ), $sContent));
 
         if($isPlaceInCenter)
-        	$sContent = '<div class="login_ajax_wrap">' . $sContent . '</div>';
+            $sContent = '<div class="login_ajax_wrap">' . $sContent . '</div>';
 
         return $sContent;
     }