appification of notes

5 files changed, 61 insertions, 30 deletions

diff --git a/Zotlabs/Module/Notes.php b/Zotlabs/Module/Notes.php
index e530e6ff4..cd383a6c2 100644
--- a/Zotlabs/Module/Notes.php
+++ b/Zotlabs/Module/Notes.php
@@ -1,13 +1,19 @@
 <?php
 namespace Zotlabs\Module; /** @file */
 
+use App;
+use Zotlabs\Web\Controller;
+use Zotlabs\Lib\Apps;
 
-class Notes extends \Zotlabs\Web\Controller {
+class Notes extends Controller {
 
-	function init() {
+	function post() {
 	
 		if(! local_channel())
-			return;
+			return EMPTY_STR;
+
+		if(! Apps::system_app_installed(local_channel(), 'Notes'))
+			return EMPTY_STR;
 	
 		$ret = array('success' => true);
 		if(array_key_exists('note_text',$_REQUEST)) {
@@ -24,17 +30,38 @@ class Notes extends \Zotlabs\Web\Controller {
 			}
 			set_pconfig(local_channel(),'notes','text',$body);
 		}
-	
+
 		// push updates to channel clones
-	
+
 		if((argc() > 1) && (argv(1) === 'sync')) {
 			require_once('include/zot.php');
 			build_sync_packet();
 		}
-	
+
 		logger('notes saved.', LOGGER_DEBUG);
 		json_return_and_die($ret);
-		
+
+	}
+
+	function get() {
+
+		if(! local_channel())
+			return EMPTY_STR;
+
+		if(! Apps::system_app_installed(local_channel(), 'Notes')) {
+			//Do not display any associated widgets at this point
+			App::$pdl = EMPTY_STR;
+
+			$o = '<b>Notes App (Not Installed):</b><br>';
+			$o .= t('A simple notes app with a widget (note: notes are not encrypted)');
+			return $o;
+		}
+
+		$w = new \Zotlabs\Widget\Notes;
+		$arr = ['app' => true];
+
+		return $w->widget($arr);
+
 	}
 	
 }
diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php
index 5c83a550f..238008d81 100644
--- a/Zotlabs/Widget/Notes.php
+++ b/Zotlabs/Widget/Notes.php
@@ -2,20 +2,26 @@
 
 namespace Zotlabs\Widget;
 
+use Zotlabs\Lib\Apps;
+
 class Notes {
 
 	function widget($arr) {
 		if(! local_channel())
-			return '';
-		if(! feature_enabled(local_channel(),'private_notes'))
-			return '';
+			return EMPTY_STR;
+
+		if(! Apps::system_app_installed(local_channel(), 'Notes'))
+			return EMPTY_STR;
 
 		$text = get_pconfig(local_channel(),'notes','text');
 
-		$o = replace_macros(get_markup_template('notes.tpl'), array(
+		$tpl = get_markup_template('notes.tpl');
+
+		$o = replace_macros($tpl, array(
 			'$banner' => t('Notes'),
 			'$text' => $text,
 			'$save' => t('Save'),
+			'$app' => ((isset($arr['app'])) ? true : false)
 		));
 
 		return $o;
diff --git a/app/notes.apd b/app/notes.apd
new file mode 100644
index 000000000..ba7e2bbc1
--- /dev/null
+++ b/app/notes.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/notes
+requires: local_channel
+name: Notes
+photo: icon:sticky-note-o
+categories: Personal, Productivity
diff --git a/include/features.php b/include/features.php
index 3feb10fbf..4c865f406 100644
--- a/include/features.php
+++ b/include/features.php
@@ -85,25 +85,6 @@ function get_features($filtered = true, $level = (-1)) {
 				feature_level('start_menu',1),
 			],
 
-/*
-			[
-				'hide_rating',       
-				t('Hide Rating'),          
-				t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),
-				false,
-				get_config('feature_lock','hide_rating'),
-				feature_level('hide_rating',3),
-			],
-*/			
-			[
-				'private_notes',       
-				t('Private Notes'),          
-				t('Enables a tool to store notes and reminders (note: not encrypted)'),
-				false,
-				get_config('feature_lock','private_notes'),
-				feature_level('private_notes',1),
-			],
-
 			[
 				'premium_channel', 
 				t('Premium Channel'), 
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index c6d5d8a73..67da5ff37 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -1,5 +1,13 @@
+{{if $app}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$banner}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+{{else}}
 <div class="widget">
 	<h3>{{$banner}}</h3>
+{{/if}}
 	<textarea name="note_text" id="note-text">{{$text}}</textarea>
 	<script>
 		var noteSaveTimer = null;
@@ -32,4 +40,7 @@
 			noteSaveTimer = setTimeout(noteSaveChanges,10000);
 		}
 	</script>
+{{if $app}}
+</div>
+{{/if}}
 </div>