From ede220d392f20842f136c50cd8a0da50dc3bae37 Mon Sep 17 00:00:00 2001 From: Nathan Hwang Date: Sat, 4 Feb 2012 06:17:54 -0500 Subject: [PATCH] extracted template from channel.html --- README.md | 2 +- static/css/authd-template.css | 25 ++++++++++ static/css/channel.css | 94 +++++++++++++++++++++++++++++++++++ templates/authd-template.html | 24 +++++++++ templates/channel.html | 69 ++++++++++++------------- 5 files changed, 176 insertions(+), 38 deletions(-) create mode 100644 static/css/authd-template.css create mode 100644 static/css/channel.css create mode 100644 templates/authd-template.html diff --git a/README.md b/README.md index 48b1f82..41ae2a8 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ TODO - Probably clean up the styles right about here - front page - channel list - - \ channel + - / channel - settings - who's in the room list? / past participants (sadd, srem) - Add title-page notification diff --git a/static/css/authd-template.css b/static/css/authd-template.css new file mode 100644 index 0000000..76c8ca7 --- /dev/null +++ b/static/css/authd-template.css @@ -0,0 +1,25 @@ +/* authd-template.css */ + +body { + margin:0; + padding:0; +} + +/* ------------------------------------------------------------ */ + +#page-header { + padding:0.3em; + font:bold 16pt sans-serif; + background-color:black; +} + +#page-header a, #page-header a:visited { + color:white; +} + +#home-page { + display:inline-block; + margin-right:1em; + padding-right:1em; + border-right:2px #888 solid; +} diff --git a/static/css/channel.css b/static/css/channel.css new file mode 100644 index 0000000..dbffab6 --- /dev/null +++ b/static/css/channel.css @@ -0,0 +1,94 @@ +/* channel.css */ +/* ------------------------------------------------------------ */ + +#load-past { + display:inline-block; + margin:0.5em; +} + +#channel-name { + margin:0.3em; + font-family:sans-serif; +} + +#chatroom { + height:100px; + overflow:auto; + margin:0; + padding:0; + font-family:sans-serif; + list-style:none; +} + +#chatroom li { + padding:0.1em 0; + border:0px #EEE solid; + border-width:0 0 1px 0; +} + +#chatroom li:nth-child(even) { + background-color:#F5F5F5; +} + +.timestamp { + display:inline-block; + width:5em; + color:#AAA; +} +.timestamp:hover { + color:black; +} + +.line-number { + display:inline-block; + width:3em; + color:#888; +} +.line-number:hover { + color:black; +} + +.username { + display:inline-block; + overflow:hidden; + width:10em; + padding-right:0.5em; + border-right:2px #CCC solid; + font-weight:bold; + text-align:right; +} + +.message { + display:inline-block; + padding-left:0.5em; + font-family:Georgia, serif; + text-align:left; +} + +/* ------------------------------------------------------------ */ + +#post-cont { + position:fixed; + left:0; + bottom:0; + display:block; + width:100%; + margin:0; + margin-right:85px; + padding:0; +} + +#post { + display:inline-block; + width:90%; +} + +#submit { + position:relative; + float:right; + display:inline-block; + width:10%; + margin:0; + padding:3px; + z-index:1; +} \ No newline at end of file diff --git a/templates/authd-template.html b/templates/authd-template.html new file mode 100644 index 0000000..5ad4580 --- /dev/null +++ b/templates/authd-template.html @@ -0,0 +1,24 @@ + + + + Sockityak - {% block title %} Channels {% end %} + + + {% block css %}{% end %} + + + +
+ Channels +
+ + {% block content %} + {% end %} + + + + + {% block javascript %} + {% end %} + + diff --git a/templates/channel.html b/templates/channel.html index 8265792..91998f8 100644 --- a/templates/channel.html +++ b/templates/channel.html @@ -1,43 +1,38 @@ - - - - Sockityak +{% extends "authd-template.html" %} - - +{% block title %} +## {{ channel }} +{% end %} - -
- Channels - Some Other... organizations? -
+{% block css %} + +{% end %} -

{{ channel }}

+{% block content %} +

##{{ channel }}

- -
- -
- -
-
+ +
+ +
+ +
+
- + +{% end %} - - - - - - - +{% block javascript %} + + +{% end %}