Merge pull request #254 from safiyu/library

unwanted libraries remove
This commit is contained in:
Nayan Ambali 2013-11-08 00:15:01 -08:00
commit ceee4dd5da
19 changed files with 224 additions and 233 deletions

View File

@ -90,6 +90,7 @@
"label.transactionId":"Transaction Id",
"label.value":"Value:",
"label.collaterals":"Collaterals",
"label.suspend":"Suspend",
"label.minimum":"Minimum",
"label.default":"Default",
"label.maximum":"Maximum",
@ -1053,6 +1054,7 @@
"label.schedulerjobs":"Scheduler Jobs",
"label.scheduleajobmodifyjobs":"Schedule a job, modify or delete jobs",
"label.globalconfigurationsand":"Global configurations and Cache settings",
"label.defineormodifymakercheckertasks":"Define or modify maker checker tasks",
"label.addcode":"Add Code",
"label.codename":"Code Name",
"label.systemdefined":"System Defined",

View File

@ -3,10 +3,8 @@
SavingProductController: function(scope, resourceFactory) {
scope.products = [];
scope.$broadcast('SavingProductDataLoadingStartEvent');
resourceFactory.savingProductResource.getAllSavingProducts(function(data) {
scope.savingproducts = data;
scope.$broadcast('SavingProductDataLoadingCompleteEvent');
});
}

View File

@ -5,10 +5,8 @@
scope.newUserFormDialog = function() {
scope.$broadcast('OpenUserFormDialog', {title: 'New User'});
};
scope.$evalAsync(function() { scope.$broadcast('UserDataLoadingStartEvent'); });
resourceFactory.userResource.getAllUsers({fields: "id,firstname,lastname,username,officeName"}, function(data) {
scope.users = data;
scope.$broadcast('UserDataLoadingCompleteEvent');
});
}
});

View File

