Merge branch '1.9.1' into devel
Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/configs/navigation.php install_minimal/DoctrineMigrations/Version20110711161043.php python_apps/api_clients/api_client.py
This commit is contained in:
commit
f855da0f45
10 changed files with 150 additions and 97 deletions
|
@ -0,0 +1,12 @@
|
|||
<div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences">
|
||||
<h2>Support Setting</h2>
|
||||
<form method="post" action="/Preference/support-setting" enctype="multipart/form-data">
|
||||
<div id="support-settings">
|
||||
<?php echo $this->statusMsg ?>
|
||||
<?php echo $this->form ?>
|
||||
</div>
|
||||
<div class="button-bar bottom" id="submit-element">
|
||||
<?php echo $this->form->getElement('submit') ?>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
Loading…
Add table
Add a link
Reference in a new issue