Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hobbit army patch 1 #28

Open
wants to merge 80 commits into
base: gh-pages
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
7088adb
Update README.md
HobbitArmy Jan 5, 2023
3540282
Update settings.yml
HobbitArmy Jan 5, 2023
5cf5887
Update settings.yml
HobbitArmy Jan 5, 2023
cf35161
Update _config.yml
HobbitArmy Jan 5, 2023
265ffff
Update settings.yml
HobbitArmy Jan 5, 2023
7485252
Update settings.yml
HobbitArmy Jan 5, 2023
b7dd952
Update settings.yml
HobbitArmy Jan 5, 2023
ff00cfe
Rename people.html to research.html
HobbitArmy Jan 5, 2023
27460c9
Create res1.html
HobbitArmy Jan 5, 2023
65f508f
Create settings.yml
HobbitArmy Jan 5, 2023
1934415
Add files via upload
HobbitArmy Jan 5, 2023
a4b7692
Add files via upload
HobbitArmy Jan 5, 2023
a48ae19
Update settings.yml
HobbitArmy Jan 5, 2023
0810694
Update settings.yml
HobbitArmy Jan 6, 2023
d7f0e35
Update settings.yml
HobbitArmy Jan 6, 2023
4d1aa6d
Update settings.yml
HobbitArmy Jan 6, 2023
d353343
Rename research.html to people.html
HobbitArmy Jan 6, 2023
cd53c62
Update settings.yml
HobbitArmy Jan 6, 2023
583eece
Update footer.html
HobbitArmy Jan 6, 2023
fbf3783
Update settings.yml
HobbitArmy Jan 6, 2023
feb44b1
Update footer.html
HobbitArmy Jan 6, 2023
f82b7b8
Update settings.yml
HobbitArmy Jan 6, 2023
b2b8c8d
Update footer.html
HobbitArmy Jan 6, 2023
daf17a2
Update settings.yml
HobbitArmy Jan 6, 2023
22c01bd
Update footer.html
HobbitArmy Jan 6, 2023
c01ff4b
Update settings.yml
HobbitArmy Jan 6, 2023
838eb1e
add
HobbitArmy Jan 6, 2023
4f8c362
luxy
HobbitArmy Jan 10, 2023
a8eb40c
luxy
HobbitArmy Jan 10, 2023
ef2ebbe
luxy
HobbitArmy Jan 10, 2023
ca2a803
luxy
HobbitArmy Jan 10, 2023
08f1ca2
luxy
HobbitArmy Jan 10, 2023
acee726
luxy
HobbitArmy Jan 10, 2023
283a77d
luxy
HobbitArmy Jan 10, 2023
dcbbb7b
luxy2
HobbitArmy Jan 10, 2023
552d9d5
luxy2
HobbitArmy Jan 10, 2023
ca7e12c
luxy2
HobbitArmy Jan 10, 2023
dfcc9d8
luxy
HobbitArmy Jan 12, 2023
631a545
luxy
HobbitArmy Jan 12, 2023
17dd24e
luxy
HobbitArmy Jan 14, 2023
1c407c5
luxy
HobbitArmy Jan 14, 2023
ed266c5
luxy
HobbitArmy Jan 14, 2023
5f2030b
luxy
HobbitArmy Jan 14, 2023
d3dce86
luxy
HobbitArmy Jan 15, 2023
3588207
luxy
HobbitArmy Jan 17, 2023
572ddc0
luxy
HobbitArmy Jan 17, 2023
6c9cfa9
luxy
HobbitArmy Jan 17, 2023
94b912b
luxy
HobbitArmy Jan 17, 2023
99c01d1
luxy
HobbitArmy Jan 19, 2023
16d5045
luxy
HobbitArmy Jan 20, 2023
235a58d
luxy
HobbitArmy Jan 20, 2023
56aa243
luxy
HobbitArmy Jan 28, 2023
c5552d9
luxy
HobbitArmy Jan 30, 2023
9ca16f1
luxy
HobbitArmy Jan 30, 2023
07e7802
luxy
HobbitArmy Jan 30, 2023
7e7e43a
luxy
HobbitArmy Jan 30, 2023
46b153b
update
HobbitArmy Apr 21, 2023
4fb0ae7
Add files via upload
HobbitArmy Nov 13, 2023
fb3c0a0
update
HobbitArmy Nov 13, 2023
87e1d95
update
HobbitArmy Nov 13, 2023
29d626f
update
HobbitArmy Nov 13, 2023
669e148
update
HobbitArmy Nov 13, 2023
85f934f
update
HobbitArmy Nov 13, 2023
565df12
u
HobbitArmy Nov 13, 2023
4205ce7
update
HobbitArmy Nov 13, 2023
186ef93
up
HobbitArmy Nov 14, 2023
3238cc1
update
HobbitArmy Nov 14, 2023
f4d4e61
Add files via upload
HobbitArmy Jan 9, 2024
3867f92
Add files via upload
HobbitArmy Jan 9, 2024
9318bdd
update
HobbitArmy Sep 11, 2024
125be34
update
HobbitArmy Sep 11, 2024
d5a90a6
up
HobbitArmy Sep 11, 2024
8d1d044
update
HobbitArmy Sep 11, 2024
b22b5d7
okk
HobbitArmy Sep 11, 2024
c5211e9
upup
HobbitArmy Sep 11, 2024
86d2711
up
HobbitArmy Sep 12, 2024
a34fbec
okk
HobbitArmy Sep 12, 2024
123704a
update
HobbitArmy Sep 12, 2024
2201319
Update research.html
HobbitArmy Dec 16, 2024
a793d00
Update research.html
HobbitArmy Dec 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 1 addition & 83 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,83 +1 @@
# academic