@ -2,9 +2,7 @@
require.config({
paths: {
'jquery': '../bower_components/jquery/jquery',
'jquery-ui': '../bower_components/jquery-ui/ui/jquery-ui',
'data-tables': '../bower_components/datatables/media/js/jquery.dataTables',
'blockUI': '../bower_components/blockui/jquery.blockUI',
'angular': '../bower_components/angular/angular',
'angular-resource': '../bower_components/angular-resource/angular-resource',
'angular-translate':'../bower_components/angular-translate/angular-translate',
@ -37,7 +35,6 @@
'angularuitpls': { deps: ['angular' ,'angularui' ] },
'angular-mocks': { deps: ['angular'] },
'webstorage': { deps: ['angular'] },
'jquery-ui': { deps: ['jquery'] },
'd3': {exports: 'd3'},
'nvd3': { deps: ['d3']},
'nvd3ChartDirectives': {deps: ['angular','nvd3']},
@ -58,8 +55,6 @@
'angularuitpls',
'webstorage',
'data-tables',
'blockUI',
'jquery-ui',
'nvd3ChartDirectives',
'notificationWidget',
'angularFileUpload',

View File

@ -160,7 +160,6 @@ define(['underscore', 'mifosX'], function() {
],
directives: [
'DataTablesDirective',
'OverlayDirective',
'DialogDirective',
'PanelDirective',
'BigPanelDirective',

View File

@ -280,7 +280,7 @@ iframe {
margin: 15px 15px 15px 15px;
height:300px;
width:310px;
overflow:auto;
overflow:hidden;
z-index: -1;
background-color:#ffffff;
border-top-left-radius: 8px;
@ -295,7 +295,7 @@ iframe {
margin: 15px 15px 15px 15px;
height:370px;
width:735px;
overflow:auto;
overflow:hidden;
z-index: -1;
background-color:#ffffff;
border-top-left-radius: 8px;

View File

@ -6,7 +6,7 @@
.circularG{
position:absolute;
background-color:#008000;
background-color:#008000 !important;
width:10px;
height:10px;
-moz-border-radius:7px;

View File

@ -1,124 +1,147 @@
<div>
<ul class="breadcrumb">
<li><a href="#/accounting">{{'link.accounting' | translate}}</a> <span class="divider">/</span></li>
<li><a href="#/accounting_coa">{{'label.coa' | translate}}</a> <span class="divider">/</span></li>
<li class="active">{{'label.createglaccount' | translate}}</li>
</ul>
</div>
<form name="createglaccountingform" novalidate="" class="form-horizontal well" ng-controller="AccCreateGLAccountController" ng-submit="submit()">
<div class="error" ng-show="errorStatus || errorDetails">
<label>{{'label.error' | translate}}</label>
<label ng-show="errorStatus">{{errorStatus}}</label>
<label ng-hide="errorStatus" ng-repeat="error in errorDetails">{{error.code | translate}}</label>
</div>
<fieldset>
<legend>{{'label.createglaccount' | translate}}</legend>
<table width="100%">
<div>
<ul class="breadcrumb">
<li><a href="#/accounting">{{'link.accounting' | translate}}</a> <span class="divider">/</span></li>
<li><a href="#/accounting_coa">{{'label.coa' | translate}}</a> <span class="divider">/</span></li>
<li class="active">{{'label.createglaccount' | translate}}</li>
</ul>
</div>
<form name="createglaccountingform" novalidate="" class="form-horizontal well"
ng-controller="AccCreateGLAccountController" ng-submit="submit()">
<div class="error" ng-show="errorStatus || errorDetails">
<label>{{'label.error' | translate}}</label>
<label ng-show="errorStatus">{{errorStatus}}</label>
<label ng-hide="errorStatus" ng-repeat="error in errorDetails">{{error.code | translate}}</label>
</div>
<fieldset>
<legend>{{'label.createglaccount' | translate}}</legend>
<table width="100%">
<tr>
<td>
<div class="control-group">
<label class="control-label" for="name">{{'label.accountname' | translate}}<span class="required">*</span></label>
<div class="controls">
<input id="name" type="text" ng-autofocus="true" name="name" id="name" ng-model="formData.name" required late-Validate/>
<span ng-show="createglaccountingform.name.$invalid">
<td>
<div class="control-group">
<label class="control-label" for="name">{{'label.accountname' | translate}}<span
class="required">*</span></label>
<div class="controls">
<input id="name" type="text" ng-autofocus="true" name="name" id="name"
ng-model="formData.name" required late-Validate/>
<span ng-show="createglaccountingform.name.$invalid">
<small class="error" ng-show="createglaccountingform.name.$error.req">
{{'label.requiredfield' | translate}}
</small>
</span>
</div>
</div>
</div>
</td>
</td>
</tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="glCode">{{'label.glcode' | translate}}<span class="required">*</span></label>
<div class="controls">
<input type="text" id="glCode" name="glCode" ng-model="formData.glCode" required late-Validate/>
<span ng-show="createglaccountingform.glCode.$invalid">
<td>
<div class="control-group">
<label class="control-label" for="glCode">{{'label.glcode' | translate}}<span
class="required">*</span></label>
<div class="controls">
<input type="text" id="glCode" name="glCode" ng-model="formData.glCode" required
late-Validate/>
<span ng-show="createglaccountingform.glCode.$invalid">
<small class="error" ng-show="createglaccountingform.glCode.$error.req">
{{'label.requiredfield' | translate}}
</small>
</span>
</div>
</div>
</div>
</td>
</td>
</tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="type">{{'label.accounttype' | translate}}</label>
<div class="controls">
<select id="type" ng-model="formData.type" ng-change="changeType(formData.type)" ng-options="accountType.id as accountType.value for accountType in accountTypes" value="{{accountType.id}}">
</div>
</div>
</td>
</tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="tagId">{{'label.tag' | translate}}</label>
<div class="controls">
<select id="tagId" ng-model="formData.tagId" ng-options="type.id as type.name for type in types" value="{{type.id}}">
<option value="">{{'label.select.tag' | translate}}</option>
</select>
</div>
</div>
</td>
</tr>
<tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="usage">{{'label.accountusage' | translate}}</label>
<div class="controls">
<select id="usage" ng-model="formData.usage" ng-options="usageType.id as usageType.value for usageType in usageTypes" value="{{usageType.id}}">
</div>
</div>
</td>
</tr>
<tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="parentId">{{'label.parent' | translate}}</label>
<div class="controls">
<select id="parentId" ng-model="formData.parentId" ng-options="headerType.id as headerType.name for headerType in headerTypes" value="{{headerType.id}}">
<option value="">{{'label.select.parent' | translate}}</option>
</select>
</div>
</div>
</td>
</tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="manualEntriesAllowed">{{'label.manualentriesallowed' | translate}}</label>
<div class="controls">
<label class="checkbox">
<input type="checkbox" ng-model="formData.manualEntriesAllowed">
</label>
<td>
<div class="control-group">
<label class="control-label" for="type">{{'label.accounttype' | translate}}</label>
<div class="controls">
<select id="type" ng-model="formData.type" ng-change="changeType(formData.type)"
ng-options="accountType.id as accountType.value for accountType in accountTypes"
value="{{accountType.id}}"/>
</div>
</div>
</div>
</td>
</td>
</tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="description">{{'label.description' | translate}}</label>
<div class="controls">
<textarea id="description" name="description" ng-model="formData.description" rows="4" cols=""></textarea>
<td>
<div class="control-group">
<label class="control-label" for="tagId">{{'label.tag' | translate}}</label>
<div class="controls">
<select id="tagId" ng-model="formData.tagId"
ng-options="type.id as type.name for type in types" value="{{type.id}}">
<option value="">{{'label.select.tag' | translate}}</option>
</select>
</div>
</div>
</div>
</td>
</tr>
</table>
<div class="offset3">
<a href="#/accounting_coa"><button type="reset" class="btn">{{'label.cancel' | translate}}</button></a>
</td>
</tr>
<tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="usage">{{'label.accountusage' | translate}}</label>
<div class="controls">
<select id="usage" ng-model="formData.usage"
ng-options="usageType.id as usageType.value for usageType in usageTypes"
value="{{usageType.id}}">
</div>
</div>
</td>
</tr>
<tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="parentId">{{'label.parent' | translate}}</label>
<div class="controls">
<select id="parentId" ng-model="formData.parentId"
ng-options="headerType.id as headerType.name for headerType in headerTypes"
value="{{headerType.id}}">
<option value="">{{'label.select.parent' | translate}}</option>
</select>
</div>
</div>
</td>
</tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="manualEntriesAllowed">{{'label.manualentriesallowed' |
translate}}</label>
<div class="controls">
<label class="checkbox">
<input type="checkbox" ng-model="formData.manualEntriesAllowed">
</label>
</div>
</div>
</td>
</tr>
<tr>
<td>
<div class="control-group">
<label class="control-label" for="description">{{'label.description' | translate}}</label>
<div class="controls">
<textarea id="description" name="description" ng-model="formData.description" rows="4"
cols=""></textarea>
</div>
</div>
</td>
</tr>
</table>
<div class="offset3">
<a href="#/accounting_coa">
<button type="reset" class="btn">{{'label.cancel' | translate}}</button>
</a>
<button type="submit" class="btn btn-primary">{{'label.save' | translate}}</button>
</div>
</fieldset>
</form>
</div>
</fieldset>
</form>

View File

@ -93,7 +93,6 @@
<button type="reset" class="btn">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
</div>
</fieldset>
</form>
</div>

View File

@ -6,7 +6,7 @@
<p class="list-group-item-text">{{'label.addnewextrafieldstoanyentityintheformofdatatable' | translate}}</p>
</a>
<a class="list-group-item" href="#/codes">
<h4 class="list-group-item-heading"><i class="icon-list-ul icon-large"></i>&nbsp;&nbsp;{{'label.managecodes' | translate}}Manage Codes</h4>
<h4 class="list-group-item-heading"><i class="icon-list-ul icon-large"></i>&nbsp;&nbsp;{{'label.managecodes' | translate}}</h4>
<p class="list-group-item-text">{{'label.codesareusedtodefinedropdownvalues' | translate}}</p>
</a>
<a class="list-group-item" href="#/admin/roles">
@ -15,7 +15,7 @@
</a>
<a class="list-group-item" href="#/admin/viewmctasks">
<h4 class="list-group-item-heading"><i class="icon-sitemap icon-large"></i>&nbsp;&nbsp;{{'label.configuremakercheckertask' | translate}}</h4>
<p class="list-group-item-text">{{'label.defineormodifymakercheckertasks' | translate}}Define or modify maker checker tasks</p>
<p class="list-group-item-text">{{'label.defineormodifymakercheckertasks' | translate}}</p>
</a>
</div>
</div>

View File

@ -47,7 +47,7 @@
</div>
</form>
</div>
<div class="hide"
<div class="hide"
data-mf-overlay="{show: 'SubmitUserFormStart', hide: 'SubmitUserFormSuccess,SubmitUserFormError'}">
<div class="overlay-msg page info">
<spam>Saving user data...</spam>

View File

@ -15,12 +15,5 @@
</tr>
</thead>
</table>
<div class="hide"
data-mf-overlay="{show: 'UserDataLoadingStartEvent', hide: 'UserDataLoadingCompleteEvent'}"
data-mf-overlay-target="#systemUsers">
<div class="overlay-msg element info">
<spam>Loading users... Please wait.</spam>
</div>
</div>
<div data-ng-include="'html/administration/userFormDialog.html'"></div>
</div>

View File

@ -25,7 +25,6 @@
<button type="reset" class="btn" ng-click="cancel()">{{ 'button.cancel' | translate }}</button>
<button type="submit" ng-disabled="!loanchargeform.$valid" class="btn btn-primary">{{ 'button.save' | translate }}</button>
</div>
</fieldset>
</form>
</div>

View File

@ -28,11 +28,4 @@
</tr>
</tbody>
</table>
<div class="hide"
data-mf-overlay="{show: 'LoanProductDataLoadingStartEvent', hide: 'LoanProductDataLoadingCompleteEvent'}"
data-mf-overlay-target="#systemUsers">
<div class="overlay-msg element info">
<spam>Loading loanproducts... Please wait.</spam>
</div>
</div>
</div>

View File

@ -22,11 +22,4 @@
</tr>
</tbody>
</table>
<div class="hide"
data-mf-overlay="{show: 'SavingProductDataLoadingStartEvent', hide: 'SavingProductDataLoadingCompleteEvent'}"
data-mf-overlay-target="#systemUsers">
<div class="overlay-msg element info">
<spam>Loading savingproduct... Please wait.</spam>
</div>
</div>
</div>

View File

@ -4,6 +4,7 @@
<li><a href="#/system">{{'link.admin.system' | translate}}</a> <span class="divider">/</span></li>
<li class="active">{{'label.manageschedulerjobs' | translate}}</li>
</ul>
</div>
</div>
<div class="row-fluid" ng-controller="SchedulerJobsController">
<table>
@ -50,4 +51,4 @@
<button class="btn btn-primary" ng-click="runSelectedJobs()">{{'label.runselectedjobs' | translate}}</button>
<button class="btn btn-primary" ng-click="refresh()">{{'label.refresh' | translate}}</button>
</div>
<div>
</div>

View File

@ -8,8 +8,8 @@
</div>
<div class="pull-right">
<div class="btn-group">
<a href="#/editschedulerjob/{{job.jobId}}" class="btn btn-primary"><i class="icon-edit icon-white"></i>{{'button.edit' | translate}</a>
<a href="#/viewhistory/{{job.jobId}}" class="btn btn-primary"><i class=""></i>{{'label.viewhistory' | translate}</a>
<a href="#/editschedulerjob/{{job.jobId}}" class="btn btn-primary"><i class="icon-edit icon-white"></i>{{'button.edit' | translate}}</a>
<a href="#/viewhistory/{{job.jobId}}" class="btn btn-primary"><i class=""></i>{{'label.viewhistory' | translate}}</a>
</div>
</div>
<div class="row paddedleft">
@ -29,7 +29,7 @@
</tr>
<tr>
<td>{{ 'label.follow' | translate }}</td>
<td><a href="http://www.cronmaker.com" target="">{{'label.clickheretogeneratecron' | translate}</a></td>
<td><a href="http://www.cronmaker.com" target="">{{'label.clickheretogeneratecron' | translate}}</a></td>
</tr>
</table>
</div>

View File

@ -1,83 +1,83 @@
<div>
<ul class="breadcrumb">
<li><a href="#/templates">{{'label.templates' | translate}}</a> <span class="divider">/</span></li>
<li class="active">{{'label.createtemplate' | translate}}</li>
</ul>
<div>
<ul class="breadcrumb">
<li><a href="#/templates">{{'label.templates' | translate}}</a> <span class="divider">/</span></li>
<li class="active">{{'label.createtemplate' | translate}}</li>
</ul>
</div>
<form class="well" ng-controller="CreateTemplateController">
<fieldset>
<div>
<div class="span8 paddedleft">
<div class="control-group">
<table width="30%">
<tr>
<td width="15%">
<label class="control-label">{{ 'label.entity' | translate }}&nbsp;</label>
<select ng-model="formData.entity" class="input-small" ng-options="entity.id as entity.name for entity in template.entities" value="{{entity.id}}" ng-change="entityChange(formData.entity)"> </select>
</td>
<td width="15%">
<label class="control-label rowleft">{{ 'label.type' | translate }}&nbsp;</label>
<select ng-model="formData.type" class="input-small rowleft" ng-options="type.id as type.name for type in template.types" value="{{type.id}}"> </select>
</td>
</tr>
<tr>
<td width="15%">
<label class="control-label">{{ 'label.templatename' | translate }}&nbsp;</label>
<input type="text" ng-model="formData.name">
</td>
<td></td>
</tr>
</table>
</div>
<form class="well" ng-controller="CreateTemplateController">
<fieldset>
<div>
<div class="span8 paddedleft">
<div class="control-group">
<table width="30%">
<tr>
<td width="15%">
<label class="control-label">{{ 'label.entity' | translate }}&nbsp;</label>
<select ng-model="formData.entity" class="input-small" ng-options="entity.id as entity.name for entity in template.entities" value="{{entity.id}}" ng-change="entityChange(formData.entity)"> </select>
</td>
<td width="15%">
<label class="control-label rowleft">{{ 'label.type' | translate }}&nbsp;</label>
<select ng-model="formData.type" class="input-small rowleft" ng-options="type.id as type.name for type in template.types" value="{{type.id}}"> </select>
</td>
</tr>
<tr>
<td width="15%">
<label class="control-label">{{ 'label.templatename' | translate }}&nbsp;</label>
<input type="text" ng-model="formData.name">
</td>
<td></td>
</tr>
</table>
</div>
<div class="control-group">
<button class="btn input-large" ng-click="advanceOptionClick()">{{'label.advancedoptions' | translate}}</button>
<table width="50%" ng-show="advanceOption=='true'" ng-repeat="mapper in mappers">
<tr ng-show="mapper.defaultAddIcon == 'true'">
<td width="8%">
<label class="control-label">{{ 'label.mapperkey' | translate }}&nbsp;</label>
<input type="text" class="input-medium" ng-model="mapper.mapperskey">
</td>
<td width="15%">
<label class="control-label">{{ 'label.mappervalue' | translate }}&nbsp;</label>
<input type="text" class="input-xlarge" ng-model="mapper.mappersvalue">
</td>
<td width="15%">
<a class="btn marginbuttontop16px" ng-click="addMapperKeyValue()">
<i class="icon-plus icon-white"></i>
</a>
</td>
</tr>
<tr ng-hide="mapper.defaultAddIcon == 'true'">
<td width="8%">
<label class="control-label">{{ 'label.mapperkey' | translate }}&nbsp;</label>
<input type="text" class="input-medium" ng-model="mapper.mapperskey">
</td>
<td width="15%">
<label class="control-label">{{ 'label.mappervalue' | translate }}&nbsp;</label>
<input type="text" class="input-xlarge" ng-model="mapper.mappersvalue"`>
</td>
<td width="15%">
<a class="btn marginbuttontop16px" ng-click="deleteMapperKeyValue($index)">
<i class="icon-minus icon-white"></i>
</a>
</td>
</tr>
</table>
</div>
<div class="control-group">
<textarea id="templateeditor" ng-model="formData.text" ck-Editor></textarea>
</div>
<div>
<button ng-click="submit()" class="btn btn-primary">{{'button.save'| translate}}</button>
</div>
</div>
<div class="span4 paddedleft">
<accordion close-others="true" ng-repeat="entity in templateEntity">
<accordion-group heading="{{entity.entityName}}">
<div ng-repeat="templateKey in entity.templateKeys" class="templatekeys" ng-click="templateKeySelected(templateKey)">{{templateKey}}</div>
</accordion-group>
</accordion>
</div>
</div>
</fieldset>
</form>
<div class="control-group">
<button class="btn input-large" ng-click="advanceOptionClick()">{{'label.advancedoptions' | translate}}</button>
<table width="50%" ng-show="advanceOption=='true'" ng-repeat="mapper in mappers">
<tr ng-show="mapper.defaultAddIcon == 'true'">
<td width="8%">
<label class="control-label">{{ 'label.mapperkey' | translate }}&nbsp;</label>
<input type="text" class="input-medium" ng-model="mapper.mapperskey">
</td>
<td width="15%">
<label class="control-label">{{ 'label.mappervalue' | translate }}&nbsp;</label>
<input type="text" class="input-xlarge" ng-model="mapper.mappersvalue">
</td>
<td width="15%">
<a class="btn marginbuttontop16px" ng-click="addMapperKeyValue()">
<i class="icon-plus icon-white"></i>
</a>
</td>
</tr>
<tr ng-hide="mapper.defaultAddIcon == 'true'">
<td width="8%">
<label class="control-label">{{ 'label.mapperkey' | translate }}&nbsp;</label>
<input type="text" class="input-medium" ng-model="mapper.mapperskey">
</td>
<td width="15%">
<label class="control-label">{{ 'label.mappervalue' | translate }}&nbsp;</label>
<input type="text" class="input-xlarge" ng-model="mapper.mappersvalue"`>
</td>
<td width="15%">
<a class="btn marginbuttontop16px" ng-click="deleteMapperKeyValue($index)">
<i class="icon-minus icon-white"></i>
</a>
</td>
</tr>
</table>
</div>
<div class="control-group">
<textarea id="templateeditor" ng-model="formData.text" ck-Editor></textarea>
</div>
<div>
<button ng-click="submit()" class="btn btn-primary">{{'button.save'| translate}}</button>
</div>
</div>
<div class="span4 paddedleft">
<accordion close-others="true" ng-repeat="entity in templateEntity">
<accordion-group heading="{{entity.entityName}}">
<div ng-repeat="templateKey in entity.templateKeys" class="templatekeys" ng-click="templateKeySelected(templateKey)">{{templateKey}}</div>
</accordion-group>
</accordion>
</div>
</div>
</fieldset>
</form>

View File

@ -10,18 +10,16 @@
"angular-mocks": "1.0.7",
"angular-bootstrap": "0.6.0",
"angular-webstorage": "0.9.3",
"blockui": "2.55.0-2013.01.23",
"datatables": "1.9.4",
"jquery": "1.8.3",
"jquery-ui": "1.10.3",
"require-css": "0.0.7",
"require-less": "0.0.7",
"requirejs": "2.1.8",
"underscore": "1.5.1",
"angular-translate": "1.0.2",
"angular-translate-loader-static-files": "0.1.4",
"d3": "3.3.3",
"nvd3": "1.1.10-beta",
"d3": "3.3.9",
"nvd3": "1.1.14-beta",
"angularjs-file-upload": "0.1.4",
"angular-sanitize": "v1.0.8",
"ckeditor": ""