JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
gitweb / contractor-progress.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e9aa2a1)
update wfpl and templates master
authorJason Woofenden <jason@jasonwoof.com>
Thu, 7 Mar 2013 13:21:29 +0000 (08:21 -0500)
committerJason Woofenden <jason@jasonwoof.com>
Thu, 7 Mar 2013 13:21:29 +0000 (08:21 -0500)
16 files changed:
code/wfpl patch | blob | history
css_mangler.php patch | blob | history
index.html patch | blob | history
index.php patch | blob | history
login.html patch | blob | history
login.php patch | blob | history
narrative_example.html patch | blob | history
people.html patch | blob | history
people.php patch | blob | history
su.html patch | blob | history
su.php patch | blob | history
tasks.html patch | blob | history
tasks.php patch | blob | history
template.html patch | blob | history
tiny_agreement.html patch | blob | history
tiny_agreement.php patch | blob | history

diff --git a/code/wfpl b/code/wfpl
index 2b91af8..5a2ac79 160000 (submodule)
--- 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 (file)
--- 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 (file)
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-  <!--~main_body {~-->
+  <!--~$body show {~-->
 
     <h2>Progress Manager</h2>
 
diff --git a/index.php b/index.php
index 88b09f6..0724a48 100644 (file)
--- 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 (file)
--- a/login.html
+++ b/login.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-  <!--~main_body {~-->
+  <!--~$body show {~-->
     <h3>Client Login</h3>
 
     <!--~failed {~-->
diff --git a/login.php b/login.php
index da07a64..3e88184 100644 (file)
--- 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 (file)
--- a/narrative_example.html
+++ b/narrative_example.html
@@ -7,13 +7,13 @@
 </head>
 
 <body>
-<!--~main_body {~-->
+<!--~$body show {~-->
   <h2>Narrative Example</h2>
 
   <p>When you <a href="./">commission Jason Woofenden</a> 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.</p>
   <p>Here is an example of a narrative for a new page:</p>
 
-  <p class="boxed">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."</p>
+  <blockquote>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."</blockquote>
 
   <p>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.</p>
 <!--~}~-->
diff --git a/people.html b/people.html
index ae61b3e..1c54d23 100644 (file)
--- a/people.html
+++ b/people.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-  <!--~main_body {~-->
+  <!--~$body show {~-->
 
   <!--~message_container {~-->
        <div style="border: 2px solid red; background: #fbb; padding: 5px; margin: 20px 0px">
diff --git a/people.php b/people.php
index 31b4fa0..2443042 100644 (file)
--- 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 (file)
--- a/su.html
+++ b/su.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-  <!--~main_body {~-->
+  <!--~$body show {~-->
   <h2>Switch Login</h2>
 
   <p>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.</p>
diff --git a/su.php b/su.php
index a6acd12..8f0c6f0 100644 (file)
--- 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 (file)
--- a/tasks.html
+++ b/tasks.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-  <!--~main_body {~-->
+  <!--~$body show {~-->
 
 <!--~display_body {~-->
   <h3><!--~normal_title {~-->Task #~task_id~<!--~}~--><!--~bug_title {~-->Problem Report<!--~}~--> "~title html~"</h3>
diff --git a/tasks.php b/tasks.php
index 58737a3..ecbf757 100644 (file)
--- 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 (file)
--- a/template.html
+++ b/template.html
@@ -1,48 +1,46 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en" class="no-js">
 <head>
-  <title>JasonWoof -- Website Services</title>
-  <link rel="stylesheet" href="style_4.css" type="text/css" />
-  <link rel="stylesheet" href="tasks_2.css" type="text/css" />
+       <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
+       <title>JasonWoof -- ~title~</title>
+       <!--[if lt IE 9]>
+               <script src="html5.js"></script>
+       <![endif]-->
+       <style>
+               @font-face {
+                       font-family: 'jasonwooflogo';
+                       src: url('jasonwooflogo.eot');
+                       src: url('jasonwooflogo.eot?#iefix') format('embedded-opentype'), url('jasonwooflogo.woff') format('woff'), url('jasonwooflogo.ttf') format('truetype'), url('jasonwooflogo.svg#jasonwooflogo') format('svg');
+                       font-weight: normal;
+                       font-style: normal;
+               }
+               header {
+                       font: 52px jasonwooflogo;
+               }
+       </style>
+       <link rel="stylesheet" href="style_11.css">
+       <link rel="stylesheet" href="tasks_11.css">
 </head>
 
-<body onload="document.getElementById('screen_height').style.height = (window.innerHeight ? window.innerHeight : document.documentElement.clientWidth) + 'px'">
-  <div id="background"></div>
-  <div id="background2"></div>
-
-  <div id="box0">
-    <div id="screen_height" style="height: 10px; width: 0px; float: left"></div>
-    <div id="box1">
-      <div id="box2">
-        <div id="box3">
-          <p id="logo"></p>
-
-          <div id="body" class="~basename~_body">
-            <!--~logout_bar~-->
-            <!--~wfpl_messages {~-->
-              <!--~ first {~-->
-                <div style="border: 2px solid red; background: #fbb; padding: 5px; margin: 20px 0px">
-              <!--~}~-->
-                  <p style="font-size: 120%; padding: 5px; margin: 0px">~data html~</p>
-              <!--~ sep {~-->
-                  <hr />
-              <!--~}~-->
-              <!--~ last {~-->
-                </div>
-              <!--~}~-->
-            <!--~}~-->
-            <!--~main_body~-->
-          </div>
-          <div id="agpl_footer"><a href="http://gitorious.org/contractor-progress/contractor-progress">The code</a> that runs this website is licensed under the <a href="http://www.gnu.org/licenses/agpl.html">AGPL</a>.</div>
+<body id="~$basename~_body" class="real_body_tag">
+       <div id="centerer"><div id="centerer2">
+               <div id="lsquig"><div id="lsquigi"></div></div>
+               <div id="rsquig"><div id="rsquigi"></div></div>
+               <header>JasonWoof<br>&bull;</header>
+               <nav>
+                       ~menu~
+               </nav>
 
-          <div id="badges">
-            <a href="http://www.fsf.org/register_form?referrer=4579" title="Please support the Free Software Foundation"><img width="88" height="31" src="images/fsf4579.png" alt="[FSF Associate Member]" /></a> &nbsp; &nbsp; <a href="http://en.wikinews.org/wiki/Main_Page" title="News by and for the community"><img width="88" height="31" src="images/wikinews_badge.png" alt="[WikiNews]" /></a> &nbsp; &nbsp; <a href="http://endsoftpatents.org/innovating-without-patents" title="Software patents inhibit progress"><img width="88" height="31" src="images/esp-iwp.png" alt="[Innovating Without Patents]" /></a>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+               <div id="main-body">
+                       <article>
+                               <!--~logout_bar~-->
+                               ~$body~
+                       </article>
+                       <div style="clear: both"></div>
+               </div>
+               <div style="clear: both"></div>
+               <footer>
+                       Jason Woof
+               </footer>
+       </div></div>
 </body>
 </html>
diff --git a/tiny_agreement.html b/tiny_agreement.html
index b2386f3..62f50a1 100644 (file)
--- a/tiny_agreement.html
+++ b/tiny_agreement.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-<!--~main_body {~-->
+<!--~$body show {~-->
   <h3><a href="#" id="tiny_job_agreement" name="tiny_job_agreement"></a>Tiny Job Agreement</h3>
 
   <p>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.</p>
diff --git a/tiny_agreement.php b/tiny_agreement.php
index ea159e7..4e5a39c 100644 (file)
--- 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');
 }
 
 ?>
Contractor Progress; a website for tracking projects including itemized pricing