Replace PR 21628 - improve a11y for systeminformation

joomla · Aug 19, 2018 · afcfd6f · afcfd6f
1 parent bc36bcf
commit afcfd6f
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 70 deletions.
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default.php b/administrator/components/com_admin/tmpl/sysinfo/default.php
@@ -19,36 +19,33 @@
 HTMLHelper::_('behavior.tabstate');
 ?>
 
-<form action="<?php echo Route::_('index.php?option=com_admin&view=sysinfo'); ?>" method="post" name="adminForm" id="adminForm">
-	<div class="row">
-		<?php // Begin Content ?>
-		<div class="col-md-12">
-			<?php echo HTMLHelper::_('bootstrap.startTabSet', 'myTab', array('active' => 'site')); ?>
-
-			<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'site', Text::_('COM_ADMIN_SYSTEM_INFORMATION')); ?>
-			<?php echo $this->loadTemplate('system'); ?>
-			<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
-
-			<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'phpsettings', Text::_('COM_ADMIN_PHP_SETTINGS')); ?>
-			<?php echo $this->loadTemplate('phpsettings'); ?>
-			<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
-
-			<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'config', Text::_('COM_ADMIN_CONFIGURATION_FILE')); ?>
-			<?php echo $this->loadTemplate('config'); ?>
-			<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
-
-			<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'directory', Text::_('COM_ADMIN_DIRECTORY_PERMISSIONS')); ?>
-			<?php echo $this->loadTemplate('directory'); ?>
-			<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
-
-			<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'phpinfo', Text::_('COM_ADMIN_PHP_INFORMATION')); ?>
-			<?php echo $this->loadTemplate('phpinfo'); ?>
-			<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
-
-			<?php echo HTMLHelper::_('bootstrap.endTabSet'); ?>
-		</div>
-		<input type="hidden" name="task" value="">
-		<?php echo HTMLHelper::_('form.token'); ?>
-		<?php // End Content ?>
+<div class="row">
+	<?php // Begin Content ?>
+	<div class="col-md-12">
+		<?php echo HTMLHelper::_('bootstrap.startTabSet', 'myTab', array('active' => 'site')); ?>
+
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'site', Text::_('COM_ADMIN_SYSTEM_INFORMATION')); ?>
+		<?php echo $this->loadTemplate('system'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'phpsettings', Text::_('COM_ADMIN_PHP_SETTINGS')); ?>
+		<?php echo $this->loadTemplate('phpsettings'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'config', Text::_('COM_ADMIN_CONFIGURATION_FILE')); ?>
+		<?php echo $this->loadTemplate('config'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'directory', Text::_('COM_ADMIN_DIRECTORY_PERMISSIONS')); ?>
+		<?php echo $this->loadTemplate('directory'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'phpinfo', Text::_('COM_ADMIN_PHP_INFORMATION')); ?>
+		<?php echo $this->loadTemplate('phpinfo'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+
+		<?php echo HTMLHelper::_('bootstrap.endTabSet'); ?>
 	</div>
-</form>
+	<?php // End Content ?>
+</div>
+
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_config.php b/administrator/components/com_admin/tmpl/sysinfo/default_config.php
@@ -12,8 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<fieldset class="adminform">
-	<legend><?php echo Text::_('COM_ADMIN_CONFIGURATION_FILE'); ?></legend>
+<div class="sysinfo">
 	<table class="table">
 		<thead>
 			<tr>
@@ -25,11 +24,6 @@
 				</th>
 			</tr>
 		</thead>
-		<tfoot>
-			<tr>
-				<td colspan="2">&#160;</td>
-			</tr>
-		</tfoot>
 		<tbody>
 			<?php foreach ($this->config as $key => $value) : ?>
 				<tr>
@@ -43,4 +37,4 @@
 			<?php endforeach; ?>
 		</tbody>
 	</table>
-</fieldset>
+</div>
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_directory.php b/administrator/components/com_admin/tmpl/sysinfo/default_directory.php
@@ -13,8 +13,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 ?>
-<fieldset class="adminform">
-	<legend><?php echo Text::_('COM_ADMIN_DIRECTORY_PERMISSIONS'); ?></legend>
+<div class="sysinfo">
 	<table class="table">
 		<thead>
 			<tr>
@@ -26,11 +25,6 @@
 				</th>
 			</tr>
 		</thead>
-		<tfoot>
-			<tr>
-				<td colspan="2">&#160;</td>
-			</tr>
-		</tfoot>
 		<tbody>
 			<?php foreach ($this->directory as $dir => $info) : ?>
 				<tr>
@@ -44,4 +38,4 @@
 			<?php endforeach; ?>
 		</tbody>
 	</table>
-</fieldset>
+</div>
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_phpinfo.php b/administrator/components/com_admin/tmpl/sysinfo/default_phpinfo.php
@@ -12,7 +12,6 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<fieldset class="adminform">
-	<legend><?php echo Text::_('COM_ADMIN_PHP_INFORMATION'); ?></legend>
+<div class="sysinfo">
 	<?php echo $this->php_info; ?>
-</fieldset>
+</div>
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php b/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
@@ -13,8 +13,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 ?>
-<fieldset class="adminform">
-	<legend><?php echo Text::_('COM_ADMIN_RELEVANT_PHP_SETTINGS'); ?></legend>
+<div class="sysinfo">
 	<table class="table">
 		<thead>
 			<tr>
@@ -26,12 +25,6 @@
 				</th>
 			</tr>
 		</thead>
-		<tfoot>
-			<tr>
-				<td colspan="2">&#160;
-				</td>
-			</tr>
-		</tfoot>
 		<tbody>
 			<tr>
 				<th scope="row">
@@ -147,4 +140,4 @@
 			</tr>
 		</tbody>
 	</table>
-</fieldset>
+</div>
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_system.php b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
@@ -13,8 +13,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 ?>
-<fieldset class="adminform">
-	<legend><?php echo Text::_('COM_ADMIN_SYSTEM_INFORMATION'); ?></legend>
+<div class="sysinfo">
 	<table class="table">
 		<thead>
 			<tr>
@@ -26,11 +25,6 @@
 				</th>
 			</tr>
 		</thead>
-		<tfoot>
-			<tr>
-				<td colspan="2">&#160;</td>
-			</tr>
-		</tfoot>
 		<tbody>
 			<tr>
 				<th scope="row">
@@ -114,4 +108,4 @@
 			</tr>
 		</tbody>
 	</table>
-</fieldset>
+</div>
diff --git a/administrator/templates/atum/css/template-rtl.css b/administrator/templates/atum/css/template-rtl.css
@@ -1496,6 +1496,11 @@ iframe {
 .editor .mce-panel {
   background: #fefefe; }
 
+.sysinfo .table {
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25); }
+  .sysinfo .table th {
+    font-weight: bold; }
+
 .com_config .content {
   background-color: transparent; }
 

diff --git a/administrator/templates/atum/css/template-rtl.min.css b/administrator/templates/atum/css/template-rtl.min.css
diff --git a/administrator/templates/atum/css/template.css b/administrator/templates/atum/css/template.css
@@ -1496,6 +1496,11 @@ iframe {
 .editor .mce-panel {
   background: #fefefe; }
 
+.sysinfo .table {
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25); }
+  .sysinfo .table th {
+    font-weight: bold; }
+
 .com_config .content {
   background-color: transparent; }
 

diff --git a/administrator/templates/atum/css/template.min.css b/administrator/templates/atum/css/template.min.css
diff --git a/administrator/templates/atum/scss/pages/_com_admin.scss b/administrator/templates/atum/scss/pages/_com_admin.scss
@@ -0,0 +1,11 @@
+// com-admin
+
+.sysinfo {
+	.table {
+		  box-shadow: $atum-box-shadow;
+		  th {
+			  font-weight: bold;
+		  }
+
+	  }
+}
diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss
@@ -49,6 +49,7 @@
 @import "vendor/tinymce";
 
 // Page specifics
+@import "pages/com_admin";
 @import "pages/com_config";
 @import "pages/com_cpanel";
 @import "pages/com_templates";