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:
Martin Konecny 2011-11-18 11:59:27 -05:00
commit c773c5c674
4 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
airtime_mvc/application/controllers/ScheduleController.php
View file

@ -730,6 +730,28 @@ class ScheduleController extends Zend_Controller_Action
Application_Model_Schedule::createNewFormSections($this->view);
$this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
}else{
$this->view->what = $formWhat;
$this->view->when = $formWhen;
$this->view->repeats = $formRepeats;
$this->view->who = $formWho;
$this->view->style = $formStyle;
$this->view->rr = $formRecord;
$this->view->absoluteRebroadcast = $formAbsoluteRebroadcast;
$this->view->rebroadcast = $formRebroadcast;
$this->view->addNewShow = true;
//the form still needs to be "update" since
//the validity test failed.
if ($data['add_show_id'] != -1){
$this->view->addNewShow = false;
}
if (!$startDateModified){
$formWhen->getElement('add_show_start_date')->setOptions(array('disabled' => true));
}
$this->view->form = $this->view->render('schedule/add-show-form.phtml');
}
}else{
$userInfo = Zend_Auth::getInstance()->getStorage()->read();

2
airtime_mvc/application/models/Preference.php
View file

@ -530,7 +530,7 @@ class Application_Model_Preference
public static function GetLatestLink(){
$link = self::GetValue("latest_link");
if($link == null || strlen($link) == 0) {
return "http://www.sourcefabric.org/en/airtime/download/";
return 'http://airtime.sourcefabric.org';
} else {
return $link;
}

1
airtime_mvc/public/css/styles.css
View file

@ -1516,7 +1516,6 @@ div.success{
list-style-type:none;
margin:0 0 8px 0;
padding:0;
height:25px;
display:block;
}
/*