updated documentation, and source link

diff --git a/INSTALL b/INSTALL
index 1fccecb..88e7772 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -8,14 +8,17 @@ System Requirements:
 
 You'll also need a recent version of wfpl in code/wfpl:
 
 
 You'll also need a recent version of wfpl in code/wfpl:
 

+       If you've cloned a recent version with git, you should get it
+       automatically. Otherwise:
+

        $ cd code
        $ cd code

-       $ git clone git://github.com/JasonWoof/wfpl.git
+       $ git clone git://gitorious.org/wfpl/wfpl.git

 
 Apache settings:
 
        There is .htaccess file with all the needed settings. You may need to
        change apache's AllowOverride directive to allow these settings to be
 
 Apache settings:
 
        There is .htaccess file with all the needed settings. You may need to
        change apache's AllowOverride directive to allow these settings to be

-       changed in the .htaccessfile.
+       changed in the .htaccess file.

 
        Also, since mod_rewrite does not allow you to redirect to relative URLs,
        you'll have to edit the rewrite rules if you don't install this at the
 
        Also, since mod_rewrite does not allow you to redirect to relative URLs,
        you'll have to edit the rewrite rules if you don't install this at the

@@ -33,8 +36,13 @@ Database:
        code/wfpl/examples/session.sql
 
        Create the Contractor account:
        code/wfpl/examples/session.sql
 
        Create the Contractor account:

+

                go to /logout in browser (this creates a session)
                go to /logout in browser (this creates a session)

-               in mysql do: insert into wfpl_session_data (name,value,session_id) values("auth_username", "1", (select id from wfpl_sessions limit 1));
-               Then go to /people in your browser and create your account (first account created is administrator/contractor)
+
+               in mysql do: insert into wfpl_session_data (name,value,session_id)
+               values("auth_username", "1", (select id from wfpl_sessions limit 1));
+
+               Then go to /people in your browser and create your account (first
+               account created is administrator/contractor)

        
        

-       Now you can create accounts for your customers, and/or create tasks for yourself.
+       Now you can create accounts for your customers.

diff --git a/README b/README
index 7a6aa7a..378cbbb 100644 (file)
--- a/README
+++ b/README
@@ -19,10 +19,13 @@ Current features:
 
        5) Clients can approve price or edit further (or let it sit)
 
 
        5) Clients can approve price or edit further (or let it sit)
 

-       6) Contractor can mark a task as in-progress at which point it is no longer
+       6) Clients can re-order the queue (the list of tasks which are approved
+       and priced, but work hasn't started yet)
+
+       7) Contractor can mark a task as in-progress at which point it is no longer

        editable.
 
        editable.
 

-       7) Contractor can mark a task as finished (needing testing). Then client can
+       8) Contractor can mark a task as finished (needing testing). Then client can

        test and mark it as confirmed finished.
 
 
        test and mark it as confirmed finished.
 
 

@@ -34,19 +37,18 @@ Current features:
        in as any of the clients.
 
 
        in as any of the clients.
 
 

-Planned features in a probably order of appearance:
+Planned features in a probable order of appearance:

 
 

-       1) Clients can re-order the queue (the list of tasks which are approved
-       and priced, but work hasn't started yet)
-
-       2) Contractor gets an e-mail whenever a client causes a task to move into
+       1) Contractor gets an e-mail whenever a client causes a task to move into

        his list of things to attend to.
 
        his list of things to attend to.
 

-       3) Contractor can add money to the client's balance, and system will
+       2) Contractor can add money to the client's balance, and system will

        automatically mark finished tasks as paid, and reduce the balance.
 
        automatically mark finished tasks as paid, and reduce the balance.
 

-       4) Contractor can auto-generate an invoice from tasks and contact info in
+       3) Contractor can auto-generate an invoice from tasks and contact info in

        the database.
 
        the database.
 

+       4) Client can easily create invoices and make payments through paypal.
+

        5) Site detects when client's balance is too low for work to continue and
        displays that prominently to them.
        5) Site detects when client's balance is too low for work to continue and
        displays that prominently to them.

diff --git a/template.html b/template.html
index b475f29..552caef 100644 (file)
--- a/template.html
+++ b/template.html
@@ -33,7 +33,7 @@
             <!--~end~-->
             <!--~main_body~-->
           </div>
             <!--~end~-->
             <!--~main_body~-->
           </div>

-          <div id="agpl_footer"><a href="http://github.com/JasonWoof/progress/tree/master">The code</a> that runs this website is licensed under the <a href="http://www.gnu.org/licenses/agpl.html">AGPL</a>.</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>

 
           <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 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>