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

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

Browse source
This commit is contained in:
denise 2012-08-01 16:26:14 -04:00
commit bf0dcc9035
4 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/controllers/WebstreamController.php
View file

@ -34,7 +34,8 @@ class WebstreamController extends Zend_Controller_Action
$request = $this->getRequest();
Application_Model_Webstream::save($request);
$this->view->statusMessage = "<div class='success'>Webstream saved.</div>";
$this->view->x = "hi";
}
}

2
airtime_mvc/application/views/scripts/webstream/webstream.phtml
View file

@ -6,6 +6,7 @@
<?php if (isset($this->ws)) : ?>
<input id="ws_id" type="hidden" value="<?php echo $this->ws->getId(); ?>"></input>
<input id="pl_lastMod" type="hidden" value="<?php echo $this->ws->getLastModified('U'); ?>"></input>
<div class="status" style="display:none;"></div>
<div class="playlist_title">
<h3 id="ws_name">
<a id="playlist_name_display" contenteditable="true"><?php echo $this->ws->getName(); ?></a>
@ -30,7 +31,6 @@
<input type="text" value="00h 20m"/>
</dd>
<dd id="submit-element" class="buttons">
<input class="ui-button ui-state-default" type="submit" value="Cancel" id="webstream_cancel" name="cancel">
<input class="ui-button ui-state-default" type="submit" value="Save" id="webstream_save" name="submit">
</dd>
</dl>