Merge pull request #1162 from doktornotor/patch-19

5 files changed, 60 insertions, 16 deletions

diff --git a/config/notes/notes.priv.inc b/config/notes/notes.priv.inc
new file mode 100644
index 00000000..fe4adae4
--- /dev/null
+++ b/config/notes/notes.priv.inc
@@ -0,0 +1,38 @@
+<?php
+/*
+	notes.priv.inc
+	part of pfSense (http://www.pfSense.org/)
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+global $priv_list;
+
+$priv_list['page-status-notes'] = array();
+$priv_list['page-status-notes']['name'] = "WebCfg - Status: Notes";
+$priv_list['page-status-notes']['descr'] = "Allow access to Notes package GUI";
+$priv_list['page-status-notes']['match'] = array();
+$priv_list['page-status-notes']['match'][] = "pkg.php?xml=notes.xml*";
+$priv_list['page-status-notes']['match'][] = "pkg_edit.php?xml=notes.xml*";
+
+?>
diff --git a/config/notes/notes.xml b/config/notes/notes.xml
index 03c0a01a..d6fb9abf 100644
--- a/config/notes/notes.xml
+++ b/config/notes/notes.xml
@@ -43,23 +43,29 @@
 	</copyright>
 	<description>Notes</description>
 	<name>Notes</name>
-	<version>0.2.6</version>
-	<title>Settings</title>
+	<version>0.2.8</version>
+	<title>Status: Notes</title>
+	<aftersaveredirect>/pkg.php?xml=notes.xml</aftersaveredirect>
+	<addedit_string>[notes] Successfully created/modified a note.</addedit_string>
+	<delete_string>[notes] Successfully deleted a note.</delete_string>
 	<menu>
 		<name>Notes</name>
-		<tooltiptext>Notes.</tooltiptext>
 		<section>Status</section>
 		<configfile>notes.xml</configfile>
 		<url>/pkg.php?xml=notes.xml</url>
 	</menu>
 	<tabs>
 		<tab>
-			<text>Settings</text>
-			<url>/pkg_edit.php?xml=notes.xml</url>
+			<text>Notes</text>
+			<url>/pkg.php?xml=notes.xml</url>
 			<active/>
 		</tab>
 	</tabs>
 	<configpath>installedpackages->package->$packagename->configuration->notes</configpath>
+	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/notes/notes.priv.inc</item>
+	</additional_files_needed>
 	<adddeleteeditpagefields>
 		<columnitem>
 			<fielddescr>Title</fielddescr>
@@ -69,6 +75,9 @@
 			<fielddescr>Category</fielddescr>
 			<fieldname>category</fieldname>
 		</columnitem>
+	<addtext>Add a new note</addtext>
+	<edittext>Edit this note</edittext>
+	<deletetext>Delete this note</deletetext>
 	</adddeleteeditpagefields>
 	<fields>
 		<field>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index f34af9b7..d1a63ff2 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -323,10 +323,9 @@
 		<category>Utility</category>
 		<pkginfolink/>
 		<config_file>https://packages.pfsense.org/packages/config/notes/notes.xml</config_file>
-		<version>0.2.7</version>
-		<status>RC</status>
+		<version>0.2.8</version>
+		<status>RELEASE</status>
 		<required_version>2.2</required_version>
-		<maintainer>markjcrane@gmail.com</maintainer>
 		<configurationfile>notes.xml</configurationfile>
 	</package>
 	<package>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 28e13668..779d8252 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -383,10 +383,9 @@
 		<pkginfolink/>
 		<config_file>https://packages.pfsense.org/packages/config/notes/notes.xml</config_file>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<version>0.2.4</version>
-		<status>Alpha</status>
-		<required_version>1.2.1</required_version>
-		<maintainer>markjcrane@gmail.com</maintainer>
+		<version>0.2.8</version>
+		<status>Release</status>
+		<required_version>2.1</required_version>
 		<configurationfile>notes.xml</configurationfile>
 	</package>
 	<package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index a5e54c50..9e4d83d9 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -370,10 +370,9 @@
 		<pkginfolink/>
 		<config_file>https://packages.pfsense.org/packages/config/notes/notes.xml</config_file>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<version>0.2.4</version>
-		<status>Alpha</status>
-		<required_version>1.2.1</required_version>
-		<maintainer>markjcrane@gmail.com</maintainer>
+		<version>0.2.8</version>
+		<status>Release</status>
+		<required_version>2.1</required_version>
 		<configurationfile>notes.xml</configurationfile>
 	</package>
 	<package>