From dfc50b2f8c4d4ca58e4a720cda3ff543a819e96b Mon Sep 17 00:00:00 2001
From: Tim Kelty <tim@fusionary.com>
Date: Fri, 13 Nov 2015 15:31:39 -0500
Subject: [PATCH 1/9] Store channel ID instead of handle

---
 usermanual/UserManualPlugin.php                  |  2 +-
 usermanual/templates/index.html                  |  2 +-
 .../twigextensions/UserManualTwigExtension.php   | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 usermanual/UserManualPlugin.php
 mode change 100755 => 100644 usermanual/templates/index.html

diff --git a/usermanual/UserManualPlugin.php b/usermanual/UserManualPlugin.php
old mode 100755
new mode 100644
index fa1bfcc..36a3b00
--- a/usermanual/UserManualPlugin.php
+++ b/usermanual/UserManualPlugin.php
@@ -59,7 +59,7 @@ public function getSettingsHtml(){
 		foreach(craft()->sections->getAllSections() as $section){
 			$options[] = [
 				'label' => $section['name'],
-				'value' => $section['handle']
+				'value' => $section['id']
 			];
 		}
 
diff --git a/usermanual/templates/index.html b/usermanual/templates/index.html
old mode 100755
new mode 100644
index b7d47db..2e127a8
--- a/usermanual/templates/index.html
+++ b/usermanual/templates/index.html
@@ -6,7 +6,7 @@
 
 {% set sidebar %}
   <nav>
-  	{% set help = craft.entries.section(channelSelected) %}
+  	{% set help = craft.entries.sectionId(channelSelected) %}
 	<ul>
 	    {% nav page in help %}
 	        <li>
diff --git a/usermanual/twigextensions/UserManualTwigExtension.php b/usermanual/twigextensions/UserManualTwigExtension.php
index aa044b5..8257da7 100755
--- a/usermanual/twigextensions/UserManualTwigExtension.php
+++ b/usermanual/twigextensions/UserManualTwigExtension.php
@@ -2,11 +2,11 @@
 
 namespace Craft;
 
-use Twig_Extension;  
+use Twig_Extension;
 use Twig_Function_Method;
 use Twig_Filter_Method;
 
-class UserManualTwigExtension extends Twig_Extension  
+class UserManualTwigExtension extends Twig_Extension
 {
   public function getName()
   {
@@ -23,22 +23,22 @@ public function getFunctions()
   public function getHelpDocument($path = '') {
     $segments = craft()->request->segments;
     $segment = end($segments);
-    
-    $section = craft()->userManual_settings->getChannelSetting();
+
+    $sectionId = craft()->userManual_settings->getChannelSetting();
 
     $criteria = craft()->elements->getCriteria(ElementType::Entry);
-    $criteria->section = $section;
+    $criteria->sectionId = $sectionId;
     $criteria->slug = $segment;
     $entry = $criteria->find();
 
   // if the app has not been set up at all, redirect to the settings page
-    if($section == ''){
+    if($sectionId == ''){
       craft()->request->redirect(UrlHelper::getCpUrl('settings/plugins/usermanual/'));
     }
   // if there is no url segment, load the homepage
     else if(! $entry){
       $firstCriteria = craft()->elements->getCriteria(ElementType::Entry);
-      $firstCriteria->section = $section;
+      $firstCriteria->sectionId = $sectionId;
       $firstCriteria->limit = 1;
       $firstEntry = $firstCriteria->find();
       echo($firstEntry[0]['body']);
@@ -50,4 +50,4 @@ public function getHelpDocument($path = '') {
   }
 }
 
-?>
\ No newline at end of file
+?>

From 92593b65e880a20b04a1bf837af01a8a34cc91bd Mon Sep 17 00:00:00 2001
From: Tim Kelty <tim@fusionary.com>
Date: Fri, 13 Nov 2015 15:55:20 -0500
Subject: [PATCH 2/9] Return instead of echo

---
 usermanual/twigextensions/UserManualTwigExtension.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usermanual/twigextensions/UserManualTwigExtension.php b/usermanual/twigextensions/UserManualTwigExtension.php
index 8257da7..684dca1 100755
--- a/usermanual/twigextensions/UserManualTwigExtension.php
+++ b/usermanual/twigextensions/UserManualTwigExtension.php
@@ -41,11 +41,13 @@ public function getHelpDocument($path = '') {
       $firstCriteria->sectionId = $sectionId;
       $firstCriteria->limit = 1;
       $firstEntry = $firstCriteria->find();
-      echo($firstEntry[0]['body']);
+
+      return $firstEntry[0]['body'];
     }
+
   // if there is a defined page, load that page's body
     else{
-      echo($entry[0]['body']);
+      return $entry[0]['body'];
     }
   }
 }

From 8d6c64490eb28c275c4bcb85f91c72e2b8c7811b Mon Sep 17 00:00:00 2001
From: Tim Kelty <tim@fusionary.com>
Date: Fri, 13 Nov 2015 17:31:35 -0500
Subject: [PATCH 3/9] Allow template overrides

---
 usermanual/UserManualPlugin.php               | 19 ++--
 usermanual/templates/_body.html               |  1 +
 usermanual/templates/settings.html            | 42 ++++++---
 .../UserManualTwigExtension.php               | 89 ++++++++++---------
 4 files changed, 91 insertions(+), 60 deletions(-)
 create mode 100644 usermanual/templates/_body.html

diff --git a/usermanual/UserManualPlugin.php b/usermanual/UserManualPlugin.php
index 36a3b00..b4b9a95 100644
--- a/usermanual/UserManualPlugin.php
+++ b/usermanual/UserManualPlugin.php
@@ -6,7 +6,10 @@ class UserManualPlugin extends BasePlugin
 
 	function getName()
 	{
-		return Craft::t('User Manual');
+		$pluginName         = Craft::t('User Manual');
+		$pluginNameOverride = $this->getSettings()->pluginNameOverride;
+
+		return ($pluginNameOverride) ? $pluginNameOverride : $pluginName;
 	}
 
 	function getVersion()
@@ -41,13 +44,13 @@ public function registerCpRoutes() {
 	    );
 	  }
 
-
-    protected function defineSettings()
-    {
-		return array(
-            'channels' => array(AttributeType::Mixed, 'default' => ""),
-        );
-    }
+	protected function defineSettings() {
+			return array(
+					'pluginNameOverride'     => AttributeType::String,
+					'templateOverride'       => AttributeType::String,
+					'channels' 							 => array(AttributeType::Mixed, 'default' => ''),
+		);
+	}
 
 	public function getSettingsHtml(){
 
diff --git a/usermanual/templates/_body.html b/usermanual/templates/_body.html
new file mode 100644
index 0000000..d73eec7
--- /dev/null
+++ b/usermanual/templates/_body.html
@@ -0,0 +1 @@
+{{ entry.body|default }}
diff --git a/usermanual/templates/settings.html b/usermanual/templates/settings.html
index 6ef2202..ec107fb 100755
--- a/usermanual/templates/settings.html
+++ b/usermanual/templates/settings.html
@@ -1,12 +1,32 @@
 {% import "_includes/forms" as forms %}
-<p>Select which Craft section should be used as the "User Manual" section:</p>
-{{ forms.select({
-        label: "My Setting"|t,
-        id: 'channels',
-        name: 'channels',
-        instructions: "Input your setting"|t,
-        value: settings.channels,
-        options: options,
-        autofocus: true
-    }) 
-}}
\ No newline at end of file
+
+{{ forms.textField({
+  label: "Plugin Name"|t,
+  id: 'pluginNameOverride',
+  name: 'pluginNameOverride',
+  instructions: "Intuitive, human-readable plugin name for the end user."|t,
+  value: settings.pluginNameOverride,
+  autofocus: true,
+  first: true,
+  errors: ''
+}) }}
+
+{{ forms.selectField({
+    label: "Section"|t,
+    id: 'channels',
+    name: 'channels',
+    instructions: 'Select which Craft section should be used as the "User Manual" section'|t,
+    value: settings.channels,
+    options: options,
+  })
+}}
+
+{{ forms.textField({
+    label: "Template Override"|t,
+    id: 'templateOverride',
+    name: 'templateOverride',
+    instructions: "For more control over the output, you may optionally override the default template."|t,
+    value: settings.templateOverride,
+    errors: ''
+  })
+}}
diff --git a/usermanual/twigextensions/UserManualTwigExtension.php b/usermanual/twigextensions/UserManualTwigExtension.php
index 684dca1..df4060f 100755
--- a/usermanual/twigextensions/UserManualTwigExtension.php
+++ b/usermanual/twigextensions/UserManualTwigExtension.php
@@ -4,52 +4,59 @@
 
 use Twig_Extension;
 use Twig_Function_Method;
-use Twig_Filter_Method;
 
 class UserManualTwigExtension extends Twig_Extension
 {
-  public function getName()
-  {
-      return 'User Manual Twig Extension';
-  }
-
-  public function getFunctions()
-  {
-    return array(
-      'getHelpDocument' => new Twig_Function_Method($this, 'getHelpDocument'),
-    );
-  }
-
-  public function getHelpDocument($path = '') {
-    $segments = craft()->request->segments;
-    $segment = end($segments);
-
-    $sectionId = craft()->userManual_settings->getChannelSetting();
-
-    $criteria = craft()->elements->getCriteria(ElementType::Entry);
-    $criteria->sectionId = $sectionId;
-    $criteria->slug = $segment;
-    $entry = $criteria->find();
-
-  // if the app has not been set up at all, redirect to the settings page
-    if($sectionId == ''){
-      craft()->request->redirect(UrlHelper::getCpUrl('settings/plugins/usermanual/'));
+    public function getName()
+    {
+        return 'User Manual Twig Extension';
     }
-  // if there is no url segment, load the homepage
-    else if(! $entry){
-      $firstCriteria = craft()->elements->getCriteria(ElementType::Entry);
-      $firstCriteria->sectionId = $sectionId;
-      $firstCriteria->limit = 1;
-      $firstEntry = $firstCriteria->find();
-
-      return $firstEntry[0]['body'];
+
+    public function getFunctions()
+    {
+        return array(
+            'getHelpDocument' => new Twig_Function_Method($this, 'getHelpDocument'),
+        );
     }
 
-  // if there is a defined page, load that page's body
-    else{
-      return $entry[0]['body'];
+    public function getHelpDocument()
+    {
+        $oldPath = craft()->path->getTemplatesPath();
+        $newPath = craft()->path->getPluginsPath().'usermanual/templates/';
+        $template = '_body.html';
+        $settings = craft()->plugins->getPlugin('usermanual')->getSettings();
+        $segments = craft()->request->segments;
+        $segment = end($segments);
+        $sectionId = $settings->channels;
+
+        $criteria = craft()->elements->getCriteria(ElementType::Entry);
+        $criteria->sectionId = $sectionId;
+        $criteria->slug = $segment;
+
+        if (!$criteria->total()) {
+            $criteria->slug = null;
+        }
+
+        $entry = $criteria->first();
+
+        // If the app has not been set up at all or there are no entires, redirect to the settings page
+        if (!$sectionId || !$entry) {
+            craft()->request->redirect(UrlHelper::getCpUrl('settings/plugins/usermanual/'));
+        } else {
+
+            if ($settings->templateOverride) {
+                $newPath = craft()->path->getSiteTemplatesPath();
+                $template = $settings->templateOverride;
+            }
+
+            craft()->path->setTemplatesPath($newPath);
+
+            $output = craft()->templates->render($template, [
+                'entry' => $entry,
+            ]);
+            craft()->path->setTemplatesPath($oldPath);
+
+            return $output;
+        }
     }
-  }
 }
-
-?>

From 6e7139b38b2084803e3f83c93ffeec8f4c10620a Mon Sep 17 00:00:00 2001
From: Tim Kelty <tim@fusionary.com>
Date: Sat, 14 Nov 2015 00:10:44 -0500
Subject: [PATCH 4/9] Cleanup, message if field is missing.

---
 usermanual/UserManualPlugin.php               | 114 +++++++++---------
 .../services/UserManual_SettingsService.php   |  15 ---
 usermanual/templates/_body.html               |  10 +-
 usermanual/templates/index.html               |  21 ++--
 usermanual/templates/settings.html            |  24 ++--
 .../UserManualTwigExtension.php               |   1 -
 usermanual/variables/UserManualVariable.php   |  15 ++-
 7 files changed, 97 insertions(+), 103 deletions(-)
 delete mode 100755 usermanual/services/UserManual_SettingsService.php
 mode change 100755 => 100644 usermanual/variables/UserManualVariable.php

diff --git a/usermanual/UserManualPlugin.php b/usermanual/UserManualPlugin.php
index b4b9a95..ad385ae 100644
--- a/usermanual/UserManualPlugin.php
+++ b/usermanual/UserManualPlugin.php
@@ -1,80 +1,82 @@
 <?php
+
 namespace Craft;
 
 class UserManualPlugin extends BasePlugin
 {
+    public function getName()
+    {
+        $pluginName = Craft::t('User Manual');
+        $pluginNameOverride = $this->getSettings()->pluginNameOverride;
 
-	function getName()
-	{
-		$pluginName         = Craft::t('User Manual');
-		$pluginNameOverride = $this->getSettings()->pluginNameOverride;
-
-		return ($pluginNameOverride) ? $pluginNameOverride : $pluginName;
-	}
+        return ($pluginNameOverride) ? $pluginNameOverride : $pluginName;
+    }
 
-	function getVersion()
-	{
-		return '1.0.0';
-	}
+    public function getVersion()
+    {
+        return '1.0.0';
+    }
 
-	function getDeveloper()
-	{
-		return 'Hill Holliday';
-	}
+    public function getDeveloper()
+    {
+        return 'Hill Holliday';
+    }
 
-	function getDeveloperUrl()
-	{
-		return 'http://hhcc.com';
-	}
+    public function getDeveloperUrl()
+    {
+        return 'http://hhcc.com';
+    }
 
-	function hasCpSection()
+    public function hasCpSection()
     {
         return true;
     }
 
-	public function addTwigExtension()
-	{
-		Craft::import('plugins.usermanual.twigextensions.UserManualTwigExtension');
-		return new UserManualTwigExtension();
-	}
-
-	public function registerCpRoutes() {
-	    return array(
-	      'usermanual/(?P<userManualPath>[a-zA-Z0-9\-\_\/]+)' => 'usermanual/index'
-	    );
-	  }
-
-	protected function defineSettings() {
-			return array(
-					'pluginNameOverride'     => AttributeType::String,
-					'templateOverride'       => AttributeType::String,
-					'channels' 							 => array(AttributeType::Mixed, 'default' => ''),
-		);
-	}
+    public function addTwigExtension()
+    {
+        Craft::import('plugins.usermanual.twigextensions.UserManualTwigExtension');
 
-	public function getSettingsHtml(){
+        return new UserManualTwigExtension();
+    }
 
-		$options= [[
-			'label' => 'Please select',
-			'value' => ''
-		]];
+    public function registerCpRoutes()
+    {
+        return [
+    		'usermanual/(?P<userManualPath>[a-zA-Z0-9\-\_\/]+)' => 'usermanual/index',
+        ];
+    }
 
-		foreach(craft()->sections->getAllSections() as $section){
-			$options[] = [
-				'label' => $section['name'],
-				'value' => $section['id']
-			];
-		}
+    protected function defineSettings()
+    {
+        return [
+	        'pluginNameOverride' => AttributeType::String,
+	        'templateOverride' => AttributeType::String,
+	        'channels' => [AttributeType::Mixed, 'default' => ''],
+        ];
+    }
 
-		return craft()->templates->render('UserManual/settings',array(
-			'settings' => $this->getSettings(),
-			'options' => $options
-		));
-	}
+    public function getSettingsHtml()
+    {
+        $options = [[
+            'label' => 'Please select',
+            'value' => '',
+        ]];
+
+        foreach (craft()->sections->getAllSections() as $section) {
+            $options[] = [
+                'label' => $section['name'],
+                'value' => $section['id'],
+            ];
+        }
+
+        return craft()->templates->render('usermanual/settings', [
+            'settings' => $this->getSettings(),
+            'options' => $options,
+        ]);
+    }
 
     public function onAfterInstall()
     {
         craft()->request->redirect(UrlHelper::getCpUrl('settings/plugins/usermanual/'));
     }
-
 }
diff --git a/usermanual/services/UserManual_SettingsService.php b/usermanual/services/UserManual_SettingsService.php
deleted file mode 100755
index 4fbd7a5..0000000
--- a/usermanual/services/UserManual_SettingsService.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace Craft;
-
-class UserManual_SettingsService extends BaseApplicationComponent{
-	public function getChannelSetting(){
-		$plugin = craft()->plugins->getPlugin('UserManual');
-		$settings = $plugin->settings;
-
-		return $settings->channels;
-	}
-
-	public function getCp(){
-		return craft()->config->get('cpTrigger');
-	}
-}
\ No newline at end of file
diff --git a/usermanual/templates/_body.html b/usermanual/templates/_body.html
index d73eec7..7184b40 100644
--- a/usermanual/templates/_body.html
+++ b/usermanual/templates/_body.html
@@ -1 +1,9 @@
-{{ entry.body|default }}
+{% if entry.body is defined %}
+    {{ entry.body }}
+{% else %}
+    <p>
+        <a href="{{ url('settings/fields/new') }}">Create a field</a> with the handle of <code>body</code>
+        <b>or</b>
+        use the <a href="{{ url('settings/plugins/usermanual#settings-templateOverride-field') }}">Template Override</a> option to define your own fields.
+    </p>
+{% endif %}
diff --git a/usermanual/templates/index.html b/usermanual/templates/index.html
index 2e127a8..e6f0ef0 100644
--- a/usermanual/templates/index.html
+++ b/usermanual/templates/index.html
@@ -1,20 +1,23 @@
 {% extends "_layouts/cp" %}
 
-
-{% set channelSelected = (craft.userManual.getSettings() is defined) ? craft.userManual.getSettings() : "Homepage" %}
+{% set channelSelected = (craft.userManual.settings.channels is defined) ? craft.userManual.settings.channels : "Homepage" %}
 {% set title = "User Manual"|t %}
 
 {% set sidebar %}
   <nav>
   	{% set help = craft.entries.sectionId(channelSelected) %}
 	<ul>
-	    {% nav page in help %}
+        {% nav page in help %}
+            {% set active = page.slug == craft.request.lastSegment or loop.first and craft.request.lastSegment == 'usermanual' %}
 	        <li>
-	            <a {% if page.slug == craft.request.lastSegment or loop.first and craft.request.lastSegment == 'usermanual' %}class="sel"{% endif %} href="/{{craft.userManual.getCpUrl()}}/usermanual/{{page.uri}}">{{page.title}}</a>
+	            <a {% if active %}class="sel"{% endif %}
+                href="{{ url('usermanual/' ~ page.uri) }}">
+                {{page.title}}
+              </a>
 	            {% ifchildren %}
-	                <ul>
-	                    {% children %}
-	                </ul>
+                  <ul>
+                      {% children %}
+                  </ul>
 	            {% endifchildren %}
 	        </li>
 	    {% endnav %}
@@ -23,8 +26,8 @@
 {% endset %}
 
 {% set content %}
-{% includeCssResource('usermanual/css/help.css') %}
+    {% includeCssResource('usermanual/css/help.css') %}
 	<div id="user-manual">
-		{{ getHelpDocument(channelSelected) }}
+		{{ getHelpDocument(channelSelected)|raw }}
 	</div>
 {% endset %}
diff --git a/usermanual/templates/settings.html b/usermanual/templates/settings.html
index ec107fb..f4af83e 100755
--- a/usermanual/templates/settings.html
+++ b/usermanual/templates/settings.html
@@ -1,15 +1,15 @@
 {% import "_includes/forms" as forms %}
 
 {{ forms.textField({
-  label: "Plugin Name"|t,
-  id: 'pluginNameOverride',
-  name: 'pluginNameOverride',
-  instructions: "Intuitive, human-readable plugin name for the end user."|t,
-  value: settings.pluginNameOverride,
-  autofocus: true,
-  first: true,
-  errors: ''
-}) }}
+    label: "Plugin Name"|t,
+    id: 'pluginNameOverride',
+    name: 'pluginNameOverride',
+    instructions: "Intuitive, human-readable plugin name for the end user."|t,
+    value: settings.pluginNameOverride,
+    autofocus: true,
+    first: true,
+    errors: ''
+})}}
 
 {{ forms.selectField({
     label: "Section"|t,
@@ -18,8 +18,7 @@
     instructions: 'Select which Craft section should be used as the "User Manual" section'|t,
     value: settings.channels,
     options: options,
-  })
-}}
+})}}
 
 {{ forms.textField({
     label: "Template Override"|t,
@@ -28,5 +27,4 @@
     instructions: "For more control over the output, you may optionally override the default template."|t,
     value: settings.templateOverride,
     errors: ''
-  })
-}}
+})}}
diff --git a/usermanual/twigextensions/UserManualTwigExtension.php b/usermanual/twigextensions/UserManualTwigExtension.php
index df4060f..204b8e1 100755
--- a/usermanual/twigextensions/UserManualTwigExtension.php
+++ b/usermanual/twigextensions/UserManualTwigExtension.php
@@ -43,7 +43,6 @@ public function getHelpDocument()
         if (!$sectionId || !$entry) {
             craft()->request->redirect(UrlHelper::getCpUrl('settings/plugins/usermanual/'));
         } else {
-
             if ($settings->templateOverride) {
                 $newPath = craft()->path->getSiteTemplatesPath();
                 $template = $settings->templateOverride;
diff --git a/usermanual/variables/UserManualVariable.php b/usermanual/variables/UserManualVariable.php
old mode 100755
new mode 100644
index 95f5779..0a00fe6
--- a/usermanual/variables/UserManualVariable.php
+++ b/usermanual/variables/UserManualVariable.php
@@ -1,12 +1,11 @@
-<?php 
+<?php
+
 namespace Craft;
 
 class UserManualVariable
 {
-	public function getSettings(){
-		return craft()->userManual_settings->getChannelSetting();
-	}
-	public function getCpUrl(){
-		return craft()->userManual_settings->getCp();
-	}
-}
\ No newline at end of file
+    public function settings()
+    {
+        return craft()->plugins->getPlugin('usermanual')->getSettings();
+    }
+}

From 189a25ae66924da3b72da3daa4ffaacaf5f1b0db Mon Sep 17 00:00:00 2001
From: Tim Kelty <tim@fusionary.com>
Date: Sat, 14 Nov 2015 00:18:51 -0500
Subject: [PATCH 5/9] Replace titles

---
 usermanual/templates/index.html             | 2 +-
 usermanual/variables/UserManualVariable.php | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/usermanual/templates/index.html b/usermanual/templates/index.html
index e6f0ef0..d232efb 100644
--- a/usermanual/templates/index.html
+++ b/usermanual/templates/index.html
@@ -1,7 +1,7 @@
 {% extends "_layouts/cp" %}
 
 {% set channelSelected = (craft.userManual.settings.channels is defined) ? craft.userManual.settings.channels : "Homepage" %}
-{% set title = "User Manual"|t %}
+{% set title = craft.userManual.name|t %}
 
 {% set sidebar %}
   <nav>
diff --git a/usermanual/variables/UserManualVariable.php b/usermanual/variables/UserManualVariable.php
index 0a00fe6..4080f01 100644
--- a/usermanual/variables/UserManualVariable.php
+++ b/usermanual/variables/UserManualVariable.php
@@ -4,8 +4,15 @@
 
 class UserManualVariable
 {
-    public function settings()
+    public function getSettings()
     {
         return craft()->plugins->getPlugin('usermanual')->getSettings();
     }
+
+    public function getName()
+    {
+        $plugin = craft()->plugins->getPlugin('usermanual');
+
+        return $plugin->getName();
+    }
 }

From 02f135e486d733deabe43d455d95f3d8100763be Mon Sep 17 00:00:00 2001
From: Tim Kelty <tim@fusionary.com>
Date: Sat, 14 Nov 2015 00:45:03 -0500
Subject: [PATCH 6/9] Renaming channels to section

---
 usermanual/UserManualPlugin.php                       | 2 +-
 usermanual/templates/_body.html                       | 5 ++++-
 usermanual/templates/index.html                       | 6 +++---
 usermanual/templates/settings.html                    | 6 +++---
 usermanual/twigextensions/UserManualTwigExtension.php | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/usermanual/UserManualPlugin.php b/usermanual/UserManualPlugin.php
index ad385ae..bf8a058 100644
--- a/usermanual/UserManualPlugin.php
+++ b/usermanual/UserManualPlugin.php
@@ -51,7 +51,7 @@ protected function defineSettings()
         return [
 	        'pluginNameOverride' => AttributeType::String,
 	        'templateOverride' => AttributeType::String,
-	        'channels' => [AttributeType::Mixed, 'default' => ''],
+	        'section' => [AttributeType::Mixed, 'default' => ''],
         ];
     }
 
