index uses template

4 years ago · ed9c90722b
parent 6f841349ae
commit ed9c90722b
8 changed files with 95 additions and 34 deletions
--- a/src/index.py
+++ b/src/index.py
@ -1,7 +1,5 @@
 from bottle import route, run, template
 nav = <div class="nav-grid"><div class="nav-bar"></div><div class="nav-index"><a href="index.html"><div class="button">home</div></a></div><div class="nav-game"><a href="game"><div class="button">game</div></a></div><div class="nav-diary"><a href="diary"><div class="button">diary</div></a></div><div class="nav-presskit"><a href="presskit"><div class="button">presskit</div></a></div></div>
@route('/')
 def index():
    """home page"""
--- a/src/views/footer.tpl
+++ b/src/views/footer.tpl
@ -0,0 +1,6 @@
 <!--Footer-->
 <footer>
    <div class="footer">
        &#169 chimchooree<br>
    </div>
 </footer>
--- a/src/views/frame.tpl
+++ b/src/views/frame.tpl
@ -0,0 +1,17 @@
 <!DOCTYPE html>
 <html>
 <head>
 % include('header.tpl')
 </head>
 <body>
 <div class="grid">
 % include('logo-bar.tpl')
 % include('nav.tpl')
 {{!base}}
 </div>
 % include('footer.tpl')
 </body>
--- a/src/views/header.tpl
+++ b/src/views/header.tpl
@ -0,0 +1,3 @@
  <title>chimchooree's dev space - blessfrey</title>
  <meta http-equiv="Content-Type" content="text/html; charset="utf-8">
  <link rel="stylesheet" type="text/css" href="res/styles/index.css"/>
--- a/src/views/index.tpl
+++ b/src/views/index.tpl
@ -1,27 +1,5 @@
 <!DOCTYPE html>
-<html>
+% rebase('frame.tpl')
 <!-- Header -->
 <head>
  <title>chimchooree's dev space - blessfrey</title>
  <meta http-equiv="Content-Type" content="text/html; charset="utf-8">
  <link rel="stylesheet" type="text/css" href="res/styles/index.css"/>
 </head>
 <!-- Body -->
 <body>
 <div class="grid">
    <div class="whitespace">
        blessfrey.me<br>
    </div>
    <div class="blessfrey-logo"></div>
    <div class="nav-row"></div>
 <!--Navigation Bar-->
    {{nav}}
    <div class="body-row"> </div>
    <div class="social">
@ -45,12 +23,3 @@
        <br>
 <center>.            ★            ..             •           .            ☆</center>
    </div>
 </div>
 <!--Footer-->
 <footer>
    <div class="footer">
        &#169 chimchooree<br>
    </div>
 </footer>
 </body>
--- a/src/views/index.tpl.old
+++ b/src/views/index.tpl.old
@ -0,0 +1,37 @@
 <!DOCTYPE html>
 <html>
 <head>
 {{header}}
 </head>
 <body>
 <div class="grid">
 {{logo-bar}}
 {{nav}}
    <div class="body-row"> </div>
    <div class="social">
        <a href="https://twitter.com/lilchimchooree"><img class="img-social-ribbon" src="res/img/ele/twitter-ribbon.png"></a>
    </div>
    <div class="bg">
        <img class="img-bg-home">
    </div>
    <div class="footer-row"> </div>
    <div class="tweets">
        <a class="twitter-timeline" data-width="400" data-height="200" data-theme="dark" href="https://twitter.com/lilchimchooree?ref_src=twsrc%5Etfw">Tweets by lilchimchooree</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script> 
    </div>
    <div class="news">
        <center>.      •        . <strong>news</strong> ☆            ..   . <br></center>
        <br>
        {{news}}
        <br>
 <center>.            ★            ..             •           .            ☆</center>
    </div>
 </div>
 {{footer}}
 </body>
--- a/src/views/logo-bar.tpl
+++ b/src/views/logo-bar.tpl
@ -0,0 +1,6 @@
 <!DOCTYPE html>
    <div class="whitespace">
        blessfrey.me<br>
    </div>
    <div class="blessfrey-logo"></div>
--- a/src/views/nav.tpl
+++ b/src/views/nav.tpl
@ -0,0 +1,25 @@
 <!--Navigation Bar-->
    <div class="nav-row"></div>
    <div class="nav-grid">
        <div class="nav-bar"></div>
        <div class="nav-index">
            <a href="index.html">
                <div class="button">home</div>
            </a>
        </div>
        <div class="nav-game">
            <a href="game.html">
                <div class="button">game</div>
            </a>
        </div>
        <div class="nav-diary">
            <a href="diary.php">
                <div class="button">diary</div>
            </a>
        </div>
        <div class="nav-presskit">
            <a href="presskit.html">
                <div class="button">presskit</div>
            </a>
        </div>
    </div>