fix merge conflict, minor change to film

.gitignore

@@ -5,3 +5,5 @@ www/
 *.swp
 venv
 *.swo
+secret.txt
+app/local_settings.py

app/settings.py

@@ -19,9 +19,6 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
 
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure-4^*01ba-twojkikte8_7q_%zc96f@i%^gwg-36*xlr1&l4w-im'
-
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
@@ -148,3 +145,26 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 TIMELINE_PREFIX = "https://aab21.pad.ma/"
 
 URL_PREFIX = 'polis+'
+
+try:
+    from .local_settings import *
+except ImportError:
+    pass
+
+# Make this unique, creates random key first at first time.
+try:
+    SECRET_KEY
+except NameError:
+    SECRET_FILE = BASE_DIR / 'secret.txt'
+    try:
+        SECRET_KEY = open(SECRET_FILE).read().strip()
+    except IOError:
+        try:
+            from django.utils.crypto import get_random_string
+            chars = 'abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)'
+            SECRET_KEY = get_random_string(50, chars)
+            secret = open(SECRET_FILE, 'w')
+            secret.write(SECRET_KEY)
+            secret.close()
+        except IOError:
+            raise Exception('Please create a %s file with random characters to generate your secret key!' % SECRET_FILE)

app/static/css/partials/_ascroll.scss

@@ -1,22 +1,31 @@
 #ascroll {
   font-family: "noto_sans";
   width: 100%;
-  max-width: 1080px;
+  color: #222;
-  margin: auto;
 
   h1 {
-    margin: 4px;
+    padding: 4px;
-    margin-top: 32px;
+    padding-top: 32px;
-    font-size: 24px;
+    font-size: 20px;
     letter-spacing: 1px;
     font-weight: bold;
+    max-width: 1080px;
+    margin: auto;
   }
   h2 {
-    margin: 4px;
+    padding: 4px;
+    max-width: 1080px;
+    margin: auto;
   }
   .intro {
-    margin: 4px;
+    padding: 4px;
-    margin-bottom: 64px;
+    padding-bottom: 64px;
+    max-width: 1080px;
+    margin: auto;
+  }
+  .vbox {
+    max-width: 1080px;
+    margin: auto;
   }
   .player {
     position: absolute;
@@ -31,6 +40,8 @@
   .annotation {
     min-height: 100vh;
     .frame {
+      max-width: 1080px;
+      margin: auto;
       img {
         width: 100%;
         height: auto;
@@ -42,7 +53,9 @@
       }
     }
     .text {
-      margin: 20px 20px;
+      max-width: 1080px;
+      margin: auto;
+      padding: 20px 20px;
       font-size: 22px;
       line-height: 26px;
     }

app/static/css/partials/_layout.scss

@@ -19,11 +19,14 @@
         //color: #000;
     }
 }
