+
{% include squad.html squad=page.team.players.starting %}
diff --git a/_plugins/league_generator.rb b/_plugins/league_generator.rb
index 9706107..132d6e5 100644
--- a/_plugins/league_generator.rb
+++ b/_plugins/league_generator.rb
@@ -39,7 +39,25 @@ def initialize(site, base, dir, team_key, team, season_key, season, history_stat
end
class GamePage < Jekyll::Page
- def initialize(site, base, dir, key, game)
+ def buildStartingSquad(squad, team_player_hash)
+ for i in 0..(squad.length-1)
+ s = squad[i]
+ l = s['locator']
+ p = team_player_hash[s['name']]
+ if l != nil
+ squad[i] = {
+ 'name' => p['name'],
+ 'number' => p['number'],
+ 'img' => p['img'],
+ 'locator' => l
+ }
+ else
+ squad[i] = team_player_hash[s['name']]
+ end
+ end
+ end
+
+ def initialize(site, base, dir, key, game, home_team, away_team)
@site = site
@base = base
@dir = dir
@@ -51,6 +69,22 @@ def initialize(site, base, dir, key, game)
self.data['key'] = key
self.data['game'] = game
+
+ # build squad
+ if game['home']['squad'] != nil
+ if game['home']['squad'] == 'default'
+ game['home']['squad'] = home_team['players']['starting']
+ else
+ self.buildStartingSquad(game['home']['squad'], home_team['player_hash'])
+ end
+ end
+ if game['away']['squad'] != nil
+ if game['away']['squad'] == 'default'
+ game['away']['squad'] = away_team['players']['starting']
+ else
+ self.buildStartingSquad(game['away']['squad'], away_team['player_hash'])
+ end
+ end
# self.data['home_team'] = home_team
# self.data['away_team'] = away_team
@@ -352,6 +386,19 @@ def generate(site)
home_team = team_hash[game['home']['key']]
away_team = team_hash[game['away']['key']]
+ if home_team['players'] == nil
+ home_team['players'] = {
+ "starting" => [],
+ "subs" => []
+ }
+ end
+ if away_team['players'] == nil
+ away_team['players'] = {
+ "starting" => [],
+ "subs" => []
+ }
+ end
+
home_team['games'] << p
away_team['games'] << p
@@ -392,7 +439,7 @@ def generate(site)
end
end
- site.pages << GamePage.new(site, site.source, File.join('seasons', season[0], 'games', key), key, game)
+ site.pages << GamePage.new(site, site.source, File.join('seasons', season[0], 'games', key), key, game, home_team, away_team)
end
diff --git a/_posts/2021-07-10-league-rules.md b/_posts/2021-07-10-league-rules.md
deleted file mode 100644
index f0e55d5..0000000
--- a/_posts/2021-07-10-league-rules.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-layout: game_post
-season_key: "21s"
-
-title: "2021年夏季联赛规则简版以及赛前赛后各队任务"
-date: 2013-11-17
-categories: news
----
-
-* 竞赛及决定名次办法
- 1. 本次联赛为友谊比赛，不计名次。
- 1. 本次联赛有16支球队，分为A，B，两个小组，组内单循环赛制。各组比赛在不同场地进行，上场比赛人数也有不同要求
- 1. A组采用9人制， 在 Irvington Community Park (以下简称ICP) 举行, 地址：41885 Blacow Rd, Fremont, CA 94538
- 1. B组采用8人制， 在 Newark Sportsfield Park（以下简称Newark）举行, 地址： 6800 Mowry Avenue, Newark, CA 94560
- 1. 比赛时间是90分钟，分上下半场各45分钟，中间休息10分钟
-* 参赛队员资格
- 1. 球员必须年满18周岁才能参加比赛
- 1. 每队参赛球员没有限制，无须在OLE上加入队员名单
-* 着装与装备要求
- 1. 上场队员必须带护腿板，穿长筒球袜，并完全覆盖护腿板，否则不允许上场比赛。
- 1. 上场球员不允许佩戴任何首饰戒指及其他佩戴物，除非有医生证明需要日常佩戴以维持身体健康之需要。不允许佩戴普通眼镜，只允许球类专用的运动眼镜。
- 1. 每个队员上场比赛的球衣要有号码且不能重复。当场比赛两个队员不能使用相同的球衣号码。
- 1. 组委会准备了不同颜色有号码的背心，如果一些参赛队短期内没有统一的有号码的队服，在比赛前可以向组委会申请借用带有号码的背心。
-* 上场队员资格审核
- 1. 本联赛为友谊比赛，每场比赛无须对上场队员资格进行审核。
-* 比赛弃权
- 1. 球队弃权的决定必须在比赛48小时之前（星期四晚12点前）通知组委会，否则弃权球队须交纳$50罚金给对手球队。
-* 不可抗力影响
- 1. 如果因为天气或场地等不可抗原因取消比赛，组委会不会再安排补赛。
-
-### 比赛规则与特殊规定
-* **执行国际足联最新版本的《足球竞赛规则》，及以下特殊规定**
- 1. A组采用9人制在 ICP 进行的比赛，执行国际足联最新版本的《足球竞赛规则》，（但禁止铲球）
- 1. B组采用8人制在 Newark 进行的比赛，有以下特殊规定
- 1. B组采用8人制的比赛没有越位
- 1. 禁止以铲球的方式争抢球权，铲球队员会得到黄牌警告，甚至红牌罚下。守门员在禁区内有铲球的特权，在禁区外等同于普通球员，不能铲球。
- 1. 守门员用手拿球后，在球落地前不能直接用脚踢球，只能用手把球丢出，或在球着地后再踢，违反则对方发角球
- 1. 守门员二次触球的违例则对方发间接任意球，包括: 1、守门员把球放到地上后又抱起; 2、守门员把球向上或斜上方向抛起后又把球接住; 3、守门员把球扔到脚上踢起后又抓住。
- 1. 定位球：当一方发定位球时，无球方队员要退到距离罚球点6米以外。如果无球方队员故意在近距离阻碍对方快发任意球，则该无球方队员应被黄牌警告。
- 1. 点球： 队员在本方罚球区内 ，违反可判罚直接任意球的规定，无论当时球在何处，应判罚点球。点球离球门8米（从大禁区线上向球门方向跨一步的位置）。
- 1. 换人：不限人次。替补队员在中场线外就绪后向裁判提出换人及人数，在裁判批准后，场上队员跑步下场，替补队员才能上场。裁判有权否决无球权球队的换人申请。
- 1. 在比赛进行中未经裁判允许下，任何球员擅自进出场地，会被黄牌警告
- 1. 裁判员认为，如果队员草率地、鲁莽地或使用过分的力量在双方进行争抢或对方队员控制球时实施铲抢，被视为严重犯规，判给对方直接任意球，可根据犯规严重情况给予黄牌警告或红牌罚出场。
- 1. 犯规情节严重，或明显伤人的一律红牌，情节特别严重的要追加处罚
- 1. 场外队员只能在指定区域观看比赛，禁止站在场边。只有需要换上场的队员才能在中场线外等待
-* 红黄牌规定
- 1. 黄牌：黄牌罚立即下场等待五分钟，可换其他队员上场。守门员得到黄牌后不需离场。
- 1. 红牌：得到红牌的队员罚立即终止当场比赛，下一场比赛可以上场，不停赛，所在球队要被罚款$100，从压金中扣除。红牌犯规情节严重者要加罚。
-* 裁判权威
- 1. 裁判有绝对权威，禁止在任何情况下和裁判争执。场上场外任何队员辱骂裁判一律红牌，并停赛至少4场。情节特别严重者要加罚。
- 1. 场上球员对裁判判罚的意见只能通过队长与裁判交涉。对裁判判罚说三道四的队员，在口头警告无效后，要黄牌警告。
- 1. 不服从裁判判罚，（用言语或动作表示异议），藐视裁判权威的队员，直接黄牌警告。
- 1. 对裁判当场执法有意见，请通过球队队长向NCCSF组委会提交。
- 1. 严禁场外队员大声喧哗干扰指责裁判，如果在裁判提出2次正式警告后，仍屡禁不止，则裁判有权终止比赛，并判对方球队3:0胜。而且球队要被罚款$50，从压金中扣除。
-* 禁令
- 1. 严格禁止场内场外球员用任何言语或肢体动作辱骂他人，裁判视情况可以给黄牌警告或红牌罚下
- 1. 严格禁止打架闹事，挑起打架的队员直接禁止后续赛事并由NCCSF记录在案，情节严重的或有前科的终身禁止参加NCCSF组织的赛事。如果有违反体育道德行为禁赛本赛季余下所有比赛，如果余下比赛不满8场则禁赛8场
- 1. 如果违反体育道德行为情节特别严重的禁赛12个月或终生禁止参加NCCSF组织的所有比赛
- 1. 追加处罚自动带入足联组织的所有比赛
- 1. 人工草地场内禁止抽烟，如果有球场围栏内吸烟者将罚款$200，罚款由当事球队负责
-* 申诉与仲裁
- 1. 当场比赛结束后，比分，红黄牌纪录即为不可更改的最终结果。不在申诉范畴之内。
- 1. 申诉只适用于对违反体育道德行为所受到的追加处罚。
- 1. 球队如果对追加处罚有异议，可以缴纳$100申诉费后向赛事DRC申诉，申诉费只会在申诉成功后退回。
-
-NCCSF保留最终解释权
-
-### 各队比赛前后任务
-
-* 赛前任务
- 1. 赛前交$20裁判费给裁判
- 1. A组上周拿球网的值班球队必须在比赛前提前把球网带回球场，并安装好。
- 1. B组第一场比赛各队要setup各自的球门
-* 赛后任务
- 1. 每场比赛结束后，参赛两队要清理场地垃圾。最后一场比赛结束后，参赛两队要负责清理整个场地的垃圾。如果由于场地垃圾未清理而遭到City的罚款，罚金由最后两支球队均摊，又押金中扣除
- 1. A组最后比赛的本周值班球队负责拆除球门球网，带回保管，并在下周比赛前提前到场地安装
\ No newline at end of file
diff --git a/_posts/2021-12-12-r12-news.md b/_posts/2021-12-12-r12-news.md
new file mode 100644
index 0000000..3b19d4a
--- /dev/null
+++ b/_posts/2021-12-12-r12-news.md
@@ -0,0 +1,25 @@
+---
+layout: game_post
+season_key: "21w"
+game_key: "2021-12-12-0"
+
+title: "第十二轮GSF United 3:0 OP 战报"
+categories: news
+---
+
+
+
VIDEO
+
+2021年12月11日深夜，gsf联队网上会议室仍“灯火通明“， 队员们本着战略藐视，战术重视的态度热火朝天的讨论着第二天对阵op的各种细节。据“可靠”内部情报，op 拓球王将尽遣在墨联征战的主力来力战gsf联队来力保在联赛排名。而gsf 联队又面临着全场多面手小虹，巴西快马pedro以及在上一轮对阵hehe中一过五后送出妙传的托尼大腿的缺席，让本来就因伤而人员捉襟见肘的球队更是雪上加霜。然。。。并卵，会议最终达成以不变应万变的指导思想结束。
+
+翌日午时，gsf获得重要情报，由于天气原因op主力球员尽数缺席，只能以残阵应战。下午四时，随着“守门员”的一声哨响，比赛正式开始了。双方都没有受到湿冷的阴雨或者人员紧缺影响而迅速进入到了状态之中，你来我往互有进攻，精彩纷呈。gsf联队后防佳捷，Colin和正年继续保持着一直以来让对方九十分钟不射的稳度和硬度。猜哥，中焱，宁球王疏导着球队的进攻，频频传出妙球和第一时间阻击对方的反击。Kevin和Renbo积极跑动，接应传球。Xuan总扣球大法炉火纯青穿梭于对方的后方。。 gsf联队将比赛节奏紧紧的控制在自己手里。然而，人算不如天算。当比赛进行到第七分钟时，gsf联队出现后场传球失误，op的前锋12号球员抢断得球长驱直入禁区，眼见对方球员正要提腿射门，防守队员拍马赶到将球解围出界。
+
+言归正传，gsf将比分改写为1:0是当比赛进行到20分钟时，宁球王在己方大禁区线上接到对方的”传球“，快速过掉对方一名球员，迅速向前推进到对方半场时，抬头一看对方门户大开，疑似“空城计”，宁球王想起昨晚会议定制的以不变应万变的策略不为所惑，继续推进到对方大禁区，在对方多民球员的包夹下一脚逆足穿云箭射进了死角（Wenyan语）。赛后回放才发现“空城计”竟是对方门将在帮隔壁赛场捡球离开球门刚刚回到球门，而宁球王射门也充分利用了拓球王势能大的特点，射向反角而拓球王也是奈何鞭虽长却难及。
+
+本场比赛的一次精彩配合发生在地30分钟，球在中场经过无数次“无效”传递之后来到了gsf右路，中焱传给站位中场空位的宁球王后，迅速插入禁区，而宁球王一脚传给已经在边路等待的Wenyan，Wenyan轻盈地用脚后跟做给了后排插上的中焱，中焱拿球后传向球门远角，可惜力道稍大球飞出底线。
+
+Gsf在比赛进行到第60分钟左右将比赛改写为2:0。gsf获得右边角球，gsf球员充分实践了安排已久的战术，发球球员Bruce给了埋伏在禁区里的球员宁球王，Kevin，Wenyan以及中焱一个第n号进攻模式的指令，只见Kevin佯攻抢前点并带走两个防守球员并成功带偏对方门将，宁球王眼疾脚快跑向后门柱顶向了Bruce发出的漂亮的弧线球，头进了！！！
+
+Gsf在下半场25分钟继续扩大比分，对方从左路进攻受阻，球来到猜哥脚下，猜哥顺势将球传给Xuan总，Xuan总带球推进并吸引着对 方多名防守球员，猜哥迅速跑向右边空位，Xuan总冷静将球分给无人防守的猜哥，猜哥带球突破过掉对方1个，2个球员来到大禁区前，倚住对方球员一脚猜哥标志性大力射门，球应声入网，3:0。虽然留给op球队的时间不多了，3球落后的op并没有气馁，拓球王调兵遣将（场上球员轮转），发起了几波猛烈攻势，但遗憾的是都没有取得进球。
+
+终场哨声响起，最后gsf联队以3:0战胜op稳稳的保住联赛前排排名，而op的拼搏不放弃的精神也赢得了gsf联队球员的尊重（拓球王也得以可以继续混迹于gsf社区）。正如张指导所说，凡是gsf 联队靠防守将对手进球限制在1球以下，而自己进球在1球及以上的比赛，基本都是gsf 联赢球了！
\ No newline at end of file
diff --git a/assets/img/teams/GSF/logo.jpg b/assets/img/teams/GSF/logo.jpg
new file mode 100644
index 0000000..1a20376
Binary files /dev/null and b/assets/img/teams/GSF/logo.jpg differ
diff --git a/assets/img/teams/THU/logo.jpg b/assets/img/teams/THU/logo.jpg
new file mode 100644
index 0000000..9122ca2
Binary files /dev/null and b/assets/img/teams/THU/logo.jpg differ
diff --git a/docs/EN.md b/docs/EN.md
new file mode 100644
index 0000000..3d1458f
--- /dev/null
+++ b/docs/EN.md
@@ -0,0 +1,210 @@
+# Super Unprofessional League Website Generator
+
+By shrekshao狄学长
+
+[EN](#) | [简体中文](../README.md)
+
+[Demo](https://super-unprofessional-league.github.io/super-unprofessional-league-website/) (in Chinese)
+
+A Jekyll based static site generator for website of a unprofessional league.
+
+
+
+
+
+
+
+Features include:
+* Multiple seasons
+ - League (traditional table, with data auto calculated from game data)
+ - Tournament (group stage table + knockout stage bracket)
+* Game
+ - score
+ - info: date, round, etc.
+ - events
+ - goal
+ - penalty
+ - yellow card
+ - red card
+ - sub
+ - pictures
+ - video embed code
+* Player stats table
+ - goal scorer (goals auto calculated from game data)
+* Team page
+ - Starting and sub player list
+ - Formation of starting squad
+ - Pictures
+* Language translation support
+* News post
+
+
+It is suitable for college and community league since it can be hosted free on a number of place.
+
+## Getting Started (TODO: Refine)
+
+* install [Jekyll](https://jekyllrb.com/docs/) (More basic tutorials follow Jekyll)
+* `bundle install`
+* generate the site by running `bundle exec jekyll serve` during development.
+* build the site by running `bundle exec jekyll build` before publish.
+* init git in `_site` folder, push to the `gh_page` branch on github to host
+ * github cannot automatically built since we use customized jekyll plugin.
+
+
+## Add your data
+
+All league data (matches, squad, etc.) goes under `_data` folder. All static assets (photos, images) better goes under `assets`.
+
+### _data folder structures
+
+* _data
+ - seasons
+ - 2018-2019
+ - config.json (optional, default to League table style)
+ - teams
+ * bayern.json
+ * dortmund.json
+ - games
+ * 2018-11-10-1.json
+
+### Team json file example
+
+```json
+{
+ "key": "dortmund",
+ "display_name": "Borussia Dortmund",
+ "description": "blahblahblah...",
+ "logo": "bvb09.jpg",
+ "table": {
+ "games_played": 20,
+ "wins": 15,
+ "draws": 4,
+ "loses": 1,
+ "goals_for": 51,
+ "goals_against": 20,
+ "points": 49
+ },
+ "players": {
+ "starting": [
+ {
+ "number": 1,
+ "name": "Roman Burki",
+ "img": "placeholder-player.jpg",
+ "locator": "GK",
+ "position": "GoalKeeper"
+ }
+ ,{
+ "number": 28,
+ "name": "Axel Witsel",
+ "img": "placeholder-player.jpg",
+ "locator": "CDM",
+ "position": "Midfielder"
+ }
+ ,{
+ "number": 11,
+ "name": "Marco Reus",
+ "img": "placeholder-player.jpg",
+ "locator": "CAM",
+ "position": "Forward"
+ }
+ ],
+ "subs": [
+ {
+ "number": 22,
+ "name": "Christian Pulisic",
+ "img": "placeholder-player.jpg",
+ "position": "Midfielder"
+ }
+
+ ]
+ }
+}
+```
+
+* squad position (`GK`, `CM`, etc) abbreviations are correspond to predefined positions in css (take a look to see the full list [here](https://github.com/super-unprofessional-league/super-unprofessional-league-website/blob/master/assets/css/custom-football-squad.css#L70))
+
+
+
+### Game json file example
+
+```json
+{
+ "date": "2018/11/10/9:30",
+ "type": "round-11",
+ "home": {
+ "key": "dortmund",
+ "score": 3,
+ "events": [
+ {"type": "yellow", "time": 29, "player": "Weigl"},
+ {"type": "yellow", "time": 36, "player": "Akanji"},
+ {"type": "off", "time": 46, "player": "Weigl"},
+ {"type": "sub", "time": 46, "player": "Dahoud"},
+ {"type": "penalty", "time": 49, "player": "Reus"},
+ {"type": "goal", "time": 67, "player": "Reus"},
+ {"type": "goal", "time": 73, "player": "Paco Alcacer"}
+ ]
+ },
+ "away": {
+ "key": "bayern",
+ "score": 2,
+ "events": [
+ {"type": "goal", "time": 26, "player": "Lewandowski"},
+ {"type": "goal", "time": 52, "player": "Lewandowski"},
+ {"type": "yellow", "time": 55, "player": "Ribery"}
+ ]
+ }
+}
+```
+
+### config.json 联赛设置
+
+```json
+{
+ "display_name": "2013",
+ "type": "group + knockout",
+ "group_stage": {
+ "A": [
+ "613111",
+ "610122",
+ "610121",
+ "610111"
+ ],
+ "B": [
+ "611111",
+ "613121",
+ "610113",
+ "610112"
+ ]
+ },
+ "knockout_stage": [
+ [
+ ["610131", "610111", "2013-10-21-1"],
+
+ ["613111", "610112", "2013-10-20-1"],
+
+ ["613131", "611131", ""],
+
+ ["610132", "611111", "2013-10-15-1"]
+ ],
+ [
+ ["610111", "613111", "2013-11-14-1"],
+
+ ["611131", "610132", "2013-11-15-1"]
+ ],
+ [
+ ["613111","611131", "2013-11-17-1"]
+ ]
+ ],
+ "winner": "613111",
+ "rules": "*hahahah\n*hahha"
+}
+```
+
+* Season defaults to League type if this file doesn't exist
+* `type`
+ - `league`
+ - `group + knockout`
+* if `type = "group + knockout"`
+ * `group_stage` is `group name` => `team file name (without ext)`
+ * `knockout_stage` element length is power of 2，... 16, 8, 4, 2, 1
+ * `["home team file name (without ext)", "away team file name (without ext)", "game file name (without ext)"]`
\ No newline at end of file
diff --git a/docs/field-locator.png b/docs/field-locator.png
new file mode 100644
index 0000000..b0ea673
Binary files /dev/null and b/docs/field-locator.png differ
diff --git a/docs/game-page.png b/docs/game-page.png
new file mode 100644
index 0000000..66d39d5
Binary files /dev/null and b/docs/game-page.png differ
diff --git a/docs/team-page.png b/docs/team-page.png
new file mode 100644
index 0000000..6734589
Binary files /dev/null and b/docs/team-page.png differ
diff --git a/docs/tournament-page.png b/docs/tournament-page.png
new file mode 100644
index 0000000..b893610
Binary files /dev/null and b/docs/tournament-page.png differ
{{ site.title | escape }}
- {%- if page_paths -%}
-