Merge branch 'master' into 'deployment/production'

Master

See merge request !1

@@ -6,5 +6,10 @@ app/administrator/logs/*
 files
 images
 php5.6-back
+configuration.php
 
+.htpasswd
 .git.back/
+
+# TODO 環境整備後削除
+god-hand

+# 鹿屋体育大学CMSのソース管理リポジトリ
+
+## ※このリポジトリ単体では動きません
+
+## 以下は管理から除外  
+・キャッシュ  
+・ログ  
+・アップロードファイル  
+詳しくは.gitignoreを参照  
+
+### 開発環境
+https://project.lilli.co.jp/oki/kanoya-univercity-docker
+
+## DB/アップロードファイルのバックアップについて
+ec2-uesrのホームディレクトリに毎週日曜に１度だけ取るようにしてます。  
+~/backup.sh をcron実行しています。 

+<?php
+class JConfig {
+	public $offline = '0';
+	public $offline_message = 'このサイトはメンテナンスのためサービスを一時停止しています。<br />しばらくしてから再度ご確認ください。';
+	public $display_offline_message = '1';
+	public $offline_image = '';
+	public $sitename = '鹿屋体育大学';
+	public $editor = 'jce';
+	public $captcha = '0';
+	public $list_limit = '20';
+	public $access = '1';
+	public $debug = '0';
+	public $debug_lang = '0';
+	public $dbtype = 'mysqli';
+	public $host = 'joomladb:3306';
+	public $db_hostname = 'joomladb';
+	public $db_port = '3306';
+	public $user = 'root';
+	public $password = 'example';
+	public $db = 'ad1216tnc7_kanoya';
+	public $dbprefix = 'v4vfh_';
+	public $live_site = '';
+	public $secret = 'UUMQf2H5fJJO85LT';
+	public $gzip = '0';
+	public $error_reporting = 'default';
+	public $helpurl = 'https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&lang={langcode}';
+	public $ftp_host = '';
+	public $ftp_port = '';
+	public $ftp_user = '';
+	public $ftp_pass = '';
+	public $ftp_root = '';
+	public $ftp_enable = '0';
+	public $offset = 'Asia/Tokyo';
+	public $mailonline = '1';
+	public $mailer = 'mail';
+	public $mailfrom = 's-yamamoto@eyehunt.jp';
+	public $fromname = '鹿屋体育大学';
+	public $sendmail = '/usr/sbin/sendmail';
+	public $smtpauth = '0';
+	public $smtpuser = '';
+	public $smtppass = '';
+	public $smtphost = 'localhost';
+	public $smtpsecure = 'none';
+	public $smtpport = '25';
+	public $caching = '2';
+	public $cache_handler = 'file';
+	public $cachetime = '15';
+	public $cache_platformprefix = '0';
+	public $MetaDesc = '';
+	public $MetaKeys = '';
+	public $MetaTitle = '1';
+	public $MetaAuthor = '1';
+	public $MetaVersion = '0';
+	public $robots = '';
+	public $sef = '1';
+	public $sef_rewrite = '1';
+	public $sef_suffix = '1';
+	public $unicodeslugs = '0';
+	public $feed_limit = '10';
+	public $feed_email = 'none';
+	public $log_path = '/var/www/html/administrator/logs';
+	public $tmp_path = '/var/www/html/tmp';
+	public $lifetime = '15';
+	public $session_handler = 'database';
+	public $shared_session = '0';
+	public $memcache_persist = '1';
+	public $memcache_compress = '0';
+	public $memcache_server_host = 'localhost';
+	public $memcache_server_port = '11211';
+	public $memcached_persist = '1';
+	public $memcached_compress = '0';
+	public $memcached_server_host = 'localhost';
+	public $memcached_server_port = '11211';
+	public $redis_persist = '1';
+	public $redis_server_host = 'localhost';
+	public $redis_server_port = '6379';
+	public $redis_server_auth = '';
+	public $redis_server_db = '0';
+	public $proxy_enable = '0';
+	public $proxy_host = '';
+	public $proxy_port = '';
+	public $proxy_user = '';
+	public $proxy_pass = '';
+	public $massmailoff = '0';
+	public $replyto = '';
+	public $replytoname = '';
+	public $MetaRights = '';
+	public $sitename_pagetitles = '0';
+	public $force_ssl = '0';
+	public $session_memcache_server_host = 'localhost';
+	public $session_memcache_server_port = '11211';
+	public $session_memcached_server_host = 'localhost';
+	public $session_memcached_server_port = '11211';
+	public $session_redis_persist = '1';
+	public $session_redis_server_host = 'localhost';
+	public $session_redis_server_port = '6379';
+	public $session_redis_server_auth = '';
+	public $session_redis_server_db = '0';
+	public $frontediting = '1';
+	public $cookie_domain = '';
+	public $cookie_path = '';
+	public $asset_id = '1';
+	public $debug_lang_const = '1';
+}
\ No newline at end of file

@@ -176,7 +176,25 @@ $catid = JRequest::getInt('catid');
                     }
                 } else { //TOP以外
                     ?>
-
+                    <?php
+                    // error_log("chk\n", 3, '/var/www/html/debug.log');
+                    // error_log("\n", 3, '/var/www/html/debug.log');
+                    // error_log($moduleclass_sfx, 3, '/var/www/html/debug.log');
+                    // error_log("\n", 3, '/var/www/html/debug.log');
+                    if ($moduleclass_sfx == 'covid-19-students' ||
+                        $moduleclass_sfx == 'covid-19-staff') {
+                    ?>
+                        <span class="mod-articles-category-category cat<?php echo $item->catid; ?>">
+                            <?php echo $item->displayCategoryTitle; ?>
+                        </span>
+                        <?php
+                            if ($new == 1) {
+                                echo '<div class="icon_new">NEW</div>';
+                            }
+                        ?>
+                    <?php
+                    }
+                    ?>
                     <?php if ($item->displayCategoryTitle) : ?>
                         <span class="mod-articles-category-category cat<?php echo $item->catid; ?>">
                             <?php echo $item->displayCategoryTitle; ?>

+.btn_covid-19_info_all {
+  text-align: right;
+  margin-bottom: 10px;
+}
+
+.btn_covid-19_info_all a:link,
+.btn_covid-19_info_all a:active,
+.btn_covid-19_info_all a:hover,
+.btn_covid-19_info_all a:visited {
+  display: inline-block;
+  color: #fff !important;
+  background-color: #009fa8;
+  color: #fff;
+  margin: 0 0 8px 8px;
+  padding: 1.5px 15px 1.5px;
+  font-size: 85%;
+  border-radius: 5px;
+}
+
+.newsbox ul li {
+  display: flex;
+  flex-flow: row wrap;
+}
+
+.newsbox.covid-19 .icon_new,
+.newsbox.covid-19 .txt {
+  margin-left: 8px;
+}
+
+.newsbox.covid-19 .mod-articles-category-category  {
+	display: none;
+}
+
+.newsbox.covid-19 .txt {
+  width: 100%;
+}
+
+.newsbox.covid-19 .icon_new {
+  background-color: #cd0e0e;
+  color: #fff;
+  border-radius: 5px;
+  font-size: 76%;
+  letter-spacing: 0;
+  text-align: center;
+  margin-bottom: 3px;
+  margin-top: 5px;
+  line-height: 1.1;
+  padding-bottom: 2px;
+  padding-top: 3px;
+  width: 80px;
+}
\ No newline at end of file

 /* コロナ暫定対処 */
-.itemid-879 .mod-articles-category-category  {
+.covid-19 .mod-articles-category-category  {
 	display: none;
 }
 

@@ -3,6 +3,7 @@
 @import url('meganavi.css');
 @import url('tabmenu.css');
 @import url('fontsize.css');
+@import url('covid-19.css');
 
 
 article,