diff --git a/Gemfile b/Gemfile index 379be73..bd9f467 100644 --- a/Gemfile +++ b/Gemfile @@ -33,4 +33,6 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] gem "webrick", "~> 1.7" -gem "jekyll-yamt" \ No newline at end of file +gem "jekyll-yamt" + +gem "jekyll-redirect-from" \ No newline at end of file diff --git a/README.md b/README.md index c08b75d..ebf3981 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,17 @@ ## How to edit the web page content -This web site uses [Jekyll](https://jekyllrb.com) for generation of web pages from Markdown source, and [YAMT theme](http://jekyllthemes.org/themes/jekyll-yamt/) as lipstick. The pages are served via [GitHub pages](https://guides.github.com/features/pages/) at [(https://ul-fmf.github.io/mathematics-in-ljubljana/)](https://ul-fmf.github.io/mathematics-in-ljubljana/). +This web site uses [Jekyll](https://jekyllrb.com) for generation of web pages from Markdown source, +and [YAMT theme](http://jekyllthemes.org/themes/jekyll-yamt/) as lipstick. +The pages are served via [GitHub pages](https://guides.github.com/features/pages/) +at [https://ul-fmf.github.io/olmu/](https://ul-fmf.github.io/olmu/). The pages are written in the Markdown format and automatically translated to HTML by GitHub. Simply edit the Markdown files and use Git to push the changes back to the server. The website always shows the contents of the `main` branch of the GitHub repository. -You can **edit the `.md` files in GitHub's online editor** (just navigate to the file you want to edit), or locally on your machine (if you are comfortable with `git`): +You can **edit the `.md` files in GitHub's online editor** (just navigate to the file you want to edit), +or locally on your machine (if you are comfortable with `git`): 1. `git pull` 2. Make changes to `.md` files (see below) @@ -34,7 +38,7 @@ bare hands, you should just try With a bit of luck you've got Ruby installed so this command will do the right thing. The `bundle` command is part of the Ruby [Bundler](https://bundler.io) package manager. On a Mac it is available through [Homebrew](https://brew.sh). On Linux it is available through -your package manager, e.g. on Debian/Ubuntu `sudo apt install ruby-bundler ruby-dev'. +your package manager, e.g. on Debian/Ubuntu `sudo apt install ruby-bundler ruby-dev`. Then to generate and serve the pages locally, run diff --git a/_config.yml b/_config.yml index 4596d46..1b8d121 100644 --- a/_config.yml +++ b/_config.yml @@ -18,14 +18,14 @@ # You can create any custom variable you would like, and they will be accessible # in the templates via {{ site.myvariable }}. -title: Mathematics in Ljubljana +title: OLMU # Site owner owner: - name: Urban Jezernik - email: mathematicsinljubljana@fmf.uni-lj.si + name: Petkomat + email: petko@gmail.com description: -baseurl: "" # the subpath of your site, e.g. /blog -url: https://mathematicsinljubljana.fmf.uni-lj.si +baseurl: "/mathematics-in-ljubljana" # the subpath of your site, e.g. /blog +url: https://petkomat.github.io locale: en diff --git a/_data/pages.yml b/_data/pages.yml index da714c5..101629b 100644 --- a/_data/pages.yml +++ b/_data/pages.yml @@ -1,7 +1,6 @@ pages: - - {name: 'Home', url: '/'} - - {name: 'Apply', url: '/apply.html'} - - {name: 'Program', url: '/program.html'} - - {name: 'Venue', url: '/venue.html'} - - {name: 'Life in Ljubljana', url: '/ljubljana.html'} - - {name: 'Poster', url: '/poster.html'} \ No newline at end of file + - {name: 'Domov', url: '/'} + - {name: 'Sodelovanja', url: '/sodelovanja.html'} + - {name: 'Interdisciplinarni članki', url: '/clanki.html'} + - {name: 'Prakse', url: '/prakse.html'} + - {name: 'Kontakt', url: '/kontakt.html'} diff --git a/_includes/footer.html b/_includes/footer.html index b82278d..1268e96 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -9,8 +9,8 @@ (01) 476 6500 / fmf@fmf.uni-lj.si
\ No newline at end of file diff --git a/_includes/header.html b/_includes/header.html index 20810d9..21adabe 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -2,7 +2,7 @@

