diff --git a/app/index.html b/app/index.html index e1d49454..0e3c7078 100755 --- a/app/index.html +++ b/app/index.html @@ -209,7 +209,7 @@
-
+
- -
-
- -

- -
-
- + +
+
+
+ +

+ +
- - - - diff --git a/app/scripts/controllers/loanAccount/NewJLGLoanAccAppController.js b/app/scripts/controllers/loanAccount/NewJLGLoanAccAppController.js index eb65c714..5d25265c 100755 --- a/app/scripts/controllers/loanAccount/NewJLGLoanAccAppController.js +++ b/app/scripts/controllers/loanAccount/NewJLGLoanAccAppController.js @@ -1,6 +1,6 @@ (function (module) { mifosX.controllers = _.extend(module, { - NewJLGLoanAccAppController: function (scope, rootScope, routeParams, resourceFactory, location, dateFilter, WizardHandler) { + NewJLGLoanAccAppController: function (scope, rootScope, routeParams, resourceFactory, location, dateFilter) { scope.response = {success:[],failed:[]}; scope.group = {}; @@ -41,12 +41,11 @@ scope.loanProductChange = function (loanProductId) { _.isUndefined(scope.datatables) ? scope.tempDataTables = [] : scope.tempDataTables = scope.datatables; - WizardHandler.wizard().removeSteps(1, scope.tempDataTables.length); scope.inparams.productId = loanProductId; resourceFactory.loanResource.get(scope.inparams, function (data) { scope.productDetails = data.product; - + console.log('scope', scope.productDetails); scope.group.clients = data.group.clientMembers.map(function(client) { client.principal = data.product.principal; client.charges = data.product.charges.map(function(charge){ @@ -140,11 +139,6 @@ /* Submit button action */ scope.submit = function () { - if (WizardHandler.wizard().getCurrentStep() != scope.noOfTabs) { - WizardHandler.wizard().next(); - return; - } - if (!_.isUndefined(scope.datatables) && scope.datatables.length > 0) { angular.forEach(scope.datatables, function (datatable, index) { scope.columnHeaders = datatable.columnHeaderData; @@ -258,7 +252,7 @@ } // End of NewJLGLoanAccAppController }); - mifosX.ng.application.controller('NewJLGLoanAccAppController', ['$scope', '$rootScope', '$routeParams', 'ResourceFactory', '$location', 'dateFilter', 'WizardHandler', mifosX.controllers.NewJLGLoanAccAppController]).run(function ($log) { + mifosX.ng.application.controller('NewJLGLoanAccAppController', ['$scope', '$rootScope', '$routeParams', 'ResourceFactory', '$location', 'dateFilter', mifosX.controllers.NewJLGLoanAccAppController]).run(function ($log) { $log.info("NewJLGLoanAccAppController initialized"); }); }(mifosX.controllers || {})); \ No newline at end of file diff --git a/app/styles-dev/main/components/_content.scss b/app/styles-dev/main/components/_content.scss index 766256e2..2631d512 100644 --- a/app/styles-dev/main/components/_content.scss +++ b/app/styles-dev/main/components/_content.scss @@ -103,7 +103,7 @@ div[data-tree-model] li .selected { } #mifos-reskin-body-view { - padding:10px 0 0 0; + padding: 10px 0 0 65px; .content-container { width: 100%; max-width: 1124px; diff --git a/app/styles-dev/main/components/_layout.scss b/app/styles-dev/main/components/_layout.scss index ea9e9685..28b778fa 100644 --- a/app/styles-dev/main/components/_layout.scss +++ b/app/styles-dev/main/components/_layout.scss @@ -1,5 +1,15 @@ /* @import this file */ +#bs-example-navbar-collapse-1 { + @media screen and (max-width: 767px){ + padding: 0 0 0 65px; + } +} + +.navbar-default .navbar-nav .open .dropdown-menu > li > a, .navbar-default .navbar-nav > li > a{ + color: #4f99ed !important; +} + #mifos-reskin-ui-container{ position:absolute; top:0; @@ -13,9 +23,9 @@ } #mifos-reskin-header-nav{ - @include flex(1 100%); + // @include flex(1 100%); @include order(0); - max-height:52px; + // max-height:52px; } $sidebar-width : 51px; @@ -32,7 +42,7 @@ $sidebar-hover-width : 240px; position: absolute; top: 52px; bottom: 0; - z-index: 1; + z-index: 3; @include flex(1 100%); @include order(0); @@ -87,12 +97,12 @@ $sidebar-hover-width : 240px; #mifos-reskin-body-view{ - @include flex(1 100%); - @include order(0); + padding: 10px 0 0 65px; + // @include flex(1 100%); + // @include order(0); overflow: auto; background-color: #ebeff1; } - - + } \ No newline at end of file diff --git a/app/styles-dev/main/components/_navbar.scss b/app/styles-dev/main/components/_navbar.scss index 2d8d3004..1622dc21 100644 --- a/app/styles-dev/main/components/_navbar.scss +++ b/app/styles-dev/main/components/_navbar.scss @@ -8,7 +8,6 @@ display:inline-block; height:50px; border-right:1px solid #e0e0e0; - margin-left: -15px; padding: 11px 16px 0 0; font-size:20px; margin-right:10px; diff --git a/app/styles-dev/main/styles.scss b/app/styles-dev/main/styles.scss index a80cb081..dff35412 100644 --- a/app/styles-dev/main/styles.scss +++ b/app/styles-dev/main/styles.scss @@ -9,7 +9,7 @@ $state-success-text:#1abc9c; /* Load External Stylesheets */ @import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap"; -//@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap"; +// @import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap"; @import "../../bower_components/fontawesome/scss/font-awesome"; @import "../../bower_components/angular-bootstrap/ui-bootstrap-csp.css"; @import "../../bower_components/chosen/chosen.css"; @@ -28,4 +28,3 @@ $state-success-text:#1abc9c; @import "components/leftnav"; @import "components/chosen"; @import "components/notifications"; -@import "components/report" diff --git a/app/styles/styles.css b/app/styles/styles.css index 3b9434b8..280ab406 100644 --- a/app/styles/styles.css +++ b/app/styles/styles.css @@ -7466,7 +7466,7 @@ div[data-tree-model] li .selected { max-height: 21px; } #mifos-reskin-body-view { - padding: 10px 0 0 0; } + padding: 10px 0 0 65px; } #mifos-reskin-body-view .content-container { width: 100%; max-width: 1124px; @@ -7608,7 +7608,6 @@ div[data-tree-model] li .selected { display: inline-block; height: 50px; border-right: 1px solid #e0e0e0; - margin-left: -15px; padding: 11px 16px 0 0; font-size: 20px; margin-right: 10px; } @@ -7637,6 +7636,13 @@ div[data-tree-model] li .selected { height: 22px; } /* @import this file */ +@media screen and (max-width: 767px) { + #bs-example-navbar-collapse-1 { + padding: 0 0 0 65px; } } + +.navbar-default .navbar-nav .open .dropdown-menu > li > a, .navbar-default .navbar-nav > li > a { + color: #4f99ed !important; } + #mifos-reskin-ui-container { position: absolute; top: 0; @@ -7653,17 +7659,11 @@ div[data-tree-model] li .selected { flex-direction: column; } #mifos-reskin-header-nav { - -webkit-box-flex: 1 100%; - -moz-box-flex: 1 100%; - -webkit-flex: 1 100%; - -ms-flex: 1 100%; - flex: 1 100%; -webkit-box-ordinal-group: 0; -moz-box-ordinal-group: 0; -ms-flex-order: 0; -webkit-order: 0; - order: 0; - max-height: 52px; } + order: 0; } #mifos-reskin-body-container { -webkit-box-flex: 1 100%; @@ -7685,7 +7685,7 @@ div[data-tree-model] li .selected { position: absolute; top: 52px; bottom: 0; - z-index: 1; + z-index: 3; -webkit-box-flex: 1 100%; -moz-box-flex: 1 100%; -webkit-flex: 1 100%; @@ -7728,16 +7728,7 @@ div[data-tree-model] li .selected { transition-duration: 500ms; max-width: 240px; } #mifos-reskin-body-container #mifos-reskin-body-view { - -webkit-box-flex: 1 100%; - -moz-box-flex: 1 100%; - -webkit-flex: 1 100%; - -ms-flex: 1 100%; - flex: 1 100%; - -webkit-box-ordinal-group: 0; - -moz-box-ordinal-group: 0; - -ms-flex-order: 0; - -webkit-order: 0; - order: 0; + padding: 10px 0 0 65px; overflow: auto; background-color: #ebeff1; } @@ -7896,49 +7887,3 @@ div[data-tree-model] li .selected { font-size: 14px; text-align: center; padding: 8px 5px; } - -.width170px { - min-width: 170px !important; - width: auto; } - -.width100 { - width: 100%; } - -.width86 { - width: 86%; } - -.width30 { - width: 30%; } - -.width20 { - width: 20%; } - -.width11 { - width: 11%; } - -.width8 { - width: 8%; } - -.minheight30px { - min-height: 30px; } - -.paddedbottom10 { - padding-bottom: 10px; } - -.blockquoteresult { - margin: 0 0 20px; - padding: 10px 15px; } - .blockquoteresult.width86 select { - display: inline-block; - width: auto; - vertical-align: middle; } - -.margintopminustenpx { - margin-top: -10px; } - .margintopminustenpx input { - margin-left: 0px; } - -.container td:first-child { - padding-left: 20px; } -.container td:last-child { - padding-right: 20px; } diff --git a/app/views/_topnavbar.html b/app/views/_topnavbar.html index dbd02fc3..7797c569 100644 --- a/app/views/_topnavbar.html +++ b/app/views/_topnavbar.html @@ -1,12 +1,20 @@ -