Refs #2143: DRY up button input views (button, reset, submit). Changed core uses of button to reflect the fact that it no longer defaults to submit

git-svn-id: http://code.elgg.org/elgg/trunk@7364 36083f99-b078-4883-b0ff-0f9b5a30f544

10 files changed, 26 insertions, 87 deletions

diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
index 2b07fae94..60012dac6 100644
--- a/mod/blog/views/default/blog/forms/edit.php
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -72,7 +72,7 @@ if (isset ($vars['entity'])) {
 	));
 }
 
-$save_button = elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'submit_button'));
+$save_button = elgg_view('input/submit', array('value' => elgg_echo('save')));
 $action_buttons = $save_button . $delete_link;
 
 $title_label = elgg_echo('title');
diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php
index c7a5cd4b1..ad77b5085 100644
--- a/mod/diagnostics/index.php
+++ b/mod/diagnostics/index.php
@@ -25,7 +25,7 @@ $test_body .= "<p>" . elgg_echo('diagnostics:unittester:warning') . "</p>";
 if (isset($CONFIG->debug)) {
 	// create a button to run tests
 	$js = "onclick=\"window.location='".elgg_get_site_url()."engine/tests/suite.php'\"";
-	$params = array('type' => 'button', 'value' => elgg_echo('diagnostics:test:executeall'), 'js' => $js);
+	$params = array('value' => elgg_echo('diagnostics:test:executeall'), 'js' => $js);
 	$test_body .= elgg_view('input/button', $params);
 } else {
 	// no tests when not in debug mode
diff --git a/mod/ecml/views/default/embed/web_services/content.php b/mod/ecml/views/default/embed/web_services/content.php
index 5c46dfad4..b609db448 100644
--- a/mod/ecml/views/default/embed/web_services/content.php
+++ b/mod/ecml/views/default/embed/web_services/content.php
@@ -40,7 +40,7 @@ $input = elgg_view('input/text', array(
 	'internalid' => 'web_services_resource'
 ));
 
-$embed = elgg_view('input/button', array(
+$embed = elgg_view('input/submit', array(
 	'name' => 'buggy',
 	'internalid' => 'embed_submit',
 	'type' => 'button',
@@ -109,7 +109,7 @@ $(function() {
 		
 		var value = $(this).val();
 		var value_length = value.length;
-		 
+		
 		if (value_length > 0) {
 			//embed_button.removeAttr('disabled').removeClass('disabled');//.addClass('embed_warning');
 			url_status.removeClass('success').addClass('failure');
diff --git a/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php b/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
index 279c7387f..332fac3f9 100644
--- a/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
+++ b/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
@@ -58,7 +58,7 @@ $form_body .= elgg_echo('uservalidationbyemail:admin:with_checked') . elgg_view(
 	'value' => 'resend_validation',
 ));
 
-$form_body .= '<br />' . elgg_view('input/button', array('value' => elgg_echo('submit')));
+$form_body .= '<br />' . elgg_view('input/submit', array('value' => elgg_echo('submit')));
 
 echo elgg_view('input/form', array(
 	'action' => 'action/uservalidationbyemail/bulk_action',
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 306ddfd7f..dc5846108 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -43,7 +43,7 @@ $category_pulldown = elgg_view('input/pulldown', array(
 	'value' => $show_category
 ));
 
-$category_button = elgg_view('input/button', array(
+$category_button = elgg_view('input/submit', array(
 	'value' => elgg_echo('filter'),
 	'class' => 'action_button'
 ));
diff --git a/views/default/input/button.php b/views/default/input/button.php
index 906e41b4c..1be03e3eb 100644
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -5,61 +5,32 @@
  * @package Elgg
  * @subpackage Core
  *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['internalid'] The id of the input field
- * @uses $vars['type'] Submit, button, or reset, defaults to submit.
  * @uses $vars['src'] Src of an image
- *
  */
 
 global $CONFIG;
 
-if (isset($vars['class'])) {
-	$class = $vars['class'];
-} else {
-	$class = "submit_button";
-}
+$defaults = array(
+	'type' => 'button',
+	'class' => 'submit_button',
+);
 
-if (isset($vars['type'])) {
-	$type = strtolower($vars['type']);
-} else {
-	$type = 'button';
-}
+$vars = array_merge($defaults, $vars);
 
-switch ($type) {
-	case 'button' :
-		$type = 'button';
-		break;
-	case 'reset' :
-		$type = 'reset';
-		break;
+switch ($vars['type']) {
+	case 'button':
+	case 'reset':
 	case 'submit':
+	case 'image':
+		break;
 	default:
-		$type = 'submit';
-}
-
-$value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
-
-$name = '';
-if (isset($vars['internalname'])) {
-	$name = $vars['internalname'];
-}
-
-$src = '';
-if (isset($vars['src'])) {
-	$src = "src=\"{$vars['src']}\"";
-}
-// blank src if trying to access an offsite image.
-if (strpos($src, $CONFIG->wwwroot) === false) {
-	$src = "";
+		$vars['type'] = 'button';
+		break;
 }
 
-$id = '';
-if (isset($vars['internalid'])) {
-	$id = "id=\"{$vars['internalid']}\"";
+// blank src if trying to access an offsite image. @todo why?
+if (strpos($vars['src'], $CONFIG->wwwroot) === false) {
+	$vars['src'] = "";
 }
-
 ?>
-<input name="<?php echo $name; ?>" <?php echo $id; ?> type="<?php echo $type; ?>" class="<?php echo $class; ?>" <?php echo $vars['js']; ?> value="<?php echo $value; ?>" <?php echo $src; ?> />
\ No newline at end of file
+<input <?php echo elgg_format_attributes($vars); ?> />
\ No newline at end of file
diff --git a/views/default/input/reset.php b/views/default/input/reset.php
index 1d5e47ccb..d1296e4bf 100644
--- a/views/default/input/reset.php
+++ b/views/default/input/reset.php
@@ -1,24 +1,15 @@
 <?php
 /**
  * Create a reset input button
+ *
+ * @todo ... huh?
  * Use this view for forms rather than creating a submit/reset button tag in the wild as it provides
  * extra security which help prevent CSRF attacks.
  *
  * @package Elgg
  * @subpackage Core
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['type'] Submit or reset, defaults to submit.
- *
  */
 
 $vars['type'] = 'reset';
-$class = $vars['class'];
-if (!$class) {
-	$class = "submit_button";
-}
-$vars['class'] = $class;
 
 echo elgg_view('input/button', $vars);
\ No newline at end of file
diff --git a/views/default/input/submit.php b/views/default/input/submit.php
index 315a70eac..39734b807 100644
--- a/views/default/input/submit.php
+++ b/views/default/input/submit.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * Create a submit input button
+ *
+ * @todo ... huh?
  * Use this view for forms rather than creating a submit/reset button tag in the wild as it provides
  * extra security which help prevent CSRF attacks.
  *
@@ -9,8 +11,5 @@
  */
 
 $vars['type'] = 'submit';
-if (!isset($vars['class'])) {
-	$vars['class'] = "submit_button";
-}
 
 echo elgg_view('input/button', $vars);
\ No newline at end of file
diff --git a/views/installation/input/reset.php b/views/installation/input/reset.php
index 1d5e47ccb..0c83a92ca 100644
--- a/views/installation/input/reset.php
+++ b/views/installation/input/reset.php
@@ -6,19 +6,8 @@
  *
  * @package Elgg
  * @subpackage Core
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['type'] Submit or reset, defaults to submit.
- *
  */
 
 $vars['type'] = 'reset';
-$class = $vars['class'];
-if (!$class) {
-	$class = "submit_button";
-}
-$vars['class'] = $class;
 
 echo elgg_view('input/button', $vars);
\ No newline at end of file
diff --git a/views/installation/input/submit.php b/views/installation/input/submit.php
index 0a6d2a06d..aefb2ada6 100644
--- a/views/installation/input/submit.php
+++ b/views/installation/input/submit.php
@@ -6,19 +6,8 @@
  *
  * @package Elgg
  * @subpackage Core
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['type'] Submit or reset, defaults to submit.
- *
  */
 
 $vars['type'] = 'submit';
-$class = $vars['class'];
-if (!$class) {
-	$class = "submit_button";
-}
-$vars['class'] = $class;
 
 echo elgg_view('input/button', $vars);
\ No newline at end of file