From 2377222b2e275d7e954e23b53b60c32c476aeea3 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Thu, 7 Mar 2013 08:21:29 -0500 Subject: [PATCH] update wfpl and templates --- code/wfpl | 2 +- css_mangler.php | 2 +- index.html | 2 +- index.php | 1 - login.html | 2 +- login.php | 3 +- narrative_example.html | 4 +-- people.html | 2 +- people.php | 1 - su.html | 2 +- su.php | 1 - tasks.html | 2 +- tasks.php | 2 -- template.html | 82 +++++++++++++++++++++++------------------------- tiny_agreement.html | 2 +- tiny_agreement.php | 2 -- 16 files changed, 51 insertions(+), 61 deletions(-) diff --git a/code/wfpl b/code/wfpl index 2b91af8..5a2ac79 160000 --- a/code/wfpl +++ b/code/wfpl @@ -1 +1 @@ -Subproject commit 2b91af8c3f5c2b6cf3b749c769c5ccbe62890b5e +Subproject commit 5a2ac791b1c0ae217a7dba9f972d22b900303932 diff --git a/css_mangler.php b/css_mangler.php index 1b0d7d8..bc60051 100644 --- a/css_mangler.php +++ b/css_mangler.php @@ -29,7 +29,7 @@ function css_mangler() { return; } - header('Content-Type: text/css'); + header('Content-Type: text/plain'); http_cache_forever('private'); # serves different content for old IE versions, so no sharing the cache if(ie5or6()) { diff --git a/index.html b/index.html index a162800..01b98db 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - +

Progress Manager

diff --git a/index.php b/index.php index 88b09f6..0724a48 100644 --- a/index.php +++ b/index.php @@ -25,7 +25,6 @@ function index_main() { if($ret) { return $ret; } - tem_show('main_body'); } # pass multiple argumens for where-clause and printf-args just like db_get_rows() diff --git a/login.html b/login.html index 0b6bd59..faadbfe 100644 --- a/login.html +++ b/login.html @@ -7,7 +7,7 @@ - +

Client Login

diff --git a/login.php b/login.php index da07a64..3e88184 100644 --- a/login.php +++ b/login.php @@ -56,9 +56,8 @@ function login_main() { } } - tem_sub('failed'); + tem_set('failed'); } - tem_sub('main_body'); } ?> diff --git a/narrative_example.html b/narrative_example.html index eee9505..3a93f97 100644 --- a/narrative_example.html +++ b/narrative_example.html @@ -7,13 +7,13 @@ - +

Narrative Example

When you commission Jason Woofenden you are asked to write about your change/addition in the form of a first-person narrative. In this narrative you write as if the change/addition you would like has already been implemented. You write the specifics of what you do and what you see as a result.

Here is an example of a narrative for a new page:

-

I go to my home page, (or any other page on my site) and I click a link labeled "Contact Us" which is just below the "About Us" link on the left. Then I see a page with a headline "Contact Us" and a form with these fields: "Name", "E-mail", "Comments" and a button "Send". When I click "Send", all information entered is e-mailed to foo@example.com and I see a page with the headline "Thank You" and this paragraph: "Thank you for your interest. We can usually reply within one business day."

+
I go to my home page, (or any other page on my site) and I click a link labeled "Contact Us" which is just below the "About Us" link on the left. Then I see a page with a headline "Contact Us" and a form with these fields: "Name", "E-mail", "Comments" and a button "Send". When I click "Send", all information entered is e-mailed to foo@example.com and I see a page with the headline "Thank You" and this paragraph: "Thank you for your interest. We can usually reply within one business day."

After Jason makes the changes, you can verify that they are complete by following the steps in the narrative and making sure you can see everything it describes.

diff --git a/people.html b/people.html index ae61b3e..1c54d23 100644 --- a/people.html +++ b/people.html @@ -7,7 +7,7 @@ - +
diff --git a/people.php b/people.php index 31b4fa0..2443042 100644 --- a/people.php +++ b/people.php @@ -80,7 +80,6 @@ function people_main() { if($ret) { return $ret; } - tem_show('main_body'); } function _people_main() { diff --git a/su.html b/su.html index 3633f19..f7c9686 100644 --- a/su.html +++ b/su.html @@ -7,7 +7,7 @@ - +

Switch Login

With the links below you can quickly switch to being logged in under one of the client accounts. You will then see exactly what they see when they log in, and have exactly the same privileges to edit, etc. except that you are not prompted to fill out the tiny agreement and can still access this "Switch Login" page.

diff --git a/su.php b/su.php index a6acd12..8f0c6f0 100644 --- a/su.php +++ b/su.php @@ -28,7 +28,6 @@ function su_main() { if($ret) { return $ret; } - tem_show('main_body'); } function _su_main() { diff --git a/tasks.html b/tasks.html index 21907ae..4fb5987 100644 --- a/tasks.html +++ b/tasks.html @@ -7,7 +7,7 @@ - +

Task #~task_id~Problem Report "~title html~"

diff --git a/tasks.php b/tasks.php index 58737a3..ecbf757 100644 --- a/tasks.php +++ b/tasks.php @@ -68,8 +68,6 @@ function tasks_main() { } tem_show('edit_body'); } - - tem_show('main_body'); } function tasks_display_main() { diff --git a/template.html b/template.html index 09aa128..4f6f622 100644 --- a/template.html +++ b/template.html @@ -1,48 +1,46 @@ - - - + - JasonWoof -- Website Services - - + + JasonWoof -- ~title~ + + + + - -
-
- -
-
-
-
-
- - -
- - - -
- -

~data html~

- -
- - -
- - - -
- + +
+
+
+
JasonWoof
•
+ -
- [FSF Associate Member]     [WikiNews]     [Innovating Without Patents] -
-
-
-
-
+
+
+ + ~$body~ +
+
+
+
+
+ Jason Woof +
+
diff --git a/tiny_agreement.html b/tiny_agreement.html index b2386f3..62f50a1 100644 --- a/tiny_agreement.html +++ b/tiny_agreement.html @@ -7,7 +7,7 @@ - +

Tiny Job Agreement

Welcome to the task manager! I'd like to take this opportunity to have you make an agreement with me about very small jobs. Please read it carefully, and call me if you have any questions.

diff --git a/tiny_agreement.php b/tiny_agreement.php index ea159e7..4e5a39c 100644 --- a/tiny_agreement.php +++ b/tiny_agreement.php @@ -55,8 +55,6 @@ function tiny_agreement_main() { message('Something went wrong there. Please try again'); } } - - tem_sub('main_body'); } ?> -- 1.7.10.4