From 8c735a4178ea74bddc50c33a6960e27fc07730fb Mon Sep 17 00:00:00 2001 From: Fabian Schmid Date: Thu, 19 Mar 2015 09:45:33 +0100 Subject: [PATCH] Disabled jQuery fullscreen --- classes/class.ilLiveVotingConfigGUI.php | 10 +++++----- templates/content.css | 18 +++++++++--------- templates/tpl.content.html | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/classes/class.ilLiveVotingConfigGUI.php b/classes/class.ilLiveVotingConfigGUI.php index 3e5eba5f..a6a9a9a4 100644 --- a/classes/class.ilLiveVotingConfigGUI.php +++ b/classes/class.ilLiveVotingConfigGUI.php @@ -65,11 +65,11 @@ public function getFields() { ), 'allow_fullscreen' => array( 'type' => 'ilCheckboxInputGUI', - 'subelements' => array( - 'jquery' => array( - 'type' => 'ilCheckboxInputGUI', - ), - ) +// 'subelements' => array( +// 'jquery' => array( +// 'type' => 'ilCheckboxInputGUI', +// ), +// ) ), 'allow_shortlink' => array( 'type' => 'ilCheckboxInputGUI', diff --git a/templates/content.css b/templates/content.css index dad8726e..70bde72f 100644 --- a/templates/content.css +++ b/templates/content.css @@ -21,7 +21,7 @@ div.fullscreen { top: 0; left: 0; width: 100%; - z-index: 100000; + z-index: 100000; } /*div.fullscreen div.lvo_pin_container { @@ -58,14 +58,6 @@ div.lvo_fullscreendummy #lvo_content { margin: 50px; } -div.lvo_fullscreendummy div.lvo_qr_hidden_canvas_close { - display: block; -} - -div.lvo_fullscreendummy div.lvo_actions { - display: none; -} - div.lvo_qr_hidden_canvas_close { height: 20px; display: none; @@ -74,6 +66,14 @@ div.lvo_qr_hidden_canvas_close { color: #FFFFFF; } +div.lvo_fullscreendummy div.lvo_actions { + display: none; +} + +div.lvo_qr_hidden_canvas_close.fullscreen { + display: none; +} + div.lvo_qr_hidden_canvas_close:hover { text-decoration: underline; cursor: hand; diff --git a/templates/tpl.content.html b/templates/tpl.content.html index afd15620..b5c09f14 100644 --- a/templates/tpl.content.html +++ b/templates/tpl.content.html @@ -1,5 +1,6 @@ - + +
{FS_CLOSE}
@@ -182,7 +183,6 @@ $('#lvo_fullscreen_button').click(function () { $('#lvo_content_canvas').toggleClass("fullscreen"); $('#lvo_qr_hidden_canvas_close').toggleClass("fullscreen"); - }); });