From c78b56bcac06c4c4aa8c4637e7219329bcaf2ef7 Mon Sep 17 00:00:00 2001 From: LouisGac Date: Thu, 17 Dec 2015 15:22:04 +0100 Subject: [PATCH] Dev: redesigned statistics view filters --- application/controllers/admin/statistics.php | 8 ++ .../statistics_subviews/_dataselection.php | 88 +++++++++--------- .../export/statistics_subviews/_header.php | 16 +--- .../statistics_subviews/_outputformat.php | 34 ++++--- .../statistics_subviews/_outputoptions.php | 75 ++++++++------- .../_response_filter_header.php | 15 +-- .../statistics_subviews/_responseid.php | 28 +++--- .../views/admin/export/statistics_view.php | 30 +++--- scripts/admin/admin_core.js | 1 - scripts/admin/statistics.js | 19 +++- styles/Sea_Green/config.xml | 2 + .../lime-admin.scssc | Bin 1189119 -> 1192479 bytes styles/Sea_Green/css/bootstrap-switch.min.css | 22 +++++ styles/Sea_Green/css/lime-admin.css | 7 +- styles/Sea_Green/css/lime-admin.css.map | 2 +- styles/Sea_Green/css/lime-admin.scss | 8 +- .../Sea_Green/scripts/bootstrap-switch.min.js | 22 +++++ 17 files changed, 228 insertions(+), 149 deletions(-) create mode 100644 styles/Sea_Green/css/bootstrap-switch.min.css create mode 100644 styles/Sea_Green/scripts/bootstrap-switch.min.js diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index 2dd6a4f5a65..96bcac77418 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -643,6 +643,14 @@ function graph() */ protected function _renderWrappedTemplate($sAction = 'export', $aViewUrls = array(), $aData = array()) { + //$switch = realpath(__DIR__ . '/../..').'/widgets/switch/assets/js/bootstrap-switch.min.js '; + $switch = Yii::app()->getBaseUrl(true).'/application/extensions/yiiwheels/widgets/switch/assets/js/bootstrap-switch.min.js '; + //var_dump($switch); + //App()->getClientScript()->registerScriptFile( App()->getAssetManager()->publish( $switch) ); + App()->getClientScript()->registerScriptFile( $switch ); + + +// $aData['display']['menu_bars'] = false; $aData['display']['menu_bars']['browse'] = gT('Browse responses'); // browse is independent of the above diff --git a/application/views/admin/export/statistics_subviews/_dataselection.php b/application/views/admin/export/statistics_subviews/_dataselection.php index 8826dce3e7c..74acd72199b 100644 --- a/application/views/admin/export/statistics_subviews/_dataselection.php +++ b/application/views/admin/export/statistics_subviews/_dataselection.php @@ -1,51 +1,55 @@ -
- +
+
+

+
+
-
- +
+ -
- -
-
+
+ +
+
-
- -
- /> -
-
+
+ +
+ /> +
+
-
- -
- /> -
-
+
+ +
+ /> +
+
- ".$temp[1]."\n"; - } + ".$temp[1]."\n"; + } - ?> + ?> -
- -
- +
+ +
+ +
+
-
diff --git a/application/views/admin/export/statistics_subviews/_header.php b/application/views/admin/export/statistics_subviews/_header.php index c97ecfd4c1f..d2a138f920e 100644 --- a/application/views/admin/export/statistics_subviews/_header.php +++ b/application/views/admin/export/statistics_subviews/_header.php @@ -1,11 +1,5 @@ -
-
- - -
- -
- -
- -
+ +

+ + +

diff --git a/application/views/admin/export/statistics_subviews/_outputformat.php b/application/views/admin/export/statistics_subviews/_outputformat.php index 3ebf80187f1..a7169e7f91b 100644 --- a/application/views/admin/export/statistics_subviews/_outputformat.php +++ b/application/views/admin/export/statistics_subviews/_outputformat.php @@ -1,21 +1,19 @@ -
- : -
- -
- +
+
+

:

-
-
- -
- -
-
-
- -
- +
+
+ + + +
+
-
diff --git a/application/views/admin/export/statistics_subviews/_outputoptions.php b/application/views/admin/export/statistics_subviews/_outputoptions.php index c3a1234240b..8830e6a02fe 100644 --- a/application/views/admin/export/statistics_subviews/_outputoptions.php +++ b/application/views/admin/export/statistics_subviews/_outputoptions.php @@ -1,44 +1,49 @@ -
- -
- -
- /> -
+
+
+

+
+
+ +
+ /> +
+
-
- -
- /> +
+ +
+ /> +
+ $error
"; } ?>
- $error
"; } ?> -
-
- -
- +
+ -
- +
+ +
+
-
+ diff --git a/application/views/admin/export/statistics_subviews/_response_filter_header.php b/application/views/admin/export/statistics_subviews/_response_filter_header.php index ff41ef0bca3..a6270a2e35b 100644 --- a/application/views/admin/export/statistics_subviews/_response_filter_header.php +++ b/application/views/admin/export/statistics_subviews/_response_filter_header.php @@ -1,10 +1,5 @@ -
-
- - - -
-
- -
-
+ +

+ + +

diff --git a/application/views/admin/export/statistics_subviews/_responseid.php b/application/views/admin/export/statistics_subviews/_responseid.php index ab60812cc87..7ed001427e8 100644 --- a/application/views/admin/export/statistics_subviews/_responseid.php +++ b/application/views/admin/export/statistics_subviews/_responseid.php @@ -1,16 +1,20 @@ -
- -
- -
- ' onkeypress="return goodchars(event,'0123456789')" /> +
+
+

-
+
+
+ +
+ ' onkeypress="return goodchars(event,'0123456789')" /> +
+
-
- -
- ' onkeypress="return goodchars(event,'0123456789')" /> +
+ +
+ ' onkeypress="return goodchars(event,'0123456789')" /> +
+
-
diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index 071a60e5de4..f964b4c893c 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -7,7 +7,7 @@ renderPartial('/admin/export/statistics_subviews/_statistics_view_scripts', array('sStatisticsLanguage'=>$sStatisticsLanguage, 'surveyid'=>$surveyid, 'showtextinline'=>$showtextinline)) ; ?> -
+

    @@ -21,27 +21,29 @@ renderPartial('/admin/export/statistics_subviews/_header', array()) ; ?> -