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

Updates from pro v19

Browse Source
This commit is contained in:
Gamonoid
2016-11-25 17:20:39 +01:00
parent 4c171bfce3
commit e6b4245334
273 changed files with 867 additions and 67718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ext/modules/employees/customTemplates/myDetails.html
View File

@@ -167,7 +167,14 @@
<div class="row" id="customFieldsCont" style="margin-left:10px;margin-top:20px;">
<div class="panel panel-default" style="width:97.5%;">
<div class="panel-heading"><h4>Other Details</h4></div>
<div class="panel-body">
<div class="row-fluid" id="customFields">
</div>
</div>
</div>
</div>
@@ -207,4 +214,4 @@
</div>
</div>
</div>
</div>
</div>

2
ext/modules/employees/dashboard.html
View File

@@ -14,4 +14,4 @@
<t>View/Edit Profile</t> <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div>
</div>

2
ext/modules/employees/index.php
View File

@@ -83,4 +83,4 @@ modJsList['tabCompanyGraph'] = new CompanyGraphAdapter('CompanyStructure');
var modJs = modJsList['tabEmployee'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/modules/employees/lib.js
View File

@@ -263,7 +263,7 @@ EmployeeAdapter.method('modEmployeeGetSuccessCallBack' , function(data) {
}
}
html = html.replace(/#_.+_#/i,"");
html = html.replace(/#_.+_#/gi,"");
html = html.replace(/_id_/g,data.id);