More fixes for dashboard and GA

core-ext/scripts/icehrm_master_data.sql

@@ -820,14 +820,14 @@ INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
 
 
 INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('Notifications: Send Document Expiry Emails', '1', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
-  ('Notifications: Copy Document Expiry Emails to Manager', '1', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
-  ('Expense: Pre-Approve Expenses', '0', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
   ('Travel: Pre-Approve Travel Request', '0', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
 
 INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
   ('Attendance: Use Department Time Zone', '0', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
 
+INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('Analytics: Google Key', 'UA-48048570-2',  'Google Analytics Key','');
+
 
 
 INSERT INTO `Certifications` (`id`, `name`, `description`) VALUES

ext/admin/dashboard/index.php

@@ -185,7 +185,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
                 <div class="icon">
                     <i class="ion ion-help"></i>
                 </div>
-                <a href="#" target="_blank" class="small-box-footer" id="icehrmHelpLink">
+                <a href="http://blog.icehrm.com/docs/home/" target="_blank" class="small-box-footer" id="icehrmHelpLink">
                     Documentation <i class="fa fa-arrow-circle-right"></i>
                 </a>
             </div>
@@ -193,7 +193,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 	</div>
 
     <div id="iceannon">
-        <div class="callout callout-warning lead" style="font-size: 14px;">
+        <div class="callout callout-danger lead" style="font-size: 14px;font-weight: bold;">
             <h4>Why not upgrade to IceHrm Pro Version</h4>
             <p>
                 IceHrm Pro is the feature rich upgrade to IceHrm open source version. It comes with improved modules for
@@ -228,7 +228,6 @@ $("#reportsLink").attr("href",modJs.getCustomUrl('?g=admin&n=reports&m=admin_Rep
 $("#settingsLink").attr("href",modJs.getCustomUrl('?g=admin&n=settings&m=admin_System'));
 $("#travelLink").attr("href",modJs.getCustomUrl('?g=admin&n=travel&m=admin_Employees'));
 
-$("#icehrmHelpLink").attr("href",modJs.getCustomUrl('http://blog.icehrm.com/docs/home/'));
 
 modJs.getInitData();
 

ext/modules/dashboard/index.php

@@ -116,7 +116,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
                 <div class="icon">
                     <i class="ion ion-help"></i>
                 </div>
-                <a href="#" target="_blank" class="small-box-footer" id="icehrmHelpLink">
+                <a href="http://blog.icehrm.com/docs/home/" target="_blank" class="small-box-footer" id="icehrmHelpLink">
                     Documentation <i class="fa fa-arrow-circle-right"></i>
                 </a>
             </div>
@@ -221,10 +221,10 @@ $("#leavesLink").attr("href",modJs.getCustomUrl('?g=modules&n=leaves&m=module_Le
 $("#timesheetLink").attr("href",modJs.getCustomUrl('?g=modules&n=time_sheets&m=module_Time_Management'));
 $("#projectsLink").attr("href",modJs.getCustomUrl('?g=modules&n=projects&m=module_Time_Management'));
 $("#traveAdminlLink").attr("href",modJs.getCustomUrl('?g=admin&n=travel&m=admin_Employees'));
-$("#traveLink").attr("href",modJs.getCustomUrl('?g=modules&n=travel&m=module_Travel_Management'));
+$("#travelLink").attr("href",modJs.getCustomUrl('?g=modules&n=travel&m=module_Travel_Management'));
 $("#reportsLink").attr("href",modJs.getCustomUrl('?g=admin&n=reports&m=admin_Reports'));
 
-$("#icehrmHelpLink").attr("href",modJs.getCustomUrl('http://blog.icehrm.com/docs/home/'));
+
 
 modJs.getPunch();
 modJs.getPendingLeaves();

src/classes/BaseService.php

@@ -1022,7 +1022,7 @@ class BaseService{
     }
 
     public function getGAKey(){
-		return "";
+        return SettingsManager::getInstance()->getSetting('Analytics: Google Key');
     }
 
     /**

src/header.php

@@ -165,7 +165,7 @@ include('configureUIManager.php');
         m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-		  ga('create', '<?=BaseService::getInstance()->getGAKey()?>', 'gamonoid.com');
+    ga('create', '<?=BaseService::getInstance()->getGAKey()?>', 'auto');
     ga('send','pageview');
 
 </script>
@@ -278,4 +278,3 @@ include('configureUIManager.php');
         <section class="content">
 
 
-