From: Jakub Vrana <jakub@vrana.cz>
Date: Wed, 10 Jul 2013 20:13:36 +0000 (-0700)
Subject: Highlight required fields in Chrome and after submit
X-Git-Tag: v4.0.0~137
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=4d7c675cab4602390caba278f16b4861ac7a022b;p=adminer.git

Highlight required fields in Chrome and after submit
---

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index d59451fa..a000ac7f 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -159,7 +159,7 @@ foreach ($engines as $engine) {
 <?php if ($TABLE == "" && !$_POST) { ?><script type='text/javascript'>focus(document.getElementById('form')['name']);</script><?php } ?>
 <?php echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) : ""); ?>
  <?php echo ($collations && !ereg("sqlite|mssql", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
- <input type="submit" value="<?php echo lang('Save'); ?>" formnovalidate>
+ <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 
 <?php if (support("table")) { ?>
@@ -187,10 +187,10 @@ edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments);
 	: '')
 ; ?>
 <p>
-<input type="submit" value="<?php echo lang('Save'); ?>" formnovalidate>
+<input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 
-<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?> formnovalidate><?php } ?>
+<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 <?php
 if (support("partitioning")) {
 	$partition_table = ereg('RANGE|LIST', $row["partition_by"]);
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index e7280f8d..aa6d8d02 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -140,7 +140,7 @@ function edit_type($key, $field, $collations, $foreign_keys = array()) {
 	global $structured_types, $types, $unsigned, $on_actions;
 	?>
 <td><select name="<?php echo $key; ?>[type]" class="type" onfocus="lastType = selectValue(this);" onchange="editingTypeChange(this);"><?php echo optionlist((!$field["type"] || isset($types[$field["type"]]) ? array() : array($field["type"])) + $structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); ?></select>
-<td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"<?php echo (ereg('var(char|binary)$', $field["type"]) ? " required" : ""); ?>><td class="options"><?php //! type="number" with enabled JavaScript
+<td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"<?php echo (!$field["length"] && ereg('var(char|binary)$', $field["type"]) ? " class='required'" : ""); ?> onchange="editingLengthChange(this);" onkeyup="this.onchange();"><td class="options"><?php //! type="number" with enabled JavaScript
 	echo "<select name='$key" . "[collation]'" . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
 	echo ($unsigned ? "<select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('((^|[^o])int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
 	echo (isset($field['on_update']) ? "<select name='$key" . "[on_update]'" . ($field["type"] == "timestamp" ? "" : " class='hidden'") . '>' . optionlist(array("" => "(" . lang('ON UPDATE') . ")", "CURRENT_TIMESTAMP"), $field["on_update"]) . '</select>' : '');
diff --git a/adminer/static/default.css b/adminer/static/default.css
index d5ab5421..0d508724 100644
--- a/adminer/static/default.css
+++ b/adminer/static/default.css
@@ -22,6 +22,7 @@ tbody tr:hover td, tbody tr:hover th { background: #eee; }
 pre { margin: 1em 0 0; }
 input[type=image] { vertical-align: middle; }
 input.default { box-shadow: 1px 1px 1px #777; }
+input.required { box-shadow: 1px 1px 1px red; }
 .block { display: block; }
 .version { color: #777; font-size: 67%; }
 .js .hidden, .nojs .jsonly { display: none; }
diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index ca7742b5..a7c93f47 100644
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -356,13 +356,13 @@ function editingTypeChange(type) {
 	for (var i=0; i < type.form.elements.length; i++) {
 		var el = type.form.elements[i];
 		if (el.name == name + '[length]') {
-			el.required = /var(char|binary)$/.test(text);
 			if (!(
 				(/(char|binary)$/.test(lastType) && /(char|binary)$/.test(text))
 				|| (/(enum|set)$/.test(lastType) && /(enum|set)$/.test(text))
 			)) {
 				el.value = '';
 			}
+			el.onchange.apply(el);
 		}
 		if (lastType == 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
 			el.checked = false;
@@ -382,6 +382,16 @@ function editingTypeChange(type) {
 	}
 }
 
+/** Mark length as required
+* @param HTMLInputElement
+*/
+function editingLengthChange(el) {
+	el.className = el.className.replace(/( |^)required( |$)/, '$2');
+	if (!el.value.length && /var(char|binary)$/.test(selectValue(el.parentNode.previousSibling.firstChild))) {
+		el.className += ' required';
+	}
+}
+
 /** Edit enum or set
 * @param HTMLInputElement
 */