Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
paul.baranowski 2010-10-04 17:00:40 -04:00
parent 739801d180 d1fce69e64
commit faee83440d
6 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/GreenBox.php
View File

@ -560,6 +560,8 @@ class GreenBox extends BasicStor {
return;
$res = $pl->lock($sessid);
return $res;
}

18
backend/tests/AllTests.php
View File

@ -1,17 +1,21 @@
<?php
$path = dirname(__FILE__).'/../../3rd_party/php/pear';
set_include_path(get_include_path() . PATH_SEPARATOR . $path);
require_once(dirname(__FILE__).'/../../conf.php');
require_once('DB.php');
require_once('PHPUnit.php');
require_once 'BasicStorTests.php';
require_once 'SchedulerTests.php';
require_once 'SchedulerExportTests.php';
//require_once 'BasicStorTests.php';
//require_once 'SchedulerTests.php';
//require_once 'SchedulerExportTests.php';
require_once 'PlayListTests.php';
$suite = new PHPUnit_TestSuite("BasicStorTest");
$suite = new PHPUnit_TestSuite("PlayListTests");
//$suite = new PHPUnit_TestSuite("BasicStorTest");
//$suite = new PHPUnit_TestSuite("SchedulerTests");
$suite->addTestSuite("SchedulerTests");
$suite->addTestSuite("SchedulerExportTests");
$suite->addTestSuite("PlayListTests");
//$suite->addTestSuite("SchedulerTests");
//$suite->addTestSuite("SchedulerExportTests");
//$suite->addTestSuite("PlayListTests");
$result = PHPUnit::run($suite);
echo $result->toString();

11
backend/tests/PlayListTests.php
View File

@ -1,8 +1,13 @@
<?php
require_once(dirname(__FILE__).'/../conf.php');
require_once('PHPUnit.php');
$path = dirname(__FILE__).'/../../3rd_party/php/pear';
set_include_path(get_include_path() . PATH_SEPARATOR . $path);
//require_once(dirname(__FILE__).'/../../conf.php');
require_once('DB.php');
require_once('PHPUnit.php');
require_once(dirname(__FILE__).'/../../conf.php');
require_once(dirname(__FILE__).'/../GreenBox.php');
require_once(dirname(__FILE__).'/../Playlist.php');
@ -80,6 +85,7 @@ class PlayListTests extends PHPUnit_TestCase {
}
}
/*
function testGBGetPLMetaData() {
$pl = new Playlist();
$name = "Testing";
@ -132,6 +138,7 @@ class PlayListTests extends PHPUnit_TestCase {
return;
}
}
*/
}

6
htmlUI/templates/library/results.tpl
View File

@ -42,10 +42,10 @@
<td {include file=$action_handler} style="text-align: right; cursor: pointer">{assign var="_duration" value=$i.duration}{niceTime in=$_duration}</td>
<td {include file=$action_handler} style="border: 0; text-align: center; cursor: pointer">
{if $i.type == 'playlist' && $PL->isAvailable($i.id) == false}
<div align="left"><img src="img/ico_lock.png">
<img src="img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {* include file="sub/alttext.tpl" *} /></div>
<div align="left"><img src="html/img/ico_lock.png">
<img src="html/img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {* include file="sub/alttext.tpl" *} /></div>
{else}
<img src="img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {* include file="sub/alttext.tpl" *} />
<img src="html/img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {* include file="sub/alttext.tpl" *} />
{/if}
</td>
</tr>

6
htmlUI/templates/scratchpad/main.tpl
View File

@ -41,10 +41,10 @@
<td {include file="scratchpad/actionhandler.tpl"} style="text-align: right; cursor: pointer">{niceTime in=$_duration}</td>
<td {include file="scratchpad/actionhandler.tpl"} style="border: 0; text-align: center; cursor: pointer">
{if $i.type == 'playlist' && $PL->isAvailable($i.id) == false}
<div align="left"><img src="img/ico_lock.png">
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {* include file="sub/alttext.tpl"*} /></div>
<div align="left"><img src="html/img/ico_lock.png">
<img src="html/img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {* include file="sub/alttext.tpl"*} /></div>
{else}
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {* include file="sub/alttext.tpl" *} /> {/if}
<img src="html/img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {* include file="sub/alttext.tpl" *} /> {/if}
</td>
</tr>
<!-- end item -->

2
htmlUI/templates/statusbar.tpl
View File

@ -4,7 +4,7 @@
<tr>
<td>
<div id="logo">
<img src="img/logo.png">
<img src="html/img/logo.png">
</div>
</td>