Merge branch '2.0' into 'master'
fix coming soon / Add weekly See merge request !18
This commit is contained in:
commit
ec6292e0e3
22
Update.bat
22
Update.bat
@ -352,6 +352,24 @@ findstr "mediastatstextcolour" config.php >nul 2>&1
|
||||
goto END
|
||||
:END
|
||||
|
||||
rem mediawidget2 episodes
|
||||
findstr "mediawidget2" config.php >nul 2>&1
|
||||
if errorlevel 1 goto ONE
|
||||
if errorlevel 0 goto ZERO
|
||||
goto END
|
||||
:ZERO
|
||||
echo mediawidget2 Already Updated
|
||||
goto END
|
||||
:ONE
|
||||
echo ^<?php >>config.php
|
||||
echo //// mediawidget2 >> config.php
|
||||
echo $mediawidget2 = "1"; >> config.php
|
||||
echo //// >> config.php
|
||||
echo ^?^> >> config.php
|
||||
echo mediawidget2 Updated
|
||||
goto END
|
||||
:END
|
||||
|
||||
|
||||
|
||||
rem Update Version
|
||||
@ -374,8 +392,8 @@ findstr "localversion" config.php >nul 2>&1
|
||||
goto END
|
||||
:END
|
||||
:ONE
|
||||
cscript replace.vbs "config.php" "2.1" "2.2"
|
||||
echo Version Updated to 2.2
|
||||
cscript replace.vbs "config.php" "2.2" "2.3"
|
||||
echo Version Updated to 2.3
|
||||
goto END
|
||||
:END
|
||||
|
||||
|
@ -30,7 +30,7 @@
|
||||
Clock Widget Enabled: <input name="clockvisible" id="id" type="checkbox" <?php if($clockvisible > "0") echo "checked=checked; "; ?> /><br />
|
||||
KKnowledge Widget Enabled: <input name="kknowledgefeedvisible" id="id" type="checkbox" <?php if($kknowledgefeedvisible > "0") echo "checked=checked; "; ?> /><br />
|
||||
Klips Widget Enabled: <input name="webclipfeedvisible" id="id" type="checkbox" <?php if($webclipfeedvisible > "0") echo "checked=checked; "; ?> /><br />
|
||||
Coming Episodes Enabled: <input name="mediawidget" id="id" type="checkbox" <?php if($mediawidget > "0") echo "checked=checked; "; ?> /><br /><br />
|
||||
Coming Episodes Widget Enabled: <input name="mediawidget" id="id" type="checkbox" <?php if($mediawidget > "0") echo "checked=checked; "; ?> /> - Week View: <input name="mediawidget" id="id" type="checkbox" <?php if($mediawidget2 > "0") echo "checked=checked; "; ?> /><br /><br />
|
||||
</div>
|
||||
<div style="float:right; width:50%; ">
|
||||
Konvos Chatbox Enabled: <input name="konvoschat" id="id" type="checkbox" <?php if($konvoschat > "0") echo "checked=checked; "; ?> /><br />
|
||||
|
@ -19,6 +19,7 @@ $KWorldEnabled1 = $_POST['kworldenabled'];
|
||||
$widgetcolor1 = $_POST['widgetcolor'];
|
||||
$MStatusEnabled1 = $_POST['MStatusEnabled'];
|
||||
$mediawidget1 = $_POST['mediawidget'];
|
||||
$mediawidget21 = $_POST['mediawidget2'];
|
||||
$mediastatscolour1 = $_POST['mediastatscolour'];
|
||||
$mediastatstextcolour1 = $_POST['mediastatstextcolour'];
|
||||
|
||||
@ -91,6 +92,12 @@ $content = preg_replace( '/\$widgetcolour = \"(.*?)\";/', '$widgetcolour = "#'
|
||||
} else {
|
||||
$content = preg_replace( '/\$mediawidget = \"(.*?)\";/', '$mediawidget = "1";', $content);
|
||||
}
|
||||
// comingepisodes2 Settings
|
||||
if (empty($mediawidget21)) {
|
||||
$content = preg_replace( '/\$mediawidget2 = \"(.*?)\";/', '$mediawidget2 = "0";', $content);
|
||||
} else {
|
||||
$content = preg_replace( '/\$mediawidget2 = \"(.*?)\";/', '$mediawidget2 = "1";', $content);
|
||||
}
|
||||
// Widget Config
|
||||
if (empty($widgetbackgroud1)) {
|
||||
$content = preg_replace( '/\$widgetbackgroud = \"(.*?)\";/', '$widgetbackgroud = "0";', $content);
|
||||
|
@ -18,20 +18,15 @@ tr { background-color:<?php echo $widgetcolour; ?>;
|
||||
color: <?php echo $mediastatstextcolour; ?>;
|
||||
background-color: <?php echo $mediastatscolour; ?>;
|
||||
}
|
||||
|
||||
|
||||
li{
|
||||
list-style:none;
|
||||
color: white ;
|
||||
li {
|
||||
list-style: none;
|
||||
color: white;
|
||||
padding-left: 0pt;
|
||||
margin-top:0px;
|
||||
-webkit-background-size: cover;
|
||||
-moz-background-size: cover;
|
||||
-o-background-size: cover;
|
||||
background-size: 80px 60px;
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
margin-top: 0px;
|
||||
background-size: cover;
|
||||
height: 60px;
|
||||
width: 240px;
|
||||
}
|
||||
ul {
|
||||
padding-left: 0px;
|
||||
padding-top: 0px;
|
||||
@ -42,5 +37,7 @@ iframe {
|
||||
padding: none;
|
||||
border: none;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
</tr>
|
||||
<tr class="hiddenRow">
|
||||
<td bgcolor='#FFFFFF'>
|
||||
<iframe src="feeds/SickBeard_2.php" width="271" height="200" scrolling="yes">
|
||||
<iframe src="feeds/SickBeard_today.php" width="271" height="200" scrolling="yes">
|
||||
</iframe>
|
||||
</td>
|
||||
</tr>
|
34
feeds/SickBeard_i_todaySoon.php
Normal file
34
feeds/SickBeard_i_todaySoon.php
Normal file
@ -0,0 +1,34 @@
|
||||
<html>
|
||||
<head>
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="../css/static.php" />
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.js" type="text/javascript"></script>
|
||||
<style>
|
||||
.hiddenRow { display: none; }
|
||||
</style>
|
||||
<script>
|
||||
function toggleNextRow(row) {
|
||||
var nextRow = $(row).next();
|
||||
nextRow.toggle();
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<table width='275' border='0' cellspacing='0' cellpadding='0'>
|
||||
<tr onclick="toggleNextRow(this)" >
|
||||
<th style='text-align: left;'><font color='white'>Coming Episodes</font></th>
|
||||
</tr>
|
||||
<tr class="hiddenRow">
|
||||
<td bgcolor='#FFFFFF'>
|
||||
<iframe src="feeds/SickBeard_todaySoon.php" width="271" height="200" scrolling="yes">
|
||||
</iframe>
|
||||
</td>
|
||||
</tr>
|
||||
</form>
|
||||
</td>
|
||||
</table>
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
|
@ -43,8 +43,8 @@ $Sick = json_decode(file_get_contents("http://$base:$sickport/api/$SICKAPI/?cmd=
|
||||
<?php foreach($Sick['data'] as $day) : ?>
|
||||
<?php foreach($day as $item) : ?>
|
||||
<?php $url = "http://$base:$sickport/api/$SICKAPI/?cmd=show.getbanner&tvdbid=".$item['tvdbid']; ?>
|
||||
<li style='border: 1px solid black; background: url(<?php echo $url; ?>) no-repeat center center;'>
|
||||
<span style="background-color: #000000"> <?php echo $item['show_name'] ?> - S<?php echo $item['season'] ?>E<?php echo $item['episode'] ?> </br> <?php echo $item['ep_name'] ?></li></span>
|
||||
<li style='border: 1px solid black; background-image: url(<?php echo $url; ?>); background-size: 100% 100%'>
|
||||
<span style="background-color: #000000"> <?php echo $item['show_name'] ?></br>S<?php echo $item['season'] ?>E<?php echo $item['episode'] ?> - <?php echo $item['ep_name'] ?></li></span>
|
||||
<?php endforeach ?>
|
||||
<?php endforeach ?>
|
||||
<?php echo "<a href=\"http://$base:$sickport/api/$SICKAPI/?cmd=sb.forcesearch\"target=\"_blank\">Click here To Force Search</a>"; ?>
|
74
feeds/SickBeard_todaySoon.php
Normal file
74
feeds/SickBeard_todaySoon.php
Normal file
@ -0,0 +1,74 @@
|
||||
<!--Force IE6 into quirks mode with this comment tag-->
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
||||
<head>
|
||||
<link rel="stylesheet" type="text/css" href="../css/white.css" />
|
||||
<link rel="stylesheet" type="text/css" href="../css/static.php" />
|
||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="black" href="../css/black.css" />
|
||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="white" href="../css/white.css" />
|
||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="blue" href="../css/blue.css" />
|
||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="red" href="../css/red.css" />
|
||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="custom" href="../css/custom.php" />
|
||||
<script src="../styleswitch.js" type="text/javascript">
|
||||
</script>
|
||||
<script type="text/javascript" src="http://www.convergent-evolution.co.uk/js/full/scrollingcarousel.2.0.js"></script>
|
||||
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.js" type="text/javascript"></script>
|
||||
<style>
|
||||
.hiddenRow { display: none; }
|
||||
</style>
|
||||
<script>
|
||||
function toggleNextRow(row) {
|
||||
var nextRow = $(row).next();
|
||||
nextRow.toggle();
|
||||
}
|
||||
function togglebodytheme() {
|
||||
$('#themetable tbody').toggle();
|
||||
}
|
||||
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$('#carousel-demo1').scrollingCarousel( {
|
||||
scrollerAlignment : 'vertical',
|
||||
autoScroll: true
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<?php
|
||||
include '../config.php';
|
||||
$Sick = json_decode(file_get_contents("http://$base:$sickport/api/$SICKAPI/?cmd=future&sort=date&type=today"), TRUE);
|
||||
$SickSoon = json_decode(file_get_contents("http://$base:$sickport/api/$SICKAPI/?cmd=future&sort=date&type=soon"), TRUE); ?>
|
||||
<table>
|
||||
<th style='text-align: left;'><font color='white'>Today</font></th>
|
||||
</table>
|
||||
<ul>
|
||||
<?php foreach($Sick['data'] as $day) : ?>
|
||||
<?php foreach($day as $item) : ?>
|
||||
<?php $url = "http://$base:$sickport/api/$SICKAPI/?cmd=show.getbanner&tvdbid=".$item['tvdbid']; ?>
|
||||
<li style='border: 1px solid black; background-image: url(<?php echo $url; ?>); background-size: 100% 100%'>
|
||||
<span style="background-color: #000000"> <?php echo $item['show_name'] ?></br>S<?php echo $item['season'] ?>E<?php echo $item['episode'] ?> - <?php echo $item['ep_name'] ?></li></span>
|
||||
<?php endforeach ?>
|
||||
<?php endforeach ?>
|
||||
</ul>
|
||||
<table>
|
||||
<th style='text-align: left;'><font color='white'>Soon</font></th>
|
||||
</table>
|
||||
<ul>
|
||||
<?php foreach($SickSoon['data'] as $day) : ?>
|
||||
<?php foreach($day as $item) : ?>
|
||||
<?php $url = "http://$base:$sickport/api/$SICKAPI/?cmd=show.getbanner&tvdbid=".$item['tvdbid']; ?>
|
||||
<li style='border: 1px solid black; background-image: url(<?php echo $url; ?>); background-size: 100% 100%'>
|
||||
<span style="background-color: #000000"> <?php echo $item['airdate'] ?></br><?php echo $item['show_name'] ?></br>S<?php echo $item['season'] ?>E<?php echo $item['episode'] ?> - <?php echo $item['ep_name'] ?></li></span>
|
||||
<?php endforeach ?>
|
||||
<?php endforeach ?>
|
||||
</ul>
|
||||
<?php echo "<a href=\"http://$base:$sickport/api/$SICKAPI/?cmd=sb.forcesearch\"target=\"_blank\">Click here To Force Search</a>"; ?>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
@ -81,10 +81,12 @@ if ($webclipfeedvisible > "0") {
|
||||
?>
|
||||
<?php
|
||||
if ($mediawidget > "0") {
|
||||
require "/feeds/SickBeard.php";
|
||||
if ($mediawidget2 > "0") {
|
||||
require "/feeds/SickBeard_i_todaySoon.php";
|
||||
} else {
|
||||
|
||||
require "/feeds/SickBeard_i_today.php";
|
||||
}
|
||||
}
|
||||
?>
|
||||
</p>
|
||||
<?php
|
||||
|
@ -1,4 +1,4 @@
|
||||
<?php
|
||||
//// KLANDING VERSION
|
||||
$remoteversion = "2.2"; //
|
||||
$remoteversion = "2.3"; //
|
||||
?>
|
Loading…
x
Reference in New Issue
Block a user