-body {
+body.animated {
     background: linear-gradient(to right, var(--bg-color-1), var(--bg-color-2) , var(--bg-color-3), var(--bg-color-4));
     animation: background_animation 60s ease-in-out infinite;
     background-size: 400% 100%;
-    color: #eee;
+}
+
+body {
+    color: #ddd;
     font-family: "noto_sans", sans-serif;
     font-size: 20px;
     overflow-x: hidden;

app/static/css/partials/_menu.scss

@@ -33,10 +33,6 @@
     font-size: 17px;
     margin-left: var(--spacing);
 
-    &:hover {
-      background-color: #ddd;
-      color: black;
-    }
     @media screen and (max-width: 799px) {
       &.title {
         display: block;

app/static/css/partials/_text.scss

@@ -63,3 +63,21 @@ main > .texts {
     }
   }
 }
+
+
+main > .index {
+  text-align: center;
+  padding-top: 48px;
+  font-size: 26px;
+  line-height: 1.3;
+
+}
+
+main > .about {
+  line-height: 1.2;
+  margin: 16px;
+  p {
+    padding-bottom: 24px;
+  }
+
+}

app/static/css/partials/_titleanimation.scss

@@ -0,0 +1,21 @@
+
+@keyframes animated_title_animation {
+    0%,100% {
+        background-position: 0 0;
+    }
+
+    50% {
+        background-position: 100% 0;
+    }
+}
+
+.animated-title {
+  .text {
+    //background: linear-gradient(to right, #6666ff, #0099ff , #00ff00, #ff3399, #6666ff);
+    background: linear-gradient(to right, var(--bg-color-1), var(--bg-color-2) , var(--bg-color-3), var(--bg-color-4));
+    background-clip: text;
+    color: transparent;
+    animation: animated_title_animation 60s ease-in-out infinite;
+    background-size: 400% 100%;
+  }
+}

app/static/css/style.scss

@@ -1,5 +1,6 @@
 @import "partials/reset";
 @import "partials/layout";
+@import "partials/titleanimation";
 @import "partials/menu";
 @import "partials/film";
 @import "partials/text";

app/static/js/animation.js

@@ -0,0 +1,12 @@
+document.querySelectorAll('body.animated').forEach(element => {
+    var animationDuration = 60;
+    var randomDuration = Math.random() * animationDuration;
+    element.style.animationDelay = -randomDuration + 's';
+})
+document.querySelectorAll('.animated-title').forEach(element => {
+    var animationDuration = 60;
+    var randomDuration = Math.random() * animationDuration;
+    element.querySelectorAll('.text').forEach(text => {
+        text.style.animationDelay = -randomDuration + 's';
+    }
+})

app/static/js/ascroll.js

@@ -120,16 +120,19 @@ function timeupdate(event) {
 }
 
 function formatInfo(config, ascroll) {
+    var info = document.createElement('div')
     var h1 = document.createElement('h1')
     h1.innerHTML = config.title
-    ascroll.appendChild(h1)
+    info.appendChild(h1)
     var h2 = document.createElement('h2')
     h2.innerHTML = config.byline
-    ascroll.appendChild(h2)
+    info.appendChild(h2)
     var div = document.createElement('div')
     div.classList.add('intro')
     div.innerHTML = config.body
-    ascroll.appendChild(div)
+    info.appendChild(div)
+    ascroll.appendChild(info)
+    return info
 }
 
 function showOverlay(event) {
@@ -181,6 +184,34 @@ function showOverlay(event) {
 
 }
 
+async function loadClips(annotations) {
+    var items = annotations.map(annotation => annotation.id.split('/')[0])
+    items = [...new Set(items)]
+    return pandoraAPI('findClips', {itemsQuery: {
+        conditions: [{key: 'id', operator: '&', value: items}]
+    }, range: [0, 10000], keys: [
+        'id', 'hue', 'saturation', 'lightness'
+    ]}).then(response => {
+        var colors = {}
+        response.data.items.forEach(clip => {
+            colors[clip.id] = clip
+        })
+        var previous
+        annotations.forEach(annotation => {
+            var clipId = annotation.id.split('/')[0] + '/' + annotation.in.toFixed(3)  + '-'+ annotation.out.toFixed(3)
+            annotation.color1 = colors[clipId]
+            if(previous) {
+                previous.color2 = annotation.color1
+            }
+            previous = annotation
+        })
+        if (annotations.length) {
+            annotations[annotations.length - 1].color2 = annotations[0].color1
+        }
+        return annotations
+    })
+}
+
 function loadItem(config) {
     pandoraAPI('get', {id: config.item, keys: [
         'id', 'title', 'layers', 'hue', 'saturation', 'lightness'
@@ -198,39 +229,48 @@ function loadItem(config) {
         video.addEventListener('timeupdate', timeupdate)
         video.addEventListener('touchstart', showOverlay)
         video.addEventListener('mouseover', showOverlay)
-        ascroll.appendChild(video)
+        var box = document.createElement('div')
+        box.classList.add('vbox')
+        box.appendChild(video)
+        ascroll.appendChild(box)
 
         var first
-        formatInfo(config, ascroll)
+        var info = formatInfo(config, ascroll)
-
+        var annotations = response.data.layers[config.layer].filter(annotation => {
-        response.data.layers[layer].forEach(annotation => {
+            return !(config.user && annotation.user != config.user)
-            if (config.user && annotation.user != config.user) {
+        })
-                return
+        loadClips(annotations).then(annotations => {
-            }
+            annotations.forEach(annotation => {
-            if (!first) {
+                var div = document.createElement('div')
-                first = annotation
+                div.classList.add('annotation')
-            }
+
-            var div = document.createElement('div')
+                var color1 = `hsl(${annotation.color1.hue}, 70%, 75%)`
-            div.classList.add('annotation')
+                var color2 = `hsl(${annotation.color2.hue}, 70%, 75%)`
-            div.innerHTML = `
+                if (!first) {
-                <div class="frame"><img src="${baseURL}/${annotation.id.split('/')[0]}/${imageResolution}p${annotation.in}.jpg"></div>
+                    first = annotation
-                <div class="text">${annotation.value}</div>
+                    info.style.background = color1
-
+                }
-            `
+                div.style.background = `linear-gradient(to bottom, ${color1}, ${color2})`;
-            ascroll.appendChild(div)
+                div.innerHTML = `
-            var frame = div.querySelector('.frame')
+                    <div class="frame"><img src="${baseURL}/${annotation.id.split('/')[0]}/${imageResolution}p${annotation.in}.jpg"></div>
-            document.addEventListener('scroll', onVisibilityChange(div.querySelector('.frame'), function(visible) {
+                    <div class="text">${annotation.value}</div>
-                if (loaded && visible) {
+
-                    updatePlayer(video, frame, annotation['in'], annotation['out'])
+                `
-                }
+                ascroll.appendChild(div)
-
+                var frame = div.querySelector('.frame')
-            }))
+                document.addEventListener('scroll', onVisibilityChange(div.querySelector('.frame'), function(visible) {
+                    if (loaded && visible) {
+                        updatePlayer(video, frame, annotation['in'], annotation['out'])
+                    }
+
+                }))
+            })
+            loaded = true
+            let frame = ascroll.querySelector('.annotation .frame')
+            if (frame) {
+                updatePlayer(video, frame, first['in'], first['out'])
+            }
         })
-        loaded = true
-        let frame = ascroll.querySelector('.annotation .frame')
-        if (frame) {
-            updatePlayer(video, frame, first['in'], first['out'])
-        }
     })
 }
 function loadEdit(config) {
@@ -245,23 +285,37 @@ function loadEdit(config) {
         ascroll.appendChild(video)
 
         var first
-        formatInfo(config, ascroll)
+        var info = formatInfo(config, ascroll)
+        var previous
+
+        var annotations = []
 
         response.data.clips.forEach(clip => {
-            clip.layers[layer].forEach(annotation => {
+            clip.layers[config.layer].forEach(annotation => {
                 if (config.user && annotation.user != config.user) {
                     return
                 }
-                if (!first) {
+                annotation.title = clip.title
-                    first = annotation
+                annotations.push(annotation)
-                }
+            })
+        })
+        loadClips(annotations).then(annotations => {
+            annotations.forEach(annotation => {
                 var div = document.createElement('div')
                 div.classList.add('annotation')
+
+                var color1 = `hsl(${annotation.color1.hue}, 70%, 75%)`
+                var color2 = `hsl(${annotation.color2.hue}, 70%, 75%)`
+                if (!first) {
+                    first = annotation
+                    info.style.background = color1
+                }
+                div.style.background = `linear-gradient(to bottom, ${color1}, ${color2})`;
                 div.innerHTML = `
                     <div class="frame">
                         <figure>
                             <img src="${baseURL}/${annotation.id.split('/')[0]}/${imageResolution}p${annotation.in}.jpg">
-                            <figcaption><a href="${baseURL}/${annotation.id}" target="_blank">${clip.title}</a></figcaption>
+                            <figcaption><a href="${baseURL}/${annotation.id}" target="_blank">${annotation.title}</a></figcaption>
                         </figure>
 
                     </div>
@@ -288,6 +342,8 @@ function loadEdit(config) {
     })
 }
 
+config.layer = config.layer || layer
+
 if (config.item) {
     loadItem(config)
 } else if (config.edit) {

app/templates/about.html

@@ -0,0 +1,138 @@
+{% extends "base.html" %}
+{% block title %}About 關於{% endblock title %}
+{% block body_class%}animated{% endblock %}
+{% block main %}
+<div class="about">
+<p>
+The title Phantasmopolis is a newly coined Greek word comprising “phantasma” (phantom) and “polis” (city-state) inspired by Phantasmagoria, an English sci-fi novel by architect Wang Dahong. Treating “Asian futurisms”  as its main theme, the 2021 Asia Art Biennial “Phantasmapolis” seeks to review Asia’s past and present from the perspective of science fiction.
+</p><p>
+
+「Phantasmapolis」一詞是新造的希臘字，分別由「Phantasma」（幻影、魅影）及「Polis」（城邦）所組構而成。
+<br>
+「Phantasmapolis」一詞的靈感來自於建築家王大閎所撰寫的英文科幻小說《Phantasmagoria》（中譯《幻城》）。
+</p><p>
+
+
+The 8 edition of the Asian Art Biennial hosted by the National Taiwan Museum of Fine Arts (NTMoFA) invites Independent curator Nobuo Takamori (Taiwan) as the chief curator with a transnational curatorial team that also includes curators Tessa Maria Guazon (Philippines), Anushka Rajendran (India), Ho Yu-Kuan (Taiwan), and curator and art historian Thanavi Chotpradit (Thailand).
+</p><p>
+
+第八屆2021亞洲藝術雙年展將以「Phantasmapolis未至之城」為題，由臺灣獨立策展人高森信男擔綱本次展覽總策劃，邀請臺灣策展人侯昱寬、菲律賓策展人泰莎．瑪莉亞．奎松（Tessa Maria Guazon）、印度策展人安努舒卡．拉堅德蘭（Anushka Rajendran）、泰國策展人暨藝術史學者唐娜維．恰卜瑞蒂（Thanavi Chotpradit）組成多國跨域的策展團隊。
+</p><p>
+
+
+Phantas.ma/polis, is the new location for the video art programme of the biennial, “Looking Back to the Future”. Using the time-based annotation, timeline views and edit features of Pad.ma, Phantas.ma/polis showcases the participating artists’ videos along with extended commentaries by the curator, artists and critics. Over the duration of the biennial,
+Phantas.ma/polis will evolve to bring the artworks in conversation with each other through both formal and interpretative recombinations of the featured works.
+</p><p>
+
+
+Phantas.ma/polis 為本屆亞洲藝術雙年展的錄像藝術單元「回望未來」（Looking Back to the Future）的專屬網站，其時基注釋、時間軸、剪輯等特色，於線上呈現參展藝術家的錄像作品，並搭配策展人、藝術家、藝評家的深度評論和活潑精彩的每日節目規畫。雙年展期間，Phantas.ma/polis 將會持續演化，藉由將展出作品在形式上和詮釋面上的重新組合，讓作品間產生對話。 
+
+</p><p>
+
+Curated by Anushka Rajendran, “Phantasmapolis: Looking back to the future” considers alterities and futurisms whose traces endure in our present—often inherited from the past—that were denied existence, or threatened by various dominant apparatuses of power. A series of moving image works articulate their concerns in the grammatical premise determined by the future-past tense, excavating the cyclical nature of time and latencies residing in the interstices of time as experienced in the contemporary. 
+</p><p>
+錄像計畫「未至之城：回望未來」由安努舒卡．拉堅德蘭策展，該計劃想像各種被主流勢力所阻擋、威脅的未來景觀，而許多的「未來」在當前世界裡已出現蛛絲馬跡。展覽中一系列的動態影像以「未來過去式」探索各種議題，深掘當代時間感知的循環特性，以及時間間隙當中的潛在可能。
+</p><p>
+
+The artworks present in this exhibition, even as they maintain scepticism towards techno-fetishistic, development-philic, heteronormative, non-inclusive paradigms for the future, propelled in the interest of capital and by the anaemic premise inscribed by the idea of progress, they do not deny the possibility of reorienting civilizational creativity and resilience towards reconsiderations.        
+</p><p>
+                   
+雖然展覽中的作品對於科技迷戀、發展導向、異性戀觀點、對未來的排他敘事、受資本驅動、進步導向的貧乏敘事提出質疑，藝術家仍然願意透過文明創造力與韌性，重新探索不同未來可能。
+
+</p><p>
+
+                                                                                                                                                   The online platform that hosts this exhibition conceptualized and drawn from pad.ma proposes alternative ways of deepening the connectivity and democratic possibilities that can exist vis-à-vis the internet towards ethical digital infrastructures to engage intimately with art.  
+
+</p><p>
+
+呈現此計畫的網路平台之發想與概念來自 pad.ma，該平台提倡以另類的方式，讓數位介面的藝術體驗更具有連結性也更民主。
+
+</p><p>
+
+
+
+Bios 
+</p><p>
+
+Anushka RAJENDRAN 
+<br>
+is a curator and art writer based in New Delhi. She is the curator for the Prameya Art Foundation (PRAF), a non-profit arts organization based in New Delhi committed to approaches that enable audience-thinking for contemporary art in India. She is also the Festival Curator of the 2021 edition of Colomboscope and was assistant curator for Kochi-Muziris Biennale 2018. As a research scholar, Anushka is completing her PhD in Visual Studies at the School of Arts and Aesthetics, Jawaharlal Nehru University, New Delhi. Her research traces how the notion of ‘public’ has acquired alternative significance to contemporary Indian art. Her previous MPhil research focused on the adoption of installation art by artists in India in the early 1990s to address collective and personal trauma. For her curatorial practice, she has been awarded fellowships that supported residencies with Fundación Sandretto Re Rebaudengo Madrid; Aomori Contemporary Art Center, Aomori, Japan; the International Studio & Curatorial Program (ISCP), New York (by Inlaks Shivdasani Foundation); and Theertha International Artists’ Collective, Colombo.
+</p><p>
+
+安努舒卡．拉堅德蘭，現居於新德里的獨立策展人、藝術評論者。曾為2018年柯欽雙年展（Kochi Biennale）之助理策展人，同時也是現任普拉美亞藝術基金會（Prameya Art Foundation） 策展人，這是個非營利的藝術組織，致力作為印度當代藝術與觀眾之橋樑。Anushka現正於印度新德里國立尼赫魯大學（Jawaharlal Nehru University）研讀視覺研究博士學位，她的研究領域包括：追溯2004年迄今當代印度藝術中公共意義的轉變，以及1990年代初期印度藝術家如何透過繪畫、雕塑回應個人及集體的創傷。安努舒卡曾於日本青森當代藝術中心、紐約國際工作室策展計畫（簡稱ISCP）及哥倫波等地駐村。2021年將擔任斯里蘭卡哥倫坡三年展（Colomboscope）之共同策展人。
+</p><p>
+
+
+Pad.ma 
+<br>
+is an artist-run online archive of densely text-annotated video material, primarily footage and not finished films contributed by filmmakers, artists and cultural workers. It was set up in 2008 as a collaboration between CAMP, 0x2620 and the Alternative Law Forum and Majlis. Pad.ma has remained at the forefront of radical and future-oriented thinking and engagement with both material and theory of archives, and their team members have lectured and conducted workshops worldwide on the same. 
+</p><p>
+
+Pad.ma 
+<br>
+公眾存取數位媒體檔案庫（Public Access Digital Media Archive ，簡稱Pad.ma）是一個為密集文字標注影片素材所設立的線上檔案庫。其營運團隊成員皆為藝術家，彙整內容主要為電影創作者、藝術家、文化工作者提供的影片資料帶和未完成的影片。2008年正式上線的Pad.ma為CAMP、0x2620、另類法律論壇、Majlis共同合作而成，而其激進、以未來為導向的思考模式多年來始終如一，並積極投入檔案資料的素材與理論的研究，團隊成員亦常於世界各地發表演講或舉辦工作坊。
+</p><p>
+
+
+CAMP 
+<br>
+is a collaborative studio founded in Bombay in 2007. It has been producing fundamental new work in film and video, electronic media, and public art forms, in a practice characterised by a hand-dirtying, non-alienated relation to technology. From their home base in Mumbai, they co-host the online archives ​pad.ma and ​indiancine.ma and run a rooftop cinema for the past 14 years.
+</p><p>
+
+
+CAMP
+<br>
+為2007年成立於孟買的合作型工作室。其創作一向與技術維持近距親身的接觸，和不排斥不疏離的關係，並秉持此一精神與作法，不斷推出電影及錄像、電子媒體、公共藝術等類型的全新作品。他們以設址於孟買的總部為據點，執行線上資料庫​Pad.ma和​Indiancine.ma的聯合運作，其於14年前開辦的屋頂電影院至今依舊照常營運。
+
+</p><p>
+
+0x2620 
+<br>
+Founded in 2010 in Berlin, is an artist-run agency for the advancement of the international exchange of information, and usually operates at the intersections of art, politics and technology. Its activities include extensive research on intellectual property and piracy, the development of open-source software tools and web applications, and the production of both technological and social infrastructure for the collaborative creation, maintenance and use of relatively large data sets.
+</p><p>
+
+0x2620
+<br>
+2010年成立於柏林，是一個為促進國際資訊交流而建立的藝術家營運機構，擅長處理藝術、政治、技術之間所產生的交集與碰撞塊。活動包括在智慧財產與盜版、開放源軟體工具及網路應用程式的開發、合作性創作、相對巨量數據集的維護及使用等多方面的研究。
+
+</p><p>
+
+Annotation Collaborators: <br>
+影片評論共筆：
+</p><p>
+
+Yang Yu-Chiao is a researcher on oral literature, narratology and folktale poetics, and is also a narrator of Taiwanese folktales in the oral tradition. Yu-Chiao also created several performances drawing from storytelling, poetry, writing actions, and experimental sounds with artists working with different media including digital, film, and classical music since 2017.  Yu-Chiao has published several works including a series of tales that demonstrate characters in oracle bone script.
+
+</p><p>
+
+楊雨樵，喜歡散步，喜歡樹的屍骨。專職為口頭傳統民間譚的言說藝術表演者與獨立撰稿人，並從事口傳文學、戲劇與電影的敘事學、故事詩學與比較故事學研究。除開設「世界民間譚」展演式講座外，2017 年開始以言說藝術表演者身份，和聲音、影像領域的藝術家合作，發展如《聲熔質變——Anamorphosis & Anatexis》的實驗性系列演出至今。出版過數本以甲骨文為對象的文學創作，其他文章散見於紙本刊物與網路平台。
+
+</p><p>
+
+Chen Wan-Yin is an art critic and a writer. She is currently a Ph.D. researcher on media aesthetics and East Asian contemporary art at Vrije Universiteit Amsterdam. She previously worked as an editor of Artist Magazine (Taipei) from 2014 to 2017 and since 2015, she has also been working as a scriptwriter with video artist Hsu Che-Yu. 
+
+</p><p>
+
+陳琬尹，現為阿姆斯特丹自由大學藝術史與文化學系博士生，研究關注東亞現當代藝術史與媒介美學，曾任多年藝術雜誌編輯。
+
+</p><p>
+
+Acknowledgements:  Nobuo Takamori, Zinnia Ambapardiwala, Karen Menezes, Sanjay Bhangar, Ho Yu-Kuan, Renyu Ye please add here Chia-cheng Liao* 
+</p><p>
+
+
+ 致謝：高森信男、Zinnia Ambapardiwala、Karen Menezes、Sanjay Bhangar、葉人瑜
+</p><p>
+
+
+
+Project "Phantas.ma/polis" is organized by National Taiwan Museum of Fine Arts, supervised by the Ministry of Culture, and is co-organized by the Cultural Taiwan Foundation and in partnership with SEA Plateau. 
+
+</p><p>
+
+本計畫由國立臺灣美術館策劃，文化部指導、財團法人文化臺灣基金會支持、SEA plateaus協力。  
+
+</p>
+</div>
+{% endblock %}
+

app/templates/base.html

@@ -11,25 +11,26 @@
         <link href="{% sass_src 'css/style.scss' %}" rel="stylesheet" type="text/css">
 		{% block head %}{% endblock head %}
 	</head>
-	<body>
+	<body class="{% block body_class%}{% endblock %}">
 		<div class="topnav">
-		  <a href="/polis" class="title">
+		  <a href="/polis" class="title animated-title">
-				<div class="title-text">
+				<div class="title-text text">
 				Phantas.ma/polis<span class="hide-mobile">: Looking Back to the Future</span>
 				</div>
-				<div>
+				<div class="text">
 					未之至城<span class="hide-mobile">：回顧未來</span>
 				</div>
 		  </a>
 		  <nav>
-			<a href="{% url 'films'%}">films <span class="hide-mobile">-</span> 影片</a>
+			  <a href="{% url 'films'%}" class="animated-title"><span class="text">films <span class="hide-mobile">-</span> 影片</span></a>
-			<a href="{% url 'texts' %}">assemblies <span class="hide-mobile">-</span> 组件</a>
+			  <a href="{% url 'texts' %}" class="animated-title"><span class="text">assemblies <span class="hide-mobile">-</span> 组件</span></a>
-			<a href="{% url 'about' %}">about <span class="hide-mobile">-</span> 關於</a>
+			  <a href="{% url 'about' %}" class="animated-title"><span class="text">about <span class="hide-mobile">-</span> 關於</span></a>
 		  </nav>
 		</div>
         <main>
 		{% block main %}{% endblock main %}
 		</main>
 		{% block end %}{% endblock end %}
+		<script src="{% static 'js/animation.js' %}"></script>
 	</body>
 </html>

app/templates/film.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block body_class%}animated{% endblock %}
 {% block main %}
 <style>
 :root {
@@ -16,6 +17,7 @@ body {
 
 <div class="film">
 	<div class="info">
+<<<<<<< HEAD
 		<div class="info-meta">
 			<h1>
 				<span class="font-bold">{{ film.data.title | safe }}</span>
@@ -28,6 +30,30 @@ body {
 			</h2>
 			<div class="details">
 				Year: {{ film.data.date}}, Runtime: {{ film.duration }}
+=======
+		<h1>
+			<span>{{ film.data.title | safe }}</span>
+			<span>{{ film.data.title_zh | safe }}</span>
+		</h1>
+		<h2>
+			{% for director in film.data.director %}
+			{{ director|safe }}<br>
+			{% endfor %}
+		</h2>
+		<div class="details">
+			{{ film.data.date }}, {{ film.duration }}
+		</div>
+		<video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" autoplay loop muted></video>
+		<p>{{ film.data.summary|safe }}</p>
+		<br>
+		<p>{{ film.data.summary_zh|safe }}</p>
+		<div class="bio">
+			<div class="en">
+				{{film.data.director.0}}: {{ film.data.bio|safe }}
+			</div>
+			<div class="zh">
+				{{film.data.director.1}}: {{ film.data.bio_zh|safe }}
+>>>>>>> main
 			</div>
 		</div>	
 		<div class="video-block">			

app/templates/films.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block body_class%}animated{% endblock %}
 {% block main %}
 <div class="films">
 {% for film in films %}

app/templates/index.html

@@ -1,11 +1,22 @@
 {% extends "base.html" %}
+{% block body_class%}animated{% endblock %}
 {% block main %}
-<div>
+<div class="index">
-    <div>
+	Phantasmapolis<br>
-    Phantas.ma/polis is mainly in support by the Cultural Taiwan Foundation and in cooperation with SEA plateaus
+	Looking back to the future<br>
-    <div>
+	未至之城<br>
-    </div>
+	回望未來<br>
-    本計畫由財團法人文化臺灣基金會支持、SEA plateaus協力
+	<br>
-    </div>
+	Video art program<br>
+	Curated by Anushka Rajendran<br>
+	Presented by Pad.ma<br>
+	錄像計畫<br>
+	策展人 安努舒卡．拉堅德蘭<br>
+	藝術家 Pad.ma<br>
+	<br>
+	2021 Asian Art Biennale<br>
+	Oct 30, 2021 – Mar 6, 2022<br>
+	2021亞洲藝術雙年展<br>
+	2021.10.30 - 2022.3.6<br>
 </div>
 {% endblock %}

app/templates/page.html

@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }}– Phantas.ma/polis{% endblock title %}
+{% block body_class%}animated{% endblock %}
 {% block main %}
 <div class="page {{ page.slug }}">
 	{{ page.body | safe }}

app/templates/texts.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block body_class%}animated{% endblock %}
 {% block main %}
 
 <div class="texts">

app/text/views.py

@@ -23,7 +23,8 @@ def page(request, slug=''):
         return render(request, 'fallback.html', context)
 
 def about(request):
-    return page(request, 'about')
+    context = {}
+    return render(request, 'about.html', context)
 
 def texts(request):
     context = {}

app/urls.py

@@ -34,6 +34,6 @@ urlpatterns = [
     path(settings.URL_PREFIX + 'assemblies/<str:slug>', text.text, name='text'),
     path(settings.URL_PREFIX + 'about/', text.about, name='about'),
     path(settings.URL_PREFIX + '<str:slug>/', text.page, name='page'),
-    path(settings.URL_PREFIX[:-1], text.page, name='index'),
+    path(settings.URL_PREFIX[:-1], text.index, name='index'),
     path('', text.fallback, name='fallback'),
 ]

app/video/management/commands/load_titles.py

@@ -29,6 +29,8 @@ class Command(BaseCommand):
             for key, value in item.items():
                 if key == 'title':
                     f.data['title'], f.data['title_zh'] = value.split(' / ', 1)
+                elif key == 'summary':
+                    f.data['summary'], f.data['summary_zh'] = value.split('<br><br>', 1)
                 elif key == 'sourcedescription':
                     if '<br><br>' in value:
                         f.data['bio'], f.data['bio_zh'] = value.split('<br><br>', 1)

app/video/models.py

@@ -35,7 +35,7 @@ class Film(models.Model):
         return Text.objects.filter(data__item=self.padma_id)
 
     def duration(self):
-        return ox.format_timecode(self.data['duration'])[:-4]
+        return ox.format_duration(self.data['duration'] * 1000, verbosity=1, milliseconds=False)
 
     def color_1(self):
         hue = self.data['hue']