diff --git a/designbyloven.py b/designbyloven.py index 11ed7d6..bf42819 100755 --- a/designbyloven.py +++ b/designbyloven.py @@ -12,7 +12,7 @@ app = Flask(__name__) Bootstrap(app) Markdown(app) -pages = 'sidor/' +pages = os.path.dirname(os.path.realpath(__file__)) + '/sidor/' categories = [] photos = [] @@ -24,6 +24,7 @@ for x in os.walk(pages): num = len([x for x in x[2] if x.endswith(('.jpg','.JPG'))]) for i in range(num): photos.append({'category': cat, 'num': i}) +categories = sorted(categories) @app.route('/randimg') def randimg(): @@ -45,7 +46,7 @@ def thumbnails(category, num=0): catdir = pages + '/' + category thumbdir = catdir + '/thumbnails' if not os.path.isfile('%s/%d.jpg' % (thumbdir, num)): - images = [x for x in next(os.walk(catdir))[2] if x.endswith('.jpg')] + images = sorted([x for x in next(os.walk(catdir))[2] if x.endswith('.jpg')]) if not os.path.exists(thumbdir): os.makedirs(thumbdir) imgin = '%s/%s' % (catdir, images[num]) @@ -58,7 +59,7 @@ def slides(category, num=0): catdir = pages + '/' + category thumbdir = catdir + '/slides' if not os.path.isfile('%s/%d.jpg' % (thumbdir, num)): - images = [x for x in next(os.walk(catdir))[2] if x.endswith('.jpg')] + images = sorted([x for x in next(os.walk(catdir))[2] if x.endswith('.jpg')]) imgin = '%s/%s' % (catdir, images[num]) imgout = '%s/%d.jpg' % (thumbdir, num) if not os.path.exists(thumbdir): @@ -70,7 +71,7 @@ def slides(category, num=0): @app.route('//.jpg') def cat_photo(category, num): directory = pages + '/' + category - images = [x for x in next(os.walk(directory))[2] if x.endswith('.jpg')] + images = sorted([x for x in next(os.walk(directory))[2] if x.endswith('.jpg')]) try: return send_from_directory(directory, images[num]); except IndexError: diff --git a/sidor/Kuvertbody Linjer/.DS_Store b/sidor/Kuvertbody Linjer/.DS_Store new file mode 100644 index 0000000..4f947f3 Binary files /dev/null and b/sidor/Kuvertbody Linjer/.DS_Store differ diff --git a/sidor/Kuvertbody Linjer/kuvertbody_linjer.jpg b/sidor/Kuvertbody Linjer/kuvertbody_linjer.jpg new file mode 100644 index 0000000..2878030 Binary files /dev/null and b/sidor/Kuvertbody Linjer/kuvertbody_linjer.jpg differ diff --git a/sidor/Kuvertbody/presentation.md b/sidor/Kuvertbody Linjer/presentation.md similarity index 100% rename from sidor/Kuvertbody/presentation.md rename to sidor/Kuvertbody Linjer/presentation.md diff --git a/sidor/Supermanbody/1Superman.jpg b/sidor/Kuvertbody Superman/1Superman.jpg similarity index 100% rename from sidor/Supermanbody/1Superman.jpg rename to sidor/Kuvertbody Superman/1Superman.jpg diff --git a/sidor/Supermanbody/presentation.md b/sidor/Kuvertbody Superman/presentation.md similarity index 68% rename from sidor/Supermanbody/presentation.md rename to sidor/Kuvertbody Superman/presentation.md index 8fe0c0a..eb5c4e3 100644 --- a/sidor/Supermanbody/presentation.md +++ b/sidor/Kuvertbody Superman/presentation.md @@ -5,3 +5,9 @@ Visst är varje barn en liten superhjälte? Denna kuvertbody sys i st62-80 med rosa, blå eller beige bas. Samtliga varianter har vitt tryck och vita kantband. Ärmarna avslutas med kontrasterande dekorsömmar vid handleden. ###250kr + +  + +####**Nystartserbjudande!** + +####Beställ denna fina body för bara 200 kr (ord pris 250kr) innan påsk. diff --git a/sidor/Kuvertbody/2striped body.jpg b/sidor/Kuvertbody/2striped body.jpg deleted file mode 100644 index 8c0bcfe..0000000 Binary files a/sidor/Kuvertbody/2striped body.jpg and /dev/null differ diff --git a/sidor/startaom.sh.command b/sidor/startaom.sh.command index 262db3e..52150fe 100755 --- a/sidor/startaom.sh.command +++ b/sidor/startaom.sh.command @@ -2,6 +2,7 @@ rm -r /Users/thomas/code/designbyloven/sidor/**/slides rm -r /Users/thomas/code/designbyloven/sidor/**/thumbnails +rm **/.DS_Store touch /Users/thomas/code/designbyloven/designbyloven.py exit 0 diff --git a/sidor/startsida.md b/sidor/startsida.md index 000de0a..7ea9315 100644 --- a/sidor/startsida.md +++ b/sidor/startsida.md @@ -7,6 +7,6 @@ Visningsexemplar sys i samma storlek som en av mina flickor (fn st62 och st86). Samtliga tyger har tvättats parfymfritt, utan sköljmedel, innan sömnad. (Obs! Gäller ej förkläden.) -**Nystartserbjudande!** Köp vår fina [Supermanbody](/Supermanbody/) för bara 200 kr (ord pris 250kr) om du beställer innan påsk. Bodyn sys i st 62-80 med rosa, blå eller beige bas. +**Nystartserbjudande!** Köp vår fina [Supermanbody](/Kuvertbody Superman/) för bara 200 kr (ord pris 250kr) om du beställer innan påsk. Bodyn sys i st 62-80 med rosa, blå eller beige bas. Vi finns även på FaceBook, gilla för att få uppdateringar i din telefon eller surfplatta! diff --git a/templates/index.html b/templates/index.html index 40c006c..df5760d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -26,8 +26,8 @@ {% for cat in categories %}
-