a2fbef6f by TaishiTokudome

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

This reverts merge request !28
1 parent 52365c65
...@@ -159,48 +159,48 @@ class PlgQuickiconPhpVersionCheck extends JPlugin ...@@ -159,48 +159,48 @@ class PlgQuickiconPhpVersionCheck extends JPlugin
159 $today = new JDate; 159 $today = new JDate;
160 $phpEndOfSupport = new JDate($phpSupportData[$activePhpVersion]['eos']); 160 $phpEndOfSupport = new JDate($phpSupportData[$activePhpVersion]['eos']);
161 161
162 // if ($phpNotSupported = $today > $phpEndOfSupport) 162 if ($phpNotSupported = $today > $phpEndOfSupport)
163 // { 163 {
164 // /* 164 /*
165 // * Find the oldest PHP version still supported that is newer than the current version, 165 * Find the oldest PHP version still supported that is newer than the current version,
166 // * this is our recommendation for users on unsupported platforms 166 * this is our recommendation for users on unsupported platforms
167 // */ 167 */
168 // foreach ($phpSupportData as $version => $versionData) 168 foreach ($phpSupportData as $version => $versionData)
169 // { 169 {
170 // $versionEndOfSupport = new JDate($versionData['eos']); 170 $versionEndOfSupport = new JDate($versionData['eos']);
171 171
172 // if (version_compare($version, $activePhpVersion, 'ge') && ($today < $versionEndOfSupport)) 172 if (version_compare($version, $activePhpVersion, 'ge') && ($today < $versionEndOfSupport))
173 // { 173 {
174 // $supportStatus['status'] = self::PHP_UNSUPPORTED; 174 $supportStatus['status'] = self::PHP_UNSUPPORTED;
175 // $supportStatus['message'] = JText::sprintf( 175 $supportStatus['message'] = JText::sprintf(
176 // 'PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED', 176 'PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED',
177 // PHP_VERSION, 177 PHP_VERSION,
178 // $version, 178 $version,
179 // $versionEndOfSupport->format(JText::_('DATE_FORMAT_LC4')) 179 $versionEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
180 // ); 180 );
181 181
182 // return $supportStatus; 182 return $supportStatus;
183 // } 183 }
184 // } 184 }
185 185
186 // // PHP version is not supported and we don't know of any supported versions. 186 // PHP version is not supported and we don't know of any supported versions.
187 // $supportStatus['status'] = self::PHP_UNSUPPORTED; 187 $supportStatus['status'] = self::PHP_UNSUPPORTED;
188 // $supportStatus['message'] = JText::sprintf('PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED', PHP_VERSION); 188 $supportStatus['message'] = JText::sprintf('PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED', PHP_VERSION);
189 189
190 // return $supportStatus; 190 return $supportStatus;
191 // } 191 }
192 192
193 // // If the version is still supported, check if it has reached eol minus 3 month 193 // If the version is still supported, check if it has reached eol minus 3 month
194 // $securityWarningDate = clone $phpEndOfSupport; 194 $securityWarningDate = clone $phpEndOfSupport;
195 // $securityWarningDate->sub(new DateInterval('P3M')); 195 $securityWarningDate->sub(new DateInterval('P3M'));
196 196
197 // if (!$phpNotSupported && $today > $securityWarningDate) 197 if (!$phpNotSupported && $today > $securityWarningDate)
198 // { 198 {
199 // $supportStatus['status'] = self::PHP_SECURITY_ONLY; 199 $supportStatus['status'] = self::PHP_SECURITY_ONLY;
200 // $supportStatus['message'] = JText::sprintf( 200 $supportStatus['message'] = JText::sprintf(
201 // 'PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY', PHP_VERSION, $phpEndOfSupport->format(JText::_('DATE_FORMAT_LC4')) 201 'PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY', PHP_VERSION, $phpEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
202 // ); 202 );
203 // } 203 }
204 } 204 }
205 205
206 return $supportStatus; 206 return $supportStatus;
......
...@@ -45,7 +45,7 @@ JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true) ...@@ -45,7 +45,7 @@ JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true)
45 JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); 45 JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
46 46
47 // Add Stylesheets 47 // Add Stylesheets
48 JHtml::_('stylesheet', 'template.css', array('version' => '20200831001', 'relative' => true)); 48 JHtml::_('stylesheet', 'template.css', array('version' => '20200811002', 'relative' => true));
49 49
50 50
51 // Use of Google Font 51 // Use of Google Font
...@@ -599,7 +599,7 @@ if ($this->params->get('logoFile')) { ...@@ -599,7 +599,7 @@ if ($this->params->get('logoFile')) {
599 <div class="gnavibox"> 599 <div class="gnavibox">
600 <div class="title"><a href="/outline/feel-approach-program.html">大学の特色ある取組</a></div> 600 <div class="title"><a href="/outline/feel-approach-program.html">大学の特色ある取組</a></div>
601 <ul> 601 <ul>
602 <li><a href="/outline/feel-approach-program/blue-winds-ncaa.html" title="Blue Winds事業">Blue Winds事業</a></li> 602 <li><a href="/outline/feel-approach-program/blue-winds-ncaa.html" title="Blue Winds(日本版NCAA事業) ">Blue Winds(日本版NCAA事業) </a></li>
603 <li><a href="/outline/feel-approach-program/about-volunteer.html" title="学生スポーツボランティア">学生スポーツボランティア</a></li> 603 <li><a href="/outline/feel-approach-program/about-volunteer.html" title="学生スポーツボランティア">学生スポーツボランティア</a></li>
604 <li><a href="/outline/feel-approach-program/kyougiryoku.html" title="学生の競技力向上への支援">学生の競技力向上への支援</a></li> 604 <li><a href="/outline/feel-approach-program/kyougiryoku.html" title="学生の競技力向上への支援">学生の競技力向上への支援</a></li>
605 <li><a href="/outline/feel-approach-program/tyokin.html" title="貯筋研究プロジェクト">貯筋研究プロジェクト</a></li> 605 <li><a href="/outline/feel-approach-program/tyokin.html" title="貯筋研究プロジェクト">貯筋研究プロジェクト</a></li>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!