Преглед изворни кода

Removed Bootstrap and added Jquery Datetime Picker

oNdsen пре 9 година
родитељ
комит
5e04e7fede
4 измењених фајлова са 24 додато и 69 уклоњено
  1. 0 4
      css/global.css
  2. 5 51
      js/modules/user_games.js
  3. 3 6
      modules/user_games/assign_home.php
  4. 16 8
      modules/user_games/edit_home.php

+ 0 - 4
css/global.css

@@ -13,10 +13,6 @@
 	text-align: left;
 	text-align: left;
 	text-align: initial;
 	text-align: initial;
 }
 }
-/* Fixes date/time picker off screen issue */
-.bootstrap-datetimepicker-widget > ul{
-	padding: 0px;
-}
 
 
 span.versionInfo{
 span.versionInfo{
 	cursor: pointer;
 	cursor: pointer;

+ 5 - 51
js/modules/user_games.js

@@ -165,55 +165,9 @@ $(document).ready(function() {
 			}, "json");
 			}, "json");
 		}
 		}
 	});
 	});
-	
-	var datePickerInput = $( "input[name=expiration_date]" );
-	if(datePickerInput)
-	{
-		var now_str = datePickerInput.attr('data-today').split(' '),
-			date = now_str[0].split('/'),
-			time = now_str[1].split(':'),
-			now  = new Date(date[2], date[1]-1, date[0], time[0], time[1], time[2], 0);
-		
-		$('#datetimepicker').datetimepicker({
-			format: 'dd/MM/yyyy hh:mm:ss',
-			startDate: now
-		}).on('changeDate', function(e) {
-			if(e.localDate == null)
-			{
-				datePickerInput.val("X");
-			}
-			else
-			{
-				var selected = new Date(e.localDate);
-				if( selected <= now )
-				{
-					alert('The selected date has already passed.');
-					datePickerInput.value = "";
-				}
-			}
-			if("edit" == GetURLParameter('p'))
-			{
-				datePickerInput.css("background", "#fe9cb1");
-			}
-		});
-		
-		datePickerInput.on('change', function() {
-			if(this.value.match(/^\d{1,2}\/\d{1,2}\/\d{4}\s\d{1,2}:\d{1,2}:\d{1,2}$/g) == null || this.value == "X")
-			{
-				this.value = "";
-			}
-			else
-			{
-				var sel_str = this.value.split(' '),
-					date = sel_str[0].split('/'),
-					time = sel_str[1].split(':'),
-					selected  = new Date(date[2], date[1]-1, date[0], time[0], time[1], time[2], 0);
-				if( selected <= now )
-				{
-					alert('The selected date has already passed.');
-					this.value = "";
-				}
-			}
-		});
-	}
+
+});
+
+$(window).load(function(){
+	$('input[name="expiration_date"]').datetimepicker();
 });
 });

+ 3 - 6
modules/user_games/assign_home.php

@@ -201,10 +201,8 @@ function exec_ogp_module()
 		if( isset($_POST['home_id']) and !empty($_POST['home_id']) )
 		if( isset($_POST['home_id']) and !empty($_POST['home_id']) )
 		{
 		{
 			?>
 			?>
-			<link href="js/bootstrap/css/bootstrap-combined.min.css" rel="stylesheet">
-			<link rel="stylesheet" type="text/css" media="screen" href="js/bootstrap/css/bootstrap-datetimepicker.min.css" >
-			<script type="text/javascript" src="js/bootstrap/bootstrap.min.js"></script>
-			<script type="text/javascript" src="js/bootstrap/plugins/datetimepicker.min.js"></script>
+			<link rel="stylesheet" type="text/css" href="js/datetimepicker/jquery.datetimepicker.min.css">
+			<script src="js/datetimepicker/jquery.datetimepicker.full.min.js"></script>
 			<script type="text/javascript" src="js/modules/user_games.js"></script>
 			<script type="text/javascript" src="js/modules/user_games.js"></script>
 			<?php
 			<?php
 			if( $isAdmin )
 			if( $isAdmin )
@@ -225,8 +223,7 @@ function exec_ogp_module()
 				 "<tr><td class='right'>".get_lang('server_expiration_date').":</td>\n".
 				 "<tr><td class='right'>".get_lang('server_expiration_date').":</td>\n".
 				 "<td class='left'>".
 				 "<td class='left'>".
 				 "<div id='datetimepicker' class='input-append date'>".
 				 "<div id='datetimepicker' class='input-append date'>".
-				 "<input name='expiration_date' placeholder='dd/MM/yyyy hh:mm:ss' type='text' value='X' data-today='".date('d/m/Y H:i:s')."' >\n".
-				 "<span class='add-on'><i data-time-icon='icon-time' data-date-icon='icon-calendar'></i></span>".
+				 "<input name='expiration_date' placeholder='dd/MM/yyyy hh:mm:ss' type='text' value='X'>".
 				 "</div></td></tr>\n".
 				 "</div></td></tr>\n".
 				 "<tr><td  colspan='2' class='info'>". assign_expiration_date_info ."</td></tr>\n";
 				 "<tr><td  colspan='2' class='info'>". assign_expiration_date_info ."</td></tr>\n";
 			echo "<tr><td colspan='2'><input type='submit' name='assign' value='".get_lang('assign')."' /></td></tr>\n";
 			echo "<tr><td colspan='2'><input type='submit' name='assign' value='".get_lang('assign')."' /></td></tr>\n";

+ 16 - 8
modules/user_games/edit_home.php

@@ -570,12 +570,23 @@ function exec_ogp_module()
 		}
 		}
 	}
 	}
 	?>
 	?>