diff --git a/usermanual/templates/_body.html b/usermanual/templates/_body.html
index 7184b40..3d1db9d 100644
--- a/usermanual/templates/_body.html
+++ b/usermanual/templates/_body.html
@@ -1,4 +1,7 @@
-{% if entry.body is defined %}
+{# Using bracket notation for an accurate test, due to
+   a Twig bug: http://craftcms.stackexchange.com/questions/2116/twig-is-defined-always-returning-true/2117#2117 #}
+
+{% if entry['body'] is defined %}
     {{ entry.body }}
 {% else %}
     <p>
diff --git a/usermanual/templates/index.html b/usermanual/templates/index.html
index d232efb..a64f39c 100644
--- a/usermanual/templates/index.html
+++ b/usermanual/templates/index.html
@@ -1,11 +1,11 @@
 {% extends "_layouts/cp" %}
 
-{% set channelSelected = (craft.userManual.settings.channels is defined) ? craft.userManual.settings.channels : "Homepage" %}
+{% set sectionSelected = (craft.userManual.settings.section is defined) ? craft.userManual.settings.section : "Homepage" %}
 {% set title = craft.userManual.name|t %}
 
 {% set sidebar %}
   <nav>
-  	{% set help = craft.entries.sectionId(channelSelected) %}
+  	{% set help = craft.entries.sectionId(sectionSelected) %}
 	<ul>
         {% nav page in help %}
             {% set active = page.slug == craft.request.lastSegment or loop.first and craft.request.lastSegment == 'usermanual' %}
@@ -28,6 +28,6 @@
 {% set content %}
     {% includeCssResource('usermanual/css/help.css') %}
 	<div id="user-manual">
-		{{ getHelpDocument(channelSelected)|raw }}
+		{{ getHelpDocument(sectionSelected)|raw }}
 	</div>
 {% endset %}
diff --git a/usermanual/templates/settings.html b/usermanual/templates/settings.html
index f4af83e..e858eff 100755
--- a/usermanual/templates/settings.html
+++ b/usermanual/templates/settings.html
@@ -13,10 +13,10 @@
 
 {{ forms.selectField({
     label: "Section"|t,
-    id: 'channels',
-    name: 'channels',
+    id: 'section',
+    name: 'section',
     instructions: 'Select which Craft section should be used as the "User Manual" section'|t,
-    value: settings.channels,
+    value: settings.section,
     options: options,
 })}}
 
diff --git a/usermanual/twigextensions/UserManualTwigExtension.php b/usermanual/twigextensions/UserManualTwigExtension.php
index 204b8e1..09dabbc 100755
--- a/usermanual/twigextensions/UserManualTwigExtension.php
+++ b/usermanual/twigextensions/UserManualTwigExtension.php
@@ -27,7 +27,7 @@ public function getHelpDocument()
         $settings = craft()->plugins->getPlugin('usermanual')->getSettings();
         $segments = craft()->request->segments;
         $segment = end($segments);
-        $sectionId = $settings->channels;
+        $sectionId = $settings->section;
 
         $criteria = craft()->elements->getCriteria(ElementType::Entry);
         $criteria->sectionId = $sectionId;

From 03601d874b09aaf9b3ed6f5b75e7e6d068d2a869 Mon Sep 17 00:00:00 2001
From: Tim Kelty <tim@fusionary.com>
Date: Sat, 14 Nov 2015 01:06:03 -0500
Subject: [PATCH 7/9] Only show sections with URLs

---
 usermanual/UserManualPlugin.php    | 5 ++++-
 usermanual/templates/settings.html | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/usermanual/UserManualPlugin.php b/usermanual/UserManualPlugin.php
index bf8a058..a9beddd 100644
--- a/usermanual/UserManualPlugin.php
+++ b/usermanual/UserManualPlugin.php
@@ -58,11 +58,14 @@ protected function defineSettings()
     public function getSettingsHtml()
     {
         $options = [[
-            'label' => 'Please select',
+            'label' => '',
             'value' => '',
         ]];
 
         foreach (craft()->sections->getAllSections() as $section) {
+            if (!$section->hasUrls) {
+                continue;
+            }
             $options[] = [
                 'label' => $section['name'],
                 'value' => $section['id'],
diff --git a/usermanual/templates/settings.html b/usermanual/templates/settings.html
index e858eff..9a56218 100755
--- a/usermanual/templates/settings.html
+++ b/usermanual/templates/settings.html
@@ -12,10 +12,10 @@
 })}}
 
 {{ forms.selectField({
-    label: "Section"|t,
+    label: "User Manual Section"|t,
     id: 'section',
     name: 'section',
-    instructions: 'Select which Craft section should be used as the "User Manual" section'|t,
+    instructions: 'Entries in this section must have associated urls.'|t,
     value: settings.section,
     options: options,
 })}}

