소스 검색

broken commit - transfering repo

Demoparty 7 년 전
부모
커밋
fd1336097a
2개의 변경된 파일34개의 추가작업 그리고 32개의 파일을 삭제
  1. 6 4
      foto/Makefile
  2. 28 28
      foto/gallery.j2

+ 6 - 4
foto/Makefile

@@ -1,17 +1,19 @@
 # Requires imagick
 
-Skan/thumb/%.jpg: Skan/%.jpg
+FOTO_PATH=../../www/decrunch.org/2117/foto/katod
+
+$(FOTO_PATH)/thumb/%.jpg: $(FOTO_PATH)/%.jpg
 	@python3 thumbnailer.py $^
 
-build/Kosma.zip: Skan
+build/Kosma.zip: $(FOTO_PATH)
 	zip -r $@ $^
 
-thumb: $(addprefix Skan/thumb/, $(notdir $(wildcard Skan/*.jpg)))
+thumb: $(addprefix $(FOTO_PATH)/thumb/, $(notdir $(wildcard $(FOTO_PATH)/*.jpg)))
 
 build/gallery.yaml: thumb
 	@echo > $@
 	@echo 'pictures:' >> $@
-	@\ls -1 Skan/thumb | sed 's/\(.*\)/  - "\1"/' >> $@
+	@\ls -1 $(FOTO_PATH)/thumb | sed 's/\(.*\)/  - "\1"/' >> $@
 
 index.html: build/gallery.yaml gallery.j2
 	@j2 -f yaml gallery.j2 $< > $@

+ 28 - 28
foto/gallery.j2

@@ -12,39 +12,39 @@
   </head>
   <body data-spy="scroll" data-target=".navbar" data-offset="50">
 
-<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#menu">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
+  <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <div class="container-fluid">
       <div class="navbar-header">
-        <a class="navbar-brand pull-center" href="/">decrunch</a>
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#menu">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <div class="navbar-header">
+          <a class="navbar-brand pull-center" href="/">decrunch</a>
+        </div>
       </div>
     </div>
-  </div>
-</nav>
+  </nav>
 
-    <section>
-      <div class="photogrid">
-        <h2>Decrunch 2016</h2>
-        <h4>20-22 V 2016</h4>
-        <p>
-          fot. <a href="//fb.me/kosma.moczek">kosma.moczek</a>
-          &nbsp;
-          arch. <a href="build/Kosma.zip">Kosma.zip</a>
-        </p>
-        {%- set num = 0 -%}
-        {%- for name in pictures %}
-          <a href="Skan/{{name}}" name="kosma-{{num}}" data-lightbox="kosma"><img src="Skan/thumb/{{name}}" alt="kosma-{{num}}" /></a>
-          {%- set num = num + 1 -%}
-        {%- endfor -%}
-      </div>
-    </section>
+  <section>
+    <div class="photogrid">
+      <h2>Decrunch 2016</h2>
+      <h4>20-22 V 2016</h4>
+      <p>
+        fot. <a href="//fb.me/kosma.moczek">kosma.moczek</a>
+        &nbsp;
+        arch. <a href="build/Kosma.zip">Kosma.zip</a>
+      </p>
+      {%- set num = 0 -%}
+      {%- for name in pictures %}
+        <a href="Skan/{{name}}" name="kosma-{{num}}" data-lightbox="kosma"><img src="Skan/thumb/{{name}}" alt="kosma-{{num}}" /></a>
+        {%- set num = num + 1 -%}
+      {%- endfor -%}
+    </div>
+  </section>
 
-    <script src="/js/lightbox-plus-jquery.min.js"></script>
+  <script src="/js/lightbox-plus-jquery.min.js"></script>
 
   </body>
 </html>