merging latest community till 22 Sep 2016

This commit is contained in:
pramod 2016-09-22 13:10:24 +05:30
parent 2384ade549
commit 72a76ae508
4 changed files with 24 additions and 15 deletions

View File

@ -144,6 +144,7 @@ module.exports = function(grunt) {
'scripts/*.js',
'scripts/services/*.js',
'scripts/modules/*.js',
'scripts/config/*.json',
'!scripts/routes.js',
'!scripts/initialTasks.js',
'!scripts/webstorage-configuration.js',

View File

@ -62,7 +62,8 @@
<div class="panel panel-default col-md-6 loginpanel">
<div class="row" align="center">
<br/>
<img src="./images/login_large_logo.png">
<img src="./images/login_large_logo.png" alt="FINFLUX" ng-if="!isLargeLogoPath">
<img src="{{largeLogoPath}}" alt="FINFLUX" ng-if="isLargeLogoPath">
<!-- <h3>{{ 'label.heading.welcome.message' | translate }}</h3> -->
</div>
<div class="panel-body" >
@ -148,8 +149,8 @@
<div class="container-fluid container">
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<a class="brand" href="#/home">
<img src="./images/top_nav_logo.png" alt="FINFLUX" height="20" ng-if="!isHeaderLogoPath">
<img src="{{headerLogoPath}}" alt="FINFLUX" height="20" ng-if="isHeaderLogoPath">
<img src="./images/top_nav_logo.png" alt="FINFLUX" ng-if="!isHeaderLogoPath">
<img src="{{headerLogoPath}}" alt="FINFLUX" ng-if="isHeaderLogoPath">
</a>
<ul class="nav navbar-nav" id="main-menu-left">
<li class="dropdown">

View File

@ -777,15 +777,18 @@
</label>
</div>
</div>
<div class="form-group">
<div class="col-sm-3">
<input type="checkbox" name="canUseForTopup" ng-model="formData.canUseForTopup"/>
{{'label.input.canUseForTopup' | translate}}
<i class="icon-question-sign" tooltip="{{'label.tooltip.loanproduct.canUseForTopup' | translate}}"
tooltip-append-to-body="true"></i>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-4">{{'label.input.canUseForTopup' | translate }}
<i class="icon-question-sign" tooltip="{{'label.tooltip.loanproduct.canUseForTopup' | translate}}"
tooltip-append-to-body="true"></i></label>
<div class="col-sm-2">
<label class="checkbox control-label">
<input id="canUseForTopup" type="checkbox"
ng-model="formData.canUseForTopup">
</label>
</div>
</div>
<h3>{{ 'label.heading.interestRecalculation' | translate }}</h3>
<hr>

View File

@ -687,11 +687,15 @@
</div>
</div>
<div class="form-group">
<div class="col-sm-3">
<input type="checkbox" name="canUseForTopup" ng-model="formData.canUseForTopup"/>
{{'label.input.canUseForTopup' | translate}}
<label class="control-label col-sm-4">{{'label.input.canUseForTopup' | translate }}
<i class="icon-question-sign" tooltip="{{'label.tooltip.loanproduct.canUseForTopup' | translate}}"
tooltip-append-to-body="true"></i>
tooltip-append-to-body="true"></i></label>
<div class="col-sm-2">
<label class="checkbox control-label">
<input id="canUseForTopup" type="checkbox"
ng-model="formData.canUseForTopup">
</label>
</div>
</div>