From b8cd5ac6da24c1b767fad5f2aab3cbdea3bb7d3d Mon Sep 17 00:00:00 2001
From: Tim Kelty <tim@fusionary.com>
Date: Sat, 14 Nov 2015 01:28:44 -0500
Subject: [PATCH 8/9] Instructions for override

---
 usermanual/UserManualPlugin.php    | 1 +
 usermanual/templates/settings.html | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/usermanual/UserManualPlugin.php b/usermanual/UserManualPlugin.php
index a9beddd..99c8878 100644
--- a/usermanual/UserManualPlugin.php
+++ b/usermanual/UserManualPlugin.php
@@ -75,6 +75,7 @@ public function getSettingsHtml()
         return craft()->templates->render('usermanual/settings', [
             'settings' => $this->getSettings(),
             'options' => $options,
+            'siteTemplatesPath' => craft()->path->getSiteTemplatesPath(),
         ]);
     }
 
diff --git a/usermanual/templates/settings.html b/usermanual/templates/settings.html
index 9a56218..a1fcbb6 100755
--- a/usermanual/templates/settings.html
+++ b/usermanual/templates/settings.html
@@ -20,11 +20,16 @@
     options: options,
 })}}
 
+{% set instructions %}
+For more control over the output, you may optionally override the default template.<br>
+Path is relative to <code>{{ siteTemplatesPath }}</code>.
+{% endset %}
 {{ forms.textField({
     label: "Template Override"|t,
     id: 'templateOverride',
     name: 'templateOverride',
-    instructions: "For more control over the output, you may optionally override the default template."|t,
+    placeholder: '_includes/userManualContent.twig',
+    instructions: instructions|raw,
     value: settings.templateOverride,
     errors: ''
 })}}

