Fixed issue: boxes not behaving correctly on ie

LimeSurvey · Dec 27, 2017 · 0d0c034 · 0d0c034
1 parent cb92678
commit 0d0c034
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 4 deletions.
diff --git a/application/config/packages.php b/application/config/packages.php
@@ -199,6 +199,13 @@
             'build/lslog.js',
         )
     ),
+    'panelboxes' => array(
+        'devBaseUrl' => 'assets/packages/panelboxes/',
+        'basePath' => 'core.panelboxes',
+        'css' => array(
+            'build/panelboxes'.$minVersion.'.css',
+        )
+    ),
     'adminbasics' => array(
         'devBaseUrl' => 'assets/packages/adminbasics/',
         'basePath' => 'core.adminbasics',

diff --git a/application/extensions/PanelBoxWidget/PanelBoxWidget.php b/application/extensions/PanelBoxWidget/PanelBoxWidget.php
@@ -18,6 +18,7 @@ class PanelBoxWidget extends CWidget
 
     public function run()
     {
+        App()->getClientScript()->registerPackage('panelboxes');
         if ($this->display == 'singlebox') {
             if ($this->fromDb) {
                 $this->setValuesFromDb();

diff --git a/application/extensions/PanelBoxWidget/views/box.php b/application/extensions/PanelBoxWidget/views/box.php
@@ -1,5 +1,5 @@
-<div class="<?php echo $sizeClass; ?> ls-flex-column" style="padding:15px; height: 200px;" >
-    <div class="panel panel-primary panel-clickable selector__<?=str_replace(' ', '_', strtolower($title))?>" 
+<div class="<?php echo $sizeClass; ?> ls-flex-column ls-panelboxes-panelbox" >
+    <div class="panel panel-primary panel-clickable ls-panelboxes-panelbox-inner selector__<?=str_replace(' ', '_', strtolower($title))?>" 
         id="panel-<?php echo $position; ?>"
          data-url="<?php echo $url; ?>"<?php if ($external) {
         echo ' data-target="_blank"';

diff --git a/application/extensions/PanelBoxWidget/views/row_header.php b/application/extensions/PanelBoxWidget/views/row_header.php
@@ -1,2 +1,2 @@
-<div class="<?php echo $containerclass; ?> ls-flex selector__lstour--mainfunctionboxes">
-<div class="ls-flex ls-flex-row wrap <?php echo $orientation; ?> align-item-center text-center hidden-xs row-eq-height" >
+<div class="<?php echo $containerclass; ?> ls-flex ls-panelboxes selector__lstour--mainfunctionboxes">
+<div class="ls-flex ls-flex-row wrap ls-panelboxes-inner-container <?php echo $orientation; ?> align-item-center text-center hidden-xs" >
diff --git a/assets/packages/panelboxes/build/panelboxes.css b/assets/packages/panelboxes/build/panelboxes.css
@@ -0,0 +1,9 @@
+.ls-panelboxes .ls-panelboxes-panelbox {
+  padding: 20px;
+  height: 200px;
+  position: relative;
+  margin: 10px 0; }
+  .ls-panelboxes .ls-panelboxes-panelbox .ls-panelboxes-panelbox-inner {
+    position: absolute;
+    width: 95%;
+    height: 100%; }
diff --git a/assets/packages/panelboxes/compile.sh b/assets/packages/panelboxes/compile.sh
@@ -0,0 +1 @@
+sass src/main.scss > build/panelboxes.css
diff --git a/assets/packages/panelboxes/src/box.scss b/assets/packages/panelboxes/src/box.scss
@@ -0,0 +1,12 @@
+.ls-panelboxes-panelbox {
+    padding:20px; 
+    height: 200px;
+    position:relative;
+    margin: 10px 0;
+
+    .ls-panelboxes-panelbox-inner {
+        position: absolute;
+        width:95%;
+        height:100%;
+    }
+}
diff --git a/assets/packages/panelboxes/src/container.scss b/assets/packages/panelboxes/src/container.scss
@@ -0,0 +1,4 @@
+.ls-panelboxes-inner-container{
+
+}
+
diff --git a/assets/packages/panelboxes/src/main.scss b/assets/packages/panelboxes/src/main.scss
@@ -0,0 +1,4 @@
+.ls-panelboxes{
+    @import 'container';
+    @import 'box';
+}