Merge pull request #7 from studer-raimann/develop

Disabled jQuery Fullscreenmode
fluxapps · Mar 31, 2015 · 00c395b · 00c395b
2 parents b08fc6b + 8c735a4
commit 00c395b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -1,5 +1,6 @@
 <!-- BEGIN jquery_fullscreen -->
-<!--<script src="./Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting/templates/jquery.fullscreen-min.js" type="text/javascript"></script>&lt;!&ndash; END jquery_fullscreen &ndash;&gt;-->
+<!--<script src="./Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting/templates/jquery.fullscreen-min.js" type="text/javascript"></script>-->
+<!-- END jquery_fullscreen -->
 <div id="lvo_content_canvas" class="">
 	<div class="lvo_qr_hidden_canvas_close">{FS_CLOSE}</div>
 	<div id="lvo_content" class="">
@@ -182,7 +183,6 @@
 				$('#lvo_fullscreen_button').click(function () {
 					$('#lvo_content_canvas').toggleClass("fullscreen");
 					$('#lvo_qr_hidden_canvas_close').toggleClass("fullscreen");
-
 				});
 			});
 		</script>