Revert "Merge branch 'deployment/production' into 'master'"

This reverts merge request !28

Revert "Merge branch 'deployment/production' into 'master'"
This reverts merge request !28
TaishiTokudome
Showing 2 changed files with 44 additions and 44 deletions
plugins/quickicon/phpversioncheck/phpversioncheck.php
templates/protostar/index.php
--- a/plugins/quickicon/phpversioncheck/phpversioncheck.php
View file @a2fbef6
+++ b/plugins/quickicon/phpversioncheck/phpversioncheck.php
View file @a2fbef6
@@ -159,48 +159,48 @@ class PlgQuickiconPhpVersionCheck extends JPlugin
 			$today           = new JDate;
 			$phpEndOfSupport = new JDate($phpSupportData[$activePhpVersion]['eos']);
-			// if ($phpNotSupported = $today > $phpEndOfSupport)
+			if ($phpNotSupported = $today > $phpEndOfSupport)
-			// {
+			{
-			// 	/*
+				/*
-			// 	 * Find the oldest PHP version still supported that is newer than the current version,
+				 * Find the oldest PHP version still supported that is newer than the current version,
-			// 	 * this is our recommendation for users on unsupported platforms
+				 * this is our recommendation for users on unsupported platforms
-			// 	 */
+				 */
-			// 	foreach ($phpSupportData as $version => $versionData)
+				foreach ($phpSupportData as $version => $versionData)
-			// 	{
+				{
-			// 		$versionEndOfSupport = new JDate($versionData['eos']);
+					$versionEndOfSupport = new JDate($versionData['eos']);
-			// 		if (version_compare($version, $activePhpVersion, 'ge') && ($today < $versionEndOfSupport))
+					if (version_compare($version, $activePhpVersion, 'ge') && ($today < $versionEndOfSupport))
-			// 		{
+					{
-			// 			$supportStatus['status']  = self::PHP_UNSUPPORTED;
+						$supportStatus['status']  = self::PHP_UNSUPPORTED;
-			// 			$supportStatus['message'] = JText::sprintf(
+						$supportStatus['message'] = JText::sprintf(
-			// 				'PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED',
+							'PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED',
-			// 				PHP_VERSION,
+							PHP_VERSION,
-			// 				$version,
+							$version,
-			// 				$versionEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
+							$versionEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
-			// 			);
+						);
-			// 			return $supportStatus;
+						return $supportStatus;
-			// 		}
+					}
-			// 	}
+				}
-			// 	// PHP version is not supported and we don't know of any supported versions.
+				// PHP version is not supported and we don't know of any supported versions.
-			// 	$supportStatus['status']  = self::PHP_UNSUPPORTED;
+				$supportStatus['status']  = self::PHP_UNSUPPORTED;
-			// 	$supportStatus['message'] = JText::sprintf('PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED', PHP_VERSION);
+				$supportStatus['message'] = JText::sprintf('PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED', PHP_VERSION);
-			// 	return $supportStatus;
+				return $supportStatus;
-			// }
+			}
-			// // If the version is still supported, check if it has reached eol minus 3 month
+			// If the version is still supported, check if it has reached eol minus 3 month
-			// $securityWarningDate = clone $phpEndOfSupport;
+			$securityWarningDate = clone $phpEndOfSupport;
-			// $securityWarningDate->sub(new DateInterval('P3M'));
+			$securityWarningDate->sub(new DateInterval('P3M'));
-			// if (!$phpNotSupported && $today > $securityWarningDate)
+			if (!$phpNotSupported && $today > $securityWarningDate)
-			// {
+			{
-			// 	$supportStatus['status']  = self::PHP_SECURITY_ONLY;
+				$supportStatus['status']  = self::PHP_SECURITY_ONLY;
-			// 	$supportStatus['message'] = JText::sprintf(
+				$supportStatus['message'] = JText::sprintf(
-			// 		'PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY', PHP_VERSION, $phpEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
+					'PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY', PHP_VERSION, $phpEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
-			// 	);
+				);
-			// }
+			}
 		}
 		return $supportStatus;
--- a/templates/protostar/index.php
View file @a2fbef6
+++ b/templates/protostar/index.php
View file @a2fbef6
@@ -45,7 +45,7 @@ JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true)
 JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
 // Add Stylesheets
-JHtml::_('stylesheet', 'template.css', array('version' => '20200831001', 'relative' => true));
+JHtml::_('stylesheet', 'template.css', array('version' => '20200811002', 'relative' => true));
 // Use of Google Font
@@ -599,7 +599,7 @@ if ($this->params->get('logoFile')) {
                                            <div class="gnavibox">
                                                <div class="title"><a href="/outline/feel-approach-program.html">大学の特色ある取組</a></div>
                                                <ul>
-                                                    <li><a href="/outline/feel-approach-program/blue-winds-ncaa.html" title="Blue Winds事業">Blue Winds事業</a></li>
+                                                    <li><a href="/outline/feel-approach-program/blue-winds-ncaa.html" title="Blue Winds(日本版NCAA事業) ">Blue Winds(日本版NCAA事業) </a></li>
                                                    <li><a href="/outline/feel-approach-program/about-volunteer.html" title="学生スポーツボランティア">学生スポーツボランティア</a></li>
                                                    <li><a href="/outline/feel-approach-program/kyougiryoku.html" title="学生の競技力向上への支援">学生の競技力向上への支援</a></li>
                                                    <li><a href="/outline/feel-approach-program/tyokin.html" title="貯筋研究プロジェクト">貯筋研究プロジェクト</a></li>