galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

More fixes for dashboard and GA

Browse Source
This commit is contained in:
Thilina Hasantha
2015-12-13 17:49:01 +05:30
parent 3016ef518d
commit 08b4d93bef
5 changed files with 1173 additions and 1175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core-ext/scripts/icehrm_master_data.sql
View File

@@ -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

5
ext/admin/dashboard/index.php
View File

@@ -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();

6
ext/modules/dashboard/index.php
View File

@@ -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();

4
src/classes/BaseService.php
View File

@@ -28,7 +28,7 @@ Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilin
* of the tasks related to retriving and saving data. This can be referred within any module using
* BaseService::getInstance()
*
@class BaseService
@class BaseService
*/
class BaseService{
@@ -1022,7 +1022,7 @@ class BaseService{
}
public function getGAKey(){
return "";
return SettingsManager::getInstance()->getSetting('Analytics: Google Key');
}
/**

25
src/header.php
View File

@@ -78,7 +78,7 @@ include('configureUIManager.php');
?><!DOCTYPE html>
<html>
<head>
<head>
<meta charset="utf-8">
<title><?=APP_NAME?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -157,24 +157,24 @@ include('configureUIManager.php');
</head>
<body class="skin-blue">
<script>
</head>
<body class="skin-blue">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
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('send', 'pageview');
ga('create', '<?=BaseService::getInstance()->getGAKey()?>', 'auto');
ga('send','pageview');
</script>
<script type="text/javascript">
</script>
<script type="text/javascript">
</script>
</script>
<header id="delegationDiv" class="header">
<header id="delegationDiv" class="header">
<a href="<?=$homeLink?>" class="logo" style="font-family: 'Source Sans Pro', sans-serif;">
<?=APP_NAME?>
</a>
@@ -193,8 +193,8 @@ include('configureUIManager.php');
</ul>
</div>
</nav>
</header>
<div class="wrapper row-offcanvas row-offcanvas-left">
</header>
<div class="wrapper row-offcanvas row-offcanvas-left">
<!-- Left side column. contains the logo and sidebar -->
<aside class="left-side sidebar-offcanvas">
<!-- sidebar: style can be found in sidebar.less -->
@@ -278,4 +278,3 @@ include('configureUIManager.php');
<section class="content">