diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..223d4dba6eb --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "cSpell.ignoreWords": [ + "background" + ] +} \ No newline at end of file diff --git a/404.html b/404.html index c9e73a5b1d9..9f851f0629f 100644 --- a/404.html +++ b/404.html @@ -2,7 +2,5 @@ layout: page title: "404" permalink: /404 -comments: false ---

There doesn't appear to be anything here. Sorry about that.

-

If you've followed a link expecting something to be here, you can contact me.

diff --git a/CNAME b/CNAME new file mode 100644 index 00000000000..03bda78d6c7 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +tmu.yokoyama.ac \ No newline at end of file diff --git a/README.md b/README.md index fe4ded26240..bba925123d8 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,304 @@ -# Moon Jekyll Theme +# 横山研Webページ管理の手引き -> [!WARNING] -> ###### A NEW HOME FOR MOON! -> -> You can access new repository from [here](https://github.com/TolgaTatli/Moonrise/). +* 事前知識(各リンクを読んで周辺知識を身に着けてください) + * **このREADME.mdも含めて全てパブリック領域なので非公開情報は置かない事!** + * このページはGitHub上でWebページをホスティングする機能[GitHub Pages](https://docs.github.com/ja/pages/getting-started-with-github-pages/about-github-pages)を利用しています。 + * CMSやblog的なページを静的なサイトで実現する[Jekyll](http://jekyllrb-ja.github.io/)環境で作成されています。 + * 各ページは'''_post'''ディレクトリに格納される[Markdowns](https://gist.github.com/mignonstyle/083c9e1651d7734f84c99b8cf49d57fa)ファイルで記述します。 + * Jekyllはテンプレートエンジンである[Liquid](https://shopify.github.io/liquid/)を利用していますので、その機能が使えます。 + * 全体デザインは[Moon Jekyll Theme](https://github.com/TaylanTatli/Moon)をforkしてページを作っています。 + +---- + +> **重要!** ページを編集する前に、必ず**ページの構成**と**タグの付け方**を読んでください + +## 更新方法 + +* **更新は必ずブランチを作成し、それを更新してください。** +* ブランチ名は適切に付けてください。 +* 変更が終わったらPull Requestを送ってください。 +* Pull RequestはWeb係(+横山)が精査してコミットします。 +* 単ページの一部の文言変更など、コミット前のプレビューが必要無いケースでは、ブラウザでブランチを作り更新しプルリクを送ると良いでしょう + * https://github.com/YokoyamaLab/newwebpage/branches +* 手元のマシンで更新中のサイトのプレビューをしたい場合は[Jekyll](http://jekyllrb-ja.github.io/)をインストールする必要があります +## ページの構成 + +* すべてのページは```_post```ディレクトリ内に```2022-08-01-ipsj-siggi.md```のような、『日付、内容が分かる端的な名前』からなるファイル名を付ける必要が有ります。サブディレクトリ分けはせず、```_post```直下におきましょう。 +* ページに属する画像は```assets/img```の下に適切な(どの記事の写真か分かる名前の)サブディレクトリを作成し格納してください。 +* サイトの構造として、トップページの下に、全体を***About***、***Members***、***Posts***、***Projects***の4カテゴリに分けています。各ページもそれらのどれかに属していなければいけません。(ページ上部のヘッダの書き方でどのカテゴリに属するかがJekyllによってに判断され、適切に配置されます) + +### About + +* 研究室についての概要説明のページです。このカテゴリに所属しているページは、ページ中のメッセージの所に並びます。基本的に更新や追加の必要は無いです。 +* Aboutページにサブページを追加するには以下の記載をMarkdownのページ冒頭に記してください。ただしtagsは後述するタグの解説を読み正しくつけてください。titleとexcerptはAboutページに自動で貼られるリンクのタイトルと概要になります。 +* ヘッダの**comment**を**true**にするとページ下部にコメント欄が現れます。 + +``` +--- +layout: post +title: "外部からの受験希望者へ" +date: 2018-04-01 +excerpt: "外部受験希望者向けのFAQをまとめています。問い合わせる前に必ず読んでください。" +about: true +tag: +- 研究室情報 +- 留学生 +comments: false +--- +``` + +### Members + +* 研究室のメンバ紹介のページです。毎年年度初めにページを追加します。年度中にメンバーの変化が有った場合は当該年度のファイルを更新してください。 +* 年度毎に追加するファイルの日付は各年度の4月1日にしておいてください。またファイル名は「2022-04-01-our-members-2022.md」に準拠して命名してください。 +* 追加するページの冒頭に以下を技術してください。titleは「2022年度 横山研」に準拠してください。excerptには前年度との違いを簡潔に書いてください。 +* ファイルの中身は前年度のものを踏襲してください。 +* ヘッダの**comment**を**true**にするとページ下部にコメント欄が現れます。 + +``` +--- +layout: post +title: "2022年度 横山研" +excerpt: "本年度、新たに学部生5名が加わりました。" +author: "Naoki Kitamura" +date: 2022-04-01 +members: true +feature: assets/img/members/members2022.png +tags: + - 2022年度 + - 研究室 + - メンバー +comments: false --- +``` + +### Posts + +* 研究室イベントの紹介や、研究会・国際会議などの参加報告等のページを追加します。ブログ的に使います。何か話題が発生した時点で、ページを追加します。 +* 基本的には学会発表等に参加したら1ページ書きましょう。研究の事だけでなく、学会の雰囲気や出会った美味しいものなども書いてOKです。その他研究室の飲み会やスポーツ大会のイベントなども紹介してください。学生の表彰もここに載せます。 +* タグは考えて付けましょう。タグ別にページ一覧を作成する機能がありますが、適当にタグを付けると分類の意味をなさなくなります。タグについては次章で説明します。 +* ヘッダの**comment**を**true**にするとページ下部にコメント欄が現れます。 + +``` +--- +layout: post +title: "横山研公式Webリニューアル" +excerpt: "横山研のWebページをリニューアルしました。" +tag: +- 2022年度 +- お知らせ +- ホームページ +comments: false +--- +``` + +### Projects + +* 研究内容についての概要を紹介するページです。不定期で各メンバーが取り組んでいる研究を一般向けに分かりやすく紹介するページを作ります。研究発表が終わったタイミングなどで追加していきます。 +* ブログ的なPostと異なり、こちらには研究内容を伝えるために使います。特に新しいトピックで発表した場合は、論文の概要をここに書きます。 +* 中村研@明治大学のサイトが非常に参考になると思います。 + * https://nkmr-lab.org/news/deim2022_indecisive_komatsubara.html +* ページリストは新しいものが上に来るように自動的に一覧が制作されますが、「横山研の研究概要」のみ最上段にピン止めされています。ここには、全休全体の概要を書きます。これは数年に一度を目安に更新します。 +* 新しい研究ネタを追加するには以下のヘッダを利用してMarkdownを記述し_postに追加します。 +* タグには「年度」と「研究」を含めてください、また5Gかソーシャルビッグデータのどちらかのタグを付与してください。それ以上の細分化したタグは随時検討し必要なら追加してください。 +* ヘッダの**comment**を**true**にするとページ下部にコメント欄が現れます。 + +``` +--- +layout: post +title: "横山研の研究概要" +excerpt: "今取り組んでいる研究の全体像を分かりやすく説明します。" +project: true +pinned: true +tag: +- 2022年度 +- 研究 +- 5G +- ソーシャルビッグデータ +comments: false +--- +``` +---- + +## タグについて + +* 各ページにはヘッダでタグを付ける事が出来ます。それにより、[タグによるページの分類](https://tmu.yokoyama.ac/newwebpage/tags/)が自動的に行えます。 +* なので、タグの付与は、一定のルールを決めてそれに基づいて付与する事で、この索引を意味あるものにします。 +* 必要に応じて追加してください。ただしかならずこのページの情報を更新してください。 + +### Members内の投稿について +* 「2022年度」など投稿年度のタグを付与してください。 +* 「研究室」と「メンバー」のタグを必ず付与してください。 +### Posts内の投稿について + +Postsのページのタグは適当に付けると後々乱雑になって整理ができなくなるので、慎重に付けてください。ここのルールを読むとともに、類似した以前のイベントの記事を参照して、付与するタグを決めてください。 +* 「2022年度」など投稿年度のタグを付与してください。 +* 記事のタイプを以下から選んでタグとして付与してください。(必要なら新設してかまいませんが、かならずこのページも更新してください。) + * ** 日記 **: イベント参加の報告など + * ** お知らせ **: 研究室からのお知らせ(学生受賞やイベント紹介など) +* 記事の内容を以下から選んで付けてください。(複数可、これも適宜追加してください。) + * ** 出張報告 **: 学会発表などどこかに出かけて発表した時に記録 + * ** コンパ **: 新歓、追いコン、忘年会など + * ** スポーツ**: スポーツ大会など + * ** ホームページ **: このホームページに関する話題 + * ** 研究室 **: 研究室に新しい機会がやってきたなど +* **出張報告**の時は内容に応じて以下のタグも追加で付与してください。(当てはまらない出張は何もつけなくてOKです) + * ** 国内研究会 **: 国内での学会発表等 + * ** 国際会議 **: 国内で開催される国際会議もこのタグを付けてください。 + * ** ゼミ合宿 **: 他大等と合同で合宿をした時はこのタグです + * ** フィールドワーク **: あまり無いかもしれませんが学外で実験をおこなった記録など +* **学会参加の場合は学会名のタグも作ってください** + * 例えば**MEDE2022**に参加した場合は**年を削除**して**MEDES**というタグにしましょう。 + * **DEIM**、**ゲーム情報学研究会**、 +* **学会参加の場合は開催地のタグを作ってください** + * 日本国内の場合:都道府県名 eg.**神奈川県**、**香川県** + * 国外の場合:国名 eg.**フランス**、**ドイツ**、**アメリカ** +### Projects内の投稿について + +* 「2022年度」など投稿年度のタグを付与してください。 +* 「研究」のタグを必ず付与してください。 +* 発表に関する話題の場合は「発表」のタグを必ず付けてください。 +* 発表方法が「国際会議」か「論文誌」か「国内研究会」か、適切なものを付けてください。 +* 研究分野が「5G」か「ソーシャルビッグデータ」かをえらくでください。 + + +## Markdownの書き方 + +* [Markdowns](https://gist.github.com/mignonstyle/083c9e1651d7734f84c99b8cf49d57fa)の書き方は全て有効です。その上で、利用しているテンプレートが提供する以下の機能が使えます。 +* 加えて、このテンプレート特有の書き方もありますので、以下の説明を一読してください。 +* 以下ページの説明に基づいたページサンプルは[こちら](syntax-sample/)をご覧ください。 + + +### テーブルの作り方 + +``` +| Header1 | Header2 | Header3 | +|:--------|:-------:|--------:| +| cell1 | cell2 | cell3 | +| cell4 | cell5 | cell6 | +|---- +| cell1 | cell2 | cell3 | +| cell4 | cell5 | cell6 | +|===== +| Foot1 | Foot2 | Foot3 +``` + + +### キーボードのキーの表示 + +* WASDのキーを表示する例 + +```html +WASD +``` + +### コードスニペット + +* コードスニペットはMarkdown標準のものも使えますが、独自のCSSを適用させるため以下のコードを使ってください。 +* [対応する言語のリスト](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml) + +```css +{% highlight css %} +#container { + float: left; + margin: 0 -240px 0 0; + width: 100%; +} +{% endhighlight %} +``` + +### リンクをボタン風にする + +* aタグにclassに設定する事で対応可能です。(文中の場合はdivタグは必要ありません) + +```html +
白いボタン
+
緑のボタン
+
オレンジのボタン
+
赤いボタン
+
青いボタン
+``` + +### 文章を囲む + +* 文章に続いて```{: .notice}```と記述するとその段落が罫線で囲まれます。NoticeやWarningメッセージ用ですが、強調用途で使えます。 + +```markdown +**Watch out!** You can also add notices by appending `{: .notice}` to a paragraph. +{: .notice} +``` + +### 画像を綺麗に入れる + +* 画像を記事に入れるには```
```タグを使います。 +* 画像は[```assets/img```](assets/img/)ディレクトリ内に格納してください。 +* Markdownから参照する時は```{{ site.url }}/```を前に加えて絶対パスにするのを忘れずに。 +#### 画像1つ + +``` html +
+ +
画像一つだけ掲載する例
+
+``` + +#### 画像2つ + +``` html +
+ + +
画像2つを横並びにする例
+
+``` + +#### 画像3つ + +``` html +
+ + + +
画像3つを横並びにする例
+
+``` + +#### 動画を埋め込む + +* 動画を記事に入れるには、Youtube公式の埋め込みコードが使えます。レスポンシブにはならないので注意してください。 -**[Moon](https://tolgatatli.github.io/Moon)** is a minimal, one column jekyll theme. +``` html + +``` -## Features -* Minimal, you can focus on your content -* Responsive -* Disqus integration -* Syntax highlighting -* Optional post image -* Social icons -* Page for sharing projects -* Optional background image -* Simple navigation menu -* MathJax support +#### 数式を入れる -## Preview +* [MathJax](http://www.mathjax.org/) を使ってTeX形式で数式を表現できます。 -![screenshot of Moon](https://cloud.githubusercontent.com/assets/754514/14509720/61c61058-01d6-11e6-93ab-0918515ecd56.png) -![screenshot of Moon](https://cloud.githubusercontent.com/assets/754514/14509716/61ac6c8e-01d6-11e6-879f-8308883de790.png) -See a [live version of Moon](https://tolgatatli.github.io/Moon) hosted on GitHub. +``` +Here is an example MathJax inline rendering \\( 1/x^{2} \\), and here is a block rendering: +\\[ \frac{1}{n^{2}} \\] +``` -## Getting Started +* ここでエスケープが```\\}```な事に注意してください。 +* なお、複雑な数式も書くことができます。 -To learn how to install and use this theme check out the [Setup Guide](https://tolgatatli.github.io/Moon/moon-theme/) for more information. +``` +$$ +\begin{align*} + & \phi(x,y) = \phi \left(\sum_{i=1}^n x_ie_i, \sum_{j=1}^n y_je_j \right) + = \sum_{i=1}^n \sum_{j=1}^n x_i y_j \phi(e_i, e_j) = \\ + & (x_1, \ldots, x_n) \left( \begin{array}{ccc} + \phi(e_1, e_1) & \cdots & \phi(e_1, e_n) \\ + \vdots & \ddots & \vdots \\ + \phi(e_n, e_1) & \cdots & \phi(e_n, e_n) + \end{array} \right) + \left( \begin{array}{c} + y_1 \\ + \vdots \\ + y_n + \end{array} \right) +\end{align*} +$$ +``` \ No newline at end of file diff --git a/README_en.md b/README_en.md new file mode 100644 index 00000000000..4af99aad340 --- /dev/null +++ b/README_en.md @@ -0,0 +1,305 @@ +# Guide for Managing Yokoyama Lab's Website + +* **Prerequisites** (Please read the following links to gain background knowledge) + * **Do not place any confidential information here as this README.md and all related files are in a public domain!** + * This website is hosted using [GitHub Pages](https://docs.github.com/en/pages/getting-started-with-github-pages/about-github-pages). + * The site is built using [Jekyll](http://jekyllrb.com/), which enables static websites to function like CMS or blogs. + * Each page is written in [Markdown](https://gist.github.com/mignonstyle/083c9e1651d7734f84c99b8cf49d57fa) and stored in the `_posts` directory. + * Jekyll uses the [Liquid](https://shopify.github.io/liquid/) template engine, which you can utilize for advanced features. + * The overall design is based on the [Moon Jekyll Theme](https://github.com/TaylanTatli/Moon), which has been forked and customized for this site. + +---- + +> **Important!** Before editing the website, make sure to read **Page Structure** and **Tagging Guidelines**. + +## How to Update + +* **Always create a new branch for updates.** +* Name the branch appropriately. +* After making changes, submit a Pull Request. +* Pull Requests will be reviewed and committed by the web admin (+ Yokoyama). +* For minor edits, such as text changes on a single page, you can create a branch and submit a Pull Request directly from the browser: + * https://github.com/YokoyamaLab/newwebpage/branches +* To preview the site locally during updates, you need to install [Jekyll](http://jekyllrb.com/). + +## Page Structure + +* All pages must be stored directly under the `_posts` directory with a filename like `2022-08-01-ipsj-siggi.md`, which includes the date and a concise description of the content. +* Images for pages should be stored in the `assets/img` directory under a subdirectory with a descriptive name indicating the related article. +* The site is structured into four main categories: ***About***, ***Members***, ***Posts***, and ***Projects***. Each page must belong to one of these categories. The category is determined by the header in the Markdown file, which Jekyll uses to place the page appropriately. + +### About + +* Pages in this category provide an overview of the lab. These pages appear in the "About" section of the site and typically do not require frequent updates. +* To add a subpage to the About section, include the following header at the beginning of the Markdown file. Ensure the tags are correctly assigned based on the tagging guidelines. The `title` and `excerpt` fields will be used for the link title and summary on the About page. +* Setting `comments` to `true` will enable a comment section at the bottom of the page. + +```markdown +--- +layout: post +title: "For Prospective Students" +date: 2018-04-01 +excerpt: "FAQs for prospective students. Please read before contacting us." +about: true +tag: +- Lab Information +- International Students +comments: false +--- +``` + +### Members + +* This category introduces lab members. A new page should be added at the beginning of each academic year. If there are changes in members during the year, update the corresponding year's file. +* The date for new files should be set to April 1 of the respective year, and filenames should follow the format `2022-04-01-our-members-2022.md`. +* Use the following header for new pages. The `title` should follow the format "Yokoyama Lab 2022". The `excerpt` should briefly describe changes from the previous year. +* The content of the file should follow the format of the previous year's file. +* Setting `comments` to `true` will enable a comment section at the bottom of the page. + +```markdown +--- +layout: post +title: "Yokoyama Lab 2022" +excerpt: "This year, five new undergraduate students have joined." +author: "Naoki Kitamura" +date: 2022-04-01 +members: true +feature: assets/img/members/members2022.png +tags: + - 2022 + - Lab + - Members +comments: false +--- +``` + +## How to Write Markdown + +* All [Markdown syntax](https://gist.github.com/mignonstyle/083c9e1651d7734f84c99b8cf49d57fa) is supported. Additionally, the template used for this site provides the following features. +* Please read the following explanations for template-specific syntax. +* For sample pages based on the explanations below, see [here](syntax-sample/). + +### Creating Tables + +```markdown +| Header1 | Header2 | Header3 | +|:--------|:-------:|--------:| +| cell1 | cell2 | cell3 | +| cell4 | cell5 | cell6 | +|---- +| cell1 | cell2 | cell3 | +| cell4 | cell5 | cell6 | +|===== +| Foot1 | Foot2 | Foot3 +``` + +### Displaying Keyboard Keys + +* Example of displaying WASD keys: + +```html +WASD +``` + +### Code Snippets + +* While standard Markdown code blocks are supported, use the following syntax to apply custom CSS for better styling. +* [Supported language list](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml) + +```css +{% highlight css %} +#container { + float: left; + margin: 0 -240px 0 0; + width: 100%; +} +{% endhighlight %} +``` + +### Creating Button-like Links + +* Add a `class` attribute to the `` tag to create button-like links. (For inline usage, the `
` tag is not necessary.) + +```html +
White Button
+
Green Button
+
Orange Button
+
Red Button
+
Blue Button
+``` + +### Highlighting Text + +* Add `{: .notice}` after a paragraph to highlight it with a border. This is useful for notices or warnings but can also be used for emphasis. + +```markdown +**Watch out!** You can also add notices by appending `{: .notice}` to a paragraph. +{: .notice} +``` + +### Adding Images + +* Use the `
` tag to include images in articles. +* Store images in the [`assets/img`](assets/img/) directory. +* When referencing images in Markdown, prepend `{{ site.url }}/` to create an absolute path. + +#### Single Image + +```html +
+ +
Example of a single image
+
+``` + +#### Two Images Side by Side + +```html +
+ + +
Example of two images side by side
+
+``` + +#### Three Images Side by Side + +```html +
+ + + +
Example of three images side by side
+
+``` + +### Embedding Videos + +* Use YouTube's official embed code to include videos in articles. Note that the videos will not be responsive. + +```html + +``` + +### Adding Mathematical Expressions + +* Use [MathJax](http://www.mathjax.org/) to write mathematical expressions in TeX format. + +```markdown +Here is an example MathJax inline rendering \\( 1/x^{2} \\), and here is a block rendering: +\\[ \frac{1}{n^{2}} \\] +``` + +* Note that the escape sequence is `\\}`. +* Complex mathematical expressions can also be written. + +```markdown +$$ +\begin{align*} + & \phi(x,y) = \phi \left(\sum_{i=1}^n x_ie_i, \sum_{j=1}^n y_je_j \right) + = \sum_{i=1}^n \sum_{j=1}^n x_i y_j \phi(e_i, e_j) = \\ + & (x_1, \ldots, x_n) \left( \begin{array}{ccc} + \phi(e_1, e_1) & \cdots & \phi(e_1, e_n) \\ + \vdots & \ddots & \vdots \\ + \phi(e_n, e_1) & \cdots & \phi(e_n, e_n) + \end{array} \right) + \left( \begin{array}{c} + y_1 \\ + \vdots \\ + y_n + \end{array} \right) +\end{align*} +$$ +``` + +### Posts + +* This category is used for introducing lab events, participation in research meetings, international conferences, etc. It functions like a blog. Add a page whenever there is a new topic. +* Typically, write a page whenever you participate in a conference or similar event. You can include not only research-related content but also the atmosphere of the conference, interesting encounters, or delicious food you found. Additionally, introduce lab events such as parties or sports tournaments, and include student awards here. +* Be mindful when assigning tags. Tags allow for automatic categorization of pages, but assigning them carelessly can make the categorization meaningless. Refer to the next section for details on tagging. +* Setting `comments` to `true` will enable a comment section at the bottom of the page. + +```markdown +--- +layout: post +title: "Yokoyama Lab Official Website Renewal" +excerpt: "The Yokoyama Lab website has been renewed." +tag: +- 2022 +- Announcement +- Website +comments: false +--- +``` + +### Projects + +* This category introduces an overview of the lab's research. Pages are created irregularly to explain the research being conducted by each member in an easy-to-understand manner for the general public. Add pages after completing research presentations or similar milestones. +* Unlike blog-like posts, this category is used to convey research content. For example, after presenting a new topic, write a summary of the paper here. +* Refer to the Nakamura Lab at Meiji University for inspiration: + * https://nkmr-lab.org/news/deim2022_indecisive_komatsubara.html +* The list of pages is automatically generated with the newest ones at the top, except for "Overview of Yokoyama Lab's Research," which is pinned at the top. This page provides an overview of all research activities and is updated approximately every few years. +* To add a new research topic, use the following header in a Markdown file and place it in the `_posts` directory. +* Include tags such as "Year," "Research," and either "5G" or "Social Big Data." Additional tags can be added as needed. + +```markdown +--- +layout: post +title: "Overview of Yokoyama Lab's Research" +excerpt: "An easy-to-understand explanation of the overall research activities." +project: true +pinned: true +tag: +- 2022 +- Research +- 5G +- Social Big Data +comments: false +--- +``` + +---- + +## About Tags + +* Tags can be assigned in the header of each page. This allows for [automatic categorization of pages by tags](https://tmu.yokoyama.ac/newwebpage/tags/). +* Therefore, assign tags based on consistent rules to make the index meaningful. +* Add new tags as needed, but make sure to update this README accordingly. + +### Tags for Members Pages + +* Add a tag for the year of the post, such as "2022." +* Always include the tags "Lab" and "Members." + +### Tags for Posts Pages + +* Be cautious when assigning tags to posts, as careless tagging can lead to disorganization. Read this section carefully and refer to similar past events to decide on tags. +* Add a tag for the year of the post, such as "2022." +* Choose a tag for the type of article from the following options (feel free to create new ones if necessary, but update this README accordingly): + * **Diary**: Reports on event participation, etc. + * **Announcement**: Announcements from the lab (e.g., student awards, event introductions). +* Choose tags for the content of the article from the following options (multiple tags are allowed; add new ones as needed): + * **Trip Report**: Records of conference presentations or other trips. + * **Party**: Events such as welcome parties, farewell parties, or year-end parties. + * **Sports**: Sports tournaments, etc. + * **Website**: Topics related to this website. + * **Lab**: New equipment or other updates in the lab. +* For trip reports, add additional tags based on the content: + * **Domestic Conference**: For presentations at domestic conferences. + * **International Conference**: For international conferences held domestically or abroad. + * **Seminar Camp**: For joint camps with other universities, etc. + * **Fieldwork**: For experiments conducted outside the lab. +* For conference participation, create a tag for the conference name: + * For example, if you participate in "MEDE2022," create a tag "MEDES" (remove the year). + * Examples: **DEIM**, **Game Informatics SIG**. +* For conference participation, create a tag for the location: + * For domestic locations: Prefecture names, e.g., **Kanagawa**, **Kagawa**. + * For international locations: Country names, e.g., **France**, **Germany**, **USA**. + +### Tags for Projects Pages + +* Add a tag for the year of the post, such as "2022." +* Always include the tag "Research." +* For presentation-related topics, always include the tag "Presentation." +* Add a tag for the presentation type: "International Conference," "Journal," or "Domestic Conference." +* Add a tag for the research field: "5G" or "Social Big Data." \ No newline at end of file diff --git a/_config.yml b/_config.yml index 6579ac9c760..0d305bb18ca 100644 --- a/_config.yml +++ b/_config.yml @@ -1,14 +1,15 @@ # Site -title: Moon -bio: 'Minimal, one column jekyll theme.' -description: "Moon is a minimal, one column jekyll theme for your blog." +title: "Yokoyama Lab" +jtitle: "横山研究室(都立大)" +bio: '情報の偏在性と遍在性を科学する' +description: "東京都立大学システムデザイン学部情報科学科横山研究室の公式Web。5G時代のビッグデータ分析の研究を行っています。" reading_time: true words_per_minute: 200 logo: 'assets/img/logo.png' background: 'assets/img/placeholder-big.jpg' tiled_bg: false # Set this true if you want to tile your background image, otherwise it will be covered locale: en_US -url: https://taylantatli.github.io/Moon +url: https://tmu.yokoyama.ac # Jekyll permalink: /:title/ @@ -26,7 +27,7 @@ sass: style: compressed # Comments -disqus_shortname: taylantatli +disqus_shortname: yokoyama-laboratory # Social # if you don't have any of social below, comment the line. @@ -38,19 +39,19 @@ disqus_shortname: taylantatli #ad-slot: #bing-verify: #email: -twitter: username -facebook: username -github-url: username +#twitter: username +facebook: yokoyama.laboratory +github-url: YokoyamaLab #stackoverflow: 123456/username from a "http://stackoverflow.com/users/123456/username" link #linkedin: username #xing: username -instagram: username +instagram: yokoyama_laboratory #lastfm: username #tumblr: username #medium: '@username' #pinterest: username #foursquare: username -steam: username +#steam: username #dribbble: username #youtube: username #youtube-channel: channel diff --git a/_data/navigation.yml b/_data/navigation.yml index e441bec545a..426b3dd42e7 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,4 +1,5 @@ # Site navigation links - +- title: Members + url: /members/ - title: Projects url: /projects/ diff --git a/_includes/disqus_comments.html b/_includes/disqus_comments.html index 11c0c77c767..474a195403e 100644 --- a/_includes/disqus_comments.html +++ b/_includes/disqus_comments.html @@ -1,17 +1,18 @@ {% if site.disqus_shortname %} - - + + {% endif %} diff --git a/_includes/head.html b/_includes/head.html index 309e1bbbfdc..5abb36e52f1 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,7 +1,17 @@ - {% if page.title %}{{ page.title }} – {% endif %}{{ site.title }} + {% if page.title %}{{ page.title }} – {% endif %}{{ site.jtitle }} + {% if page.tags %}{% endif %} diff --git a/_includes/inquiry.html b/_includes/inquiry.html new file mode 100644 index 00000000000..cdbb86e20d3 --- /dev/null +++ b/_includes/inquiry.html @@ -0,0 +1,11 @@ + diff --git a/_includes/meta.html b/_includes/meta.html index 4cf41c43842..ae6a9218216 100644 --- a/_includes/meta.html +++ b/_includes/meta.html @@ -8,8 +8,5 @@ Tweet - - +1 -
diff --git a/_includes/profile.html b/_includes/profile.html new file mode 100644 index 00000000000..9bc986b7922 --- /dev/null +++ b/_includes/profile.html @@ -0,0 +1,50 @@ +{% if include.type == "start" %} +
+{% elsif include.type == "end" %} +
+{% else %} +
+
+
+ profile one +
+ +
+

+ {{ include.name }} +
+ {{ include.org }} +

+
+
+
+{% endif %} \ No newline at end of file diff --git a/_includes/scripts.html b/_includes/scripts.html index 86fdc494866..810d2f186c2 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,22 +1,49 @@ - - - - - - - - {% if site.google.analytics %} - - - {% endif %} - {% if page.comments != false %} - {% include disqus_comments.html %} - {% endif %} + + + + + + + + + + + + +{% include inquiry.html %} + +{% if site.google.analytics %} + + + +{% endif %} {% if page.comments != false %} {% include disqus_comments.html %} +{% endif %} diff --git a/_includes/social-links.html b/_includes/social-links.html index 06d5304706c..cd7155b06b6 100644 --- a/_includes/social-links.html +++ b/_includes/social-links.html @@ -25,4 +25,5 @@

{% if site.keybase %}{% endif %} {% if site.xmpp %}{% endif %} {% if site.hackernews %}{% endif %} +

diff --git a/_includes/toc.html b/_includes/toc.html new file mode 100644 index 00000000000..dd536e6d38e --- /dev/null +++ b/_includes/toc.html @@ -0,0 +1,182 @@ +{% capture tocWorkspace %} + {% comment %} + Copyright (c) 2017 Vladimir "allejo" Jimenez + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + {% endcomment %} + {% comment %} + Version 1.2.0 + https://github.com/allejo/jekyll-toc + + "...like all things liquid - where there's a will, and ~36 hours to spare, there's usually a/some way" ~jaybe + + Usage: + {% include toc.html html=content sanitize=true class="inline_toc" id="my_toc" h_min=2 h_max=3 %} + + Parameters: + * html (string) - the HTML of compiled markdown generated by kramdown in Jekyll + + Optional Parameters: + * sanitize (bool) : false - when set to true, the headers will be stripped of any HTML in the TOC + * class (string) : '' - a CSS class assigned to the TOC + * id (string) : '' - an ID to assigned to the TOC + * h_min (int) : 1 - the minimum TOC header level to use; any header lower than this value will be ignored + * h_max (int) : 6 - the maximum TOC header level to use; any header greater than this value will be ignored + * ordered (bool) : false - when set to true, an ordered list will be outputted instead of an unordered list + * item_class (string) : '' - add custom class(es) for each list item; has support for '%level%' placeholder, which is the current heading level + * submenu_class (string) : '' - add custom class(es) for each child group of headings; has support for '%level%' placeholder which is the current "submenu" heading level + * base_url (string) : '' - add a base url to the TOC links for when your TOC is on another page than the actual content + * anchor_class (string) : '' - add custom class(es) for each anchor element + * skip_no_ids (bool) : false - skip headers that do not have an `id` attribute + + Output: + An ordered or unordered list representing the table of contents of a markdown block. This snippet will only + generate the table of contents and will NOT output the markdown given to it + {% endcomment %} + + {% capture newline %} + {% endcapture %} + {% assign newline = newline | rstrip %} + + {% capture deprecation_warnings %}{% endcapture %} + + {% if include.baseurl %} + {% capture deprecation_warnings %}{{ deprecation_warnings }}{{ newline }}{% endcapture %} + {% endif %} + + {% if include.skipNoIDs %} + {% capture deprecation_warnings %}{{ deprecation_warnings }}{{ newline }}{% endcapture %} + {% endif %} + + {% capture jekyll_toc %}{% endcapture %} + {% assign orderedList = include.ordered | default: false %} + {% assign baseURL = include.base_url | default: include.baseurl | default: '' %} + {% assign skipNoIDs = include.skip_no_ids | default: include.skipNoIDs | default: false %} + {% assign minHeader = include.h_min | default: 1 %} + {% assign maxHeader = include.h_max | default: 6 %} + {% assign nodes = include.html | strip | split: ' maxHeader %} + {% continue %} + {% endif %} + + {% assign _workspace = node | split: '' | first }}>{% endcapture %} + {% assign header = _workspace[0] | replace: _hAttrToStrip, '' %} + + {% if include.item_class and include.item_class != blank %} + {% capture listItemClass %} class="{{ include.item_class | replace: '%level%', currLevel | split: '.' | join: ' ' }}"{% endcapture %} + {% endif %} + + {% if include.submenu_class and include.submenu_class != blank %} + {% assign subMenuLevel = currLevel | minus: 1 %} + {% capture subMenuClass %} class="{{ include.submenu_class | replace: '%level%', subMenuLevel | split: '.' | join: ' ' }}"{% endcapture %} + {% endif %} + + {% capture anchorBody %}{% if include.sanitize %}{{ header | strip_html }}{% else %}{{ header }}{% endif %}{% endcapture %} + + {% if htmlID %} + {% capture anchorAttributes %} href="{% if baseURL %}{{ baseURL }}{% endif %}#{{ htmlID }}"{% endcapture %} + + {% if include.anchor_class %} + {% capture anchorAttributes %}{{ anchorAttributes }} class="{{ include.anchor_class | split: '.' | join: ' ' }}"{% endcapture %} + {% endif %} + + {% capture listItem %}{{ anchorBody }}{% endcapture %} + {% elsif skipNoIDs == true %} + {% continue %} + {% else %} + {% capture listItem %}{{ anchorBody }}{% endcapture %} + {% endif %} + + {% if currLevel > lastLevel %} + {% capture jekyll_toc %}{{ jekyll_toc }}<{{ listModifier }}{{ subMenuClass }}>{% endcapture %} + {% elsif currLevel < lastLevel %} + {% assign repeatCount = lastLevel | minus: currLevel %} + + {% for i in (1..repeatCount) %} + {% capture jekyll_toc %}{{ jekyll_toc }}{% endcapture %} + {% endfor %} + + {% capture jekyll_toc %}{{ jekyll_toc }}{% endcapture %} + {% else %} + {% capture jekyll_toc %}{{ jekyll_toc }}{% endcapture %} + {% endif %} + + {% capture jekyll_toc %}{{ jekyll_toc }}{{ listItem }}{% endcapture %} + + {% assign lastLevel = currLevel %} + {% assign firstHeader = false %} + {% endfor %} + + {% assign repeatCount = minHeader | minus: 1 %} + {% assign repeatCount = lastLevel | minus: repeatCount %} + {% for i in (1..repeatCount) %} + {% capture jekyll_toc %}{{ jekyll_toc }}{% endcapture %} + {% endfor %} + + {% if jekyll_toc != '' %} + {% assign rootAttributes = '' %} + {% if include.class and include.class != blank %} + {% capture rootAttributes %} class="{{ include.class | split: '.' | join: ' ' }}"{% endcapture %} + {% endif %} + + {% if include.id and include.id != blank %} + {% capture rootAttributes %}{{ rootAttributes }} id="{{ include.id }}"{% endcapture %} + {% endif %} + + {% if rootAttributes %} + {% assign nodes = jekyll_toc | split: '>' %} + {% capture jekyll_toc %}<{{ listModifier }}{{ rootAttributes }}>{{ nodes | shift | join: '>' }}>{% endcapture %} + {% endif %} + {% endif %} +{% endcapture %}{% assign tocWorkspace = '' %}{{ deprecation_warnings }}{{ jekyll_toc -}} \ No newline at end of file diff --git a/_layouts/about.html b/_layouts/about.html new file mode 100644 index 00000000000..717a761e5f4 --- /dev/null +++ b/_layouts/about.html @@ -0,0 +1,46 @@ +--- +layout: compress +--- + + + + + + + {% include head.html %} + + + {% include nav.html %} + + + {% include scripts.html %} + + + + diff --git a/_layouts/home.html b/_layouts/home.html index c8b1315f6b4..b78aba7a9b3 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -34,10 +34,13 @@

About - + Posts + + Members + Projects diff --git a/_layouts/members.html b/_layouts/members.html new file mode 100644 index 00000000000..be93f13104d --- /dev/null +++ b/_layouts/members.html @@ -0,0 +1,44 @@ +--- +layout: compress +--- + + + + + + + {% include head.html %} + + + {% include nav.html %} + + + {% include scripts.html %} + + + + diff --git a/_layouts/page.html b/_layouts/page.html index 61b46dd9b53..29d7992b309 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,35 +1,47 @@ --- layout: compress --- + - - - {% include head.html %} - - - {% include nav.html %} - - - {% include scripts.html %} - {% if site.mathjax == true %} - - - {% endif %} - + {% if page.comments and site.disqus_shortname %} +
+ {% endif %} + + {% include scripts.html %} {% if site.mathjax == true %} + + + + {% endif %} + diff --git a/_layouts/post-list.html b/_layouts/post-list.html index 405fd88dbfe..dba65ce64e3 100644 --- a/_layouts/post-list.html +++ b/_layouts/post-list.html @@ -23,7 +23,7 @@

{{ page.title }}

{% for post in site.posts %} - {% if post.project == null %} + {% if post.project == null and post.members == null and post.about == null %}
- {% if page.comments and site.disqus_shortname %}
{% endif %} + {% if page.comments and site.disqus_shortname %} +
+ {% endif %} {% include scripts.html %} {% if site.mathjax == true %} - + + {% endif %} - + \ No newline at end of file diff --git a/_layouts/project.html b/_layouts/project.html index bed126902ff..4149aebd801 100644 --- a/_layouts/project.html +++ b/_layouts/project.html @@ -23,7 +23,20 @@

{{ page.title }}

{% for post in site.posts %} - {% if post.project %} + {% if post.project and post.pinned %} + + {% endif %} + {% endfor %} +
+ {% for post in site.posts %} + {% if post.project and post.pinned == null %}