Merge branch 'develop' into feature/moveToENVFiles

application/controllers/Home.php

@@ -250,6 +250,7 @@ function ($entry) {
 		}
 
 		// useCustomHeader also controls whether or not to show the custom footer
+		$headerData['customHeaderMode'] = $this->instance->getUseCustomHeader();
 		if ($this->instance->getUseCustomHeader()) {
 			$headerData['customHeader'] = $this->instance->getCustomHeaderText();
 			$headerData['customFooter'] = $this->instance->getCustomFooterText();

application/controllers/Instances.php

@@ -55,7 +55,7 @@ public function save()
 		$instance->setBucketRegion($this->input->post('bucketRegion'));
 		$instance->setDefaultBucket($this->input->post('defaultBucket'));
 		$instance->setGoogleAnalyticsKey($this->input->post('googleAnalyticsKey'));
-		$instance->setUseCustomHeader($this->input->post('useCustomHeader')?1:0);
+		$instance->setUseCustomHeader($this->input->post('useCustomHeader'));
 		$instance->setCustomHeaderText($this->input->post("customHeaderText"));
 		$instance->setCustomFooterText($this->input->post("customFooterText"));
 		$instance->setUseHeaderLogo($this->input->post('useHeaderLogo')?1:0);

application/doctrine/Entity.Instance.dcm.xml

@@ -69,7 +69,7 @@
           <field name="introText" type="text" nullable='true' />
           <field name="createdAt" type="datetime" nullable='true' />
           <field name="modifiedAt" type="datetime" nullable='true' />
-          <field name="useCustomHeader" type="boolean" nullable='true' />
+          <field name="useCustomHeader" type="integer" nullable='true' />
           <field name="useCustomCSS" type="boolean" nullable='true' />
           <field name="useHeaderLogo" type="boolean" nullable='true' />
           <field name="useCentralAuth" type="boolean" nullable='true' />

application/models/Entity/Instance.php

@@ -77,7 +77,7 @@ class Instance
     private $modifiedAt;
 
     /**
-     * @var boolean
+     * @var integer
      */
     private $useCustomHeader;
 
@@ -439,7 +439,7 @@ public function getModifiedAt()
     /**
      * Set useCustomHeader
      *
-     * @param boolean $useCustomHeader
+     * @param integer $useCustomHeader
      * @return Instance
      */
     public function setUseCustomHeader($useCustomHeader)
@@ -452,7 +452,7 @@ public function setUseCustomHeader($useCustomHeader)
     /**
      * Get useCustomHeader
      *
-     * @return boolean
+     * @return integer
      */
     public function getUseCustomHeader()
     {

application/views/instances/_form_fields.php

@@ -148,10 +148,20 @@
 
 <div class="form-group">
 	<div class="col-sm-offset-2 col-sm-8">
-		<label>
-			<input type="checkbox" id="useCustomHeader" name="useCustomHeader" value="On" <?=$instance->getUseCustomHeader()?"checked":null?>>
-			Use Custom Header and Footer
+		Display Custom Header and Footer: 
+		<ul style="list-style-type: none;">
+			<li><label>
+			<input type="radio" id="useCustomHeader" name="useCustomHeader" value="0" <?=$instance->getUseCustomHeader()==0?"checked":null?>>
+			Never</li>
 		</label>
+		<li><label>
+			<input type="radio" id="useCustomHeader" name="useCustomHeader" value="1" <?=$instance->getUseCustomHeader()==1?"checked":null?>>
+			Always
+		</label></li>
+		<li><label>
+			<input type="radio" id="useCustomHeader" name="useCustomHeader" value="2" <?=$instance->getUseCustomHeader()==2?"checked":null?>>
+			Only on Home Page
+		</label></li>
 	</div>
 </div>