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:
James 2013-01-10 14:52:45 -05:00
commit 55fa8b8dc1
15 changed files with 30 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/views/scripts/form/edit-user.phtml
View file

@ -1,5 +1,6 @@
<h2><? echo sprintf(_("%s's Settings"), $this->currentUser) ?></h2>
<div id="current-user-container">
<form id="current-user-form" class="edit-user-global" enctype="application/x-www-form-urlencoded">
<form id="current-user-form" class="edit-user-global" method="post" enctype="application/x-www-form-urlencoded">
<dl class="zend_form">
<?php echo $this->element->getElement('cu_user_id') ?>
<dt id="cu-username-label">
@ -142,7 +143,7 @@
</ul>
<?php endif; ?>
</dd>
<button id="cu_save_user" type="button" class="btn btn-small right-floated">Save</button>
<button type="submit" id="cu_save_user" class="btn btn-small right-floated">Save</button>
</dl>
</form>
</div>

1
airtime_mvc/application/views/scripts/user/edit-user.phtml
View file

@ -1,5 +1,4 @@
<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong edit-current-user">
<h2><? echo _("Edit User") ?></h2>
<?php echo $this->successMessage ?>
<?php echo $this->form?>
</div>