diff --git a/acl_setup.php b/acl_setup.php
index 2057456cc60..1fa7df956dc 100644
--- a/acl_setup.php
+++ b/acl_setup.php
@@ -59,6 +59,8 @@
// xl('Sensitivities')
$gacl->add_object_section('Placeholder' , 'placeholder' , 10, 0, 'ACO');
// xl('Placeholder')
+ $gacl->add_object_section('Nation Notes' , 'nationnotes' , 10, 0, 'ACO');
+ // xl('Nation Notes')
// Create Accounting ACOs.
//
@@ -158,6 +160,11 @@
//
$gacl->add_object('placeholder', 'Placeholder (Maintains empty ACLs)', 'filler', 10, 0, 'ACO');
// xl('Placeholder (Maintains empty ACLs)')
+
+ // Create ACO for nationnotes.
+ //
+ $gacl->add_object('nationnotes', 'Nation Notes Configure', 'nn_configure', 10, 0, 'ACO');
+ // xl('Nation Notes Configure')
// Create ARO groups.
//
@@ -208,7 +215,8 @@
'encounters'=>array('auth_a', 'coding_a', 'notes_a', 'date_a'),
'lists'=>array('default','state','country','language','ethrace'),
'patients'=>array('appt', 'demo', 'med', 'trans', 'docs', 'notes'),
- 'sensitivities'=>array('normal', 'high')
+ 'sensitivities'=>array('normal', 'high'),
+ 'nationnotes'=>array('nn_configure')
),
NULL, array($admin), NULL, NULL,
1, 1, 'write', 'Administrators can do anything'
@@ -310,7 +318,8 @@
'encounters'=>array('auth_a', 'coding_a', 'notes_a', 'date_a'),
'lists'=>array('default','state','country','language','ethrace'),
'patients'=>array('appt', 'demo', 'med', 'trans', 'docs', 'notes'),
- 'sensitivities'=>array('normal', 'high')
+ 'sensitivities'=>array('normal', 'high'),
+ 'nationnotes'=>array('nn_configure')
),
NULL, array($breakglass), NULL, NULL,
1, 1, 'write', 'Emergency Login user can do anything'
diff --git a/acl_upgrade.php b/acl_upgrade.php
index 4c555066a46..9ee4a83b166 100644
--- a/acl_upgrade.php
+++ b/acl_upgrade.php
@@ -76,6 +76,8 @@
addObjectSectionAcl('lists', 'Lists');
//Add 'Placeholder' object section (added in 3.0.2)
addObjectSectionAcl('placeholder', 'Placeholder');
+//Add 'Nation Notes' object section (added in 4.1.0)
+addObjectSectionAcl('nationnotes','Nation Notes');
//Add new Objects
echo "
Adding new objects
";
@@ -103,6 +105,8 @@
addObjectAcl('placeholder', 'Placeholder', 'filler', 'Placeholder (Maintains empty ACLs)');
//Add 'Sign Lab Results (write,addonly optional)' object (added in 3.3.0)
addObjectAcl('patients', 'Patients', 'sign', 'Sign Lab Results (write,addonly optional)');
+//Add 'nationnotes' object (added in 4.1.0)
+addObjectAcl('nationnotes', 'Nation Notes', 'nn_configure', 'Nation Notes Configure');
//Update already existing Objects
echo "
Upgrading objects
";
@@ -228,7 +232,10 @@
updateAcl($emergency_write, 'Emergency Login', 'sensitivities', 'Sensitivities', 'normal', 'Normal', 'write');
//Insert the 'sign' object from the 'patients' section into the Physicians group write ACL (added in 3.3.0)
updateAcl($doc_write, 'Physicians', 'patients', 'Patients', 'sign', 'Sign Lab Results (write,addonly optional)', 'write');
-
+//Insert the 'sign' object from the 'nationnotes' section into the Administrators group write ACL (added in 3.3.0)
+updateAcl($admin_write, 'Administrators','nationnotes', 'Nation Notes', 'nn_configure', 'Nation Notes Configure','write');
+//Insert the 'sign' object from the 'nationnotes' section into the Emergency Login group write ACL (added in 3.3.0)
+updateAcl($emergency_write, 'Emergency Login','nationnotes', 'Nation Notes', 'nn_configure', 'Nation Notes Configure','write');
//Function will return an array that contains the ACL ID number.
//It will also check to ensure the ACL exist and is not duplicated.
diff --git a/images/b_edit.png b/images/b_edit.png
new file mode 100644
index 00000000000..05711a0948e
Binary files /dev/null and b/images/b_edit.png differ
diff --git a/images/enter.gif b/images/enter.gif
new file mode 100644
index 00000000000..33ce7eaf79b
Binary files /dev/null and b/images/enter.gif differ
diff --git a/images/paragraph.png b/images/paragraph.png
new file mode 100644
index 00000000000..65048b7d5af
Binary files /dev/null and b/images/paragraph.png differ
diff --git a/images/question.png b/images/question.png
new file mode 100644
index 00000000000..ccd5d479d0d
Binary files /dev/null and b/images/question.png differ
diff --git a/interface/forms/LBF/new.php b/interface/forms/LBF/new.php
index 4bfdc3363dd..a4c25eecbcf 100644
--- a/interface/forms/LBF/new.php
+++ b/interface/forms/LBF/new.php
@@ -154,15 +154,40 @@ function end_group() {
-
+
+
+
+
+
+
+
-
+
+
+
+