### A Jekyll theme for academia

![Academic Screenshot](https://raw.githubusercontent.com/LeNPaul/academic/gh-pages/screenshot.png)

A Jekyll theme designed for academia, although you can use it for almost any other purpose as well:

* Showcase your research interests, publications, your curriculum vitae, the people in your research group, and your contact information.

* Manage courses that you are teaching.

* Provide updates to your students and faulty.

For a guide on how to deploy a Jekyll site using GitHub Pages, please check out [this article](https://paulle.ca/jekyll-tutorials/deploy-jekyll-site-github-pages).

If you like my work then please consider supporting me with [Ko-fi](https://ko-fi.com/paulle).

## Installation

### Ruby Gem Method

Add this line to your Jekyll site's `Gemfile`:

```ruby
gem "academic-jekyll-theme"
```

And add this line to your Jekyll site's `_config.yml`:

```yaml
theme: academic-jekyll-theme
```

And then execute:

$ bundle

Or install it yourself as:

$ gem install academic-jekyll-theme

## Usage

### Layouts

The following sections describe usage instructions for this Jekyll theme,including available layouts, includes, sass and/or assets.

#### Home

The `_layouts/home.html` layout defines the home page for this theme. An introduction to your research group or to yourself can be provided, along with a list of featured publications. There is also a section for providing any updates through posts placed in the `_posts` directory.

#### People

The `_layouts/people.html` layout can be used to showcase and describe people in your research group. People are defined in the `_data/settings.yml` file, and markdown pages for each person with the `_layouts/page.html` layout can be placed in the `people` directory.

#### Publications

The `_layouts/publications.html` layout can be used to showcase selected publications, or the entire catalogue of publications. Direct links to the paper can be used, or a PDF copy of the paper can be served. Publications are defined in the `_data/publications.yml` file, and any PDF files that are served can be placed in the `publications` directory.

#### Courses

The `_layouts/courses.html` layout can be used to showcase courses that were taught in the past or are currently being taught. Courses are defined in the `_data/settings.yml` file, and markdown pages for each course with the `_layouts/page.html` layout can be placed in the `courses` directory. Related course material, such as PDF files, can also be placed in the `courses` directory in a subdirectory with the same name as the corresponding course.

#### CV

The `_layouts/cv.html` layout can be used to showcase a curriculum vitae. The sections of the cv are defined in the `_data/cv` directory, where each section has its own `<section>.yml` file.

#### Contact

The `_layouts/contact.html` layout can be used to provide contact information for the research group or the people that lead the research group. Contact information is defined in the `_data/settings.yml` file.

## Contributing

Bug reports and pull requests are welcome on GitHub at https://github.com/LeNPaul/academic. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

## Development

To set up your environment to develop this theme, run `bundle install`, then run `bundle exec jekyll serve`, and open your browser at `http://localhost:4000`. This starts a Jekyll server using this theme. Make changes to the pages, documents, data, etc. like normal to test this theme's contents. As you make modifications to this theme the site will regenerate and you should see the changes in the browser after a refresh.

## License

The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
Modified from [LeNPaul/academic](https://github.com/LeNPaul/academic)
5 changes: 3 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
url: "" # the base hostname & protocol for your site, e.g. http://example.com
baseurl: "" # the subpath of your site, e.g. /blog
title: "academic" # the name of your site, e.g. ACME Corp.
description: "a Jekyll theme for academia"
title: "Home" # the name of your site, e.g. ACME Corp.
# description: "Doctoral student at Zhejiang University"
# theme: academic-jekyll-theme
11 changes: 7 additions & 4 deletions _data/cv/academic-experience.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
- title: 'Professor of Physics'
description: 'McMaster University (2005 – present)'
- title: 'Visiting Ph.D. Student'
description: 'University of Toronto (2024-2025)'

- title: 'Associate Faculty'
description: 'McGill University (1987 – 2005)'
- title: 'Exchange Student '
description: 'China Agricultural University (2018-2019)'

- title: 'Summer Courses Program '
description: 'University of Oxford (2018)'
12 changes: 8 additions & 4 deletions _data/cv/education.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
- title: 'B.Sc. (Hons) Physics & Applied Mathematics'
description: 'The University of Waterloo (1976-1980)'
- title: 'Ph.D., Agricultural Electrification and Automation '
description: 'Zhejiang University (2020 - 2025)'

- title: 'B.S., Agricultural Mechanization & Automation'
description: 'Northwest A&F University (2016 - 2020)'



- title: 'Ph.D. Theoretical High Energy Physics'
description: 'The University of Texas at Austin (1980-1985)'

10 changes: 0 additions & 10 deletions _data/publications.yml

This file was deleted.

32 changes: 21 additions & 11 deletions _data/settings.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
menu:
- {name: 'people', url: '/people'}
- {name: 'publications', url: '/publications'}
- {name: 'courses', url: '/courses'}
- {name: 'cv', url: '/cv'}
- {name: 'contact', url: '/contact'}
# - {name: 'people', url: '/people'}
- {name: 'Research', url: '/research'}
- {name: 'Hobbies', url: '/hobby'}
- {name: 'Publications', url: '/publications'}
# - {name: 'courses', url: '/courses'}
- {name: 'CV', url: '/cv'}
- {name: 'Contact', url: '/contact'}

people:
- {name: 'Primary Investigator', title: 'Researcher', department: 'Physics & Astronomy', institution: 'Some University', institution_address: '1 Main Street, Canada', phone: '(000) 000-0000', email: '[email protected]', office: 'Science Building 505', image: 'assets/img/primary-investigator.jpg', url: 'primary-investigator'}
- {name: 'Lab Technician', title: 'Researcher', department: 'Physics & Astronomy', institution: 'Some University', institution_address: '1 Main Street, Canada', phone: '(000) 000-0000', email: '[email protected]', office: 'Science Building 505', image: 'assets/img/lab-technician.jpg', url: 'lab-technician'}
- {name: 'Graduate Student', title: 'Researcher', department: 'Physics & Astronomy', institution: 'Some University', institution_address: '1 Main Street, Canada', phone: '(000) 000-0000', email: '[email protected]', office: 'Science Building 505', image: 'assets/img/graduate-student.jpg', url: 'graduate-student'}

courses:
hobbies:
- {name: '🐲 Board Games and D&D TRPG', url: 'hobbies', description: 'DND-Wizards', link: 'https://dnd.wizards.com/', image: 'assets/img/h1_BaldursGate.jpg'}
- {name: '🎥 UAV Photography and Film Editing', url: 'hobbies', description: 'Aerial Videos', link: 'https://www.bilibili.com/video/BV1nW4y1M7un/?share_source=copy_web&vd_source=6db384fae8a3447f8093591b1e124c05', image: 'assets/img/h2_Harvest.jpg'}
- {name: '⛰️ Hiking, Cycling and Touring', url: 'hobbies', description: 'Bicycle Touring', link: 'https://www.crazyguyonabike.com/', image: 'assets/img/h3_Touring.jpg'}
- {name: '🕹️ LOL Game', url: 'hobbies', description: 'League of Legends', link: 'https://www.leagueoflegends.com/', image: 'assets/img/h4_Urgot.jpg'}

courses:
- {name: 'Vector Calculus', url: 'vector-calculus'}
- {name: 'Quantum Mechanics', url: 'quantum-mechanics'}
- {name: 'Stellar Structures', url: 'stellar-structures'}

social:
- {icon: 'github', link: 'https://github.com/LeNPaul'}
- {icon: 'twitter', link: 'https://twitter.com/paululele'}
- {icon: 'instagram', link: 'https://instagram.com/paululele'}
- {icon: 'linkedin', link: 'https://linkedin.com/in/lenpaul'}
- {icon: 'github', link: 'https://github.com/HobbitArmy'}
- {icon: 'researchgate', link: 'https://www.researchgate.net/profile/Xiangyu_Lu6'}
- {icon: 'google', link: 'https://scholar.google.com/citations?user=u2q9sI8AAAAJ&hl=en'}
- {icon: 'twitter', link: 'https://twitter.com/luxiangyugo'}

contacts:
- {name: 'Dr. Academia', title: 'Professor', department: 'Physics & Astronomy', institution: 'Some University', institution_address: '1 Main Street, Canada', phone: '(000) 000-0000', email: '[email protected]', office: 'Science Building 505', image: 'assets/img/contact.jpg'}
- {name: 'Xiangyu', title: 'Ph.D. student', major: 'Agricultural Engineering', institution: 'Zhejiang University', institution_address: '866 Yuhangtang Road, Hangzhou, Zhejiang Province, China',
phone: '+86 152 0642 4953', email: '[email protected]',
image: 'assets/img/IMG_0602.jpg'}
15 changes: 8 additions & 7 deletions _includes/contact.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<div class="row g-5 mb-5">
<div>
<h3 class="fw-bold border-bottom pb-3 mb-5">Contact</h3>
<h4 class="fw-bold border-bottom pb-3 mb-5">Contact</h4>
{% for contact in site.data.settings.contacts %}
<div class="row g-5 mb-5">
<div class="col-md-6">
<h4>{{ contact.name }}</h4>
<p>{{ contact.title }} | {{ contact.department }}</p>
<p>{{ contact.institution }} | {{ contact.institution_address }}</p>
<h5>{{ contact.name }}</h5>
<p>{{ contact.title }} | {{ contact.major }}</p>
<p>{{ contact.institution }} </p>
<p>{{ contact.institution_address }} </p>
<p>Phone: {{ contact.phone }}</p>
<p>Email: {{ contact.email }}</p>
<p>Office: {{ contact.office }}</p>
<p>Email: <a href="mailto:{{ contact.email }}">{{ contact.email }}</a></p>
<!-- <p>Office: {{ contact.office }}</p> -->
</div>
<div class="col-md-6">
<img src="{{ site.github.url }}/{{ contact.image }}" alt="Contact" width="100%">
<img src="{{ site.github.url }}/{{ contact.image }}" alt="Contact" width="105%">
</div>
</div>
{% endfor %}
Expand Down
5 changes: 3 additions & 2 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<footer class="pt-5 my-5 text-muted border-top">
<div class="row">
<div class="col-md-6 text-end social-media-icons">
<div class="col-md-7 text-end social-media-icons">
{% for item in site.data.settings.social %}
<a href="{{ item.link }}" class="ms-3 fs-5"><i class="fab fa-{{ item.icon }}"></i></a>
<a href="{{ item.link }}" class="ms-3 fs-5">
<p class="fab fa-{{ item.icon }}"></p></a>
{% endfor %}
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<header class="d-flex flex-column flex-md-row align-items-center pb-3 mb-5 border-bottom">
<div>
<a href="{{ site.github.url }}/" class="d-flex align-items-center text-decoration-none">
<a href="{{ site.baseurl }}/" class="d-flex mt-1 text-decoration-none" style="color: #212529;">
<span class="fs-4 fw-bold">{{ site.title }}</span>
</a>
<a href="{{ site.github.url }}/" class="d-flex align-items-center text-decoration-none">
Expand All @@ -9,7 +9,8 @@
</div>
<nav class="d-inline-flex mt-2 mt-md-0 ms-md-auto">
{% for item in site.data.settings.menu %}
<a class="me-3 py-2 text-decoration-none" href="{{ site.github.url }}{{ item.url }}">{{ item.name }}</a>
<a class="me-3 py-2 text-decoration-none" style="color: #212529; font-size: 1.2rem;"
href="{{ site.github.url }}{{ item.url }}" rel="noopener">{{ item.name }}</a>
{% endfor %}
</nav>
</header>
114 changes: 106 additions & 8 deletions _includes/publications.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,112 @@
<div class="row g-5 mb-5">
<div>
<h3 class="fw-bold border-bottom pb-3 mb-5">Publications</h3>
{% if page.title == "Home" %}
{% for item in site.data.publications.featured %}
<p><a href="{{ item.url }}">{{ item.name }}</a></p>
{% endfor %}
<p>
<strong> Lu X</strong>, Zhang J, Yang R, et al.
Effective variance attention-enhanced diffusion model for crop field aerial image super resolution.
<i>ISPRS Journal of Photogrammetry and Remote Sensing. </i>
2024; 218:50-68.
<a href="https://doi.org/10.1016/j.isprsjprs.2024.08.017">
https://doi.org/10.1016/j.isprsjprs.2024.08.017
</a>
</p>

<p>
<strong> Lu X</strong>, Zhou J, Yang R, et al.
Automated Rice Phenology Stage Mapping Using UAV Images and Deep Learning.
<i>Drones. </i>
2023; 7(2):83.
<a href="https://doi.org/10.3390/drones7020083">
https://doi.org/10.3390/drones7020083
</a>
</p>

<p>
<strong>Lu X</strong>, Yang R, Zhou J, et al.
A hybrid model of ghost-convolution enlightened transformer for
effective diagnosis of grape leaf disease and pest.
<i>Journal of King Saud University - Computer and Information Sciences. </i>
2022;34(5):1755-1767.
<a href="https://doi.org/10.1016/j.jksuci.2022.03.006">
https://doi.org/10.1016/j.jksuci.2022.03.006
</a>
</p>


{% else %}
{% for item in site.data.publications.index %}
<p><a href="{{ item.url }}">{{ item.name }}</a></p>
{% endfor %}
<h4 class="fw-bold border-bottom pb-3" style="margin-top: 2rem; margin-bottom: 1rem;">Publications</h4>
<h5 class="fw-bold border-bottom pb-3" style="margin-top: 2rem; margin-bottom: 1rem;">2024</h5>
<p>
<strong> Lu X</strong>, Zhang J, Yang R, et al.
Effective variance attention-enhanced diffusion model for crop field aerial image super resolution.
<i>ISPRS Journal of Photogrammetry and Remote Sensing. </i>
2024; 218:50-68.
<a href="https://doi.org/10.1016/j.isprsjprs.2024.08.017">
https://doi.org/10.1016/j.isprsjprs.2024.08.017
</a>
</p>
<p>
Zhang X, <strong> Lu X</strong>, Zhang Z, et al.
Simultaneous detection of reference lines in paddy fields using a machine vision-based framework.
<i>Computers and Electronics in Agriculture. </i>
2024; 221:108923.
<a href="https://doi.org/10.1016/j.compag.2024.108923">
https://doi.org/10.1016/j.compag.2024.108923
</a>
</p>

<h5 class="fw-bold border-bottom pb-3" style="margin-top: 2rem; margin-bottom: 1rem;">2023</h5>
<p>
<strong> Lu X</strong>, Zhou J, Yang R, et al.
Automated Rice Phenology Stage Mapping Using UAV Images and Deep Learning.
<i>Drones. </i>
2023; 7(2):83.
<a href="https://doi.org/10.3390/drones7020083">
https://doi.org/10.3390/drones7020083
</a>
</p>
<p>
Zhou J, <strong> Lu X</strong>, Yang R, et al.
Developing thermal infrared de-ghost and multi-level nested conglutinated segmentation algorithm for detection of rice seed setting rate.
<i>Computers and Electronics in Agriculture. </i>
2023; 207:107725.
<a href="https://doi.org/10.1016/j.compag.2023.107725">
https://doi.org/10.1016/j.compag.2023.107725
</a>
</p>

<h5 class="fw-bold border-bottom pb-3" style="margin-top: 2rem; margin-bottom: 1rem;">2022</h5>
<p>
<strong>Lu X</strong>, Yang R, Zhou J, et al.
A hybrid model of ghost-convolution enlightened transformer for
effective diagnosis of grape leaf disease and pest.
<i>Journal of King Saud University - Computer and Information Sciences. </i>
2022;34(5):1755-1767.
<a href="https://doi.org/10.1016/j.jksuci.2022.03.006">
https://doi.org/10.1016/j.jksuci.2022.03.006
</a>
</p>

<p>
Zhou J, <strong> Lu X</strong>, Yang R, et al.
Developing Novel Rice Yield Index Using UAV Remote Sensing Imagery Fusion Technology.
<i>Drones. </i>
2022; 6(6):151.
<a href="https://doi.org/10.3390/drones6060151">
https://doi.org/10.3390/drones6060151 </a>
</p>

<h5 class="fw-bold border-bottom pb-3" style="margin-top: 2rem; margin-bottom: 1rem;">2021</h5>
<p>
Yang R, <strong>Lu X</strong>, Huang J, et al.
A Multi-Source Data Fusion Decision-Making Method for Disease and
Pest Detection of Grape Foliage Based on ShuffleNet V2.
<i>Remote Sensing.</i>
2021; 13(24):5102.
<a href="https://doi.org/10.3390/rs13245102">
https://doi.org/10.3390/rs13245102
</a>
</p>
{% endif %}
</div>
</div>
</div>
Loading