diff --git a/rophako/modules/account/templates/account/login.html b/rophako/modules/account/templates/account/login.html index 7e90419..b463130 100644 --- a/rophako/modules/account/templates/account/login.html +++ b/rophako/modules/account/templates/account/login.html @@ -8,15 +8,15 @@
- Log In + Log In - Username:
-

+ Username:
+

- Passphrase:
-

+ Passphrase:
+

- +

diff --git a/rophako/modules/account/templates/account/setup.html b/rophako/modules/account/templates/account/setup.html index 4e38eea..151d851 100644 --- a/rophako/modules/account/templates/account/setup.html +++ b/rophako/modules/account/templates/account/setup.html @@ -15,27 +15,27 @@ to create the initial Administrator user account.

- Admin User + Admin User - Your site needs at least one admin user to log in and manage the site. - You can use any username/password combination you want, but "admin" is - a typical username.

+ Your site needs at least one admin user to log in and manage the site. + You can use any username/password combination you want, but "admin" is + a typical username.

- Username:
-

+ Username:
+

- Real name:
-

+ Real name:
+

- Passphrase:
- This can be as long as you want. Pick something - secure!
-

+ Passphrase:
+ This can be as long as you want. Pick something + secure!
+

- Confirm Passphrase:
-

+ Confirm Passphrase:
+

- +

