Fix contstraints on inclusion of fields-nav.inc and consolidate fields-links.inc.

There is a new templates/Jobs/fields-links.inc file that is used similarly to fields-nav.inc. Change the constraints on the file inclusion so these files can be consolidated.

It needs testing, but likely changing the first test to

action != 'add' 

in add-edit-view.php may work.