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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-07-27 17:30:35 -04:00
parent 55b8b08508 648b8ae296
commit c2aea7490f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/models/Webstream.php
View File

@ -48,8 +48,8 @@ class Application_Model_Webstream{
$webstream->setDbLength($dblength);
$webstream->setDbLogin($userInfo->id);
$webstream->setDbUtime(new DateTime($timezone = new DateTimeZone('UTC')));
$webstream->setDbMtime(new DateTime($timezone = new DateTimeZone('UTC')));
$webstream->setDbUtime(new DateTime("now", new DateTimeZone('UTC')));
$webstream->setDbMtime(new DateTime("now", new DateTimeZone('UTC')));
$webstream->save();
}
}

4
airtime_mvc/application/views/scripts/webstream/webstream.phtml
View File

@ -13,7 +13,7 @@
<h4 id="ws_length"><?php echo $this->ws->getDefaultLength(); ?></h4>
</div>
<fieldset class="toggle closed" id="fieldset-metadate_change">
<fieldset class="toggle" id="fieldset-metadate_change">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>
<dl class="zend_form">
<dt id="description-label"><label for="description">Description</label></dt>
@ -23,7 +23,7 @@
<dt id="submit-label" style="display: none;">&nbsp;</dt>
<dt id="streamurl-label"><label for="streamurl">Stream URL:</label></dt>
<dd id="streamurl-element">
<input type="text" value="http://"/>
<input type="text" value="http://" size="40"/>
</dd>
<dt id="streamlength-label"><label for="streamlength">Default Length:</label></dt>
<dd id="streamlength-element">