Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev

application/controllers/Options.php

@@ -98,6 +98,22 @@ class Options extends CI_Controller {
 				$this->session->set_flashdata('success', 'Dashboard banner changed to '.$this->input->post('dashboardBanner'));
 			}
 
+			// Update dashboard map within the options system
+			$dashboard_map_update_status = $this->optionslib->update('dashboard_map', $this->input->post('dashboardMap'), 'yes');
+
+			// If dashboard map update is complete set a flashsession with a success note
+			if($ldashboard_map_update_status == TRUE) {
+				$this->session->set_flashdata('success', 'Dashboard map changed to '.$this->input->post('dashboardMap'));
+			}
+
+			// Update logbook map within the options system
+			$logbook_map_update_status = $this->optionslib->update('logbook_map', $this->input->post('logbookMap'), 'yes');
+
+			// If logbook map update is complete set a flashsession with a success note
+			if($logbook_map_update_status == TRUE) {
+				$this->session->set_flashdata('success', 'Logbook map changed to '.$this->input->post('logbookMap'));
+			}
+
 			// Update Lang choice within the options system
 			// $lang_update_status = $this->optionslib->update('language', $this->input->post('language'));
 

application/views/dashboard/index.php

@@ -84,9 +84,10 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 <?php } ?>
 </div>
 
+<?php if($this->optionslib->get_option('dashboard_map') != "false" && $this->optionslib->get_option('dashboard_map') != "map_at_right") { ?>
 <!-- Map -->
 <div id="map" style="width: 100%; height: 350px"></div>
-
+<?php } ?>
 <div style="padding-top: 0px; margin-top: 5px;" class="container dashboard">
 
 <!-- Log Data -->
@@ -153,6 +154,10 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
   </div>
 
   <div class="col-sm-4">
+  	<?php if($this->optionslib->get_option('dashboard_map') == "map_at_right") { ?>
+	<!-- Map -->
+	<div id="map" style="width: 100%; height: 350px;  margin-bottom: 15px;"></div>
+	<?php } ?>
   	<div class="table-responsive">
 
 		<?php if($radio_status->num_rows()) { ?>

application/views/options/appearance.php

@@ -78,6 +78,25 @@
                             <small id="dashboardBannerHelp" class="form-text text-muted">This allows to disable the global notification banner on the dashboard.</small>
                         </div>
 
+                        <div class="form-group">
+                            <label for="dashboardMap">Dashboard Map</label>
+                            <select class="custom-select" id="dashboardMap" name="dashboardMap" aria-describedby="dashboardMapHelp" required>
+                                <option value='true' <?php if($this->optionslib->get_option('dashboard_map') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
+                                <option value='false' <?php if($this->optionslib->get_option('dashboard_map') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
+                                <option value='map_at_right' <?php if($this->optionslib->get_option('dashboard_map') == "map_at_right") { echo "selected=\"selected\""; } ?>>Map at right</option>
+                            </select>
+                            <small id="dashboardMapHelp" class="form-text text-muted">This allows the map on the dashboard to be disabled or placed on the right.</small>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="logbookMap">Logbook Map</label>
+                            <select class="custom-select" id="logbookMap" name="logbookMap" aria-describedby="logbookMapHelp" required>
+                                <option value='true' <?php if($this->optionslib->get_option('logbook_map') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
+                                <option value='false' <?php if($this->optionslib->get_option('logbook_map') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
+                            </select>
+                            <small id="logbookMapHelp" class="form-text text-muted">This allows to disable the map in the logbook.</small>
+                        </div>
+
                         <!-- Save the Form -->
                         <input class="btn btn-primary" type="submit" value="Save" />
                     </form>

application/views/view_log/index.php

@@ -13,8 +13,10 @@
 	<?php } ?>
 </div>
 	
+<?php if($this->optionslib->get_option('logbook_map') != "false") { ?>
 	<!-- Map -->
 	<div id="map" style="width: 100%; height: 350px"></div>
+<?php } ?>
 
 <div style="padding-top: 10px; margin-top: 0px;" class="container logbook">
 	<?php $this->load->view('view_log/partial/log_ajax') ?>