Merge branch 'master' into 'interview_dev'

From master to interview_dev

See merge request !29

@@ -159,48 +159,48 @@ class PlgQuickiconPhpVersionCheck extends JPlugin
 			$today           = new JDate;
 			$today           = new JDate;
 			$phpEndOfSupport = new JDate($phpSupportData[$activePhpVersion]['eos']);
 			$phpEndOfSupport = new JDate($phpSupportData[$activePhpVersion]['eos']);
 
 
-			if ($phpNotSupported = $today > $phpEndOfSupport)
-			{
-				/*
-				 * Find the oldest PHP version still supported that is newer than the current version,
-				 * this is our recommendation for users on unsupported platforms
-				 */
-				foreach ($phpSupportData as $version => $versionData)
-				{
-					$versionEndOfSupport = new JDate($versionData['eos']);
-
-					if (version_compare($version, $activePhpVersion, 'ge') && ($today < $versionEndOfSupport))
-					{
-						$supportStatus['status']  = self::PHP_UNSUPPORTED;
-						$supportStatus['message'] = JText::sprintf(
-							'PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED',
-							PHP_VERSION,
-							$version,
-							$versionEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
-						);
-
-						return $supportStatus;
-					}
-				}
-
-				// PHP version is not supported and we don't know of any supported versions.
-				$supportStatus['status']  = self::PHP_UNSUPPORTED;
-				$supportStatus['message'] = JText::sprintf('PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED', PHP_VERSION);
-
-				return $supportStatus;
-			}
-
-			// If the version is still supported, check if it has reached eol minus 3 month
-			$securityWarningDate = clone $phpEndOfSupport;
-			$securityWarningDate->sub(new DateInterval('P3M'));
-
-			if (!$phpNotSupported && $today > $securityWarningDate)
-			{
-				$supportStatus['status']  = self::PHP_SECURITY_ONLY;
-				$supportStatus['message'] = JText::sprintf(
-					'PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY', PHP_VERSION, $phpEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
-				);
-			}
+			// if ($phpNotSupported = $today > $phpEndOfSupport)
+			// {
+			// 	/*
+			// 	 * Find the oldest PHP version still supported that is newer than the current version,
+			// 	 * this is our recommendation for users on unsupported platforms
+			// 	 */
+			// 	foreach ($phpSupportData as $version => $versionData)
+			// 	{
+			// 		$versionEndOfSupport = new JDate($versionData['eos']);
+
+			// 		if (version_compare($version, $activePhpVersion, 'ge') && ($today < $versionEndOfSupport))
+			// 		{
+			// 			$supportStatus['status']  = self::PHP_UNSUPPORTED;
+			// 			$supportStatus['message'] = JText::sprintf(
+			// 				'PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED',
+			// 				PHP_VERSION,
+			// 				$version,
+			// 				$versionEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
+			// 			);
+
+			// 			return $supportStatus;
+			// 		}
+			// 	}
+
+			// 	// PHP version is not supported and we don't know of any supported versions.
+			// 	$supportStatus['status']  = self::PHP_UNSUPPORTED;
+			// 	$supportStatus['message'] = JText::sprintf('PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED', PHP_VERSION);
+
+			// 	return $supportStatus;
+			// }
+
+			// // If the version is still supported, check if it has reached eol minus 3 month
+			// $securityWarningDate = clone $phpEndOfSupport;
+			// $securityWarningDate->sub(new DateInterval('P3M'));
+
+			// if (!$phpNotSupported && $today > $securityWarningDate)
+			// {
+			// 	$supportStatus['status']  = self::PHP_SECURITY_ONLY;
+			// 	$supportStatus['message'] = JText::sprintf(
+			// 		'PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY', PHP_VERSION, $phpEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
+			// 	);
+			// }
 		}
 		}
 
 
 		return $supportStatus;
 		return $supportStatus;

@@ -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'));
 JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
 
 
 // Add Stylesheets
 // Add Stylesheets
-JHtml::_('stylesheet', 'template.css', array('version' => '20200811002', 'relative' => true));
+JHtml::_('stylesheet', 'template.css', array('version' => '20200831001', 'relative' => true));
 
 
 
 
 // Use of Google Font
 // Use of Google Font
@@ -599,7 +599,7 @@ if ($this->params->get('logoFile')) {
                                             <div class="gnavibox">
                                             <div class="gnavibox">
                                                 <div class="title"><a href="/outline/feel-approach-program.html">大学の特色ある取組</a></div>
                                                 <div class="title"><a href="/outline/feel-approach-program.html">大学の特色ある取組</a></div>
                                                 <ul>
                                                 <ul>
-                                                    <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/blue-winds-ncaa.html" title="Blue Winds事業">Blue Winds事業</a></li>
                                                     <li><a href="/outline/feel-approach-program/about-volunteer.html" title="学生スポーツボランティア">学生スポーツボランティア</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/kyougiryoku.html" title="学生の競技力向上への支援">学生の競技力向上への支援</a></li>
                                                     <li><a href="/outline/feel-approach-program/tyokin.html" title="貯筋研究プロジェクト">貯筋研究プロジェクト</a></li>
                                                     <li><a href="/outline/feel-approach-program/tyokin.html" title="貯筋研究プロジェクト">貯筋研究プロジェクト</a></li>