Merge branch '2.1.x' into devel

Conflicts: python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00 · 2012-06-29 10:57:14 -04:00 · 335dd1516b
commit 335dd1516b
parent 8141dec3b5 6c1c36fa9b
40 changed files with 1084 additions and 870 deletions
--- a/airtime_mvc/application/forms/PasswordRestore.php
+++ b/airtime_mvc/application/forms/PasswordRestore.php
@ -29,5 +29,13 @@ class Application_Form_PasswordRestore extends Zend_Form
                'ViewHelper'
            )
        ));
+        
+        $cancel = new Zend_Form_Element_Button("cancel");
+        $cancel->class = 'ui-button ui-widget ui-state-default ui-button-text-only center';
+        $cancel->setLabel("Cancel")
+               ->setIgnore(True)
+               ->setAttrib('onclick', 'redirectToLogin();')
+               ->setDecorators(array('ViewHelper'));
+        $this->addElement($cancel);
    }
 }