Merge branch '4.0-dev' into j4/fix/tests

joomla · Nov 27, 2018 · 37bbdb5 · 37bbdb5
2 parents 1b688f2 + 7ba8b05
commit 37bbdb5
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 10 deletions.
diff --git a/administrator/components/com_cpanel/tmpl/system/default.php b/administrator/components/com_cpanel/tmpl/system/default.php
@@ -28,7 +28,7 @@
 					<a href="<?php echo $link['link']; ?>"><?php echo Text::_($link['title']); ?>
 					<?php if ($link['badge']) : ?>
 						<span class="pull-right badge badge-pill badge-warning">
-							<?php echo Text::_($link['badge']); ?>
+							<?php echo '&#x200E;' . Text::_($link['badge']); ?>
 						</span>
 					<?php endif; ?>
 					</a>

diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
@@ -15,7 +15,7 @@
 ?>
 
 <h2>
-	<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBILITY_CHECK', $this->updateInfo['latest']); ?>
+	<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBILITY_CHECK', '&#x200E;' . $this->updateInfo['latest']); ?>
 </h2>
 
 <div class="row-fluid">
@@ -115,11 +115,11 @@
 					</td>
 					<td class="extension-check"
 					    data-extension-id="<?php echo $extension->extension_id; ?>"
-					    data-extension-current-version="<?php echo $extension->version; ?>">
+					    data-extension-current-version="<?php echo $extension->version; ?>" dir="ltr">
 						<img src="../media/system/images/mootree_loader.gif" />
 					</td>
 					<td>
-						<?php echo $extension->version; ?>
+						<?php echo '&#x200E;' . $extension->version; ?>
 					</td>
 				</tr>
 			<?php endforeach; ?>

diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php
@@ -18,7 +18,7 @@
 	<legend><?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES'); ?></legend>
 	<p><?php echo Text::sprintf($this->langKey, $this->updateSourceKey); ?></p>
 	<div class="alert alert-success">
-		<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE', JVERSION); ?>
+		<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE', '&#x200E;' . JVERSION); ?>
 	</div>
 	<?php if (is_object($this->updateInfo['object']) && ($this->updateInfo['object'] instanceof Update)) : ?>
 		<table class="table">

diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php
@@ -29,15 +29,15 @@
 					<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLED'); ?>
 				</td>
 				<td>
-					<?php echo $this->updateInfo['installed']; ?>
+					<?php echo '&#x200E;' . $this->updateInfo['installed']; ?>
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_LATEST'); ?>
 				</td>
 				<td>
-					<?php echo $this->updateInfo['latest']; ?>
+					<?php echo '&#x200E;' . $this->updateInfo['latest']; ?>
 				</td>
 			</tr>
 			<tr>

diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php
@@ -58,7 +58,7 @@
 				<td>
 					<input class="form-control-file" id="install_package" name="install_package" type="file" size="57">
 					<?php $maxSize = HTMLHelper::_('number.bytes', Utility::getMaxUploadSize()); ?>
-					<small class="form-text text-muted"><?php echo Text::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?></small>
+					<small class="form-text text-muted"><?php echo Text::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', '&#x200E;' . $maxSize); ?></small>
 				</td>
 			</tr>
 			<tr>

diff --git a/administrator/templates/atum/scss/font-awesome.scss b/administrator/templates/atum/scss/font-awesome.scss
@@ -6,3 +6,8 @@
 
 // B/C for Icomoon
 @import "../../../../build/media/system/scss/icomoon";
+
+// RTL override
+html[dir=rtl] .pull-right {
+    float: left;
+}
diff --git a/build/media/com_joomlaupdate/js/default.js b/build/media/com_joomlaupdate/js/default.js
@@ -146,6 +146,7 @@ Joomla = window.Joomla || {};
      */
     PreUpdateChecker.setResultView = function (extensionData) {
         var html = '';
+        var direction = (document.dir !== undefined) ? document.dir : document.getElementsByTagName("html")[0].getAttribute("dir");
 
         // Switch the compatibility state
         switch (extensionData.state) {
@@ -155,8 +156,13 @@ Joomla = window.Joomla || {};
                     html = '<span class="badge badge-success">' + Joomla.JText._('JYES') + '</span>';
                 } else {
                     // The compatible version does not match the current version => display warning label.
-                    html = '<span class="badge badge-warning">' + Joomla.JText._('JYES')
-                        + ' (' + extensionData.compatibleVersion + ')</span>';
+                    if (direction === 'rtl') {
+                        html = '<span class="badge badge-warning">' + '(' + extensionData.compatibleVersion + ') '
+                           + Joomla.JText._('JYES') + '</span>';
+                    } else {
+                        html = '<span class="badge badge-warning">' + Joomla.JText._('JYES')
+                            + ' (' + extensionData.compatibleVersion + ')</span>';
+                    }
                 }
                 break;
             case PreUpdateChecker.STATE.INCOMPATIBLE:

diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
@@ -281,3 +281,15 @@ caption {
 .badge-warning {
   color: #292b2c;
 }
+
+.fa-eye:before, .icon-eye-open:before, .icon-eye:before {
+  font-family: FontAwesome;
+  cursor: pointer;
+  content: "\f06e";
+}
+
+.fa-eye-slash:before, .icon-eye-close:before, .icon-eye-blocked:before, .icon-eye-2:before {
+  font-family: FontAwesome;
+  cursor: pointer;
+  content: "\f070";
+}