Revision: 2247
http://mrbs.svn.sourceforge.net/mrbs/?rev=2247&view=rev
Author: cimorrison
Date: 2012-01-12 15:56:14 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Fixed bug which meant that the default action on hitting Enter on forms with
two submit buttons was not necessarily to save the form.
Modified Paths:
--------------
mrbs/trunk/web/Themes/default/header.inc
mrbs/trunk/web/edit_area_room.php
mrbs/trunk/web/edit_entry.php
mrbs/trunk/web/edit_users.php
Modified: mrbs/trunk/web/Themes/default/header.inc
===================================================================
--- mrbs/trunk/web/Themes/default/header.inc 2012-01-12 11:37:26 UTC (rev
2246)
+++ mrbs/trunk/web/Themes/default/header.inc 2012-01-12 15:56:14 UTC (rev
2247)
@@ -1297,6 +1297,29 @@
}).appendTo('#header_search');
}
+ <?php
+ // There are some forms that have multiple submit buttons, eg a "Back" and
"Save"
+ // buttons. In these cases we want hitting the Enter key in a text input
field
+ // to result in a "Save" rather than "Back". So in these cases we have
assigned
+ // a class of 'default_action' to the one that we want to be executed when
we hit
+ // Enter. (Note that it is a class rather than an id just in case we have
two or
+ // more such forms on a page. However we should ensure that there is only
one
+ // button with this class per form.)
+ ?>
+ $('form input.default_action').each(function() {
+ var defaultSubmitButton = $(this);
+ $(this).parents('form').find('input').keypress(function(event) {
+ if (event.which == 13) // the Enter key
+ {
+ defaultSubmitButton.click();
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ });
+ });
<?php
// ADMIN.PHP
Modified: mrbs/trunk/web/edit_area_room.php
===================================================================
--- mrbs/trunk/web/edit_area_room.php 2012-01-12 11:37:26 UTC (rev 2246)
+++ mrbs/trunk/web/edit_area_room.php 2012-01-12 15:56:14 UTC (rev 2247)
@@ -733,7 +733,7 @@
{
echo "<div id=\"edit_area_room_submit_save\">\n";
echo "<input type=\"hidden\" name=\"phase\" value=\"2\">";
- echo "<input class=\"submit\" type=\"submit\" name=\"change_room\"
value=\"" . get_vocab("change") . "\">\n";
+ echo "<input class=\"submit default_action\" type=\"submit\"
name=\"change_room\" value=\"" . get_vocab("change") . "\">\n";
echo "</div>\n";
}
echo "</fieldset>\n";
@@ -1235,7 +1235,7 @@
</div>
<div id="edit_area_room_submit_save">
<input type="hidden" name="phase" value="2">
- <input class="submit" type="submit" name="change_area" value="<?php
echo get_vocab("change") ?>">
+ <input class="submit default_action" type="submit"
name="change_area" value="<?php echo get_vocab("change") ?>">
</div>
</fieldset>
Modified: mrbs/trunk/web/edit_entry.php
===================================================================
--- mrbs/trunk/web/edit_entry.php 2012-01-12 11:37:26 UTC (rev 2246)
+++ mrbs/trunk/web/edit_entry.php 2012-01-12 15:56:14 UTC (rev 2247)
@@ -1526,7 +1526,7 @@
// The Submit button
echo "<div id=\"edit_entry_submit_save\">\n";
- echo "<input class=\"submit\" type=\"submit\" name=\"save_button\"
value=\"" .
+ echo "<input class=\"submit default_action\" type=\"submit\"
name=\"save_button\" value=\"" .
get_vocab("save") . "\">\n";
echo "</div>\n";
Modified: mrbs/trunk/web/edit_users.php
===================================================================
--- mrbs/trunk/web/edit_users.php 2012-01-12 11:37:26 UTC (rev 2246)
+++ mrbs/trunk/web/edit_users.php 2012-01-12 15:56:14 UTC (rev 2247)
@@ -389,7 +389,7 @@
}
?>
<input type="hidden" name="Action" value="Update">
- <input class="submit" type="submit" value="<?php
echo(get_vocab("save")); ?>">
+ <input class="submit default_action" type="submit" value="<?php
echo(get_vocab("save")); ?>">
</div>
</fieldset>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