From 1ee7e48e0724ae2c31154a86c9332df7e12bf920 Mon Sep 17 00:00:00 2001
From: Tim Kelty <tim@fusionary.com>
Date: Sat, 14 Nov 2015 03:15:12 -0500
Subject: [PATCH 9/9] Allow config file overrides for options, display override
 warnings.

---
 usermanual/UserManualPlugin.php    | 22 +++++++++++++--
 usermanual/config.php              |  6 +++++
 usermanual/templates/settings.html | 43 +++++++++++++++++++++++-------
 3 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 usermanual/config.php

diff --git a/usermanual/UserManualPlugin.php b/usermanual/UserManualPlugin.php
index 99c8878..c1e0c53 100644
--- a/usermanual/UserManualPlugin.php
+++ b/usermanual/UserManualPlugin.php
@@ -50,8 +50,8 @@ protected function defineSettings()
     {
         return [
 	        'pluginNameOverride' => AttributeType::String,
-	        'templateOverride' => AttributeType::String,
-	        'section' => [AttributeType::Mixed, 'default' => ''],
+	        'templateOverride' => AttributeType::Template,
+	        'section' => AttributeType::Number,
         ];
     }
 
@@ -83,4 +83,22 @@ public function onAfterInstall()
     {
         craft()->request->redirect(UrlHelper::getCpUrl('settings/plugins/usermanual/'));
     }
