improved contractor nav links: removed 'report a bug', added 'manage accounts'. Also...

diff --git a/index.html b/index.html
index 24f954c..eb1236d 100644 (file)
--- a/index.html
+++ b/index.html
@@ -13,7 +13,7 @@
 
   <p>This page is for giving Jason Woofenden work and figuring out the details of the associated tasks, costs and priorities.</p>
 
-  <p><a href="tasks?tasks_new=1">Add a task</a> &bull; <a href="tasks?tasks_new_bug=1">Report a problem</a><!--~su_link start~--> &bull; <a href="su">Switch login</a><!--~end~--><!-- &bull; <a href="pay">Pay Jason</a>--></p>
+  <p><a href="tasks?tasks_new=1">Add a task</a> &bull; <!--~not_contractor_links start~--><a href="tasks?tasks_new_bug=1">Report a problem</a><!-- &bull; <a href="pay">Pay Jason</a>--><!--~end~--><!--~contractor_links start~--><a href="people">Manage accounts</a> &bull; <a href="su">Switch login</a><!--~end~--></p>
 
   <!--~needs_attention_header start~-->
     <h3>Tasks needing your attention:</h3>

diff --git a/index.php b/index.php
index d8eb411..ab4ff12 100644 (file)
--- a/index.php
+++ b/index.php
@@ -123,7 +123,7 @@ function _index_main() {
        }
 
        if(logged_in_as_contractor()) {
-               tem_show('su_link');
+               tem_show('contractor_links');
                tem_show('needs_attention_header');
 
                $GLOBALS['unpaid_totals'] = array();
@@ -138,6 +138,7 @@ function _index_main() {
                totals_summary($GLOBALS['unpaid_totals']);
                task_summary('finished_paid', 'where state=%i && paid = 1 order by finished_at desc limit 20', TASK_FINISHED);
        } else {
+               tem_show('not_contractor_links');
                if(db_count('tasks', 'where client_id=%i && (state=%i || state=%i || state=%i || state=%i)', $client_id, TASK_DRAFT, TASK_NEEDS_CLARIFICATION, TASK_NEEDS_GO_AHEAD, TASK_NEEDS_TESTING)) {
                        tem_show('needs_attention_header');
                        task_summary('needs_approval', 'where client_id=%i && (state=%i || state=%i) order by id', $client_id, TASK_NEEDS_GO_AHEAD, TASK_NEEDS_TESTING);

diff --git a/people.html b/people.html
index abcb0e8..2b1ecca 100644 (file)
--- a/people.html
+++ b/people.html
@@ -56,6 +56,8 @@
   <!--~end~-->
 
   <p><a href="people.html?people_new=1">[Add a new record]</a></p>
+
+  <p><a href="./">Back to main page</a></p>
 <!--~end~-->
 
 <!--~end~-->