stage 1 in moving the forms markup to elgg- namespaced css - buttons still need work

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

34 files changed, 138 insertions, 147 deletions

diff --git a/mod/categories/views/default/categories/css.php b/mod/categories/views/default/categories/css.php
index 87916c412..7944f9dfe 100644
--- a/mod/categories/views/default/categories/css.php
+++ b/mod/categories/views/default/categories/css.php
@@ -6,7 +6,7 @@
  */
 ?>
 
-.categories .input-checkboxes {
+.categories .elgg-input-checkboxes {
 	padding:0;
 	margin:2px 5px 0 0;
 }
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index e87584205..fe8cef972 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -114,8 +114,8 @@
 }
 
 /* input field classes */
-#facebox .content .input-text,
-#facebox .content .input-tags {
+#facebox .content .elgg-input-text,
+#facebox .content .elgg-input-tags {
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
 	border: 1px solid #cccccc;
@@ -127,13 +127,13 @@
 	-moz-box-shadow: none;
 	box-shadow: none;
 }
-#facebox .content .input-text:focus,
-#facebox .content .input-tags:focus {
+#facebox .content .elgg-input-text:focus,
+#facebox .content .elgg-input-tags:focus {
 	border: solid 1px #4690d6;
 	background: #e4ecf5;
 	color:#333333;
 }
-#facebox .content .input-file {
+#facebox .content .elgg-input-file {
 	background-color: white;
 }
 #facebox .content p {
diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php
index 6d381a8ed..c7af78981 100644
--- a/mod/invitefriends/views/default/invitefriends/formitems.php
+++ b/mod/invitefriends/views/default/invitefriends/formitems.php
@@ -15,13 +15,13 @@ if ($CONFIG->allow_registration) {
 <p class="margin-top">
 	<label>
 		$introduction
-		<textarea class="input-textarea" name="emails" ></textarea>
+		<textarea class="elgg-input-textarea" name="emails" ></textarea>
 	</label>
 </p>
 <p>
 	<label>
 		$message
-		<textarea class="input-textarea" name="emailmessage" >$default</textarea>
+		<textarea class="elgg-input-textarea" name="emailmessage" >$default</textarea>
 	</label>
 </p>
 HTML;
diff --git a/mod/messageboard/views/default/messageboard/forms/add.php b/mod/messageboard/views/default/messageboard/forms/add.php
index 6003bade7..cacb5712f 100644
--- a/mod/messageboard/views/default/messageboard/forms/add.php
+++ b/mod/messageboard/views/default/messageboard/forms/add.php
@@ -11,7 +11,7 @@
 	<form action="<?php echo elgg_get_site_url(); ?>action/messageboard/add" method="post" name="messageboardForm">
 
 		<!-- textarea for the contents -->
-		<textarea name="message_content" value="" class="input-textarea"></textarea><br />
+		<textarea name="message_content" value="" class="elgg-input-textarea"></textarea><br />
 
 		<!-- the page owner, this will be the profile owner -->
 		<input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>"  />
diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php
index fbf6cb776..f4c822b3f 100644
--- a/mod/messageboard/views/default/widgets/messageboard/content.php
+++ b/mod/messageboard/views/default/widgets/messageboard/content.php
@@ -43,7 +43,7 @@ if (isloggedin()) {
 <div id="mb_input_wrapper"><!-- start of mb_input_wrapper div -->
 
 	<!-- message textarea -->
-	<textarea name="message_content" class="input-textarea"></textarea>
+	<textarea name="message_content" class="elgg-input-textarea"></textarea>
 
 	<!-- the page owner, this will be the profile owner -->
 	<input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>" class="pageOwner"  />
diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php
index bdf3d1283..107b86166 100644
--- a/mod/messages/views/default/messages/forms/reply.php
+++ b/mod/messages/views/default/messages/forms/reply.php
@@ -16,8 +16,8 @@
 	<?php echo elgg_view('action/securitytoken'); ?>
 
     <!-- populate the title space with the orginal message title, inserting re: before it -->						        
-	<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input-text" value='<?php echo $reply_title; ?>' /></label></p>
-	<p><label><?php echo elgg_echo("messages:message"); ?>: <br /><textarea name='message' value='' class="input-textarea" /></textarea></label></p>
+	<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="elgg-input-text" value='<?php echo $reply_title; ?>' /></label></p>
+	<p><label><?php echo elgg_echo("messages:message"); ?>: <br /><textarea name='message' value='' class="elgg-input-textarea" /></textarea></label></p>
 		
 	<p>
 	    <?php
diff --git a/mod/messages/views/default/messages/forms/send.php b/mod/messages/views/default/messages/forms/send.php
index 71705bf18..6ddf7e543 100644
--- a/mod/messages/views/default/messages/forms/send.php
+++ b/mod/messages/views/default/messages/forms/send.php
@@ -57,7 +57,7 @@ unset($_SESSION['msg_contents']);
         }
     ?>
     
-	<p class="margin-top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input-text" /></label></p>
+	<p class="margin-top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="elgg-input-text" /></label></p>
 	<p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label>
 	<?php
 		echo elgg_view("input/longtext", array(
diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php
index 97036f9b0..a1a7fd9ca 100644
--- a/mod/messages/views/default/messages/messages.php
+++ b/mod/messages/views/default/messages/messages.php
@@ -94,7 +94,7 @@ if (isloggedin())
 					<h2><?php echo elgg_echo('messages:answer'); ?></h2>
 					<form action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm" class="margin-top" id="messages_send_form">
 						<?php echo elgg_view('input/securitytoken'); ?>
-						<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input-text" value='<?php echo $reply_title; ?>' /></label></p>
+						<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="elgg-input-text" value='<?php echo $reply_title; ?>' /></label></p>
 						<p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label>
 						<?php echo elgg_view("input/longtext", array(
 											"internalname" => "message",
diff --git a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php b/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php
index c426e9ad9..e750ee69f 100644
--- a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php
+++ b/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php
@@ -26,7 +26,7 @@ $welcometitle_form = elgg_view('input/text', array(
 $welcomemessage_form = elgg_view('input/longtext', array(

 	'internalname' => 'welcomemessage',

 	'value' => $welcomemessage,

-	'class' => 'input-textarea monospace'

+	'class' => 'elgg-input-textarea monospace'

 ));

 $sidebartitle_form = elgg_view('input/text', array(

 	'internalname' => 'sidebartitle',

@@ -35,7 +35,7 @@ $sidebartitle_form = elgg_view('input/text', array(
 $sidebarmessage_form = elgg_view('input/longtext', array(

 	'internalname' => 'sidebarmessage',

 	'value' => $sidebarmessage,

-	'class' => 'input-textarea monospace'

+	'class' => 'elgg-input-textarea monospace'

 ));;

 

 $page_type = elgg_view('input/hidden', array(

diff --git a/mod/tinymce/views/default/input/longtext.php b/mod/tinymce/views/default/input/longtext.php
index 995cd8fd1..daa34b2e8 100644
--- a/mod/tinymce/views/default/input/longtext.php
+++ b/mod/tinymce/views/default/input/longtext.php
@@ -86,7 +86,7 @@ function toggleEditor(id) {
 
 <a class="longtext-control toggle_editor small link" href="javascript:toggleEditor('<?php echo $vars['internalname']; ?>');"><?php echo elgg_echo('tinymce:remove'); ?></a>
 <!-- show the textarea -->
-<textarea class="input-textarea mceEditor" name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], null, 'UTF-8'); ?></textarea>
+<textarea class="elgg-input-textarea mceEditor" name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], null, 'UTF-8'); ?></textarea>
 
 <script type="text/javascript">
 	$(document).ready(function() {
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
index 1c1567aec..bc2f7f5d2 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
@@ -13,7 +13,7 @@ $user = elgg_get_array_value('theuser', $vars);
 //	'internalname' => 'user_guids',
 //	'options' => array("$user->username - \"$user->name\" &lt;$user->email&gt;" => $user->guid)
 //));
-$checkbox = "<label><input type=\"checkbox\" value=\"$user->guid\" class=\"input-checkboxes\" name=\"user_guids[]\">"
+$checkbox = "<label><input type=\"checkbox\" value=\"$user->guid\" class=\"elgg-input-checkboxes\" name=\"user_guids[]\">"
 	. "$user->username - \"$user->name\" &lt;$user->email&gt;</label>";
 
 $created = elgg_echo('uservalidationbyemail:admin:user_created', array(elgg_view_friendly_time($user->time_created)));
diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index 60a1e3f86..ae611af07 100644
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -50,10 +50,10 @@ if ($vars['order'] < $vars['maxorder']) {
 
 if ($active) {
 	$url = elgg_get_site_url()."action/admin/plugins/disable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts";
-	$enable_disable = '<a class="elgg-cancel-button" href="' . elgg_format_url($url) . '">' . elgg_echo('disable') . '</a>';
+	$enable_disable = '<a class="elgg-button elgg-cancel-button" href="' . elgg_format_url($url) . '">' . elgg_echo('disable') . '</a>';
 } else {
 	$url = elgg_get_site_url()."action/admin/plugins/enable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts";
-	$enable_disable = '<a class="elgg-submit-button" href="' . elgg_format_url($url) . '">' . elgg_echo('enable') . '</a>';
+	$enable_disable = '<a class="elgg-button elgg-submit-button" href="' . elgg_format_url($url) . '">' . elgg_echo('enable') . '</a>';
 }
 
 
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/plugins_advanced.php
index ead930090..ead930090 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/plugins_advanced.php
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index ce31a0036..d6180db83 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -143,7 +143,7 @@ table.mceLayout {
 	font-size:100%;
 	font-weight:normal;
 }
-.elgg-admin .input-textarea {
+.elgg-admin .elgg-input-textarea {
 	width:98%;
 }
 .elgg-admin form#plugin_settings {
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 698d5fdf3..b4f8c7429 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -10,41 +10,30 @@
 	Form Elements
 *************************************** */
 /* default elgg core input field classes */
-.input-text,
-.input-tags,
-.input-url,
-.input-textarea {
-	width:98%;
-}
-.input-access {
-	margin:5px 0 0 0;
-}
-.input-password {
-	width:200px;
-}
-.input-textarea {
-	height: 200px;
-	width:718px;
-}
-input[type="checkbox"],
-input.input-radio {
-	margin:0 3px 0 0;
-	padding:0;
-	border:none;
-}
 label {
 	font-weight: bold;
-	color:#333333;
+	color: #333333;
 	font-size: 110%;
 }
 input {
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
 	border: 1px solid #cccccc;
-	color:#666666;
+	color: #666666;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 }
+input[type="text"], textarea {
+	width: 96%;
+}
+input[type="password"] {
+	width: 200px;
+}
+input[type="text"]:focus, input[type="password"]:focus {
+	border: solid 1px #4690d6;
+	background: #e4ecf5;
+	color:#333333;
+}
 textarea {
 	font: 120% Arial, Helvetica, sans-serif;
 	border: solid 1px #cccccc;
@@ -52,50 +41,106 @@ textarea {
 	color:#666666;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
+	height: 200px;
+	width: 96%;
 }
-textarea:focus,
-input[type="text"]:focus {
-	border: solid 1px #4690d6;
-	background: #e4ecf5;
-	color:#333333;
-}
-.input-textarea.monospace {
-	font-family:Monaco,"Courier New",Courier,monospace;
-	font-size:13px;
+textarea.monospace {
+	font-family: Monaco,"Courier New",Courier,monospace;
+	font-size: 13px;
 }
 a.longtext-control {
 	float:right;
 	margin-left:14px;
 }
-.elgg-submit-button {
+.elgg-input-access {
+	margin:5px 0 0 0;
+}
+input[type="checkbox"],
+input[type="radio"] {
+	margin:0 3px 0 0;
+	padding:0;
+	border:none;
+}
+
+input[type="submit"],
+input[type="button"],
+.elgg-button {
 	font-size: 14px;
 	font-weight: bold;
-	color: white;
-	text-shadow:1px 1px 0px black;
-	text-decoration:none;
-	border: 1px solid #4690d6;
-	background-color:#4690d6;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat: repeat-x;
-	background-position: left 10px;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	width: auto;
 	padding: 2px 4px;
-	margin:0 10px 10px 0;
+	margin: 10px 0 10px 0;
 	cursor: pointer;
+	outline: none;
 	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
 	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
 }
-.elgg-submit-button:hover {
+input[type="submit"],
+.elgg-submit-button {
 	color: white;
+	text-shadow: 1px 1px 0px black;
+	text-decoration: none;
+	border: 1px solid #4690d6;
+	background-color: #4690d6;
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
+	background-repeat: repeat-x;
+	background-position: left 10px;
+}
+input[type="submit"]:hover,
+.elgg-submit-button:hover {
 	border-color: #0054a7;
-	text-decoration:none;
-	background-color:#0054a7;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
+	text-decoration: none;
+	color: white;
+	background-color: #0054a7;
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
+	background-repeat: repeat-x;
+	background-position: left 10px;
+}
+.elgg-cancel-button {
+	color: #333333;
+	background-color: #dddddd;
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
+	background-repeat: repeat-x;
+	background-position: left 10px;
+	border: 1px solid #999999;
+}
+.elgg-cancel-button:hover {
+	color: white;
+	background-color: #999999;
+	background-position: left 10px;
+	text-decoration: none;
+}
+.elgg-action-button {
+	background-color:#cccccc;
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
-	background-position:  left 10px;
+	background-position: 0 0;
+	border:1px solid #999999;
+	color: #333333;
+	padding: 2px 15px 2px 15px;
+	text-align: center;
+	font-weight: bold;
+	text-decoration: none;
+	text-shadow: 0 1px 0 white;
+	cursor: pointer;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+}
+.elgg-action-button:hover,
+.elgg-action-button:focus {
+	background-position: 0 -15px;
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
+	background-repeat: repeat-x;
+	color: #111111;
+	text-decoration: none;
+	background-color: #cccccc;
+	border: 1px solid #999999;
 }
+/*
 .elgg-submit-button.disabled {
 	background-color:#999999;
 	border-color:#999999;
@@ -106,64 +151,7 @@ a.longtext-control {
 	border-color:#999999;
 	color:#dedede;
 }
-input[type="password"]:focus {
-	border: solid 1px #4690d6;
-	background-color: #e4ecf5;
-	color:#333333;
-}
-input[type="submit"] {
-	font-size: 14px;
-	font-weight: bold;
-	color: white;
-	text-shadow:1px 1px 0px black;
-	text-decoration:none;
-	border: 1px solid #4690d6;
-	background-color:#4690d6;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat:  repeat-x;
-	background-position:  left 10px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	width: auto;
-	padding: 2px 4px;
-	margin:10px 0 10px 0;
-	cursor: pointer;
-	-moz-outline-style: none;
-	outline: none;
-	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-}
-input[type="submit"]:hover {
-	border-color: #0054a7;
-	text-decoration:none;
-	background-color:#0054a7;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat:  repeat-x;
-	background-position:  left 10px;
-}
-.elgg-cancel-button {
-	font-size: 14px;
-	font-weight: bold;
-	text-decoration:none;
-	color: #333333;
-	background-color:#dddddd;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat:  repeat-x;
-	background-position:  left 10px;
-	border: 1px solid #999999;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	width: auto;
-	padding: 2px 4px;
-	margin:10px 0 10px 10px;
-	cursor: pointer;
-}
-.elgg-cancel-button:hover {
-	background-color: #999999;
-	background-position:  left 10px;
-	text-decoration:none;
-	color:white;
-}
+
 .elgg-action-button {
 	margin-left: 10px;
 }
@@ -240,6 +228,9 @@ a.elgg-action-button:focus {
 	color:white;
 	text-shadow:0 -1px 0 black;
 }
+
+*/
+
 /* small round delete button */
 .delete-button {
 	width:14px;
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 1aaffaaa8..bccbf9f47 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -278,7 +278,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
 .elgg-river-content .elgg-user-icon {
 	float: left;
 }
-.elgg-river-layout .input-pulldown {
+.elgg-river-layout .elgg-input-dropdown {
 	float: right;
 	margin: 10px 0;
 }
diff --git a/views/default/input/access.php b/views/default/input/access.php
index d4f366363..56123d49a 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -14,7 +14,7 @@
  *
  */
 
-$class = "input-access";
+$class = "elgg-input-access";
 if (isset($vars['class'])) {
 	$class = $vars['class'];
 }
diff --git a/views/default/input/checkbox.php b/views/default/input/checkbox.php
index 59af3216f..0fea3d3c6 100644
--- a/views/default/input/checkbox.php
+++ b/views/default/input/checkbox.php
@@ -15,7 +15,7 @@
  */
 
 $defaults = array(
-	'class' => 'input-checkbox',
+	'class' => 'elgg-input-checkbox',
 );
 
 $vars = array_merge($defaults, $vars);
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index 4abeabf58..2222875d8 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -29,7 +29,7 @@ if (!isset($vars['value']) || $vars['value'] === FALSE) {
 	$vars['value'] = elgg_get_sticky_value($vars['internalname']); 
 }
 
-$class = (isset($vars['class'])) ? $vars['class'] : 'input-checkboxes';
+$class = (isset($vars['class'])) ? $vars['class'] : 'elgg-input-checkboxes';
 $value = (isset($vars['value'])) ? $vars['value'] : NULL;
 $value_array = (is_array($value)) ? array_map('strtolower', $value) : array(strtolower($value));
 $internalname = (isset($vars['internalname'])) ? $vars['internalname'] : '';
diff --git a/views/default/input/email.php b/views/default/input/email.php
index c973ff7e4..577cfbbdb 100644
--- a/views/default/input/email.php
+++ b/views/default/input/email.php
@@ -8,7 +8,7 @@
  */
 
 $defaults = array(
-	'class' => 'input-text', //@todo input-email?
+	'class' => 'elgg-input-email',
 	'disabled' => FALSE,
 );
 
diff --git a/views/default/input/file.php b/views/default/input/file.php
index 8f0461083..28ab54f94 100644
--- a/views/default/input/file.php
+++ b/views/default/input/file.php
@@ -19,7 +19,7 @@ if (!empty($vars['value'])) {
 	echo elgg_echo('fileexists') . "<br />";
 }
 
-$class = "input-file";
+$class = "elgg-input-file";
 if (isset($vars['class'])) {
 	$class = $vars['class'];
 }
diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index d784c6014..d9862f95c 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -14,7 +14,7 @@
  * @uses $vars['disabled'] Is the input field disabled?
  */
 
-$class = "input-textarea";
+$class = "elgg-input-textarea";
 if (isset($vars['class'])) {
 	$class = $vars['class'];
 }
diff --git a/views/default/input/password.php b/views/default/input/password.php
index 0d1523977..86bae9c7f 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -14,7 +14,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-password";
+	$class = "elgg-input-password";
 }
 ?>
 
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index e2b8c5ed2..0ca8c07ee 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -14,7 +14,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-textarea";
+	$class = "elgg-input-textarea";
 }
 
 if (!isset($vars['value']) || $vars['value'] === FALSE) {
diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php
index f789d1020..25e3e3c37 100644
--- a/views/default/input/pulldown.php
+++ b/views/default/input/pulldown.php
@@ -18,7 +18,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-pulldown";
+	$class = "elgg-input-dropdown";
 }
 
 if (!isset($vars['value'])) {
diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index 0a5885f8b..b2b67616c 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -15,7 +15,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-radio";
+	$class = "elgg-input-radio";
 }
 
 if (!isset($vars['value']) || $vars['value'] === FALSE) {
diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index 6ce074a2a..c48793518 100644
--- a/views/default/input/tags.php
+++ b/views/default/input/tags.php
@@ -8,7 +8,7 @@
  */
 
 $defaults = array(
-	'class' => 'input-tags',
+	'class' => 'elgg-input-tags',
 	'disabled' => FALSE,
 );
 
diff --git a/views/default/input/text.php b/views/default/input/text.php
index 9f3076ed3..668102d81 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -8,7 +8,7 @@
  */
 
 $defaults = array(
-	'class' => 'input-text',
+	'class' => 'elgg-input-text',
 	'disabled' => FALSE,
 );
 
diff --git a/views/default/input/url.php b/views/default/input/url.php
index fddf44a5b..607720078 100644
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -8,7 +8,7 @@
  */
 
 $defaults = array(
-	'class' => 'input-url',
+	'class' => 'elgg-input-url',
 );
 
 $vars = array_merge($defaults, $vars);
diff --git a/views/default/page/shells/walled_garden.php b/views/default/page/shells/walled_garden.php
index 4e64276c1..bdd010496 100644
--- a/views/default/page/shells/walled_garden.php
+++ b/views/default/page/shells/walled_garden.php
@@ -128,10 +128,10 @@ body {background: white;}
 	-moz-box-shadow: none;
 	box-shadow: none;	
 }
-.walledgardenlogin .input-password {
+.walledgardenlogin .elgg-input-password {
 	width:200px;
 }
-.walledgardenlogin input.input-password:focus {
+.walledgardenlogin input.elgg-input-password:focus {
 	border: solid 1px #4690d6;
 	background-color: #e4ecf5;
 	color:#333333;
diff --git a/views/installation/input/access.php b/views/installation/input/access.php
index 51b8dfa00..3accdaf0c 100644
--- a/views/installation/input/access.php
+++ b/views/installation/input/access.php
@@ -16,7 +16,7 @@ if (isset($vars['class'])) {
 	$class = $vars['class'];
 }
 if (!$class) {
-	$class = "input-access";
+	$class = "elgg-input-access";
 }
 
 if ((!isset($vars['options'])) || (!is_array($vars['options']))) {
diff --git a/views/installation/input/checkboxes.php b/views/installation/input/checkboxes.php
index d4e1b494d..04533f6f5 100644
--- a/views/installation/input/checkboxes.php
+++ b/views/installation/input/checkboxes.php
@@ -15,7 +15,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-checkboxes";
+	$class = "elgg-input-checkboxes";
 }
 
 foreach($vars['options'] as $label => $option) {
diff --git a/views/installation/input/longtext.php b/views/installation/input/longtext.php
index c7e465e9f..a909f55f2 100644
--- a/views/installation/input/longtext.php
+++ b/views/installation/input/longtext.php
@@ -14,7 +14,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-textarea";
+	$class = "elgg-input-textarea";
 }
 
 ?>
diff --git a/views/installation/input/pulldown.php b/views/installation/input/pulldown.php
index 70e961c4d..2f4ff1631 100644
--- a/views/installation/input/pulldown.php
+++ b/views/installation/input/pulldown.php
@@ -17,7 +17,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-pulldown";
+	$class = "elgg-input-dropdown";
 }
 ?>
 <select name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">