index page uses css and images; css and img are stored in static dir

4 years ago · 72b760dc17
parent 72cb61d952
commit 72b760dc17
40 changed files with 19 additions and 5 deletions
--- a/src/index.py
+++ b/src/index.py
@ -1,5 +1,5 @@
 import datetime, os
-from bottle import route, run, template
+from bottle import error, route, run, static_file, template

 # write diary

@ -64,12 +64,26 @@ def sort_files(files):
 def gather_files():
    return os.listdir('entries/feature/')

-# Webpages
+# Static
+
+@route('/static/css/<filename:path>')
+def serve_css(filename):
+    return static_file(filename, root='static/css')
+
+@route('/static/img/<filename:path>')
+def serve_css(filename):
+    return static_file(filename, root='static/img')
+
+# Routes
+
+@error(404)
+def error404(error):
+    return "unfortunately, a 404 error"

@route('/')
 def index():
    """home page"""
-    info = {'news': 'News goes here', 'title': 'chimchooree\'s dev space - blessfrey', 'year': datetime.datetime.now()}
+    info = {'css': 'index', 'news': 'News goes here', 'title': 'chimchooree\'s dev space - blessfrey', 'year': datetime.datetime.now()}
    return template('index.tpl', info)

@route('/game')
--- a/src/res/img/ele/twitter-ribbon.png~
+++ b/src/res/img/ele/twitter-ribbon.png~
--- a/src/static/css/diary.css
+++ b/src/static/css/diary.css
--- a/src/static/css/feature.css
+++ b/src/static/css/feature.css
--- a/src/static/css/game.css
+++ b/src/static/css/game.css
--- a/src/static/css/index.css
+++ b/src/static/css/index.css
--- a/src/static/css/presskit.css
+++ b/src/static/css/presskit.css
--- a/src/static/css/style.css
+++ b/src/static/css/style.css
--- a/src/static/css/weekly.css
+++ b/src/static/css/weekly.css
--- a/src/static/img/bg/homeBG.png
+++ b/src/static/img/bg/homeBG.png
--- a/src/static/img/bg/medallion.png
+++ b/src/static/img/bg/medallion.png
--- a/src/static/img/bg/medallion_v2.png
+++ b/src/static/img/bg/medallion_v2.png
--- a/src/static/img/bg/yellow.png
+++ b/src/static/img/bg/yellow.png
--- a/src/static/img/bg/yellow.png~
+++ b/src/static/img/bg/yellow.png~
--- a/src/static/img/btn/skillblog.png
+++ b/src/static/img/btn/skillblog.png
--- a/src/static/img/btn/skillblog_pressed.png
+++ b/src/static/img/btn/skillblog_pressed.png
--- a/src/static/img/btn/skillchara.png
+++ b/src/static/img/btn/skillchara.png
--- a/src/static/img/btn/skillchara_hover.png
+++ b/src/static/img/btn/skillchara_hover.png
--- a/src/static/img/btn/skillchara_pressed.png
+++ b/src/static/img/btn/skillchara_pressed.png
--- a/src/static/img/btn/skillgame.png
+++ b/src/static/img/btn/skillgame.png
--- a/src/static/img/btn/skillgame_hover.png
+++ b/src/static/img/btn/skillgame_hover.png
--- a/src/static/img/btn/skillgame_pressed.png
+++ b/src/static/img/btn/skillgame_pressed.png
--- a/src/static/img/btn/skillhover.png
+++ b/src/static/img/btn/skillhover.png
--- a/src/static/img/btn/skillslot.png
+++ b/src/static/img/btn/skillslot.png
--- a/src/static/img/btn/skillslot_hover.png
+++ b/src/static/img/btn/skillslot_hover.png
--- a/src/static/img/btn/skillslot_pressed.png
+++ b/src/static/img/btn/skillslot_pressed.png
--- a/src/static/img/btn/skillstory.png
+++ b/src/static/img/btn/skillstory.png
--- a/src/static/img/btn/skillstory_hover.png
+++ b/src/static/img/btn/skillstory_hover.png
--- a/src/static/img/btn/skillstory_pressed.png
+++ b/src/static/img/btn/skillstory_pressed.png
--- a/src/static/img/dg/DGrails.gif
+++ b/src/static/img/dg/DGrails.gif
--- a/src/static/img/dg/editor.png
+++ b/src/static/img/dg/editor.png
--- a/src/static/img/dg/girls.png
+++ b/src/static/img/dg/girls.png
--- a/src/static/img/dg/schoolyard.png
+++ b/src/static/img/dg/schoolyard.png
--- a/src/static/img/ele/navbar.png
+++ b/src/static/img/ele/navbar.png
--- a/src/static/img/ele/twitter-ribbon.png
+++ b/src/static/img/ele/twitter-ribbon.png
--- a/src/static/img/fav.ico
+++ b/src/static/img/fav.ico
--- a/src/static/img/icon.png
+++ b/src/static/img/icon.png
--- a/src/views/feature.tpl
+++ b/src/views/feature.tpl
--- a/src/views/header.tpl
+++ b/src/views/header.tpl
@ -1,3 +1,3 @@
  <title>{{title or 'blessfrey.me'}}</title>
  <meta http-equiv="Content-Type" content="text/html; charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="res/styles/index.css"/>
+  <link rel="stylesheet" type="text/css" href="static/css/{{css}}.css"/>
--- a/src/views/index.tpl
+++ b/src/views/index.tpl
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 % rebase('frame.tpl')
    <div class="social">
-        <a href="https://twitter.com/lilchimchooree"><img class="img-social-ribbon" src="res/img/ele/twitter-ribbon.png"></a>
+        <a href="https://twitter.com/lilchimchooree"><img class="img-social-ribbon" src="static/img/ele/twitter-ribbon.png"></a>
    </div>

    <div class="bg">