Skip to content

Commit

Permalink
Issue #126 - more explanatory text
Browse files Browse the repository at this point in the history
  • Loading branch information
tbar0970 committed Sep 28, 2016
1 parent 3d4d28e commit ea8932d
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 13 deletions.
12 changes: 5 additions & 7 deletions db_objects/note_template.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,6 @@ private function _printFieldsConfiguration()
)
);
?>
<small>When a note is added to a person using this template, the user will be prompted for the
following fields. Values that the user supplies for "independent" fields will be saved
only within the note. Values for "person" fields are will be saved within the note and will also
update the corresponding
<a href="<?php build_url(Array('view' => 'admin__custom_fields')); ?>">custom field</a>
in the person record.</small>

<table class="table expandable reorderable">
<thead>
<tr>
Expand Down Expand Up @@ -177,6 +170,11 @@ private function _printFieldsConfiguration()
?>
</tbody>
</table>
<small>When someone uses this template to add a note to a person, they will be prompted to enter values for these fields.<br />
Values for "independent" fields are saved only within the note itself. <br />
Values for "person" fields are will be saved within the note and will also update the corresponding
<a href="<?php build_url(Array('view' => 'admin__custom_fields')); ?>">custom field</a>
in the person record.</small>
<?php
}

Expand Down
1 change: 1 addition & 0 deletions views/view_10_admin__1_congregations.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ function processView()
function printView()
{
?>
<p class="text alert alert-info">Each person can be in one congregation. A person with status 'contact' can be congregationless. You may want to create extra congregations to represent kids church, housebound persons, etc.</p>
<p>
<a href="?view=_add_congregation"><i class="icon-plus-sign"></i>Add New Congregation</a>
</p>
Expand Down
4 changes: 2 additions & 2 deletions views/view_10_admin__2_user_accounts.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ function processView()
function printView()
{
?>
<p class="text alert alert-info">User accounts are usually created to give <i>staff and ministry leaders</i> access to Jethro. You need to create their <i>person</i> record first, then add a user account to go with it. Usually it's best to let church <i>members</i> create their own accounts in the <a href="<?php echo BASE_URL; ?>/members" target="_blank">member area</a></p>
<p><a href="?view=_add_user_account"><i class="icon-plus-sign"></i><?php echo _('Add User Account');?></a></p>

<table class="table table-striped table-hover table-min-width">
Expand All @@ -37,5 +38,4 @@ function printView()
</table>
<?php
}
}
?>
}
7 changes: 5 additions & 2 deletions views/view_10_admin__3_custom_fields.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ static function getMenuPermissionLevel()

function getTitle()
{
return 'Configure Custom Fields';
return 'Custom Fields';
}

function processView()
Expand Down Expand Up @@ -68,7 +68,10 @@ function processView()
function printView()
{
if (is_null($this->fields)) return;

?>
<p class="text alert alert-info">When you define a custom field here, you'll then be able to enter a value for that field when editing a person record.<br />Custom fields are useful for recording dates of birth, accreditations and medical details.</p>
<?php

if (empty($this->fields)) {
?>
<p><i>No custom fields have been set up in the system yet.</i></p>
Expand Down
1 change: 1 addition & 0 deletions views/view_10_admin__4_note_templates.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ function printView()
private function printTemplateList()
{
?>
<p class="text alert alert-info">When you create a note template here, it then becomes available for use when adding a note to a person. Templates are useful if you often need to add notes containing a fixed set of details, for example an incident report or training record. </p>
<p>
<a href="<?php echo build_url(Array('*' => NULL, 'view' => $_REQUEST['view'], 'templateid' => 0)); ?>"><i class="icon-plus-sign"></i>Create a new note template</a>
</p>
Expand Down
1 change: 1 addition & 0 deletions views/view_10_admin__5_action_plans.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ function printView()
}
} else {
?>
<p class="text alert alert-info">An action plan is a set of pre-defined actions to be performed on a person or family, for example adding a note or adding them to a group. You can trigger an action plan when creating a family, when viewing a person, or using the bulk-actions tool. Action plans can be useful for automating a workflow such as your newcomer integration process.</p>
<p><a href="<?php echo build_url(Array('planid' => 0, 'delete' => NULL)); ?>"><i class="icon-plus-sign"></i>Add new plan</a></p>
<?php
$saved_plans = $GLOBALS['system']->getDBObjectData('action_plan', Array(), '', 'name');
Expand Down
4 changes: 2 additions & 2 deletions views/view_10_admin__6_system_configuration.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ public function processView()
public function printView()
{
?>
<p>Some of the following settings can be edited on this page. Other settings are read only on this page, but can be adjusted by getting your
<p class="text alert alert-info">This page shows the system-wide Jethro configuration settings. Some settings can be edited on this page; others need to be changed by your
<?php if (defined('SYSADMIN_HREF')) echo '<a href="'.SYSADMIN_HREF.'">'; ?>
system administrator
<?php if (defined('SYSADMIN_HREF')) echo '</a>'; ?>
to edit the Jethro configuration file.</p>
in the Jethro configuration file.</p>
<table class="table no-autofocus system-config">
<tr>
<td colspan="2"><h3>Overall system settings</h3></td>
Expand Down

0 comments on commit ea8932d

Please sign in to comment.