+
+    public function getSettings()
+    {
+        $settings = parent::getSettings();
+        foreach ($settings as $name => $value) {
+            $configValue = craft()->config->get($name, 'usermanual');
+            $settings->$name = is_null($configValue) ? $value : $configValue;
+        }
+
+        // Allow handles from config
+        if (!is_numeric($settings->section)) {
+            $section = craft()->sections->getSectionByHandle('homepage');
+            if ($section) {
+                $settings->section = $section->id;
+            }
+        }
+        return $settings;
+    }
 }
diff --git a/usermanual/config.php b/usermanual/config.php
new file mode 100644
index 0000000..b48b76f
--- /dev/null
+++ b/usermanual/config.php
@@ -0,0 +1,6 @@
+<?php
+return [
+    'pluginNameOverride' => null,
+    'templateOverride' => null,
+    'section' => null,
+];
diff --git a/usermanual/templates/settings.html b/usermanual/templates/settings.html
index a1fcbb6..32f6556 100755
--- a/usermanual/templates/settings.html
+++ b/usermanual/templates/settings.html
@@ -1,5 +1,14 @@
 {% import "_includes/forms" as forms %}
 
+{% macro configWarning(setting, file) -%}
+	{{ "This is being overridden by the {setting} config setting."|t({
+		setting: '<a href="https://github.com/hillholliday/Craft-User-Manual/config-settings#'~setting~'" target="_blank">'~setting~'</a>'
+	})|raw }}
+{%- endmacro %}
+
+{% from _self import configWarning %}
+
+{% set configOverride = craft.config.get('pluginNameOverride', 'usermanual') is not null %}
 {{ forms.textField({
     label: "Plugin Name"|t,
     id: 'pluginNameOverride',
@@ -8,22 +17,33 @@
     value: settings.pluginNameOverride,
     autofocus: true,
     first: true,
-    errors: ''
+    errors: '',
+    warning: configOverride ? configWarning('pluginNameOverride'),
+	disabled: configOverride,
+	readonly: configOverride,
 })}}
 
