2b830945 by Yokihito Oki

Merge branch 'master' into 'deployment/production'

Master

See merge request !1
2 parents e5290566 7a7b73dd
...@@ -6,5 +6,10 @@ app/administrator/logs/* ...@@ -6,5 +6,10 @@ app/administrator/logs/*
6 files 6 files
7 images 7 images
8 php5.6-back 8 php5.6-back
9 configuration.php
9 10
11 .htpasswd
10 .git.back/ 12 .git.back/
13
14 # TODO 環境整備後削除
15 god-hand
......
1 # 鹿屋体育大学CMSのソース管理リポジトリ
2
3 ## ※このリポジトリ単体では動きません
4
5 ## 以下は管理から除外
6 ・キャッシュ
7 ・ログ
8 ・アップロードファイル
9 詳しくは.gitignoreを参照
10
11 ### 開発環境
12 https://project.lilli.co.jp/oki/kanoya-univercity-docker
13
14 ## DB/アップロードファイルのバックアップについて
15 ec2-uesrのホームディレクトリに毎週日曜に1度だけ取るようにしてます。
16 ~/backup.sh をcron実行しています。
1 <?php
2 class JConfig {
3 public $offline = '0';
4 public $offline_message = 'このサイトはメンテナンスのためサービスを一時停止しています。<br />しばらくしてから再度ご確認ください。';
5 public $display_offline_message = '1';
6 public $offline_image = '';
7 public $sitename = '鹿屋体育大学';
8 public $editor = 'jce';
9 public $captcha = '0';
10 public $list_limit = '20';
11 public $access = '1';
12 public $debug = '0';
13 public $debug_lang = '0';
14 public $dbtype = 'mysqli';
15 public $host = 'joomladb:3306';
16 public $db_hostname = 'joomladb';
17 public $db_port = '3306';
18 public $user = 'root';
19 public $password = 'example';
20 public $db = 'ad1216tnc7_kanoya';
21 public $dbprefix = 'v4vfh_';
22 public $live_site = '';
23 public $secret = 'UUMQf2H5fJJO85LT';
24 public $gzip = '0';
25 public $error_reporting = 'default';
26 public $helpurl = 'https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&lang={langcode}';
27 public $ftp_host = '';
28 public $ftp_port = '';
29 public $ftp_user = '';
30 public $ftp_pass = '';
31 public $ftp_root = '';
32 public $ftp_enable = '0';
33 public $offset = 'Asia/Tokyo';
34 public $mailonline = '1';
35 public $mailer = 'mail';
36 public $mailfrom = 's-yamamoto@eyehunt.jp';
37 public $fromname = '鹿屋体育大学';
38 public $sendmail = '/usr/sbin/sendmail';
39 public $smtpauth = '0';
40 public $smtpuser = '';
41 public $smtppass = '';
42 public $smtphost = 'localhost';
43 public $smtpsecure = 'none';
44 public $smtpport = '25';
45 public $caching = '2';
46 public $cache_handler = 'file';
47 public $cachetime = '15';
48 public $cache_platformprefix = '0';
49 public $MetaDesc = '';
50 public $MetaKeys = '';
51 public $MetaTitle = '1';
52 public $MetaAuthor = '1';
53 public $MetaVersion = '0';
54 public $robots = '';
55 public $sef = '1';
56 public $sef_rewrite = '1';
57 public $sef_suffix = '1';
58 public $unicodeslugs = '0';
59 public $feed_limit = '10';
60 public $feed_email = 'none';
61 public $log_path = '/var/www/html/administrator/logs';
62 public $tmp_path = '/var/www/html/tmp';
63 public $lifetime = '15';
64 public $session_handler = 'database';
65 public $shared_session = '0';
66 public $memcache_persist = '1';
67 public $memcache_compress = '0';
68 public $memcache_server_host = 'localhost';
69 public $memcache_server_port = '11211';
70 public $memcached_persist = '1';
71 public $memcached_compress = '0';
72 public $memcached_server_host = 'localhost';
73 public $memcached_server_port = '11211';
74 public $redis_persist = '1';
75 public $redis_server_host = 'localhost';
76 public $redis_server_port = '6379';
77 public $redis_server_auth = '';
78 public $redis_server_db = '0';
79 public $proxy_enable = '0';
80 public $proxy_host = '';
81 public $proxy_port = '';
82 public $proxy_user = '';
83 public $proxy_pass = '';
84 public $massmailoff = '0';
85 public $replyto = '';
86 public $replytoname = '';
87 public $MetaRights = '';
88 public $sitename_pagetitles = '0';
89 public $force_ssl = '0';
90 public $session_memcache_server_host = 'localhost';
91 public $session_memcache_server_port = '11211';
92 public $session_memcached_server_host = 'localhost';
93 public $session_memcached_server_port = '11211';
94 public $session_redis_persist = '1';
95 public $session_redis_server_host = 'localhost';
96 public $session_redis_server_port = '6379';
97 public $session_redis_server_auth = '';
98 public $session_redis_server_db = '0';
99 public $frontediting = '1';
100 public $cookie_domain = '';
101 public $cookie_path = '';
102 public $asset_id = '1';
103 public $debug_lang_const = '1';
104 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -176,7 +176,25 @@ $catid = JRequest::getInt('catid'); ...@@ -176,7 +176,25 @@ $catid = JRequest::getInt('catid');
176 } 176 }
177 } else { //TOP以外 177 } else { //TOP以外
178 ?> 178 ?>
179 179 <?php
180 // error_log("chk\n", 3, '/var/www/html/debug.log');
181 // error_log("\n", 3, '/var/www/html/debug.log');
182 // error_log($moduleclass_sfx, 3, '/var/www/html/debug.log');
183 // error_log("\n", 3, '/var/www/html/debug.log');
184 if ($moduleclass_sfx == 'covid-19-students' ||
185 $moduleclass_sfx == 'covid-19-staff') {
186 ?>
187 <span class="mod-articles-category-category cat<?php echo $item->catid; ?>">
188 <?php echo $item->displayCategoryTitle; ?>
189 </span>
190 <?php
191 if ($new == 1) {
192 echo '<div class="icon_new">NEW</div>';
193 }
194 ?>
195 <?php
196 }
197 ?>
180 <?php if ($item->displayCategoryTitle) : ?> 198 <?php if ($item->displayCategoryTitle) : ?>
181 <span class="mod-articles-category-category cat<?php echo $item->catid; ?>"> 199 <span class="mod-articles-category-category cat<?php echo $item->catid; ?>">
182 <?php echo $item->displayCategoryTitle; ?> 200 <?php echo $item->displayCategoryTitle; ?>
......
1 .btn_covid-19_info_all {
2 text-align: right;
3 margin-bottom: 10px;
4 }
5
6 .btn_covid-19_info_all a:link,
7 .btn_covid-19_info_all a:active,
8 .btn_covid-19_info_all a:hover,
9 .btn_covid-19_info_all a:visited {
10 display: inline-block;
11 color: #fff !important;
12 background-color: #009fa8;
13 color: #fff;
14 margin: 0 0 8px 8px;
15 padding: 1.5px 15px 1.5px;
16 font-size: 85%;
17 border-radius: 5px;
18 }
19
20 .newsbox ul li {
21 display: flex;
22 flex-flow: row wrap;
23 }
24
25 .newsbox.covid-19 .icon_new,
26 .newsbox.covid-19 .txt {
27 margin-left: 8px;
28 }
29
30 .newsbox.covid-19 .mod-articles-category-category {
31 display: none;
32 }
33
34 .newsbox.covid-19 .txt {
35 width: 100%;
36 }
37
38 .newsbox.covid-19 .icon_new {
39 background-color: #cd0e0e;
40 color: #fff;
41 border-radius: 5px;
42 font-size: 76%;
43 letter-spacing: 0;
44 text-align: center;
45 margin-bottom: 3px;
46 margin-top: 5px;
47 line-height: 1.1;
48 padding-bottom: 2px;
49 padding-top: 3px;
50 width: 80px;
51 }
...\ No newline at end of file ...\ No newline at end of file
1 /* コロナ暫定対処 */ 1 /* コロナ暫定対処 */
2 .itemid-879 .mod-articles-category-category { 2 .covid-19 .mod-articles-category-category {
3 display: none; 3 display: none;
4 } 4 }
5 5
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 @import url('meganavi.css'); 3 @import url('meganavi.css');
4 @import url('tabmenu.css'); 4 @import url('tabmenu.css');
5 @import url('fontsize.css'); 5 @import url('fontsize.css');
6 @import url('covid-19.css');
6 7
7 8
8 article, 9 article,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!