Merge pull request #4 from studer-raimann/develop

Develop
fluxapps · Feb 28, 2015 · 27b017e · 27b017e
2 parents 251dd15 + fe4394d
commit 27b017e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 26 deletions.
diff --git a/templates/content.css b/templates/content.css
@@ -139,7 +139,7 @@ div.lvo_qr_hidden {
 	-webkit-box-shadow: inset 0px 0px 10px #878787; /* webkit browser*/ -moz-box-shadow: inset 0px 0px 10px #878787;	/* firefox */ box-shadow: inset 0px 0px 10px #878787;
 }
 
-.lvo_choice_chiper {
+.lvo_choice_cipher {
 	position: relative;
 	top: 0;
 	font-size: 8em; /* fallback font size */
@@ -178,7 +178,7 @@ div.lvo_qr_hidden {
 	text-decoration: none;
 }
 
-div.fullscreen .lvo_choice_container {
+div.fullscreen .lvo_choice {
     height: 500px;
 }
 

diff --git a/templates/responsive.css b/templates/responsive.css
@@ -73,6 +73,7 @@
 	}
 
 	table.lvo_cipher_titles td {
+		width:      auto;
 		display:    block;
 		font-size:  1.0em;
 		padding:    0;
@@ -88,4 +89,9 @@
 	#il_center_col {
 		margin: 0;
 	}
+
+	div #lvo_content_canvas {
+		padding-left:  5px;
+		padding-right: 5px;
+	}
 }
diff --git a/templates/tpl.content.html b/templates/tpl.content.html
@@ -1,5 +1,5 @@
 <!-- BEGIN jquery_fullscreen -->
-<script src="./Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting/templates/jquery.fullscreen-min.js"></script><!-- END jquery_fullscreen -->
+<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">
@@ -43,14 +43,14 @@
 							</tr>
 							<!-- END title_choice -->
 						</table>
-						<br style="clear:both;">
+						<br class="lvo_clearboth" />
 					</div>
 					<div class="lvo_actions">
 						{ACTIONS}
 					</div>
 				</div>
 			</div>
-			<br style="clear:both;">
+			<br class="lvo_clearboth" />
 		</div>
 		<script type="text/javascript">
 			(function () { // dont mess with global namespace, use anonymous function
@@ -87,12 +87,12 @@
 
 				});
 
-				repeater = function () {
+				var repeater = function () {
 					var link = '{asyncShowContent}';
 					var replacer = new RegExp('amp;', 'g');
 					link = link.replace(replacer, '');
 					var cols = 0;
-					var col = new Array();
+					var col = [];
 
 					$.getJSON(link, function (data) {
 						var total = 0;
@@ -108,7 +108,7 @@
 							$("#choice_" + i).animate({height: data[i]['percentage_round'] + "%"}, 100);
 							$('#lvo_choice_pro_' + i).html(data[i]["abs_percentage"] + '%');
 
-							//$('body').append(i + ': ' + data[i]['percentage_round'] + '<br>');
+							//$('body').append(i + ': ' + data[i]['percentage_round'] + '<br />');
 						}
 						if (col[1] == 2 * col[2] && col[1] == 2 * col[3] && total > 50 && !(col[1] % 2)) {
 							if (out == 0) {
@@ -135,7 +135,7 @@
 				$(document).ready(function () {
 					isActive();
 				});
-				isActive = function () {
+				var isActive = function () {
 					var link = '{asyncIsActive}';
 					var replacer = new RegExp('amp;', 'g');
 					link = link.replace(replacer, '');
@@ -183,33 +183,32 @@
 		<div class="lvo_body">
 			<div id="sound_element"></div>
 			<!-- BEGIN choice -->	<!-- BEGIN choice_view -->
-			<div class="lvo_choice_container" {INACTIVE} style="width: {WIDTH_PERCENTAGE}%">
+			<div class="lvo_choice_container {INACTIVE}" style="width: {WIDTH_PERCENTAGE}%">
 				<div class="lvo_choice_header {HIDE}">
 					<p id="lvo_choice_pro_{CHOICE_ID}">{VOTE_PERCENTAGE_SHOW}%</p>
 				</div>
 				<a href="{VOTE_LINK}" style="color: black;">
 					<div class="lvo_choice">
-						<p class="lvo_choice_chiper">{CHOICE_CIPHER}</p>
+						<p class="lvo_choice_cipher">{CHOICE_CIPHER}</p>
 						<div class="{HIDE}">
 							<div id="choice_{CHOICE_ID}" class="lvo_percentage{GLOW} color{CHOICE_COLOR}" style="height: {VOTE_PERCENTAGE}%;"></div>
 						</div>
 					</div>
 				</a> <a href="{VOTE_LINK}" style="color: black;">
-				<div class="lvo_choice_footer">
-					<p>
-						<span>{CHOICE_CIPHER}</span><span class='{HIDE}'>:</span>
-						<span id="choice_count_{CHOICE_ID}" class="lvo_choice_count {HIDE}">{VOTE_COUNT}</span>
-					</p>
-					<!-- BEGIN vote_link -->
-					<a class="lvo_vote_link{VOTED_CLASS}" href="{VOTE_LINK}">{VOTE_TEXT}</a>
-					<!-- END vote_link -->
-				</div>
-			</a>
+					<div class="lvo_choice_footer">
+						<p>
+							<span>{CHOICE_CIPHER}</span><span class='{HIDE}'>:</span>
+							<span id="choice_count_{CHOICE_ID}" class="lvo_choice_count {HIDE}">{VOTE_COUNT}</span>
+						</p>
+						<!-- BEGIN vote_link -->
+						<a class="lvo_vote_link{VOTED_CLASS}" href="{VOTE_LINK}">{VOTE_TEXT}</a>
+						<!-- END vote_link -->
+					</div>
+				</a>
 			</div>
 			<!-- END choice_view -->
-		<!-- END choice -->
-		<br class="lvo_clearboth" />
-
-	</div>
+			<!-- END choice -->
+			<br class="lvo_clearboth" />
+		</div>
 	</div>
-</div></div>
+</div>