Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-1668 if no preference is set, archive server taken from config file.

This commit is contained in:
naomiaro 2010-09-13 17:32:30 -04:00
parent eff63827d7
commit 17fddfc4e6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/htmlUI/var/formmask/generic.inc.php
View File

@ -74,7 +74,8 @@ $ui_fmask = array(
'isPref' => TRUE, 'isPref' => TRUE,
'type' => 'text', 'type' => 'text',
'label' => 'Archive server location URL', 'label' => 'Archive server location URL',
'required' => false, 'default' => "http://" . $CC_CONFIG['archiveUrlHost'] . ":" . $CC_CONFIG['archiveUrlPort'] . $CC_CONFIG['archiveUrlPath']."/".$CC_CONFIG['archiveXMLRPC'],
'required' => TRUE,
), ),
array( array(
'rule' => 'regex', 'rule' => 'regex',

6
src/modules/htmlUI/var/templates/scratchpad/main.tpl
View File

@ -86,14 +86,16 @@
duration = duration.split("."); duration = duration.split(".");
duration = duration[0].split(":"); duration = duration[0].split(":");
if(parseInt(duration[0] !== 0)) { if(duration[0] == ''){
duration = "00:00";
}
else if(parseInt(duration[0]) !== 0) {
duration = duration[0] +":"+duration[1]+":"+duration[2]; duration = duration[0] +":"+duration[1]+":"+duration[2];
} }
else{ else{
duration = duration[1]+":"+duration[2]; duration = duration[1]+":"+duration[2];
} }
tool_tip_content.append("<tr><td>Duration: </td><td>"+duration+"</td></tr>"); tool_tip_content.append("<tr><td>Duration: </td><td>"+duration+"</td></tr>");
if(type === "playlist") { if(type === "playlist") {