Skip to content

Commit

Permalink
moved inline styles to stylesheet
Browse files Browse the repository at this point in the history
  • Loading branch information
billsaysthis committed Apr 19, 2010
1 parent 89f263f commit 80ca9ec
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 10 deletions.
10 changes: 8 additions & 2 deletions static/style.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
body { font-family: Verdana,Arial,sans-serif; margin: 0px;}
#wrapper { margin-left: auto; margin-right: auto; width: 700px; }
.bold {font-weight: bold;}
.not-displayed {display: none;}
.underlined {text-decoration:underline;}

#top a:visited { color: blue;}
#top { height: 20px; border-bottom: 1px solid #ccc; text-align: right; font-size: 12px; padding-right: 5px; padding-top: 4px; }

#header { margin-left: auto; margin-right: auto; width: 670px; height: 125px;}
#header img { margin-right: 10px;}
#header img { margin-right: 10px; float: left;}
#header h1 { font-size: 42px; margin-top: 20px; padding-top: 10px; margin-bottom: 0px; padding-bottom: 0px;}
#header h2 { font-size: x-large; margin: 0px; }

Expand All @@ -32,4 +35,7 @@ h4 { font-size: smaller; }
#content h2 { margin-bottom: 5px; margin-top: 5px;}
#content table { margin-bottom: 20px;}

.update-block {border-bottom: 1px solid #ff0000;}
.update-block {border-bottom: 1px solid #ff0000;}

#add-log textarea {width: 300px;}
.margin-left: 20px; {margin-left: 20px;}
6 changes: 3 additions & 3 deletions templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
{% if user %}
<span><strong>{{user.email}}</strong> | <a href="{{logout_url}}">Logout</a></span>
{% else %}
<span><a style="font-weight: bold;" href="{{login_url}}">Login</a> | <a href="http://signup.hackerdojo.com/upgrade/needaccount">Need an account?</a></span>
<span><a class="bold" href="{{login_url}}">Login</a> | <a href="http://signup.hackerdojo.com/upgrade/needaccount">Need an account?</a></span>
{% endif %}
</div>
<div id="wrapper">
<div id="header">
<img src="/static/dojo_icon.png" style="float: left;" />
<img src="/static/dojo_icon.png" />
<h1>Hacker Dojo</h1>
<h2 style="font-size: x-large;">Log</h2>
<h2>Log</h2>
</div>
<div id="content">
{% block content %}{% endblock %}
Expand Down
10 changes: 5 additions & 5 deletions templates/main.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{% extends 'base.html' %}
{% block content %}

<form method="post">
<textarea name="body" style="width: 300px;"></textarea><br />
<form method="post" id='add-log'>
<textarea name="body"></textarea><br />
<input type="submit" value="Add Log" />
</form>

{% regroup updates by create_date as grouped_updates %}
{% for updates in grouped_updates %}
<h3>Recent Entries</h3>
<h4>{% ifequal updates.grouper today.date %}<span style="text-decoration:underline;">Today</span> - {% endifequal %}{{updates.grouper|date:"l, F j"}}</h4>
<h4>{% ifequal updates.grouper today.date %}<span class="underlined">Today</span> - {% endifequal %}{{updates.grouper|date:"l, F j"}}</h4>
{% for update in updates.list %}
<div class='update-block'>
<p>{{update.body}} | posted {{update.created|timesince}} ago by {{update.user_fullname}} |
<a href="javascript:void()" onclick="toggleComment({{update.key.id}})" id="comment-link-{{update.key.id}}">Comment</a>
<form action="/comment/{{update.key.id}}" method="post" id="comment-form-{{update.key.id}}" style="display: none;">
<form action="/comment/{{update.key.id}}" method="post" id="comment-form-{{update.key.id}}" class="not-displayed">
<input type="text" name="body" /> <input type="submit" value="Comment" />
<a href="javascript:void()" onclick="toggleComment({{update.key.id}})">Cancel</a>
</form>
</p>
{% for comment in update.comment_set %}
<p style="margin-left: 20px;">
<p class='log-comment'>
{{comment.body}} | posted {{comment.created|timesince}} ago by {{comment.user_fullname}}
</p>
{% endfor %}
Expand Down

0 comments on commit 80ca9ec

Please sign in to comment.