-{{ forms.selectField({
-    label: "User Manual Section"|t,
-    id: 'section',
-    name: 'section',
-    instructions: 'Entries in this section must have associated urls.'|t,
-    value: settings.section,
-    options: options,
-})}}
+{% set configOverride = craft.config.get('section', 'usermanual') is not null %}
+{% set inputMacro = configOverride ? 'textField' : 'selectField' %}
+{% set opts = {
+	label: "User Manual Section"|t,
+	id: 'section',
+	name: 'section',
+	instructions: 'Entries in this section must have associated urls.'|t,
+	value: settings.section,
+	options: options,
+	warning: configOverride ? configWarning('pluginNameOverride'),
+	disabled: configOverride,
+	readonly: configOverride,
+} %}
+{{ configOverride ? forms.textField(opts) : forms.selectField(opts) }}
 
 {% set instructions %}
 For more control over the output, you may optionally override the default template.<br>
 Path is relative to <code>{{ siteTemplatesPath }}</code>.
 {% endset %}
+{% set configOverride = craft.config.get('templateOverride', 'usermanual') is not null %}
+
 {{ forms.textField({
     label: "Template Override"|t,
     id: 'templateOverride',
@@ -31,5 +51,8 @@
     placeholder: '_includes/userManualContent.twig',
     instructions: instructions|raw,
     value: settings.templateOverride,
-    errors: ''
+    errors: '',
+	warning: configOverride ? configWarning('pluginNameOverride'),
+	disabled: configOverride,
+	readonly: configOverride,
 })}}