-	<link href="js/bootstrap/css/bootstrap-combined.min.css" rel="stylesheet">
-	<link rel="stylesheet" type="text/css" media="screen" href="js/bootstrap/css/bootstrap-datetimepicker.min.css" >
-	<script type="text/javascript" src="js/bootstrap/bootstrap.min.js"></script>
-	<script type="text/javascript" src="js/bootstrap/plugins/datetimepicker.min.js"></script>
+	<link rel="stylesheet" type="text/css" href="js/datetimepicker/jquery.datetimepicker.min.css"/>
+	<script src="js/datetimepicker/jquery.datetimepicker.full.min.js"></script>
 	<script type="text/javascript" src="js/modules/user_games.js"></script>
 	<script type="text/javascript" src="js/modules/user_games.js"></script>
 	<?php
 	<?php
+	if($isAdmin){
+		$expiration_date = $home_info['server_expiration_date'] == "X" ? "X" : date('d/m/Y H:i:s', $home_info['server_expiration_date']);
+	?>
+	<script>
+	$(window).load(function(){
+		$('input[name="expiration_date"]').datetimepicker({
+			value: '<?php echo $expiration_date;?>'
+		});
+	});
+	</script>
+	<?php
+	}
+
 	echo "<h2>". editing_home_called ." \"".htmlentities($home_info['home_name'])."\"</h2><div id='result' >";
 	echo "<h2>". editing_home_called ." \"".htmlentities($home_info['home_name'])."\"</h2><div id='result' >";
 	if(isset($result))
 	if(isset($result))
 	{
 	{
@@ -731,13 +742,10 @@ function exec_ogp_module()
 		echo "<tr><td colspan='2' class='info'>". set_as_master_server_for_local_clon_update .
 		echo "<tr><td colspan='2' class='info'>". set_as_master_server_for_local_clon_update .
 			 " (".get_lang_f( 'only_available_for', $server_xml->game_name, $home_info['remote_server_name']).")</td></tr>";
 			 " (".get_lang_f( 'only_available_for', $server_xml->game_name, $home_info['remote_server_name']).")</td></tr>";
 		// Expiration
 		// Expiration
-		$expiration_date = $home_info['server_expiration_date'] == "X" ? "X" : date('d/m/Y H:i:s', $home_info['server_expiration_date']);
 		echo "<tr><td class='right'>".get_lang('server_expiration_date').":</td>\n".
 		echo "<tr><td class='right'>".get_lang('server_expiration_date').":</td>\n".
 			 "<td class='left'><form action='?m=user_games&p=edit&home_id=".$home_id."' method='post'>".
 			 "<td class='left'><form action='?m=user_games&p=edit&home_id=".$home_id."' method='post'>".
 			 "<div id='datetimepicker' class='input-append date'>".
 			 "<div id='datetimepicker' class='input-append date'>".
-			 "<input name='expiration_date' placeholder='dd/MM/yyyy hh:mm:ss' type='text' value='".$expiration_date.
-			 "' data-today='".date('d/m/Y H:i:s')."' >\n".
-			 "<span class='add-on'><i data-time-icon='icon-time' data-date-icon='icon-calendar'></i></span>".
+			 "<input name='expiration_date' placeholder='dd/MM/yyyy hh:mm:ss' type='text' value='".$expiration_date."'>".
 			 "</div>".
 			 "</div>".
 			 "<input type='submit' name='set_expiration_date' value='". set_expiration_date ."' />".
 			 "<input type='submit' name='set_expiration_date' value='". set_expiration_date ."' />".
 			 "</form></td></tr>\n".
 			 "</form></td></tr>\n".