Dodan gem jekyll-redirect-from in popravljen readme

Gemfile

@@ -33,4 +33,6 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
 
 gem "webrick", "~> 1.7"
 
-gem "jekyll-yamt"
+gem "jekyll-yamt"
+
+gem "jekyll-redirect-from"

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
 

_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
 

_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'}
+  - {name: 'Domov', url: '/'}
+  - {name: 'Sodelovanja', url: '/sodelovanja.html'}
+  - {name: 'Interdisciplinarni članki', url: '/clanki.html'}
+  - {name: 'Prakse', url: '/prakse.html'}
+  - {name: 'Kontakt', url: '/kontakt.html'}

_includes/footer.html

@@ -9,8 +9,8 @@
     (01) 476 6500 / <a href="mailto:fmf@fmf.uni-lj.si">fmf@fmf.uni-lj.si</a> <br /> 
   </div>
   <div class="copyright">
-    Design and code: Ines Meršak <br />
-    Pictures are property of Peter Legiša.
+    Design and code: Ines Meršak,  ... <br />
+    Logo: Katja Berčič
   </div>
 </footer>
 <div class="clr"></div>

_includes/header.html

@@ -2,7 +2,7 @@
 	<div id="site_title">
 		<h1><a href="{{ "/" | absolute_url }}">
 			<!-- {{site.title}} -->
-			<strong>Mathematics</strong><br> in Ljubljana
+			<strong>Odprti laboratorij za matematiko v uporabi</strong><br>
 		</a></h1>
 		{% if site.data.settings.subtitle.active %}
 		<h2>

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;

clanki.md

@@ -0,0 +1,12 @@
+---
+layout: page
+title: Interdisciplinarni članki
+---
+
+# Seznamček
+
+Z zanko jih bomo prikazali
+
+- a
+- b
+- c

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)!*

kontakt.md

@@ -0,0 +1,12 @@
+---
+layout: page
+title: Kontakt
+---
+
+# Kontakt
+
+Za študente in zaposlene: ...
+
+Za podjetja: ...
+
+Mail: ...

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" %}

prakse.md

@@ -0,0 +1,6 @@
+---
+layout: page
+title: Prakse
+---
+
+Tule je seznam praksic.

sodelovanja.md

@@ -0,0 +1,8 @@
+---
+layout: page
+title: Sodelovanja
+---
+
+# Sodelovanja
+
+Tule so našteta vsa sodelovanja.