diff --git a/rophako/modules/admin/templates/admin/edit_user.html b/rophako/modules/admin/templates/admin/edit_user.html index 1a2c1be..cc3a609 100644 --- a/rophako/modules/admin/templates/admin/edit_user.html +++ b/rophako/modules/admin/templates/admin/edit_user.html @@ -4,9 +4,9 @@ {% block scripts %} {% endblock %} @@ -18,26 +18,26 @@ $(document).ready(function() {
- User Details + User Details - Username:
-

+ Username:
+

- Real name:
-

+ Real name:
+

- Reset Password:
-
-

+ Reset Password:
+
+

- Role:
-

+ Role:
+

- - + +

diff --git a/rophako/modules/admin/templates/admin/index.html b/rophako/modules/admin/templates/admin/index.html index 904f6ae..c1d043a 100644 --- a/rophako/modules/admin/templates/admin/index.html +++ b/rophako/modules/admin/templates/admin/index.html @@ -6,14 +6,14 @@

Admin Center

Maintenance Tasks

{% endblock %} diff --git a/rophako/modules/admin/templates/admin/users.html b/rophako/modules/admin/templates/admin/users.html index dd6636d..4a86bab 100644 --- a/rophako/modules/admin/templates/admin/users.html +++ b/rophako/modules/admin/templates/admin/users.html @@ -10,59 +10,59 @@
- Create New User + Create New User - Username:
-

+ Username:
+

- Real name:
-

+ Real name:
+

- Passphrase:
-

+ Passphrase:
+

- Confirm:
-

+ Confirm:
+

- Role:
- + Role:
+ - +

User List

- - - - - - - - - + + + + + + + + + - - {% for user in users %} - - - - - - - - {% endfor %} - + + {% for user in users %} + + + + + + + + {% endfor %} +
User IDUsernameReal nameRoleLog in
User IDUsernameReal nameRoleLog in
{{ user["uid"] }}{{ user["username"] }}{{ user["name"] }}{{ user["role"] }} - {% if user["role"] != "admin" %} - Log in as - {% else %} - n/a - {% endif %} -
{{ user["uid"] }}{{ user["username"] }}{{ user["name"] }}{{ user["role"] }} + {% if user["role"] != "admin" %} + Log in as + {% else %} + n/a + {% endif %} +
{% endblock %} \ No newline at end of file diff --git a/rophako/modules/blog/templates/blog/archive.html b/rophako/modules/blog/templates/blog/archive.html index e16a6d6..a2fc749 100644 --- a/rophako/modules/blog/templates/blog/archive.html +++ b/rophako/modules/blog/templates/blog/archive.html @@ -3,16 +3,16 @@ {% block content %} {% for date in archive %} -

{{ date["month_friendly"] }}

+

{{ date["month_friendly"] }}

- + {% endfor %} {% endblock %} \ No newline at end of file diff --git a/rophako/modules/blog/templates/blog/categories.inc.html b/rophako/modules/blog/templates/blog/categories.inc.html index 26686aa..5277939 100644 --- a/rophako/modules/blog/templates/blog/categories.inc.html +++ b/rophako/modules/blog/templates/blog/categories.inc.html @@ -1,19 +1,19 @@ {% for tag in tags %} - {% if not tag["small"] %} - » {{ tag['category'] }} - ({{ tag['count'] }})
- {% endif %} + {% if not tag["small"] %} + » {{ tag['category'] }} + ({{ tag['count'] }})
+ {% endif %} {% endfor %} {% if has_small %} - -
- ¤ Show more... -
+ +
+ ¤ Show more... +
{% endif %} \ No newline at end of file diff --git a/rophako/modules/blog/templates/blog/delete.html b/rophako/modules/blog/templates/blog/delete.html index 4388987..30bf8a4 100644 --- a/rophako/modules/blog/templates/blog/delete.html +++ b/rophako/modules/blog/templates/blog/delete.html @@ -5,13 +5,13 @@

Delete Entry

- - + + - Are you sure you want to delete the blog post, - "{{ subject }}"?

+ Are you sure you want to delete the blog post, + "{{ subject }}"?

- +

{% endblock %} \ No newline at end of file diff --git a/rophako/modules/blog/templates/blog/entry.inc.html b/rophako/modules/blog/templates/blog/entry.inc.html index 18853d2..33bc672 100644 --- a/rophako/modules/blog/templates/blog/entry.inc.html +++ b/rophako/modules/blog/templates/blog/entry.inc.html @@ -3,92 +3,92 @@ {% macro blog_entry(post, from=None) %} - {% if from == "index" %} - - {{ post["subject"] }} -

- {% else %} - {% include "blog/sibling-links.html" %} -

- {% endif %} + {% if from == "index" %} + + {{ post["subject"] }} +

+ {% else %} + {% include "blog/sibling-links.html" %} +

+ {% endif %} -

- {% if post["avatar"] %} - {{ post['profile']['name'] }} - {% elif post["photo"] %} - {{ post['profile']['name'] }} - {% else %} - {{ post['profile']['name'] }} - {% endif %} +
+ {% if post["avatar"] %} + {{ post['profile']['name'] }} + {% elif post["photo"] %} + {{ post['profile']['name'] }} + {% else %} + {{ post['profile']['name'] }} + {% endif %} -
{{ post["profile"]["username"] }}
-
+
{{ post["profile"]["username"] }}
+
-
- Posted by {{ post["profile"]["name"] }} - on {{ post["pretty_time"] }} -
+
+ Posted by {{ post["profile"]["name"] }} + on {{ post["pretty_time"] }} +
- {{ post["rendered_body"] | safe }} - {% if post["snipped"] %} -

- Read more... - {% endif %} + {{ post["rendered_body"] | safe }} + {% if post["snipped"] %} +

+ Read more... + {% endif %} -

-

- Categories: - {% if post["categories"]|length == 0 or (post["categories"]|length == 1 and post["categories"][0] == "") %} - - {{ settings().blog.default_category }} - - {% else %} - - {% endif %} -

+

+

+ Categories: + {% if post["categories"]|length == 0 or (post["categories"]|length == 1 and post["categories"][0] == "") %} + + {{ settings().blog.default_category }} + + {% else %} + + {% endif %} +

- [ - {% if from == "index" %} - {% if post["comments"] %}{# Allowed comments #} - {{ post["comment_count"] }} comment{% if post["comment_count"] != 1 %}s{% endif %} - | - Add comment - | - {% endif %} + [ + {% if from == "index" %} + {% if post["comments"] %}{# Allowed comments #} + {{ post["comment_count"] }} comment{% if post["comment_count"] != 1 %}s{% endif %} + | + Add comment + | + {% endif %} - Permalink - {% else %} - Blog - {% endif %} + Permalink + {% else %} + Blog + {% endif %} - {% if session["login"] %} - | - Edit - | - Delete - {% endif %} - ] -

-

+ {% if session["login"] %} + | + Edit + | + Delete + {% endif %} + ] +

+

- {# Show the Google ad after the first post. #} - {% if from == "index" and post["position_index"] == 1 %} - {{ leaderboard() }} - {% endif %} + {# Show the Google ad after the first post. #} + {% if from == "index" and post["position_index"] == 1 %} + {{ leaderboard() }} + {% endif %} - {% if from != "index" %} - {% include "blog/sibling-links.html" %} -

+ {% if from != "index" %} + {% include "blog/sibling-links.html" %} +

- {{ include_page("comment.partial_index", - thread="blog-"+post["post_id"]|string, - subject=post["subject"], - addable=post["comments"], - ) | safe }} - {% endif %} + {{ include_page("comment.partial_index", + thread="blog-"+post["post_id"]|string, + subject=post["subject"], + addable=post["comments"], + ) | safe }} + {% endif %} {% endmacro %} diff --git a/rophako/modules/blog/templates/blog/index.html b/rophako/modules/blog/templates/blog/index.html index c7183a0..518f976 100644 --- a/rophako/modules/blog/templates/blog/index.html +++ b/rophako/modules/blog/templates/blog/index.html @@ -3,9 +3,9 @@ {% block content %} {% if url_category %} -

Category: {{ url_category }}

+

Category: {{ url_category }}

{% else %} -

My Blog

+

My Blog

{% endif %} {{ include_page("blog.partial_index") | safe }} diff --git a/rophako/modules/blog/templates/blog/index.inc.html b/rophako/modules/blog/templates/blog/index.inc.html index 80d3c6c..863ce12 100644 --- a/rophako/modules/blog/templates/blog/index.inc.html +++ b/rophako/modules/blog/templates/blog/index.inc.html @@ -3,11 +3,11 @@ {% include "blog/nav-links.inc.html" %} {% if count == 0 %} - There are no blog posts yet. + There are no blog posts yet. {% else %} - {% for post in posts %} - {{ blog_entry(post, from="index") }} - {% endfor %} + {% for post in posts %} + {{ blog_entry(post, from="index") }} + {% endfor %} {% endif %} {% include "blog/nav-links.inc.html" %} diff --git a/rophako/modules/blog/templates/blog/nav-links.inc.html b/rophako/modules/blog/templates/blog/nav-links.inc.html index 2892be3..23347aa 100644 --- a/rophako/modules/blog/templates/blog/nav-links.inc.html +++ b/rophako/modules/blog/templates/blog/nav-links.inc.html @@ -1,27 +1,27 @@ {# Older/Newer links #} {% if can_older or can_newer %} -
- [ - RSS Feed | - {% if can_earlier %} - {% if category %} - < Newer - {% else %} - < Newer - {% endif %} +
+ [ + RSS Feed | + {% if can_earlier %} + {% if category %} + < Newer + {% else %} + < Newer + {% endif %} - {% if can_older %} | {% endif %} - {% endif %} + {% if can_older %} | {% endif %} + {% endif %} - {% if can_older %} - {% if category %} - Older > - {% else %} - Older > - {% endif %} - {% endif %} + {% if can_older %} + {% if category %} + Older > + {% else %} + Older > + {% endif %} + {% endif %} - ] -
+ ] +
{% endif %} \ No newline at end of file diff --git a/rophako/modules/blog/templates/blog/sibling-links.html b/rophako/modules/blog/templates/blog/sibling-links.html index e1d0ac1..2ea825e 100644 --- a/rophako/modules/blog/templates/blog/sibling-links.html +++ b/rophako/modules/blog/templates/blog/sibling-links.html @@ -1,18 +1,18 @@ {# Older/Newer links #} {% if post["siblings"][0] or post["siblings"][1] %} -
- [ - {% if post["siblings"][0] %} - < {{ post["siblings"][0]['subject'] }} +
+ [ + {% if post["siblings"][0] %} + < {{ post["siblings"][0]['subject'] }} - {% if post["siblings"][1] %} | {% endif %} - {% endif %} + {% if post["siblings"][1] %} | {% endif %} + {% endif %} - {% if post["siblings"][1] %} - {{ post["siblings"][1]['subject'] }} > - {% endif %} + {% if post["siblings"][1] %} + {{ post["siblings"][1]['subject'] }} > + {% endif %} - ] -
+ ] +
{% endif %} \ No newline at end of file diff --git a/rophako/modules/blog/templates/blog/update.html b/rophako/modules/blog/templates/blog/update.html index 3de9f53..9765db5 100644 --- a/rophako/modules/blog/templates/blog/update.html +++ b/rophako/modules/blog/templates/blog/update.html @@ -3,159 +3,159 @@ {% block content %} {% if preview %} -

Preview: {{ subject }}

+

Preview: {{ subject }}

- {{ rendered_body|safe }} + {{ rendered_body|safe }} -
+
{% endif %}

Update Blog

- - - + + + - Subject:
-

+ Subject:
+

- Friendly ID:
- You can leave this blank if this is a new post. It defaults to be based - on the subject.
-

+ Friendly ID:
+ You can leave this blank if this is a new post. It defaults to be based + on the subject.
+

- Body:
- -
-
- Markdown cheatsheet / - Emoticon reference (opens in new window)
- Optional: separate your summary from the rest of the post by typing <snip> - where you want the division to appear.

+ Body:
+ +
+
+ Markdown cheatsheet / + Emoticon reference (opens in new window)
+ Optional: separate your summary from the rest of the post by typing <snip> + where you want the division to appear.

- Avatar:
- -

+ Avatar:
+ +

- Categories:
- Comma-separated list, e.g. General, HTML, Perl, Web Design
-

+ Categories:
+ Comma-separated list, e.g. General, HTML, Perl, Web Design
+

- Privacy:
-

+ Privacy:
+

- Options:
-
-

+ Options:
+
+

- Time Stamp:
- / - / - @ - : - : -
- mm / dd / yyyy @ hh:mm:ss
-

+ Time Stamp:
+ / + / + @ + : + : +
+ mm / dd / yyyy @ hh:mm:ss
+

- - + +

{% endblock %} {% block scripts %} {% endblock %} diff --git a/rophako/modules/comment/templates/comment/edit.html b/rophako/modules/comment/templates/comment/edit.html index 9ef655f..f8f901e 100644 --- a/rophako/modules/comment/templates/comment/edit.html +++ b/rophako/modules/comment/templates/comment/edit.html @@ -7,23 +7,23 @@ Current preview of the comment:

- {{ comment["formatted_message"]|safe }} + {{ comment["formatted_message"]|safe }}

Edit Comment

- - + + - Message:
-
- Comments can be formatted with Markdown, - and you can use
emoticons - in your comment.

+ Message:
+
+ Comments can be formatted with Markdown, + and you can use
emoticons + in your comment.

- - + +

{% endblock %} \ No newline at end of file diff --git a/rophako/modules/comment/templates/comment/form.inc.html b/rophako/modules/comment/templates/comment/form.inc.html index 5ea82fe..42f759f 100644 --- a/rophako/modules/comment/templates/comment/form.inc.html +++ b/rophako/modules/comment/templates/comment/form.inc.html @@ -1,70 +1,70 @@ {# Common template for leaving a comment/updating the comment preview. #} {% if commenting_disabled %} - No new comments may be added to this thread. + No new comments may be added to this thread. {% else %} -
- - - - - - - - - - - - - - - - - - - - -
- Your name: - - {% if session["login"] %} - {{ session["name"] }} - {% else %} - - {% endif %} -
- Your Email: - - -
- Message: - - -
- Comments can be formatted with Markdown, - and you can use
emoticons - in your comment. -
-
- -

+ + + + + + + + + + + + + + + + + + + + + +
+ Your name: + + {% if session["login"] %} + {{ session["name"] }} + {% else %} + + {% endif %} +
+ Your Email: + + +
+ Message: + + +
+ Comments can be formatted with Markdown, + and you can use
emoticons + in your comment. +
+
+ +

-

- If you can see this, don't touch the following fields.
-
- -
+
+ If you can see this, don't touch the following fields.
+
+ +
- {% if preview %} - - - {% else %} - - {% endif %} + {% if preview %} + + + {% else %} + + {% endif %} -
+ {% endif %} diff --git a/rophako/modules/comment/templates/comment/index.inc.html b/rophako/modules/comment/templates/comment/index.inc.html index 87c560b..2ded0db 100644 --- a/rophako/modules/comment/templates/comment/index.inc.html +++ b/rophako/modules/comment/templates/comment/index.inc.html @@ -1,39 +1,39 @@ {% if header %} -

Comments

+

Comments

{% endif %} There {% if comments|length == 1 %}is{% else %}are{% endif %} - {{ comments|length }} comment{% if comments|length != 1 %}s{% endif %} - on this page.

+ {{ comments|length }} comment{% if comments|length != 1 %}s{% endif %} + on this page.

{% for comment in comments %} -

-
- {% if comment["image"] and (comment["image"].startswith('http:') or comment["image"].startswith('https:') or comment["image"].startswith('//')) %} - Avatar - {% elif comment["image"] %} - Avatar - {% else %} - guest - {% endif %} -
{% if comment['username'] %}{{ comment['username'] }}{% else %}guest{% endif %}
-
+
+
+ {% if comment["image"] and (comment["image"].startswith('http:') or comment["image"].startswith('https:') or comment["image"].startswith('//')) %} + Avatar + {% elif comment["image"] %} + Avatar + {% else %} + guest + {% endif %} +
{% if comment['username'] %}{{ comment['username'] }}{% else %}guest{% endif %}
+
- Posted on {{ comment["pretty_time"] }} by {{ comment["name"] }}.

+ Posted on {{ comment["pretty_time"] }} by {{ comment["name"] }}.

- {{ comment["formatted_message"]|safe }} + {{ comment["formatted_message"]|safe }} -

- {% if session["login"] %} - [IP: {{ comment["ip"] }} - | - Edit - | - Delete] - {% endif %} -
-

+

+ {% if session["login"] %} + [IP: {{ comment["ip"] }} + | + Edit + | + Delete] + {% endif %} +
+

{% endfor %}

Add a Comment

diff --git a/rophako/modules/comment/templates/comment/preview.html b/rophako/modules/comment/templates/comment/preview.html index 16b95b2..b4e14be 100644 --- a/rophako/modules/comment/templates/comment/preview.html +++ b/rophako/modules/comment/templates/comment/preview.html @@ -7,26 +7,26 @@ This is a preview of what your comment is going to look like once posted.

-
- {% if contact %} - Avatar - {% else %} - guest - {% endif %}
- {% if session["login"] %}{{ session["username"] }}{% else %}guest{% endif %} -
+
+ {% if contact %} + Avatar + {% else %} + guest + {% endif %}
+ {% if session["login"] %}{{ session["username"] }}{% else %}guest{% endif %} +
- Posted on {{ pretty_time }} by {{ name or "Anonymous" }}.

+ Posted on {{ pretty_time }} by {{ name or "Anonymous" }}.

- {{ preview|safe }} + {{ preview|safe }} -

+
{% if subscribe == "true" and contact %} -

- You will be subscribed to future comments on this thread. Notification - e-mails will be sent to {{ contact }}.

+

+ You will be subscribed to future comments on this thread. Notification + e-mails will be sent to {{ contact }}.

{% endif %}

Edit Comment

diff --git a/rophako/modules/comment/templates/comment/privacy.html b/rophako/modules/comment/templates/comment/privacy.html index 26eddc3..eac5d3f 100644 --- a/rophako/modules/comment/templates/comment/privacy.html +++ b/rophako/modules/comment/templates/comment/privacy.html @@ -15,46 +15,46 @@ e-mail address in the form below.

Privacy Policy

Unsubscribe from All Comment Threads

- - + + - Enter the e-mail address to be unsubscribed from all threads:
-

+ Enter the e-mail address to be unsubscribed from all threads:
+

- + -

- If you can see this, do not touch these fields.
-
- -
+
+ If you can see this, do not touch these fields.
+
+ +
diff --git a/rophako/modules/comment/templates/comment/unsubscribed.html b/rophako/modules/comment/templates/comment/unsubscribed.html index c15d5f5..cb6d620 100644 --- a/rophako/modules/comment/templates/comment/unsubscribed.html +++ b/rophako/modules/comment/templates/comment/unsubscribed.html @@ -6,9 +6,9 @@ The e-mail address {{ email }} has been unsubscribed {% if thread == "*" %} - from all comment threads on this site. + from all comment threads on this site. {% else %} - from the comment thread "{{ thread }}". + from the comment thread "{{ thread }}". {% endif %} {% endblock %} \ No newline at end of file diff --git a/rophako/modules/contact/templates/contact/index.html b/rophako/modules/contact/templates/contact/index.html index 6094e79..961a81b 100644 --- a/rophako/modules/contact/templates/contact/index.html +++ b/rophako/modules/contact/templates/contact/index.html @@ -9,39 +9,39 @@ You can use the form below to send me an e-mail.

- - - - - - + + + + + - - - - + Message:
+ (required)
+ + + + + +
- Your name:
- (so I know who you are)
- - 		- Your email:
- (if you want a response)
- -
- Message subject:
- (optional)
-

+

+ Your name:
+ (so I know who you are)
+ + 		+ Your email:
+ (if you want a response)
+ +
+ Message subject:
+ (optional)
+

- Message:
- (required)
- -

- -
+ +
- If you can see these boxes, don't touch them.
-
- + If you can see these boxes, don't touch them.
+
+
diff --git a/rophako/modules/emoticons/templates/emoticons/index.html b/rophako/modules/emoticons/templates/emoticons/index.html index 8603d8b..936e279 100644 --- a/rophako/modules/emoticons/templates/emoticons/index.html +++ b/rophako/modules/emoticons/templates/emoticons/index.html @@ -5,26 +5,26 @@

Emoticon Theme: {{ theme_name }}

- - - - - - - - {% for img in smileys %} - - - - - {% endfor %} - + + + + + + + + {% for img in smileys %} + + + + + {% endfor %} +
EmoticonTrigger Text
- - - {% for trigger in img['triggers'] %} - {{ trigger }}     - {% endfor %} -
EmoticonTrigger Text
+ + + {% for trigger in img['triggers'] %} + {{ trigger }}     + {% endfor %} +
{% endblock %} \ No newline at end of file diff --git a/rophako/modules/photo/templates/photos/album.html b/rophako/modules/photo/templates/photos/album.html index 0fadae4..a006a67 100644 --- a/rophako/modules/photo/templates/photos/album.html +++ b/rophako/modules/photo/templates/photos/album.html @@ -5,57 +5,57 @@

Album: {{ album }}

{% if album_info["description"] %} -
{{ markdown|safe }}

+

{{ markdown|safe }}

{% endif %} {% if album_info["format"] == "vertical" %} - {% for photo in photos %} - {% set data = photo["data"] %} - {% if data["caption"] %} -

{{ data["caption"] }}

- {% endif %} + {% for photo in photos %} + {% set data = photo["data"] %} + {% if data["caption"] %} +

{{ data["caption"] }}

+ {% endif %} - - -

+ + +

- {% if data["description"] %} -

{{ data["markdown"]|safe }}
- {% endif %} + {% if data["description"] %} +
{{ data["markdown"]|safe }}
+ {% endif %} - {% if loop.index < photos|length %}
{% endif %} - {% endfor %} + {% if loop.index < photos|length %}
{% endif %} + {% endfor %} {% else %}{# classic layout #} - +
{% endif %} {% if session["login"] %} -

Administrative Options

+

Administrative Options

- + {% endif %} {% endblock %} diff --git a/rophako/modules/photo/templates/photos/albums.html b/rophako/modules/photo/templates/photos/albums.html index 8e5b947..55c3e8d 100644 --- a/rophako/modules/photo/templates/photos/albums.html +++ b/rophako/modules/photo/templates/photos/albums.html @@ -5,33 +5,33 @@

Photo Albums

{% if albums|length == 0 %} - There are no photo albums yet. + There are no photo albums yet. {% else %} - +
{% endif %} {% if session["login"] %} -

Administrative Options

+

Administrative Options

- + {% endif %} {% endblock %} \ No newline at end of file diff --git a/rophako/modules/photo/templates/photos/arrange_albums.html b/rophako/modules/photo/templates/photos/arrange_albums.html index c5a582f..52a2815 100644 --- a/rophako/modules/photo/templates/photos/arrange_albums.html +++ b/rophako/modules/photo/templates/photos/arrange_albums.html @@ -7,24 +7,24 @@ Drag and drop your albums in the positions you want them in.

- - - + + +

@@ -35,26 +35,26 @@ Drag and drop your albums in the positions you want them in.

{% endblock %} \ No newline at end of file diff --git a/rophako/modules/photo/templates/photos/arrange_photos.html b/rophako/modules/photo/templates/photos/arrange_photos.html index f3c9bb9..538e37c 100644 --- a/rophako/modules/photo/templates/photos/arrange_photos.html +++ b/rophako/modules/photo/templates/photos/arrange_photos.html @@ -7,22 +7,22 @@ Drag and drop your photos in the positions you want them in.

- - - + + +

@@ -33,26 +33,26 @@ Drag and drop your photos in the positions you want them in.

{% endblock %} \ No newline at end of file diff --git a/rophako/modules/photo/templates/photos/crop.html b/rophako/modules/photo/templates/photos/crop.html index 4365ec0..fce5720 100644 --- a/rophako/modules/photo/templates/photos/crop.html +++ b/rophako/modules/photo/templates/photos/crop.html @@ -9,27 +9,27 @@ shape. You can use this page to modify the region of the photo you want to crop.

- - - + + - + + + +
- - - Preview:
-
- -
-

+

+ + + Preview:
+
+ +
+

-

- - - - + + + + + - -
-
{% endblock %} @@ -38,70 +38,70 @@ crop.

{% endblock %} \ No newline at end of file diff --git a/rophako/modules/photo/templates/photos/delete.html b/rophako/modules/photo/templates/photos/delete.html index 86b4e93..d602202 100644 --- a/rophako/modules/photo/templates/photos/delete.html +++ b/rophako/modules/photo/templates/photos/delete.html @@ -7,10 +7,10 @@

- - Are you sure you want to delete this photo?

+ + Are you sure you want to delete this photo?

- +

{% endblock %} \ No newline at end of file diff --git a/rophako/modules/photo/templates/photos/delete_album.html b/rophako/modules/photo/templates/photos/delete_album.html index ca2c075..fa87de7 100644 --- a/rophako/modules/photo/templates/photos/delete_album.html +++ b/rophako/modules/photo/templates/photos/delete_album.html @@ -5,10 +5,10 @@

Delete Album

- - Are you sure you want to delete the album {{ album }}?

+ + Are you sure you want to delete the album {{ album }}?

- +

{% endblock %} \ No newline at end of file diff --git a/rophako/modules/photo/templates/photos/edit.html b/rophako/modules/photo/templates/photos/edit.html index 10b5066..7127411 100644 --- a/rophako/modules/photo/templates/photos/edit.html +++ b/rophako/modules/photo/templates/photos/edit.html @@ -7,30 +7,30 @@

- + - Photo Caption:
-

+ Photo Caption:
+

- Description:
-
- Use Markdown syntax.

+ Description:
+
+ Use Markdown syntax.

- Rotate: - - - -

+ Rotate: + + + +

- +

{% endblock %} \ No newline at end of file diff --git a/rophako/modules/photo/templates/photos/edit_album.html b/rophako/modules/photo/templates/photos/edit_album.html index 1cdb18f..83e1ba8 100644 --- a/rophako/modules/photo/templates/photos/edit_album.html +++ b/rophako/modules/photo/templates/photos/edit_album.html @@ -5,26 +5,26 @@

Edit Album: {{ album }}

- + - Album Title:
-

+ Album Title:
+

- Description:
-
- Use Markdown syntax.

+ Description:
+
+ Use Markdown syntax.

- Display Format:
-
-

+ Display Format:
+
+

- +

diff --git a/rophako/modules/photo/templates/photos/edit_captions.html b/rophako/modules/photo/templates/photos/edit_captions.html index 443ed19..1e879c1 100644 --- a/rophako/modules/photo/templates/photos/edit_captions.html +++ b/rophako/modules/photo/templates/photos/edit_captions.html @@ -7,26 +7,26 @@ All captions use Markdown syntax.

- + - - {% for photo in photos %} - - - + + {% endfor %} +
- Photo - - Caption:
-

+ + {% for photo in photos %} + + + - - {% endfor %} -
+ Photo + + Caption:
+

- Description:
- -

+ Description:
+ +

- +

diff --git a/rophako/modules/photo/templates/photos/upload.html b/rophako/modules/photo/templates/photos/upload.html index 86ce373..e778e7f 100644 --- a/rophako/modules/photo/templates/photos/upload.html +++ b/rophako/modules/photo/templates/photos/upload.html @@ -8,72 +8,72 @@ You can upload a photo from your computer or by pasting in the URL to a photo somewhere else on the Internet.
- + -
- Where is your picture located? +
+ Where is your picture located? - -

+ +

-

- Upload a picture from my computer
-

+

+ Upload a picture from my computer
+

- Or, drag images here:
-

Drag and drop images into this box
-
+ Or, drag images here:
+
Drag and drop images into this box
+
-
- Upload a picture from the Internet
- -
-

+

+ Upload a picture from the Internet
+ +
+

- Only jpeg, gif and png images are supported. There is no maximum file size - limit, but be reasonable. -

-

+ Only jpeg, gif and png images are supported. There is no maximum file size + limit, but be reasonable. +

+

-

- Photo Options +
+ Photo Options - Photo album:
- + Photo album:
+ -
- New album:
-

+

+ New album:
+

- Album Description:
-
- Shows up at the top of the album. - Use Markdown formatting. -

-
-

+ Album Description:
+
+ Shows up at the top of the album. + Use Markdown formatting. + +

+

-

+

- +

@@ -82,24 +82,24 @@ somewhere else on the Internet. {% block scripts %} {% endblock %} \ No newline at end of file diff --git a/rophako/modules/photo/templates/photos/view.html b/rophako/modules/photo/templates/photos/view.html index 2a5ca1a..0716503 100644 --- a/rophako/modules/photo/templates/photos/view.html +++ b/rophako/modules/photo/templates/photos/view.html @@ -3,17 +3,17 @@ {% block content %} {% macro nav_links() %} -
- Photo {{ photo["position"] }} of {{ photo["siblings"] }} - {% if photo["siblings"] > 1 %} -     - [ - < Previous - | - Next > - ] - {% endif %} -
+
+ Photo {{ photo["position"] }} of {{ photo["siblings"] }} + {% if photo["siblings"] > 1 %} +     + [ + < Previous + | + Next > + ] + {% endif %} +
{% endmacro %}

Photo

@@ -23,41 +23,41 @@ {{ nav_links() }} {% if photo["caption"] %} -

{{ photo["caption"] }}

+

{{ photo["caption"] }}

{% endif %} - +

{% if photo["description"] %} -

{{ photo["markdown"]|safe }}
+
{{ photo["markdown"]|safe }}
{% endif %} Uploaded by {{ author["name"] }} on {{ photo["pretty_time"] }}. {% if session["login"] %} -

Embed this image in a blog post:
- (Markdown)
- '> (HTML) +

Embed this image in a blog post:
+ (Markdown)
+ '> (HTML) {% endif %} {{ nav_links() }} {% if session["login"] %} -

Administrative Options

+

Administrative Options

- + {% endif %} {{ include_page("comment.partial_index", - thread="photos-{}".format(photo["key"]), - subject="Photo Comment", + thread="photos-{}".format(photo["key"]), + subject="Photo Comment", ) | safe }} {% endblock %} diff --git a/rophako/modules/tracking/templates/tracking/index.html b/rophako/modules/tracking/templates/tracking/index.html index 64479b1..1ee2ae8 100644 --- a/rophako/modules/tracking/templates/tracking/index.html +++ b/rophako/modules/tracking/templates/tracking/index.html @@ -6,8 +6,8 @@

Visitor Tracking

{% endblock %} diff --git a/rophako/modules/tracking/templates/tracking/referrers.html b/rophako/modules/tracking/templates/tracking/referrers.html index 62c9fe0..e0851b8 100644 --- a/rophako/modules/tracking/templates/tracking/referrers.html +++ b/rophako/modules/tracking/templates/tracking/referrers.html @@ -10,26 +10,26 @@ the most recent 25 links, see the end of this page.

- - - - - - - - {% for link in referrers["referrers"] %} - {% if link %} - - - - - {% endif %} - {% endfor %} - + + + + + + + + {% for link in referrers["referrers"] %} + {% if link %} + + + + + {% endif %} + {% endfor %} +
HitsQuery
- {{ link[1] }} - - {{ link[0]|safe }} -
HitsQuery
+ {{ link[1] }} + + {{ link[0]|safe }} +
@@ -37,7 +37,7 @@ the most recent 25 links, see the end of this page.

    {% for item in referrers["recent"] %} -
  1. {{ item }}
    2. +
  2. {{ item }}
    3. {% endfor %}
diff --git a/rophako/modules/tracking/templates/tracking/visitors.html b/rophako/modules/tracking/templates/tracking/visitors.html index 85aeea0..ff23edb 100644 --- a/rophako/modules/tracking/templates/tracking/visitors.html +++ b/rophako/modules/tracking/templates/tracking/visitors.html @@ -17,38 +17,38 @@ Here is a full list of hits over time. Percentages are relative to the current records.

- - - - - - - - - {% for date in history["traffic"]|reverse %} - - - - - - - - - - {% endfor %} - + + + + + + + + + {% for date in history["traffic"]|reverse %} + + + + + + + + + + {% endfor %} +
DateGraphDetails
- {{ date["date"] }} - - {% set pct = (date["unique"] / history["most_unique"][1]) * 100 %} -
- 		- Unique: {{ date["unique"] }} ({{ pct|int }}%) -
- {% set pct = (date["unique"] / history["most_unique"][1]) * 100 %} -
- 		- Hits: {{ date["hits"] }} ({{ pct|int }}%) -
DateGraphDetails
+ {{ date["date"] }} + + {% set pct = (date["unique"] / history["most_unique"][1]) * 100 %} +
+ 		+ Unique: {{ date["unique"] }} ({{ pct|int }}%) +
+ {% set pct = (date["unique"] / history["most_unique"][1]) * 100 %} +
+ 		+ Hits: {{ date["hits"] }} ({{ pct|int }}%) +
{% endblock %} diff --git a/rophako/modules/wiki/templates/wiki/delete.html b/rophako/modules/wiki/templates/wiki/delete.html index 0c89000..7852f2f 100644 --- a/rophako/modules/wiki/templates/wiki/delete.html +++ b/rophako/modules/wiki/templates/wiki/delete.html @@ -7,8 +7,8 @@ Are you sure you want to delete this {{ type }}?

- - + +
{% endblock %} diff --git a/rophako/modules/wiki/templates/wiki/edit.html b/rophako/modules/wiki/templates/wiki/edit.html index 446bb8d..a09e652 100644 --- a/rophako/modules/wiki/templates/wiki/edit.html +++ b/rophako/modules/wiki/templates/wiki/edit.html @@ -3,37 +3,37 @@ {% block content %} {% if preview %} -

Preview: {{ subject }}

+

Preview: {{ subject }}

- {{ rendered_body|safe }} + {{ rendered_body|safe }} -
+
{% endif %}

Edit Wiki

- + - Title:
-

+ Title:
+

- Body:
-
- Markdown syntax. - Emoticon reference (opens in new window)

+ Body:
+
+ Markdown syntax. + Emoticon reference (opens in new window)

- Revision Note (optional):
-

+ Revision Note (optional):
+

- Options:
-

+ Options:
+

- - + +

{% endblock %} diff --git a/rophako/modules/wiki/templates/wiki/history.html b/rophako/modules/wiki/templates/wiki/history.html index d3d781d..a768ec7 100644 --- a/rophako/modules/wiki/templates/wiki/history.html +++ b/rophako/modules/wiki/templates/wiki/history.html @@ -5,36 +5,36 @@

History: {{ title }}

- - - - - - {% if session["login"] %} - - {% endif %} - - - - {% for item in history %} - - - - - {% if session["login"] %} - - {% endif %} - - {% endfor %} - + + + + + + {% if session["login"] %} + + {% endif %} + + + + {% for item in history %} + + + + + {% if session["login"] %} + + {% endif %} + + {% endfor %} +
DateEdited ByRevision NoteDelete?
{{ item["pretty_time"] }}{{ item["author"]["name"] }}{{ item["note"] }}Delete
DateEdited ByRevision NoteDelete?
{{ item["pretty_time"] }}{{ item["author"]["name"] }}{{ item["note"] }}Delete
{% if session["login"] %} -

- Admin Actions: -

+

+ Admin Actions: +

{% endif %} {% endblock %} diff --git a/rophako/modules/wiki/templates/wiki/list.html b/rophako/modules/wiki/templates/wiki/list.html index 4283d9b..0c3b90a 100644 --- a/rophako/modules/wiki/templates/wiki/list.html +++ b/rophako/modules/wiki/templates/wiki/list.html @@ -3,17 +3,17 @@ {% block content %} {% if session["login"] %} -
- [ New Page ] -
+
+ [ New Page ] +
{% endif %}

Wiki Pages

{% endblock %} diff --git a/rophako/modules/wiki/templates/wiki/missing.html b/rophako/modules/wiki/templates/wiki/missing.html index 68c3900..2e6dd82 100644 --- a/rophako/modules/wiki/templates/wiki/missing.html +++ b/rophako/modules/wiki/templates/wiki/missing.html @@ -8,7 +8,7 @@ This wiki page does not exist yet (that means it's a 404 error!) {% if session["login"] %} {% endif %} diff --git a/rophako/modules/wiki/templates/wiki/page.html b/rophako/modules/wiki/templates/wiki/page.html index c261df8..0461990 100644 --- a/rophako/modules/wiki/templates/wiki/page.html +++ b/rophako/modules/wiki/templates/wiki/page.html @@ -3,16 +3,16 @@ {% block content %}
- Last edited by {{ author["name"] }} on {{ pretty_time }} + Last edited by {{ author["name"] }} on {{ pretty_time }} - [ History - | Index - | Source - {% if session["login"] %} - | Edit - | New Page - {% endif %} - ] + [ History + | Index + | Source + {% if session["login"] %} + | Edit + | New Page + {% endif %} + ]

{{ title }}

diff --git a/rophako/www/index.html b/rophako/www/index.html index fe31400..fe7a502 100644 --- a/rophako/www/index.html +++ b/rophako/www/index.html @@ -18,62 +18,62 @@ Github!

Features

{{ include_page("blog.partial_index") | safe }} diff --git a/rophako/www/layout.html b/rophako/www/layout.html index f0f8198..7700b23 100644 --- a/rophako/www/layout.html +++ b/rophako/www/layout.html @@ -1,69 +1,69 @@ - - {% block title %}{% endblock %} + + {% block title %}{% endblock %} - - - + + +
- - Logo - - Rophako + + Logo + + Rophako
- {% with messages = get_flashed_messages() %} - {% if messages %} -

Notice!

+ {% with messages = get_flashed_messages() %} + {% if messages %} +

Notice!

- - {% endif %} - {% endwith %} + + {% endif %} + {% endwith %} - {% block content %}{% endblock %} + {% block content %}{% endblock %} -
diff --git a/rophako/www/markdown.html b/rophako/www/markdown.html index f31a1a7..636fe5b 100644 --- a/rophako/www/markdown.html +++ b/rophako/www/markdown.html @@ -73,7 +73,7 @@ get translated into a line break (<br>) in the output. This is an H1
=============

- + This is an H2
------------- @@ -293,12 +293,12 @@ get translated into a line break (<br>) in the output.

  1. This is a list item with two paragraphs. Lorem ipsum dolor - sit amet, consectetuer adipiscing elit. Aliquam hendrerit - mi posuere lectus.

    + sit amet, consectetuer adipiscing elit. Aliquam hendrerit + mi posuere lectus.

    - Vestibulum enim wisi, viverra nec, fringilla in, laoreet - vitae, risus. Donec sit amet nisl. Aliquam semper ipsum - sit amet velit.

    2. + Vestibulum enim wisi, viverra nec, fringilla in, laoreet + vitae, risus. Donec sit amet nisl. Aliquam semper ipsum + sit amet velit.
  2. Suspendisse id sem consectetuer libero luctus adipiscing.
diff --git a/rophako/www/smoke/style.css b/rophako/www/smoke/style.css index b7e8fab..74ae2ce 100644 --- a/rophako/www/smoke/style.css +++ b/rophako/www/smoke/style.css @@ -7,74 +7,74 @@ *********************/ body { - background-image: url("navbg.png"); - background-position: 0 0; - background-repeat: repeat-y; - background-color: #CFCFCF; - font-family: Ubuntu,Verdana,Arial,Helvetica,sans-serif; - font-size: small; - color: #000000; - margin: 0; - padding: 0; + background-image: url("navbg.png"); + background-position: 0 0; + background-repeat: repeat-y; + background-color: #CFCFCF; + font-family: Ubuntu,Verdana,Arial,Helvetica,sans-serif; + font-size: small; + color: #000000; + margin: 0; + padding: 0; } small { - font-size: 9pt; + font-size: 9pt; } a:link, a:visited { - color: #FF4400; - text-decoration: underline; + color: #FF4400; + text-decoration: underline; } a img { - border: 0; + border: 0; } h1, h2, h3, h4 { - font-weight: bold; - color: #000000; - text-shadow: 2px 2px 4px #FF4444; - padding: 0; - margin: 15px 0; + font-weight: bold; + color: #000000; + text-shadow: 2px 2px 4px #FF4444; + padding: 0; + margin: 15px 0; } h1 { - font-size: 34pt; + font-size: 34pt; } h1:first-of-type { - margin-top: 0; + margin-top: 0; } h2 { - font-size: 28pt; + font-size: 28pt; } h3 { - font-size: 24pt; + font-size: 24pt; } h4 { - font-size: 18pt; + font-size: 18pt; } fieldset { - display: block; - border: 1px solid #666666; + display: block; + border: 1px solid #666666; } fieldset legend { - font-weight: bold; + font-weight: bold; } /* Markdown Code-Hilite class overrides. */ .codehilite { - border: 1px dashed #000000; - padding: 0px 20px; - background-color: transparent; + border: 1px dashed #000000; + padding: 0px 20px; + background-color: transparent; } pre, code { - font-family: "DejaVu Sans Mono","Ubuntu Mono","Lucida Console","Courier New","Courier",monospace; - font-size: 10pt; + font-family: "DejaVu Sans Mono","Ubuntu Mono","Lucida Console","Courier New","Courier",monospace; + font-size: 10pt; } /* Use responsive images in Markdown code. */ @@ -89,234 +89,234 @@ pre, code { *********************/ .right { - text-align: right; + text-align: right; } .center { - text-align: center; + text-align: center; } .clear { - clear: both; + clear: both; } table.table, table.table th, table.table td { - border: 1px solid #999999; + border: 1px solid #999999; } table.table { - border-collapse: collapse; - border-spacing: 0; - margin: 0px; - padding: 0px; + border-collapse: collapse; + border-spacing: 0; + margin: 0px; + padding: 0px; } table.table-wide { - width: 100%; + width: 100%; } table.table th { - background-color: #333333; - color: #FFFFFF; - text-align: left; - padding: 4px; + background-color: #333333; + color: #FFFFFF; + text-align: left; + padding: 4px; } table.table tr:nth-child(even) { - background-color: #FFFFFF; + background-color: #FFFFFF; } table.table tr:nth-child(odd) { - background-color: #CFCFCF; + background-color: #CFCFCF; } table.table td { - padding: 4px; + padding: 4px; } /* Photo Upload page */ .photo-upload-dropbox { - border: 2px dashed #000000; - padding: 40px; + border: 2px dashed #000000; + padding: 40px; } .photo-upload-dropbox.active { - border: 4px dashed #FF0000; + border: 4px dashed #FF0000; } .upload-trough { - position: relative; - border: 1px solid #000000; - width: 100%; - height: 28px; + position: relative; + border: 1px solid #000000; + width: 100%; + height: 28px; } .upload-progress-bar { - position: relative; - width: 0%; - height: 100%; - background-color: #FF9900; + position: relative; + width: 0%; + height: 100%; + background-color: #FF9900; } /* Photo Grids: see http://ansciath.tumblr.com/post/7347495869/css-aspect-ratio */ ul.photo-grid { - list-style: none; - display: inline; - margin: 0; - padding: 0; - position: relative; + list-style: none; + display: inline; + margin: 0; + padding: 0; + position: relative; } ul.photo-grid li { - position: relative; - display: inline-block; - width: 260px; - height: 260px; - margin-left: 20px; - margin-top: 20px; + position: relative; + display: inline-block; + width: 260px; + height: 260px; + margin-left: 20px; + margin-top: 20px; } ul.photo-grid li .dummy { - padding-top: 100%; + padding-top: 100%; } .photo-grid-item { - cursor: pointer; - overflow: hidden; /* Crop off long names, etc. */ + cursor: pointer; + overflow: hidden; /* Crop off long names, etc. */ - /* We use absolute positioning to detach this element from the flow, */ - /* allowing the .dummy to dictate the height of the square. */ - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; + /* We use absolute positioning to detach this element from the flow, */ + /* allowing the .dummy to dictate the height of the square. */ + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; } .photo-grid-item img { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; } .photo-grid-item .name { - position: absolute; - top: 4px; - left: 4px; - right: 4px; - font-family: Arial,Helvetica,sans-serif; - font-size: 14pt; - font-weight: bold; - color: #FFFFFF; - text-align: left; - text-shadow: 1px 1px 0px #000000, - -1px -1px 0px #000000, - 1px -1px 0px #000000, - -1px 1px 0px #000000; + position: absolute; + top: 4px; + left: 4px; + right: 4px; + font-family: Arial,Helvetica,sans-serif; + font-size: 14pt; + font-weight: bold; + color: #FFFFFF; + text-align: left; + text-shadow: 1px 1px 0px #000000, + -1px -1px 0px #000000, + 1px -1px 0px #000000, + -1px 1px 0px #000000; } /* Make a photo look nice. */ .portrait { - display: inline; - background-color: #CFCFCF; - padding: 4px; - border: 1px solid #000000; - box-shadow: 0px 0px 4px #FF4444; + display: inline; + background-color: #CFCFCF; + padding: 4px; + border: 1px solid #000000; + box-shadow: 0px 0px 4px #FF4444; } /* Photo description blocks */ .photo-description { - display: block; - border: 1px solid #000000; - box-shadow: 0px 0px 4px #000000; - padding: 10px; - margin: 20px 0px; - background-color: #646464; - color: #FFFFFF; - width: 790px; + display: block; + border: 1px solid #000000; + box-shadow: 0px 0px 4px #000000; + padding: 10px; + margin: 20px 0px; + background-color: #646464; + color: #FFFFFF; + width: 790px; } /* Blog titles when shown on index view */ a.blog-title-index:link, a.blog-title-index:visited { - font-size: 32pt; - font-weight: bold; - color: #000000; - text-decoration: none; - text-shadow: 2px 2px 4px #FF4444; + font-size: 32pt; + font-weight: bold; + color: #000000; + text-decoration: none; + text-shadow: 2px 2px 4px #FF4444; } a.blog-title-index:hover, a.blog-title-index:active { - text-decoration: underline; - text-shadow: 2px 2px 4px #FF4444; + text-decoration: underline; + text-shadow: 2px 2px 4px #FF4444; } /* Poster's avatar box */ .blog-author, .comment-author { - float: right; - background-color: #999999; - border: 1px solid #000000; - padding: 2px; - margin-left: 10px; - margin-bottom: 10px; - width: 100px; /* 96 avatar width + 4px padding */ - text-align: center; - font-weight: bold + float: right; + background-color: #999999; + border: 1px solid #000000; + padding: 2px; + margin-left: 10px; + margin-bottom: 10px; + width: 100px; /* 96 avatar width + 4px padding */ + text-align: center; + font-weight: bold } .blog-author a, .comment-author a { - text-decoration: none; + text-decoration: none; } div.siikir-avatar { - width: 96px; - margin: auto; + width: 96px; + margin: auto; } /* Timestamp and author line below blog titles */ .blog-timestamp { - font-style: italic; - padding-left: 30px; - padding-top: 5px; - padding-bottom: 10px + font-style: italic; + padding-left: 30px; + padding-top: 5px; + padding-bottom: 10px } ul.blog-categories { - list-style: none; - display: inline; - margin: 0; - padding: 0; + list-style: none; + display: inline; + margin: 0; + padding: 0; } ul.blog-categories li { - display: inline; + display: inline; } ul.blog-categories li:after { - content: ", "; + content: ", "; } ul.blog-categories li:last-child:after { - content: ""; + content: ""; } /* Blog comment wrapper */ .comment { - border: 1px dashed #006699; - padding: 5px + border: 1px dashed #006699; + padding: 5px } /* Style overrides for comments */ .comment h1 { - font-size: 14pt; + font-size: 14pt; } .comment h2 { - font-size: 12pt; + font-size: 12pt; } .comment h3 { - font-size: 10pt; + font-size: 10pt; } .comment h4 { - font-size: 9pt; + font-size: 9pt; } /* Wiki styles */ a.wiki-broken { - text-decoration: line-through; + text-decoration: line-through; } /* Visitor history page */ @@ -341,90 +341,90 @@ a.wiki-broken { *********************/ header { - display: block; - background-image: url("header.png"); - background-position: left bottom; - background-repeat: repeat-x; - margin: 0; - height: 174px; + display: block; + background-image: url("header.png"); + background-position: left bottom; + background-repeat: repeat-x; + margin: 0; + height: 174px; } header img { - position: absolute; - top: 0px; - left: 16px; - width: 161px; - height: 169px; + position: absolute; + top: 0px; + left: 16px; + width: 161px; + height: 169px; } header span { - font-size: 72pt; - font-weight: bold; - font-style: italic; - line-height: 169px; - color: #CFCFCF; - margin-left: 220px; + font-size: 72pt; + font-weight: bold; + font-style: italic; + line-height: 169px; + color: #CFCFCF; + margin-left: 220px; } nav { - position: absolute; - top: 180px; - left: 0px; - width: 200px; + position: absolute; + top: 180px; + left: 0px; + width: 200px; } nav ul { - list-style: none; - padding: 0; - margin: 0; + list-style: none; + padding: 0; + margin: 0; } nav ul li { - display: block; - line-height: 1.5em; - padding-left: 10px; - color: #FFFFFF; + display: block; + line-height: 1.5em; + padding-left: 10px; + color: #FFFFFF; } nav ul li.header { - background-image: url("navhead.png"); - background-repeat: no-repeat; - height: 34px; - line-height: 34px; - font-weight: bold; - color: #000000; - margin: 8px 0px; + background-image: url("navhead.png"); + background-repeat: no-repeat; + height: 34px; + line-height: 34px; + font-weight: bold; + color: #000000; + margin: 8px 0px; } nav a:link, nav a:visited { - color: #FFFFFF; - text-decoration: none; + color: #FFFFFF; + text-decoration: none; } nav a:hover, nav a:active { - text-decoration: underline; + text-decoration: underline; } #content { - position: absolute; - top: 180px; - left: 220px; - right: 20px; + position: absolute; + top: 180px; + left: 220px; + right: 20px; } footer { - display: block; - text-align: center; - font-weight: bold; - color: #666666; - margin: 40px 0px; + display: block; + text-align: center; + font-weight: bold; + color: #666666; + margin: 40px 0px; } footer div { - display: block; - width: 400px; - margin: auto; + display: block; + width: 400px; + margin: auto; } footer a:link, footer a:visited { - color: #666666; + color: #666666; }