Skip to content
Browse files

Template cleanup and reorganization

  • Loading branch information...
1 parent 04f66ce commit 1aa4a8f703f4c525c11c63d795ba9a57c9db45dd @Palmik committed Apr 15, 2011
Showing with 97 additions and 31 deletions.
  1. +63 −0 log/access.log
  2. +8 −0 log/error.log
  3. +7 −9 resources/templates/index.tpl
  4. +8 −10 resources/templates/paste.tpl
  5. +11 −12 resources/templates/pastes.tpl
View
63 log/access.log
@@ -682,3 +682,66 @@
127.0.0.1 - - [14/Apr/2011:20:43:00 +0200] "GET /pastes HTTP/1.1" 200 - "http://0.0.0.0:8000/" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
127.0.0.1 - - [14/Apr/2011:20:43:00 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
127.0.0.1 - - [14/Apr/2011:20:43:02 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:43:31 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:43:33 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:43:33 +0200] "GET /pastes HTTP/1.1" 200 - "http://0.0.0.0:8000/" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:43:33 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:43:33 +0200] "GET /paste/4da74031-900faa1d48000000 HTTP/1.1" 200 - "http://0.0.0.0:8000/pastes" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:43:33 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:20 +0200] "GET /paste/4da74031-900faa1d48000000 HTTP/1.1" 200 - "http://0.0.0.0:8000/pastes" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:20 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:20 +0200] "GET /paste/4da74031-900faa1d48000000 HTTP/1.1" 200 - "http://0.0.0.0:8000/paste/4da74031-900faa1d48000000" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:20 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /paste/4da74031-900faa1d48000000 HTTP/1.1" 200 - "http://0.0.0.0:8000/paste/4da74031-900faa1d48000000" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /paste/4da74031-900faa1d48000000 HTTP/1.1" 200 - "http://0.0.0.0:8000/paste/4da74031-900faa1d48000000" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /paste/4da74031-900faa1d48000000 HTTP/1.1" 200 - "http://0.0.0.0:8000/paste/4da74031-900faa1d48000000" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /paste/4da74031-900faa1d48000000 HTTP/1.1" 200 - "http://0.0.0.0:8000/paste/4da74031-900faa1d48000000" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /paste/4da74031-900faa1d48000000 HTTP/1.1" 200 - "http://0.0.0.0:8000/paste/4da74031-900faa1d48000000" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:22 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:45 +0200] "GET /paste/ HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:45 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:49 +0200] "GET /paste/cyscsy HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:49 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:53 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:50:53 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:57:39 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:57:39 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:57:41 +0200] "GET /pastes HTTP/1.1" 200 - "http://0.0.0.0:8000/" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:57:41 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [14/Apr/2011:21:57:43 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:52:42 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:52:42 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:52:42 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:52:42 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:52:57 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:52:57 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:52:59 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:52:59 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:53:27 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:53:27 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:54:42 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:54:42 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:54:45 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:54:45 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:55:02 +0200] "GET /pastes HTTP/1.1" 200 - "http://0.0.0.0:8000/" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:55:02 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:55:02 +0200] "GET /paste/4da74031-900faa1d48000000 HTTP/1.1" 200 - "http://0.0.0.0:8000/pastes" "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:55:02 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:55:06 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:55:06 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:55:08 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:55:08 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:55:27 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20110321 Firefox/4.0"
+127.0.0.1 - - [15/Apr/2011:22:55:27 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20110321 Firefox/4.0"
+127.0.0.1 - - [15/Apr/2011:22:55:27 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20110321 Firefox/4.0"
+127.0.0.1 - - [15/Apr/2011:22:56:46 +0200] "GET /pastes HTTP/1.1" 200 - "http://0.0.0.0:8000/" "Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20110321 Firefox/4.0"
+127.0.0.1 - - [15/Apr/2011:22:59:02 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:59:02 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:59:04 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:59:04 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:59:55 +0200] "GET / HTTP/1.1" 200 - - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+127.0.0.1 - - [15/Apr/2011:22:59:55 +0200] "GET /favicon.ico HTTP/1.1" 404 3 - "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
View
8 log/error.log
@@ -226,3 +226,11 @@
[14/Apr/2011:20:42:46 +0200] Server.httpServe: START (EventLoopSimple)
[14/Apr/2011:20:54:06 +0200] Server.httpServe: SHUTDOWN
[14/Apr/2011:20:54:06 +0200] Server.httpServe: BACKEND STOPPED
+[14/Apr/2011:21:43:31 +0200] Server.httpServe: START (EventLoopSimple)
+[15/Apr/2011:22:52:38 +0200] Server.httpServe: START (EventLoopSimple)
+[15/Apr/2011:22:54:44 +0200] Server.httpServe: SHUTDOWN
+[15/Apr/2011:22:54:44 +0200] Server.httpServe: BACKEND STOPPED
+[15/Apr/2011:22:54:45 +0200] Server.httpServe: START (EventLoopSimple)
+[15/Apr/2011:22:59:00 +0200] Server.httpServe: SHUTDOWN
+[15/Apr/2011:22:59:00 +0200] Server.httpServe: BACKEND STOPPED
+[15/Apr/2011:22:59:00 +0200] Server.httpServe: START (EventLoopSimple)
View
16 resources/templates/index.tpl
@@ -1,9 +1,7 @@
-<html>
- <head>
- <title>Echo Page</title>
- </head>
- <body>
- <a href="/pastes">Recent pastes</a>
- <apply template="add-paste-form"/>
- </body>
-</html>
+<apply template="default">
+ <bind tag="main-title">Home</bind>
+
+ <bind tag="main-body">
+ <apply template="add-paste-form"/>
+ </bind>
+</apply>
View
18 resources/templates/paste.tpl
@@ -1,13 +1,11 @@
-<html>
- <head>
- <title>Echo Page</title>
- </head>
- <body>
- <div id="recent-pastes">
+<apply template="default">
+ <bind tag="main-title">Paste</bind>
+
+ <bind tag="main-body">
<single-paste>
<apply template="full-paste"/>
</single-paste>
- </div>
- <apply template="add-paste-form"/>
- </body>
-</html>
+
+ <apply template="add-paste-form"/>
+ </bind>
+</apply>
View
23 resources/templates/pastes.tpl
@@ -1,12 +1,11 @@
-<html>
- <head>
- <title>Echo Page</title>
- </head>
- <body>
- <div id="recent-pastes">
- <recent-pastes>
- <apply template="full-paste"/>
- </recent-pastes>
- </div>
- </body>
-</html>
+<apply template="default">
+ <bind tag="main-title">Recent Pastes</bind>
+
+ <bind tag="main-body">
+ <div class="pastes" id="recent-pastes">
+ <recent-pastes>
+ <apply template="full-paste"/>
+ </recent-pastes>
+ </div>
+ </bind>
+</apply>

0 comments on commit 1aa4a8f

Please sign in to comment.
Something went wrong with that request. Please try again.