- Mathematics
in Ljubljana + Odprti laboratorij za matematiko v uporabi

{% if site.data.settings.subtitle.active %}

diff --git a/apply.md b/apply.md deleted file mode 100644 index a97dc9d..0000000 --- a/apply.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: page -title: Apply ---- - -# Apply - -To apply for the Mathematics in Ljubljana 2023 summer school, simply **fill out the [Application Form](https://docs.google.com/forms/d/e/1FAIpQLSf4CwMT5MGevXPeJ4vMUixMHFFvM5eUsnfoIp1VhS17ti16AQ/viewform?usp=sf_link) before the deadline of May 1st, 2023**. We require the following documents as part of your application: - -- A *motivational letter* (maximum 1 page) explaining why you are interested in attending our summer school and how it aligns with your academic and personal goals. -- Your *CV*, highlighting your academic achievements, relevant coursework, and any research or work experience you may have. -- A *letter of recommendation* from a professor at your local university or institution. The letter should be sent directly to [mathematicsinljubljana@fmf.uni-lj.si](mailto:mathematicsinljubljana@fmf.uni-lj.si). - -If you run into any issues or have questions about the application, don't hesitate to reach out to us at [mathematicsinljubljana@fmf.uni-lj.si](mailto:mathematicsinljubljana@fmf.uni-lj.si). diff --git a/assets/css/style.css b/assets/css/style.css index dfac2c3..529c74f 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -25,7 +25,7 @@ html { margin-top: 1em; width: 900px; height: 250px; - background-image: url('../img/header.jpg'); + background-image: url('../img/header.png'); background-color: #ba232b; background-size: 60%; background-position: top left; diff --git a/assets/img/header.jpg b/assets/img/header.jpg deleted file mode 100755 index 262d05c..0000000 Binary files a/assets/img/header.jpg and /dev/null differ diff --git a/assets/img/header.png b/assets/img/header.png new file mode 100644 index 0000000..2c91660 Binary files /dev/null and b/assets/img/header.png differ diff --git a/assets/img/ljubljana/slika000.jpg b/assets/img/ljubljana/slika000.jpg deleted file mode 100644 index b38df59..0000000 Binary files a/assets/img/ljubljana/slika000.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika001.jpg b/assets/img/ljubljana/slika001.jpg deleted file mode 100644 index 33bdca7..0000000 Binary files a/assets/img/ljubljana/slika001.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika002.jpg b/assets/img/ljubljana/slika002.jpg deleted file mode 100644 index 57276b1..0000000 Binary files a/assets/img/ljubljana/slika002.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika003.jpg b/assets/img/ljubljana/slika003.jpg deleted file mode 100644 index 8d5ef30..0000000 Binary files a/assets/img/ljubljana/slika003.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika004.jpg b/assets/img/ljubljana/slika004.jpg deleted file mode 100644 index f6cd6a1..0000000 Binary files a/assets/img/ljubljana/slika004.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika005.jpg b/assets/img/ljubljana/slika005.jpg deleted file mode 100644 index 039b6e0..0000000 Binary files a/assets/img/ljubljana/slika005.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika006.jpg b/assets/img/ljubljana/slika006.jpg deleted file mode 100644 index 5570d47..0000000 Binary files a/assets/img/ljubljana/slika006.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika007.jpg b/assets/img/ljubljana/slika007.jpg deleted file mode 100644 index ff7d642..0000000 Binary files a/assets/img/ljubljana/slika007.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika008.jpg b/assets/img/ljubljana/slika008.jpg deleted file mode 100644 index c6da337..0000000 Binary files a/assets/img/ljubljana/slika008.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika009.jpg b/assets/img/ljubljana/slika009.jpg deleted file mode 100644 index 3edf638..0000000 Binary files a/assets/img/ljubljana/slika009.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika010.jpg b/assets/img/ljubljana/slika010.jpg deleted file mode 100644 index ce0190d..0000000 Binary files a/assets/img/ljubljana/slika010.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika011.jpg b/assets/img/ljubljana/slika011.jpg deleted file mode 100644 index 898acfe..0000000 Binary files a/assets/img/ljubljana/slika011.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika012.jpg b/assets/img/ljubljana/slika012.jpg deleted file mode 100644 index 1994057..0000000 Binary files a/assets/img/ljubljana/slika012.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika013.jpg b/assets/img/ljubljana/slika013.jpg deleted file mode 100644 index 3e6f6b1..0000000 Binary files a/assets/img/ljubljana/slika013.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika014.jpg b/assets/img/ljubljana/slika014.jpg deleted file mode 100644 index 31dd9dd..0000000 Binary files a/assets/img/ljubljana/slika014.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika015.jpg b/assets/img/ljubljana/slika015.jpg deleted file mode 100644 index 47b065b..0000000 Binary files a/assets/img/ljubljana/slika015.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika016.jpg b/assets/img/ljubljana/slika016.jpg deleted file mode 100644 index 855a07e..0000000 Binary files a/assets/img/ljubljana/slika016.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika017.jpg b/assets/img/ljubljana/slika017.jpg deleted file mode 100644 index 9c67964..0000000 Binary files a/assets/img/ljubljana/slika017.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika018.jpg b/assets/img/ljubljana/slika018.jpg deleted file mode 100644 index 1c8191e..0000000 Binary files a/assets/img/ljubljana/slika018.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika019.jpg b/assets/img/ljubljana/slika019.jpg deleted file mode 100644 index 3ee761c..0000000 Binary files a/assets/img/ljubljana/slika019.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika020.jpg b/assets/img/ljubljana/slika020.jpg deleted file mode 100644 index f77e852..0000000 Binary files a/assets/img/ljubljana/slika020.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika021.jpg b/assets/img/ljubljana/slika021.jpg deleted file mode 100644 index 3bd1ab4..0000000 Binary files a/assets/img/ljubljana/slika021.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika022.jpg b/assets/img/ljubljana/slika022.jpg deleted file mode 100644 index 243baf8..0000000 Binary files a/assets/img/ljubljana/slika022.jpg and /dev/null differ diff --git a/assets/img/ljubljana/slika023.jpg b/assets/img/ljubljana/slika023.jpg deleted file mode 100644 index 0310648..0000000 Binary files a/assets/img/ljubljana/slika023.jpg and /dev/null differ diff --git a/clanki.md b/clanki.md new file mode 100644 index 0000000..391dc99 --- /dev/null +++ b/clanki.md @@ -0,0 +1,12 @@ +--- +layout: page +title: Interdisciplinarni članki +--- + +# Seznamček + +Z zanko jih bomo prikazali + +- a +- b +- c \ No newline at end of file diff --git a/index.md b/index.md index f8edff3..0a28e3a 100644 --- a/index.md +++ b/index.md @@ -3,17 +3,17 @@ layout: page title: Home --- -# Mathematics in Ljubljana 2023 +# Odprti laboratorij za matematiko v uporabi -Join us for a week of exciting mathematics at the summer school Mathematics in Ljubljana 2023, taking place **from July 2nd to 8th, 2023 in Ljubljana, Slovenia**. Our goal is to introduce curious students to the most fascinating areas of mathematics studied in Ljubljana. +Tole je na kratko o nas. Preverimo _ležeče_ in **odebeljeno**, morda ~prečrtano~ ali ~~prečrtano~~ besedilo. -In addition to an overview of the local research groups, we will offer two minicourses to delve deeper into specific topics, as well as plenty of social activities to help you make connections with fellow participants. +Kaj pa $2 + 2 = 4?$ -Our summer school is designed for motivated bachelor's and master's students of mathematics who are interested in pursuing a PhD or furthering their academic career in mathematics. However, we welcome applications from students outside of this scope who can demonstrate reasonable motivation for attending. +Morebiti celo `int [] x = {1, 2, 3}` ali -The summer school will be held entirely in English. There's no registration fee and we are providing free housing and meals for participants. +``` +def f(n): + return n if n > 3 else f(n + 2) +``` -Come and explore mathematics in one of Europe's most beautiful cities. Apply now! - -*Interested in physics? Check out our sister school [Physics in Ljubljana 2023](http://physicsinljubljana.fmf.uni-lj.si)!* diff --git a/kontakt.md b/kontakt.md new file mode 100644 index 0000000..6db836f --- /dev/null +++ b/kontakt.md @@ -0,0 +1,12 @@ +--- +layout: page +title: Kontakt +--- + +# Kontakt + +Za študente in zaposlene: ... + +Za podjetja: ... + +Mail: ... \ No newline at end of file diff --git a/ljubljana.md b/ljubljana.md index 04d8f50..f06b902 100644 --- a/ljubljana.md +++ b/ljubljana.md @@ -3,12 +3,10 @@ layout: page title: Home --- -# Life in Ljubljana +# Tole je Lublana -Approximately 2000 years ago, in 14 AD, the Roman town of Emona was established at the location of present-day Ljubljana, and you can still climb a Roman wall just a stone's throw from our department. +Če si ti iz Krana, Pirana, Pakistana, -Today, Ljubljana is a beautiful, vibrant, and immensely livable city. In fact, it made #2 on Lonely Planet's Best in Europe 2014 list, was the winner of the European Green Capital Award 2016, and was voted the [best place to travel in Europe in 2022](https://www.europeanbestdestinations.com/european-best-destinations-2022/)! Our department is a 20-minute walk or a 10-minute bike or bus ride away from the city centre and Old Town, where you can get your fair share of culture, cafés, historical buildings, cobbled streets and bridges. - -And best of all, Ljubljana is smack in the centre of Slovenia, one of Europe's smallest, greenest, and most geographically and biologically diverse countries – it was ranked #5 on [Yale's list](http://www.businessinsider.com/most-environmentally-friendly-countries-2016-3) of world's greenest countries in 2016. Snow-capped Alpine [mountains](https://en.wikipedia.org/wiki/Triglav), gorgeous glacial [lakes](https://en.wikipedia.org/wiki/Bled), emerald-green [rivers](https://en.wikipedia.org/wiki/So%C4%8Da), limestone [caves](https://en.wikipedia.org/wiki/Postojna_Cave), the [Mediterranean Sea](https://en.wikipedia.org/wiki/Slovene_Istria), mediaeval coastal [towns](https://en.wikipedia.org/wiki/Piran), the famous [Lipizzaner horses](https://en.wikipedia.org/wiki/Lipica,_Se%C5%BEana), virgin [forests](https://www.google.com/search?q=virgin+forests+slovenia&tbm=isch), thermal [spas](https://en.wikipedia.org/wiki/Spa_town#Slovenia), and the oldest [grape vine](https://en.wikipedia.org/wiki/Old_vine#Old_vines_around_the_globe) in the world can all be easily reached by car, bus or train in an hour and a half or less! Visit [slovenia.info](http://www.slovenia.info/?lng=2) for more information about visiting and living in Slovenia. +to ne zanima prekrškovnega organa. {% include image-gallery.html folder="/assets/img/ljubljana" %} diff --git a/poster.md b/poster.md deleted file mode 100644 index 5311cae..0000000 --- a/poster.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: page -title: Poster ---- - -# Poster - -[Poster PDF (15MB)](/assets/poster.pdf) - -If your print shop can cut the white edges off, download the [PDF with the trim marks](/assets/poster-trim.pdf). \ No newline at end of file diff --git a/prakse.md b/prakse.md new file mode 100644 index 0000000..a40d60c --- /dev/null +++ b/prakse.md @@ -0,0 +1,6 @@ +--- +layout: page +title: Prakse +--- + +Tule je seznam praksic. \ No newline at end of file diff --git a/program.md b/program.md deleted file mode 100644 index 995ad21..0000000 --- a/program.md +++ /dev/null @@ -1,123 +0,0 @@ ---- -layout: page -title: Program ---- - -# Program - -Our summer school is a five-day program (Monday to Friday, Sunday and Saturday are arrival and departure days) packed with stimulating mathematical content and enriching cultural experiences. - - -Our mornings will be dedicated to two minicourses: - - -- Egbert Rijke: *Formalization of Mathematics* -- Luka Boc Thaler: *Introduction to Complex Dynamics* - - -In the afternoons, attendees will have the opportunity to learn about the exciting research conducted by various local research groups, covering the following areas: - - -- Algebra and Functional Analysis -- Complex Analysis -- Discrete Mathematics -- Foundations of Mathematics and Theoretical Computer Science -- Geometry -- Numerical Analysis -- Probability, Statistics and Financial Mathematics -- Topology - - -In addition to the mathematical content, we will also provide valuable information on master's and doctoral programs, including the possibility of obtaining a double degree with the University of Trieste for master's students. We will also offer details on arrival, accommodation, and studying in Ljubljana, as well as insights from current foreign master's and doctoral students on living and studying in the city. - - -Throughout the week, we will also organize exciting cultural activities, including a guided tour of Ljubljana on the first day and an excursion to Bled on Wednesday. Participants will have the opportunity to visit the memorial room of the first rector of the University of Ljubljana and renowned mathematician Josip Plemelj and learn about his life and work. - -# Timetable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Monday 3/7Tuesday 4/7Wednesday 5/7Thursday 6/7Friday 7/7
9.30-10.30Welcome sessionBureaucracy (visa etc)Bled tourComplex DynamicsComplex Dynamics
10.30-11.30FormalizationFormalization Complex DynamicsComplex Dynamics
11.30-12.30FormalizationFormalization Discrete mathematicsMeet international students
12.30-13.30LunchLunch LunchLunch
13.30-14.30TopologyPhD, MSc programme AlgebraComplex analysis
14.30-15.30GeometryNumerical analysis Functional analysisProbability and statistics
15.30-16.30 Foundations of mathematics  Goodbye session
16.30-18.30Ljubljana tour    
18.30-19.30DinnerDinner DinnerDinner
diff --git a/sodelovanja.md b/sodelovanja.md new file mode 100644 index 0000000..f0774f2 --- /dev/null +++ b/sodelovanja.md @@ -0,0 +1,8 @@ +--- +layout: page +title: Sodelovanja +--- + +# Sodelovanja + +Tule so našteta vsa sodelovanja. \ No newline at end of file diff --git a/venue.md b/venue.md deleted file mode 100644 index 1e2b231..0000000 --- a/venue.md +++ /dev/null @@ -1,49 +0,0 @@ ---- -layout: page -title: Venue ---- - -# Accommodation - -Housing is organized in “Hostel Tabor” located in an attractive downtown location. The hostel is within walking distance of both the train station and major tourist attractions. Most participants will be housed in twin rooms. - -## Address - -Hostel Tabor -Kotnikova ulica 4 -1000 Ljubljana, Slovenia - -## Contact information - -[https://hostel.ddt.si/](https://hostel.ddt.si/) -[info@ddt.si](mailto:info@ddt.si) -+386 (0)1 2348840 -+386 (0)41 359 977 - -# Venue - -The summer school will take place at the Faculty of Mathematics and Physics in the building of the Department of Mathematics. - -## Address - -University of Ljubljana -Faculty of Mathematics and Physics -Department of Mathematics -Jadranska ulica 21 -1000 Ljubljana, Slovenia - -## How to get here - -### With bus from main train/bus station - -Walk to “Bavarski dvor” and take Bus No. 6 or 6B (“Dolgi most” or “Vnanje gorice”) until stop “Hajdrihova”. There is a 3 min walk to the Faculty of Mathematics and Physics. - -### From organized housing to the Faculty of Mathematics and Physics - -To reach the Faculty of Mathematics and Physics from Hostel Tabor, we recommend a short walk to the bus stop “Ajdovščina” and then continue with bus No. 6/6B to “Hajdrihova”. There is a 3 min walk to the Faculty of Mathematics and Physics. - -Directions in Google Maps: [https://goo.gl/maps/bTwxdwGXuADmb5Q4A](https://goo.gl/maps/bTwxdwGXuADmb5Q4A) - -### From airport to Ljubljana - -From the Ljubljana Airport, you can take either bus to the Ljubljana main station or a shuttle. More info is available on the webpage [https://www.lju-airport.si/en/transport/](https://www.lju-airport.si/en/transport/).