minor changes

.gitignore

@@ -3,3 +3,6 @@ settings.php
 Modules/energyaudit
 Modules/node
 Modules/auto
+Modules/energyform
+Modules/energydata
+Modules/energygroup

Modules/dashboard/Views/js/widgets/stack/stack_widget.php

@@ -2,7 +2,7 @@
   global $path;
 
   // energyaudit module needs to be installed:
-  echo "<script type='text/javascript' src='".$path."Modules/energyaudit/stack_lib/stacks.js'></script>"; 
+  echo "<script type='text/javascript' src='".$path."Modules/energydata/stack_lib/stacks.js'></script>"; 
 
   // Widget renderer 
   echo "<script type='text/javascript' src='".$path."Modules/dashboard/Views/js/widgets/stack/stack_render.js'></script>";  

default.settings.php

@@ -1,20 +1,16 @@
 <?php
 
-/*
- * Database connection settings
- */
+  /*
+ 
+  Database connection settings
+
+  */
+
   $username = "";
   $password = "";
   $server   = "localhost";
   $database = "";
 
-  $theme = "basic";
-
-/*
- * Error processing
- */
-  $display_errors = TRUE;
-
   /*
 
   Menu settings
@@ -50,9 +46,19 @@
   $public_profile_controller = "dashboard"; 
   $public_profile_action = "run";
 
-/*
- * Allow user register in emoncms
- */
+  /*
+
+  Other
+
+  */
+
+  // Theme location
+  $theme = "basic";
+
+  // Error processing
+  $display_errors = TRUE;
+
+  // Allow user register in emoncms
   $allowusersregister = TRUE;
 
 ?>

process_settings.php

@@ -12,19 +12,11 @@
   // no direct access
   defined('EMONCMS_EXEC') or die('Restricted access');
 
-  //require "Includes/messages.php";
-
-  // Variable initialization
-  //$useckeditor = false;
-	$allowusersregister = true;
-  //$grid_size = 20;
-
   // Check if settings.php file exists
   if(!file_exists(dirname(__FILE__)."/settings.php"))
   {
-      //show_nosettingsfile_message();
-      echo 'Copy and modify default.settings.php to settings.php';
-      die;
+    echo 'Copy and modify default.settings.php to settings.php';
+    die;
   }
   else
   {
@@ -33,12 +25,9 @@
 
     // Set display errors
     if (isset($display_errors) && ($display_errors)) {
-      //error_reporting(E_ALL);
       error_reporting(E_ALL);      
       ini_set('display_errors', 'on');      
     }    
-
-
   }
 
 ?>