Use type="list" for user status, replace table heading "Enabled" by "…

…Status"
joomla · Jul 10, 2018 · d85aad3 · d85aad3
1 parent 7bb5b0c
commit d85aad3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/administrator/components/com_users/forms/filter_users.xml b/administrator/components/com_users/forms/filter_users.xml
@@ -56,8 +56,8 @@
 			<option value="a.name DESC">COM_USERS_HEADING_NAME_DESC</option>
 			<option value="a.username ASC">COM_USERS_HEADING_USERNAME_ASC</option>
 			<option value="a.username DESC">COM_USERS_HEADING_USERNAME_DESC</option>
-			<option value="a.block ASC">COM_USERS_HEADING_ENABLED_ASC</option>
-			<option value="a.block DESC">COM_USERS_HEADING_ENABLED_DESC</option>
+			<option value="a.block ASC">COM_USERS_HEADING_STATUS_ASC</option>
+			<option value="a.block DESC">COM_USERS_HEADING_STATUS_DESC</option>
 			<option value="a.activation ASC">COM_USERS_HEADING_ACTIVATED_ASC</option>
 			<option value="a.activation DESC">COM_USERS_HEADING_ACTIVATED_DESC</option>
 			<option value="a.email ASC">COM_USERS_HEADING_EMAIL_ASC</option>

diff --git a/administrator/components/com_users/forms/user.xml b/administrator/components/com_users/forms/user.xml
@@ -110,13 +110,12 @@
 
 		<field
 			name="block"
-			type="radio"
+			type="list"
 			label="COM_USERS_USER_FIELD_BLOCK_LABEL"
-			class="switcher switcher-danger"
 			default="0"
 			>
-			<option value="0">JNO</option>
-			<option value="1">JYES</option>
+			<option value="0">COM_USERS_USER_FIELD_ENABLE</option>
+			<option value="1">COM_USERS_USER_FIELD_BLOCK</option>
 		</field>
 
 		<field

diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php
@@ -52,7 +52,7 @@
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_USERNAME', 'a.username', $listDirn, $listOrder); ?>
 								</th>
 								<th style="width:5%" class="nowrap text-center">
-									<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_ENABLED', 'a.block', $listDirn, $listOrder); ?>
+									<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_STATUS', 'a.block', $listDirn, $listOrder); ?>
 								</th>
 								<th style="width:5%" class="nowrap text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_ACTIVATED', 'a.activation', $listDirn, $listOrder); ?>

diff --git a/administrator/components/com_users/tmpl/users/modal.php b/administrator/components/com_users/tmpl/users/modal.php
@@ -52,7 +52,7 @@
 						<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_USERNAME', 'a.username', $listDirn, $listOrder); ?>
 					</th>
 					<th style="width:1%" class="nowrap text-center">
-						<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_ENABLED', 'a.block', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_STATUS', 'a.block', $listDirn, $listOrder); ?>
 					</th>
 					<th style="width:1%" class="nowrap text-center">
 						<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_ACTIVATED', 'a.activation', $listDirn, $listOrder); ?>

diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
@@ -111,9 +111,6 @@ COM_USERS_HEADING_CATEGORY_ASC="Category ascending"
 COM_USERS_HEADING_CATEGORY_DESC="Category descending"
 COM_USERS_HEADING_EMAIL_ASC="Email ascending"
 COM_USERS_HEADING_EMAIL_DESC="Email descending"
-COM_USERS_HEADING_ENABLED="Enabled"
-COM_USERS_HEADING_ENABLED_ASC="Enabled ascending"
-COM_USERS_HEADING_ENABLED_DESC="Enabled descending"
 COM_USERS_HEADING_GROUP_TITLE="Group Title"
 COM_USERS_HEADING_GROUP_TITLE_ASC="Group Title ascending"
 COM_USERS_HEADING_GROUP_TITLE_DESC="Group Title descending"
@@ -136,6 +133,9 @@ COM_USERS_HEADING_REGISTRATION_DATE_DESC="Registration date descending"
 COM_USERS_HEADING_REVIEW="Review Date"
 COM_USERS_HEADING_REVIEW_ASC="Review Date ascending"
 COM_USERS_HEADING_REVIEW_DESC="Review Date descending"
+COM_USERS_HEADING_STATUS="Status"
+COM_USERS_HEADING_STATUS_ASC="Status ascending"
+COM_USERS_HEADING_STATUS_DESC="Status descending"
 COM_USERS_HEADING_SUBJECT="Subject"
 COM_USERS_HEADING_SUBJECT_ASC="Subject ascending"
 COM_USERS_HEADING_SUBJECT_DESC="Subject descending"
@@ -261,8 +261,10 @@ COM_USERS_USER_BATCH_FAILED="An error was encountered while performing the batch
 COM_USERS_USER_BATCH_SUCCESS="Batch operation completed."
 COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL="Backend Language"
 COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL="Backend Template Style"
-COM_USERS_USER_FIELD_BLOCK_LABEL="User Blocked"
+COM_USERS_USER_FIELD_BLOCK="Blocked"
+COM_USERS_USER_FIELD_BLOCK_LABEL="User Status"
 COM_USERS_USER_FIELD_EDITOR_LABEL="Editor"
+COM_USERS_USER_FIELD_ENABLE="Enabled"
 COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
 COM_USERS_USER_FIELD_HELPSITE_LABEL="Help Site"
 COM_USERS_USER_FIELD_LASTRESET_LABEL="Last Reset Date"