diff --git a/.bowerrc b/.bowerrc index d91aec1d..8c58c8ef 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,3 @@ { - "directory": "lib" + "directory": "app/bower_components" } \ No newline at end of file diff --git a/.gitignore b/.gitignore index 244ebce1..f4366b6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .idea lib-cov lib +app/bower_components *.seed *.log *.csv diff --git a/font/FontAwesome.otf b/app/fonts/FontAwesome.otf similarity index 100% rename from font/FontAwesome.otf rename to app/fonts/FontAwesome.otf diff --git a/font/fontawesome-webfont.eot b/app/fonts/fontawesome-webfont.eot similarity index 100% rename from font/fontawesome-webfont.eot rename to app/fonts/fontawesome-webfont.eot diff --git a/font/fontawesome-webfont.svg b/app/fonts/fontawesome-webfont.svg similarity index 100% rename from font/fontawesome-webfont.svg rename to app/fonts/fontawesome-webfont.svg diff --git a/font/fontawesome-webfont.ttf b/app/fonts/fontawesome-webfont.ttf similarity index 100% rename from font/fontawesome-webfont.ttf rename to app/fonts/fontawesome-webfont.ttf diff --git a/font/fontawesome-webfont.woff b/app/fonts/fontawesome-webfont.woff similarity index 100% rename from font/fontawesome-webfont.woff rename to app/fonts/fontawesome-webfont.woff diff --git a/global-translations/locale-en.json b/app/global-translations/locale-en.json similarity index 100% rename from global-translations/locale-en.json rename to app/global-translations/locale-en.json diff --git a/global-translations/locale-es.json b/app/global-translations/locale-es.json similarity index 100% rename from global-translations/locale-es.json rename to app/global-translations/locale-es.json diff --git a/global-translations/locale-fr.json b/app/global-translations/locale-fr.json similarity index 100% rename from global-translations/locale-fr.json rename to app/global-translations/locale-fr.json diff --git a/global-translations/locale-hn.json b/app/global-translations/locale-hn.json similarity index 100% rename from global-translations/locale-hn.json rename to app/global-translations/locale-hn.json diff --git a/global-translations/locale-pt.json b/app/global-translations/locale-pt.json similarity index 100% rename from global-translations/locale-pt.json rename to app/global-translations/locale-pt.json diff --git a/global-translations/locale-zh.json b/app/global-translations/locale-zh.json similarity index 100% rename from global-translations/locale-zh.json rename to app/global-translations/locale-zh.json diff --git a/image/MifosX_logo.png b/app/images/MifosX_logo.png similarity index 100% rename from image/MifosX_logo.png rename to app/images/MifosX_logo.png diff --git a/image/blank_avatar.jpg b/app/images/blank_avatar.jpg similarity index 100% rename from image/blank_avatar.jpg rename to app/images/blank_avatar.jpg diff --git a/image/cubic_loader.gif b/app/images/cubic_loader.gif similarity index 100% rename from image/cubic_loader.gif rename to app/images/cubic_loader.gif diff --git a/image/favicon.ico b/app/images/favicon.ico similarity index 100% rename from image/favicon.ico rename to app/images/favicon.ico diff --git a/image/logo.jpg b/app/images/logo.jpg similarity index 100% rename from image/logo.jpg rename to app/images/logo.jpg diff --git a/image/user_new.png b/app/images/user_new.png similarity index 100% rename from image/user_new.png rename to app/images/user_new.png diff --git a/index.html b/app/index.html similarity index 97% rename from index.html rename to app/index.html index 8e969579..41171b94 100644 --- a/index.html +++ b/app/index.html @@ -2,7 +2,7 @@ - + {{ 'label.product.title' | translate }} @@ -39,7 +39,7 @@
- MifosX + MifosX

{{ 'label.product.name' | translate }}

@@ -103,7 +103,7 @@ - Mifos X + Mifos X - + diff --git a/js/controllers/AccCoaController.js b/app/scripts/controllers/accounting/AccCoaController.js similarity index 100% rename from js/controllers/AccCoaController.js rename to app/scripts/controllers/accounting/AccCoaController.js diff --git a/js/controllers/AccCreateGLAccountContoller.js b/app/scripts/controllers/accounting/AccCreateGLAccountContoller.js similarity index 100% rename from js/controllers/AccCreateGLAccountContoller.js rename to app/scripts/controllers/accounting/AccCreateGLAccountContoller.js diff --git a/js/controllers/AccEditGLAccountController.js b/app/scripts/controllers/accounting/AccEditGLAccountController.js similarity index 100% rename from js/controllers/AccEditGLAccountController.js rename to app/scripts/controllers/accounting/AccEditGLAccountController.js diff --git a/js/controllers/AccFreqPostingController.js b/app/scripts/controllers/accounting/AccFreqPostingController.js similarity index 100% rename from js/controllers/AccFreqPostingController.js rename to app/scripts/controllers/accounting/AccFreqPostingController.js diff --git a/js/controllers/AccViewGLAccountContoller.js b/app/scripts/controllers/accounting/AccViewGLAccountContoller.js similarity index 100% rename from js/controllers/AccViewGLAccountContoller.js rename to app/scripts/controllers/accounting/AccViewGLAccountContoller.js diff --git a/js/controllers/AccountingClosureController.js b/app/scripts/controllers/accounting/AccountingClosureController.js similarity index 100% rename from js/controllers/AccountingClosureController.js rename to app/scripts/controllers/accounting/AccountingClosureController.js diff --git a/js/controllers/JournalEntryController.js b/app/scripts/controllers/accounting/JournalEntryController.js similarity index 100% rename from js/controllers/JournalEntryController.js rename to app/scripts/controllers/accounting/JournalEntryController.js diff --git a/js/controllers/SearchTransactionController.js b/app/scripts/controllers/accounting/SearchTransactionController.js similarity index 100% rename from js/controllers/SearchTransactionController.js rename to app/scripts/controllers/accounting/SearchTransactionController.js diff --git a/js/controllers/ViewTransactionController.js b/app/scripts/controllers/accounting/ViewTransactionController.js similarity index 100% rename from js/controllers/ViewTransactionController.js rename to app/scripts/controllers/accounting/ViewTransactionController.js diff --git a/js/controllers/ClientController.js b/app/scripts/controllers/client/ClientController.js similarity index 100% rename from js/controllers/ClientController.js rename to app/scripts/controllers/client/ClientController.js diff --git a/js/controllers/CreateClientController.js b/app/scripts/controllers/client/CreateClientController.js similarity index 100% rename from js/controllers/CreateClientController.js rename to app/scripts/controllers/client/CreateClientController.js diff --git a/js/controllers/EditClientController.js b/app/scripts/controllers/client/EditClientController.js similarity index 100% rename from js/controllers/EditClientController.js rename to app/scripts/controllers/client/EditClientController.js diff --git a/js/controllers/ViewClientController.js b/app/scripts/controllers/client/ViewClientController.js similarity index 100% rename from js/controllers/ViewClientController.js rename to app/scripts/controllers/client/ViewClientController.js diff --git a/js/controllers/ViewClientLoanDetailsController.js b/app/scripts/controllers/loanAccount/ViewClientLoanDetailsController.js similarity index 100% rename from js/controllers/ViewClientLoanDetailsController.js rename to app/scripts/controllers/loanAccount/ViewClientLoanDetailsController.js diff --git a/js/controllers/LoginFormController.js b/app/scripts/controllers/main/LoginFormController.js similarity index 100% rename from js/controllers/LoginFormController.js rename to app/scripts/controllers/main/LoginFormController.js diff --git a/js/controllers/MainController.js b/app/scripts/controllers/main/MainController.js similarity index 100% rename from js/controllers/MainController.js rename to app/scripts/controllers/main/MainController.js diff --git a/js/controllers/SearchController.js b/app/scripts/controllers/main/SearchController.js similarity index 100% rename from js/controllers/SearchController.js rename to app/scripts/controllers/main/SearchController.js diff --git a/js/controllers/TaskController.js b/app/scripts/controllers/main/TaskController.js similarity index 100% rename from js/controllers/TaskController.js rename to app/scripts/controllers/main/TaskController.js diff --git a/js/controllers/CreateEmployeeController.js b/app/scripts/controllers/organization/CreateEmployeeController.js similarity index 100% rename from js/controllers/CreateEmployeeController.js rename to app/scripts/controllers/organization/CreateEmployeeController.js diff --git a/js/controllers/CreateOfficeController.js b/app/scripts/controllers/organization/CreateOfficeController.js similarity index 100% rename from js/controllers/CreateOfficeController.js rename to app/scripts/controllers/organization/CreateOfficeController.js diff --git a/js/controllers/CreateUserController.js b/app/scripts/controllers/organization/CreateUserController.js similarity index 100% rename from js/controllers/CreateUserController.js rename to app/scripts/controllers/organization/CreateUserController.js diff --git a/js/controllers/CurrencyConfigController.js b/app/scripts/controllers/organization/CurrencyConfigController.js similarity index 100% rename from js/controllers/CurrencyConfigController.js rename to app/scripts/controllers/organization/CurrencyConfigController.js diff --git a/js/controllers/EditEmployeeController.js b/app/scripts/controllers/organization/EditEmployeeController.js similarity index 100% rename from js/controllers/EditEmployeeController.js rename to app/scripts/controllers/organization/EditEmployeeController.js diff --git a/js/controllers/EditUserController.js b/app/scripts/controllers/organization/EditUserController.js similarity index 100% rename from js/controllers/EditUserController.js rename to app/scripts/controllers/organization/EditUserController.js diff --git a/js/controllers/EmployeeController.js b/app/scripts/controllers/organization/EmployeeController.js similarity index 100% rename from js/controllers/EmployeeController.js rename to app/scripts/controllers/organization/EmployeeController.js diff --git a/js/controllers/ManageFundsController.js b/app/scripts/controllers/organization/ManageFundsController.js similarity index 100% rename from js/controllers/ManageFundsController.js rename to app/scripts/controllers/organization/ManageFundsController.js diff --git a/js/controllers/OfficesController.js b/app/scripts/controllers/organization/OfficesController.js similarity index 100% rename from js/controllers/OfficesController.js rename to app/scripts/controllers/organization/OfficesController.js diff --git a/js/controllers/RoleController.js b/app/scripts/controllers/organization/RoleController.js similarity index 100% rename from js/controllers/RoleController.js rename to app/scripts/controllers/organization/RoleController.js diff --git a/js/controllers/ViewEmployeeController.js b/app/scripts/controllers/organization/ViewEmployeeController.js similarity index 100% rename from js/controllers/ViewEmployeeController.js rename to app/scripts/controllers/organization/ViewEmployeeController.js diff --git a/js/controllers/ViewOfficeController.js b/app/scripts/controllers/organization/ViewOfficeController.js similarity index 100% rename from js/controllers/ViewOfficeController.js rename to app/scripts/controllers/organization/ViewOfficeController.js diff --git a/js/controllers/ChargeController.js b/app/scripts/controllers/product/ChargeController.js similarity index 100% rename from js/controllers/ChargeController.js rename to app/scripts/controllers/product/ChargeController.js diff --git a/js/controllers/LoanProductController.js b/app/scripts/controllers/product/LoanProductController.js similarity index 100% rename from js/controllers/LoanProductController.js rename to app/scripts/controllers/product/LoanProductController.js diff --git a/js/controllers/SavingProductController.js b/app/scripts/controllers/product/SavingProductController.js similarity index 100% rename from js/controllers/SavingProductController.js rename to app/scripts/controllers/product/SavingProductController.js diff --git a/js/controllers/ViewChargeController.js b/app/scripts/controllers/product/ViewChargeController.js similarity index 100% rename from js/controllers/ViewChargeController.js rename to app/scripts/controllers/product/ViewChargeController.js diff --git a/js/controllers/ViewLoanProductController.js b/app/scripts/controllers/product/ViewLoanProductController.js similarity index 100% rename from js/controllers/ViewLoanProductController.js rename to app/scripts/controllers/product/ViewLoanProductController.js diff --git a/js/controllers/ViewSavingProductController.js b/app/scripts/controllers/product/ViewSavingProductController.js similarity index 100% rename from js/controllers/ViewSavingProductController.js rename to app/scripts/controllers/product/ViewSavingProductController.js diff --git a/js/controllers/UserController.js b/app/scripts/controllers/user/UserController.js similarity index 100% rename from js/controllers/UserController.js rename to app/scripts/controllers/user/UserController.js diff --git a/js/controllers/UserFormController.js b/app/scripts/controllers/user/UserFormController.js similarity index 100% rename from js/controllers/UserFormController.js rename to app/scripts/controllers/user/UserFormController.js diff --git a/js/controllers/UserListController.js b/app/scripts/controllers/user/UserListController.js similarity index 100% rename from js/controllers/UserListController.js rename to app/scripts/controllers/user/UserListController.js diff --git a/js/controllers/UserSettingController.js b/app/scripts/controllers/user/UserSettingController.js similarity index 100% rename from js/controllers/UserSettingController.js rename to app/scripts/controllers/user/UserSettingController.js diff --git a/js/controllers/ViewUserController.js b/app/scripts/controllers/user/ViewUserController.js similarity index 100% rename from js/controllers/ViewUserController.js rename to app/scripts/controllers/user/ViewUserController.js diff --git a/js/directives/DataTablesDirective.js b/app/scripts/directives/DataTablesDirective.js similarity index 100% rename from js/directives/DataTablesDirective.js rename to app/scripts/directives/DataTablesDirective.js diff --git a/js/directives/DialogDirective.js b/app/scripts/directives/DialogDirective.js similarity index 100% rename from js/directives/DialogDirective.js rename to app/scripts/directives/DialogDirective.js diff --git a/js/directives/OverlayDirective.js b/app/scripts/directives/OverlayDirective.js similarity index 100% rename from js/directives/OverlayDirective.js rename to app/scripts/directives/OverlayDirective.js diff --git a/js/filters/StatusLookup.js b/app/scripts/filters/StatusLookup.js similarity index 100% rename from js/filters/StatusLookup.js rename to app/scripts/filters/StatusLookup.js diff --git a/js/initialTasks.js b/app/scripts/initialTasks.js similarity index 100% rename from js/initialTasks.js rename to app/scripts/initialTasks.js diff --git a/app/scripts/loader.js b/app/scripts/loader.js new file mode 100644 index 00000000..33fb2ac7 --- /dev/null +++ b/app/scripts/loader.js @@ -0,0 +1,69 @@ +(function() { + 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', + 'angular-translate-loader-static-files': '../bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files', + 'angular-mocks': '../bower_components/angular-mocks/angular-mocks', + 'angularui': '../bower_components/angular-bootstrap/ui-bootstrap', + 'angularuitpls': '../bower_components/angular-bootstrap/ui-bootstrap-tpls', + 'underscore': '../bower_components/underscore/underscore', + 'webstorage': '../bower_components/angular-webstorage/angular-webstorage', + 'require-css': '../bower_components/require-css/css', + 'require-less': '../bower_components/require-less/less', + 'styles': '../styles', + 'test': '../../test/functional' + }, + shim: { + 'angular': { exports: 'angular' }, + 'angular-resource': { deps: ['angular'] }, + 'angular-translate': { deps: ['angular'] }, + 'angular-translate-loader-static-files': {deps: ['angular' , 'angular-translate'] }, + 'angularui': { deps: ['angular'] }, + 'angularuitpls': { deps: ['angular' ,'angularui' ] }, + 'angular-mocks': { deps: ['angular'] }, + 'webstorage': { deps: ['angular'] }, + 'jquery-ui': { deps: ['jquery'] }, + 'mifosX': { + deps: [ + 'angular', + 'angular-resource', + 'angular-translate', + 'angular-translate-loader-static-files', + 'angularui', + 'angularuitpls', + 'webstorage', + 'data-tables', + 'blockUI', + 'jquery-ui' + ], + exports: 'mifosX' + } + }, + packages: [ + { + name: 'css', + location: '../bower_components/require-css', + main: 'css' + }, + { + name: 'less', + location: '../bower_components/require-less', + main: 'less' + } + ] + }); + + require(['mifosXComponents', 'mifosXStyles'], function() { + require(['test/testInitializer'], function(testMode) { + if (!testMode) { + angular.bootstrap(document, ["MifosX_Application"]); + } + }); + }); +}()); diff --git a/js/mifosX.js b/app/scripts/mifosX.js similarity index 100% rename from js/mifosX.js rename to app/scripts/mifosX.js diff --git a/app/scripts/mifosXComponents.js b/app/scripts/mifosXComponents.js new file mode 100644 index 00000000..9aa0e8b0 --- /dev/null +++ b/app/scripts/mifosXComponents.js @@ -0,0 +1,74 @@ +define(['underscore', 'mifosX'], function() { + var components = { + models: [ + 'LoggedInUser', + 'roleMap' + ], + controllers: [ + 'main/MainController', + 'main/LoginFormController', + 'main/TaskController', + 'main/SearchController', + 'loanAccount/ViewClientLoanDetailsController', + 'client/ClientController', + 'client/EditClientController', + 'client/ViewClientController', + 'client/CreateClientController', + 'product/LoanProductController', + 'product/ChargeController', + 'product/ViewChargeController', + 'product/SavingProductController', + 'product/ViewSavingProductController', + 'product/ViewLoanProductController', + 'user/UserController', + 'user/UserFormController', + 'user/UserSettingController', + 'user/UserListController', + 'user/ViewUserController', + 'organization/RoleController', + 'organization/OfficesController', + 'organization/ViewOfficeController', + 'organization/CreateOfficeController', + 'organization/CurrencyConfigController', + 'organization/CreateUserController', + 'organization/EditUserController', + 'organization/ViewEmployeeController', + 'organization/EditEmployeeController', + 'organization/EmployeeController', + 'organization/CreateEmployeeController', + 'organization/ManageFundsController', + 'accounting/AccFreqPostingController', + 'accounting/AccCoaController', + 'accounting/AccCreateGLAccountContoller', + 'accounting/AccViewGLAccountContoller', + 'accounting/AccEditGLAccountController', + 'accounting/ViewTransactionController', + 'accounting/JournalEntryController', + 'accounting/SearchTransactionController', + 'accounting/AccountingClosureController' + ], + filters: [ + 'StatusLookup' + ], + services: [ + 'ResourceFactoryProvider', + 'HttpServiceProvider', + 'AuthenticationService', + 'SessionManager', + 'Paginator' + ], + directives: [ + 'DataTablesDirective', + 'OverlayDirective', + 'DialogDirective' + ] + }; + + require(_.reduce(_.keys(components), function(list, group) { + return list.concat(_.map(components[group], function(name) { return group + "/" + name; })); + }, [ + 'routes', + 'initialTasks', + 'webstorage-configuration' + ])); +}); diff --git a/js/mifosXStyles.js b/app/scripts/mifosXStyles.js similarity index 69% rename from js/mifosXStyles.js rename to app/scripts/mifosXStyles.js index 963ed17d..eaac61f1 100644 --- a/js/mifosXStyles.js +++ b/app/scripts/mifosXStyles.js @@ -5,11 +5,6 @@ define(['underscore'], function() { 'bootswatch', 'font-awesome.min', 'app' - // 'skeleton/base', - // 'skeleton/skeleton', - // 'skeleton/layout', - // 'data-tables/css/jquery.dataTables', - // 'jquery-ui/redmond/jquery-ui-1.10.3.custom' ], less: [ 'mifosX' diff --git a/js/models/LoggedInUser.js b/app/scripts/models/LoggedInUser.js similarity index 100% rename from js/models/LoggedInUser.js rename to app/scripts/models/LoggedInUser.js diff --git a/js/models/Role.js b/app/scripts/models/Role.js similarity index 100% rename from js/models/Role.js rename to app/scripts/models/Role.js diff --git a/js/models/roleMap.js b/app/scripts/models/roleMap.js similarity index 100% rename from js/models/roleMap.js rename to app/scripts/models/roleMap.js diff --git a/app/scripts/routes.js b/app/scripts/routes.js new file mode 100644 index 00000000..3f7a735f --- /dev/null +++ b/app/scripts/routes.js @@ -0,0 +1,148 @@ +(function(mifosX) { + var defineRoutes = function($routeProvider, $locationProvider) { + $routeProvider + .when('/', { + templateUrl: 'views/start.html' + }) + .when('/login', { + templateUrl: 'views/login.html' + }) + .when('/home', { + templateUrl: 'views/home.html' + }) + .when('/admin/roles', { + templateUrl: 'views/administration/roles.html' + }) + .when('/admin/users', { + templateUrl: 'views/administration/users.html' + }) + .when('/clients', { + templateUrl: 'views/clients/clients.html' + }) + .when('/createclient', { + templateUrl: 'views/clients/createclient.html' + }) + .when('/editclient/:id', { + templateUrl : 'views/clients/editclient.html' + }) + .when('/viewclient/:id', { + templateUrl: 'views/clients/viewclient.html' + }) + .when('/viewloanaccount/:id', { + templateUrl: 'views/clients/viewclientloanaccountdetails.html' + }) + .when('/organization', { + templateUrl: 'views/administration/organization.html' + }) + .when('/system', { + templateUrl: 'views/administration/system.html' + }) + .when('/loanproducts', { + templateUrl: 'views/products/loanproducts.html' + }) + .when('/charges', { + templateUrl: 'views/products/charges.html' + }) + .when('/viewcharge/:id', { + templateUrl: 'views/products/viewcharge.html' + }) + .when('/savingproducts', { + templateUrl: 'views/products/savingproducts.html' + }) + .when('/viewsavingproduct/:id', { + templateUrl: 'views/products/viewsavingproduct.html' + }) + .when('/offices', { + templateUrl: 'views/organization/offices.html' + }) + .when('/createoffice', { + templateUrl: 'views/organization/createoffice.html' + }) + .when('/viewoffice/:id', { + templateUrl: 'views/organization/viewoffice.html' + }) + .when('/tasks', { + templateUrl: 'views/tasks.html' + }) + .when('/viewcurrconfig', { + templateUrl: 'views/organization/currencyconfig.html' + }) + .when('/search/:query', { + templateUrl: 'views/search/glresults.html' + }) + .when('/viewloanproduct/:id', { + templateUrl: 'views/products/viewloanproduct.html' + }) + .when('/usersetting', { + templateUrl: 'views/administration/usersettings.html' + }) + .when('/userslist/', { + templateUrl: 'views/administration/userslist.html' + }) + .when('/createuser/', { + templateUrl: 'views/administration/createuser.html' + }) + .when('/viewuser/:id', { + templateUrl: 'views/administration/viewuser.html' + }) + .when('/edituser/:id', { + templateUrl: 'views/administration/edituser.html' + }) + .when('/employees', { + templateUrl: 'views/organization/employees.html' + }) + .when('/viewemployee/:id', { + templateUrl: 'views/organization/viewemployee.html' + }) + .when('/editemployee/:id', { + templateUrl: 'views/organization/editemployee.html' + }) + .when('/createemployee/', { + templateUrl: 'views/organization/createemployee.html' + }) + .when('/managefunds/', { + templateUrl: 'views/organization/managefunds.html' + }) + .when('/nav/offices', { + templateUrl: 'views/navigation/offices.html' + }) + .when('/accounting', { + templateUrl: 'views/accounting/accounting.html' + }) + .when('/accounting_coa', { + templateUrl: 'views/accounting/accounting_coa.html' + }) + .when('/createglaccount', { + templateUrl: 'views/accounting/createglaccounting.html' + }) + .when('/viewglaccount/:id', { + templateUrl: 'views/accounting/viewglaccounting.html' + }) + .when('/editglaccount/:id', { + templateUrl: 'views/accounting/editglaccounting.html' + }) + .when('/freqposting', { + templateUrl: 'views/accounting/freqposting.html' + }) + .when('/viewtransactions/:transactionId', { + templateUrl: 'views/accounting/view_transactions.html' + }) + .when('/journalentry', { + templateUrl: 'views/accounting/journalentry_posting.html' + }) + .when('/searchtransaction', { + templateUrl: 'views/accounting/search_transaction.html' + }) + .when('/accounts_closure', { + templateUrl: 'views/accounting/accounts_closure.html' + }) + .when('/closedaccountingDetails/:officeId', { + templateUrl: 'views/accounting/view_close_accounting.html' + }); + + $locationProvider.html5Mode(false); + }; + mifosX.ng.application.config(defineRoutes).run(function($log) { + $log.info("Routes definition completed"); + }); +}(mifosX || {})); diff --git a/js/services/AuthenticationService.js b/app/scripts/services/AuthenticationService.js similarity index 100% rename from js/services/AuthenticationService.js rename to app/scripts/services/AuthenticationService.js diff --git a/js/services/HttpServiceProvider.js b/app/scripts/services/HttpServiceProvider.js similarity index 100% rename from js/services/HttpServiceProvider.js rename to app/scripts/services/HttpServiceProvider.js diff --git a/js/services/Paginator.js b/app/scripts/services/Paginator.js similarity index 100% rename from js/services/Paginator.js rename to app/scripts/services/Paginator.js diff --git a/js/services/ResourceFactoryProvider.js b/app/scripts/services/ResourceFactoryProvider.js similarity index 100% rename from js/services/ResourceFactoryProvider.js rename to app/scripts/services/ResourceFactoryProvider.js diff --git a/js/services/SessionManager.js b/app/scripts/services/SessionManager.js similarity index 100% rename from js/services/SessionManager.js rename to app/scripts/services/SessionManager.js diff --git a/js/webstorage-configuration.js b/app/scripts/webstorage-configuration.js similarity index 100% rename from js/webstorage-configuration.js rename to app/scripts/webstorage-configuration.js diff --git a/stylesheets/app.css b/app/styles/app.css similarity index 100% rename from stylesheets/app.css rename to app/styles/app.css diff --git a/stylesheets/bootstrap-combined.min.css b/app/styles/bootstrap-combined.min.css similarity index 100% rename from stylesheets/bootstrap-combined.min.css rename to app/styles/bootstrap-combined.min.css diff --git a/stylesheets/bootswatch.css b/app/styles/bootswatch.css similarity index 100% rename from stylesheets/bootswatch.css rename to app/styles/bootswatch.css diff --git a/stylesheets/data-tables/css/demo_page.css b/app/styles/data-tables/css/demo_page.css similarity index 100% rename from stylesheets/data-tables/css/demo_page.css rename to app/styles/data-tables/css/demo_page.css diff --git a/stylesheets/data-tables/css/demo_table.css b/app/styles/data-tables/css/demo_table.css similarity index 100% rename from stylesheets/data-tables/css/demo_table.css rename to app/styles/data-tables/css/demo_table.css diff --git a/stylesheets/data-tables/css/demo_table_jui.css b/app/styles/data-tables/css/demo_table_jui.css similarity index 100% rename from stylesheets/data-tables/css/demo_table_jui.css rename to app/styles/data-tables/css/demo_table_jui.css diff --git a/stylesheets/data-tables/css/jquery.dataTables.css b/app/styles/data-tables/css/jquery.dataTables.css similarity index 100% rename from stylesheets/data-tables/css/jquery.dataTables.css rename to app/styles/data-tables/css/jquery.dataTables.css diff --git a/stylesheets/data-tables/css/jquery.dataTables_themeroller.css b/app/styles/data-tables/css/jquery.dataTables_themeroller.css similarity index 100% rename from stylesheets/data-tables/css/jquery.dataTables_themeroller.css rename to app/styles/data-tables/css/jquery.dataTables_themeroller.css diff --git a/stylesheets/data-tables/images/Sorting icons.psd b/app/styles/data-tables/images/Sorting icons.psd similarity index 100% rename from stylesheets/data-tables/images/Sorting icons.psd rename to app/styles/data-tables/images/Sorting icons.psd diff --git a/stylesheets/data-tables/images/back_disabled.png b/app/styles/data-tables/images/back_disabled.png similarity index 100% rename from stylesheets/data-tables/images/back_disabled.png rename to app/styles/data-tables/images/back_disabled.png diff --git a/stylesheets/data-tables/images/back_enabled.png b/app/styles/data-tables/images/back_enabled.png similarity index 100% rename from stylesheets/data-tables/images/back_enabled.png rename to app/styles/data-tables/images/back_enabled.png diff --git a/stylesheets/data-tables/images/back_enabled_hover.png b/app/styles/data-tables/images/back_enabled_hover.png similarity index 100% rename from stylesheets/data-tables/images/back_enabled_hover.png rename to app/styles/data-tables/images/back_enabled_hover.png diff --git a/stylesheets/data-tables/images/favicon.ico b/app/styles/data-tables/images/favicon.ico similarity index 100% rename from stylesheets/data-tables/images/favicon.ico rename to app/styles/data-tables/images/favicon.ico diff --git a/stylesheets/data-tables/images/forward_disabled.png b/app/styles/data-tables/images/forward_disabled.png similarity index 100% rename from stylesheets/data-tables/images/forward_disabled.png rename to app/styles/data-tables/images/forward_disabled.png diff --git a/stylesheets/data-tables/images/forward_enabled.png b/app/styles/data-tables/images/forward_enabled.png similarity index 100% rename from stylesheets/data-tables/images/forward_enabled.png rename to app/styles/data-tables/images/forward_enabled.png diff --git a/stylesheets/data-tables/images/forward_enabled_hover.png b/app/styles/data-tables/images/forward_enabled_hover.png similarity index 100% rename from stylesheets/data-tables/images/forward_enabled_hover.png rename to app/styles/data-tables/images/forward_enabled_hover.png diff --git a/stylesheets/data-tables/images/sort_asc.png b/app/styles/data-tables/images/sort_asc.png similarity index 100% rename from stylesheets/data-tables/images/sort_asc.png rename to app/styles/data-tables/images/sort_asc.png diff --git a/stylesheets/data-tables/images/sort_asc_disabled.png b/app/styles/data-tables/images/sort_asc_disabled.png similarity index 100% rename from stylesheets/data-tables/images/sort_asc_disabled.png rename to app/styles/data-tables/images/sort_asc_disabled.png diff --git a/stylesheets/data-tables/images/sort_both.png b/app/styles/data-tables/images/sort_both.png similarity index 100% rename from stylesheets/data-tables/images/sort_both.png rename to app/styles/data-tables/images/sort_both.png diff --git a/stylesheets/data-tables/images/sort_desc.png b/app/styles/data-tables/images/sort_desc.png similarity index 100% rename from stylesheets/data-tables/images/sort_desc.png rename to app/styles/data-tables/images/sort_desc.png diff --git a/stylesheets/data-tables/images/sort_desc_disabled.png b/app/styles/data-tables/images/sort_desc_disabled.png similarity index 100% rename from stylesheets/data-tables/images/sort_desc_disabled.png rename to app/styles/data-tables/images/sort_desc_disabled.png diff --git a/stylesheets/font-awesome.min.css b/app/styles/font-awesome.min.css similarity index 97% rename from stylesheets/font-awesome.min.css rename to app/styles/font-awesome.min.css index 866437fa..e5fcc957 100644 --- a/stylesheets/font-awesome.min.css +++ b/app/styles/font-awesome.min.css @@ -1,4 +1,4 @@ -@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;} +@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=3.2.1');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../fonts/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;} [class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;} .icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;} a [class^="icon-"],a [class*=" icon-"]{display:inline;} diff --git a/stylesheets/jquery-ui/redmond/images/animated-overlay.gif b/app/styles/jquery-ui/redmond/images/animated-overlay.gif similarity index 100% rename from stylesheets/jquery-ui/redmond/images/animated-overlay.gif rename to app/styles/jquery-ui/redmond/images/animated-overlay.gif diff --git a/stylesheets/jquery-ui/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png b/app/styles/jquery-ui/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png rename to app/styles/jquery-ui/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png b/app/styles/jquery-ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png rename to app/styles/jquery-ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/app/styles/jquery-ui/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png rename to app/styles/jquery-ui/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png b/app/styles/jquery-ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png rename to app/styles/jquery-ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-bg_glass_95_fef1ec_1x400.png b/app/styles/jquery-ui/redmond/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-bg_glass_95_fef1ec_1x400.png rename to app/styles/jquery-ui/redmond/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/app/styles/jquery-ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png rename to app/styles/jquery-ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/app/styles/jquery-ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png rename to app/styles/jquery-ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/app/styles/jquery-ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png rename to app/styles/jquery-ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-icons_217bc0_256x240.png b/app/styles/jquery-ui/redmond/images/ui-icons_217bc0_256x240.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-icons_217bc0_256x240.png rename to app/styles/jquery-ui/redmond/images/ui-icons_217bc0_256x240.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-icons_2e83ff_256x240.png b/app/styles/jquery-ui/redmond/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-icons_2e83ff_256x240.png rename to app/styles/jquery-ui/redmond/images/ui-icons_2e83ff_256x240.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-icons_469bdd_256x240.png b/app/styles/jquery-ui/redmond/images/ui-icons_469bdd_256x240.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-icons_469bdd_256x240.png rename to app/styles/jquery-ui/redmond/images/ui-icons_469bdd_256x240.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-icons_6da8d5_256x240.png b/app/styles/jquery-ui/redmond/images/ui-icons_6da8d5_256x240.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-icons_6da8d5_256x240.png rename to app/styles/jquery-ui/redmond/images/ui-icons_6da8d5_256x240.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-icons_cd0a0a_256x240.png b/app/styles/jquery-ui/redmond/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-icons_cd0a0a_256x240.png rename to app/styles/jquery-ui/redmond/images/ui-icons_cd0a0a_256x240.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-icons_d8e7f3_256x240.png b/app/styles/jquery-ui/redmond/images/ui-icons_d8e7f3_256x240.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-icons_d8e7f3_256x240.png rename to app/styles/jquery-ui/redmond/images/ui-icons_d8e7f3_256x240.png diff --git a/stylesheets/jquery-ui/redmond/images/ui-icons_f9bd01_256x240.png b/app/styles/jquery-ui/redmond/images/ui-icons_f9bd01_256x240.png similarity index 100% rename from stylesheets/jquery-ui/redmond/images/ui-icons_f9bd01_256x240.png rename to app/styles/jquery-ui/redmond/images/ui-icons_f9bd01_256x240.png diff --git a/stylesheets/jquery-ui/redmond/jquery-ui-1.10.3.custom.css b/app/styles/jquery-ui/redmond/jquery-ui-1.10.3.custom.css similarity index 100% rename from stylesheets/jquery-ui/redmond/jquery-ui-1.10.3.custom.css rename to app/styles/jquery-ui/redmond/jquery-ui-1.10.3.custom.css diff --git a/stylesheets/jquery-ui/redmond/jquery-ui-1.10.3.custom.min.css b/app/styles/jquery-ui/redmond/jquery-ui-1.10.3.custom.min.css similarity index 100% rename from stylesheets/jquery-ui/redmond/jquery-ui-1.10.3.custom.min.css rename to app/styles/jquery-ui/redmond/jquery-ui-1.10.3.custom.min.css diff --git a/stylesheets/mifosX.less b/app/styles/mifosX.less similarity index 85% rename from stylesheets/mifosX.less rename to app/styles/mifosX.less index 481449ac..74bae265 100644 --- a/stylesheets/mifosX.less +++ b/app/styles/mifosX.less @@ -41,6 +41,6 @@ form { } } -@import url('mifosX_classes.less'); -@import url('mifosX_users.less'); -@import url('mifosX_dataTables.less'); \ No newline at end of file +@import url('mifosX_classes'); +@import url('mifosX_users'); +@import url('mifosX_dataTables'); \ No newline at end of file diff --git a/stylesheets/mifosX_classes.less b/app/styles/mifosX_classes.less similarity index 100% rename from stylesheets/mifosX_classes.less rename to app/styles/mifosX_classes.less diff --git a/stylesheets/mifosX_dataTables.less b/app/styles/mifosX_dataTables.less similarity index 100% rename from stylesheets/mifosX_dataTables.less rename to app/styles/mifosX_dataTables.less diff --git a/stylesheets/mifosX_users.less b/app/styles/mifosX_users.less similarity index 100% rename from stylesheets/mifosX_users.less rename to app/styles/mifosX_users.less diff --git a/stylesheets/skeleton/base.css b/app/styles/skeleton/base.css similarity index 100% rename from stylesheets/skeleton/base.css rename to app/styles/skeleton/base.css diff --git a/stylesheets/skeleton/layout.css b/app/styles/skeleton/layout.css similarity index 100% rename from stylesheets/skeleton/layout.css rename to app/styles/skeleton/layout.css diff --git a/stylesheets/skeleton/skeleton.css b/app/styles/skeleton/skeleton.css similarity index 100% rename from stylesheets/skeleton/skeleton.css rename to app/styles/skeleton/skeleton.css diff --git a/html/accounting/accounting.html b/app/views/accounting/accounting.html similarity index 100% rename from html/accounting/accounting.html rename to app/views/accounting/accounting.html diff --git a/html/accounting/accounting_coa.html b/app/views/accounting/accounting_coa.html similarity index 100% rename from html/accounting/accounting_coa.html rename to app/views/accounting/accounting_coa.html diff --git a/html/accounting/accounts_closure.html b/app/views/accounting/accounts_closure.html similarity index 100% rename from html/accounting/accounts_closure.html rename to app/views/accounting/accounts_closure.html diff --git a/html/accounting/createglaccounting.html b/app/views/accounting/createglaccounting.html similarity index 100% rename from html/accounting/createglaccounting.html rename to app/views/accounting/createglaccounting.html diff --git a/html/accounting/editglaccounting.html b/app/views/accounting/editglaccounting.html similarity index 100% rename from html/accounting/editglaccounting.html rename to app/views/accounting/editglaccounting.html diff --git a/html/accounting/freqposting.html b/app/views/accounting/freqposting.html similarity index 100% rename from html/accounting/freqposting.html rename to app/views/accounting/freqposting.html diff --git a/html/accounting/journalentry_posting.html b/app/views/accounting/journalentry_posting.html similarity index 100% rename from html/accounting/journalentry_posting.html rename to app/views/accounting/journalentry_posting.html diff --git a/html/accounting/search_transaction.html b/app/views/accounting/search_transaction.html similarity index 100% rename from html/accounting/search_transaction.html rename to app/views/accounting/search_transaction.html diff --git a/html/accounting/view_close_accounting.html b/app/views/accounting/view_close_accounting.html similarity index 100% rename from html/accounting/view_close_accounting.html rename to app/views/accounting/view_close_accounting.html diff --git a/html/accounting/view_transactions.html b/app/views/accounting/view_transactions.html similarity index 100% rename from html/accounting/view_transactions.html rename to app/views/accounting/view_transactions.html diff --git a/html/accounting/viewglaccounting.html b/app/views/accounting/viewglaccounting.html similarity index 100% rename from html/accounting/viewglaccounting.html rename to app/views/accounting/viewglaccounting.html diff --git a/html/administration/createuser.html b/app/views/administration/createuser.html similarity index 100% rename from html/administration/createuser.html rename to app/views/administration/createuser.html diff --git a/html/administration/edituser.html b/app/views/administration/edituser.html similarity index 100% rename from html/administration/edituser.html rename to app/views/administration/edituser.html diff --git a/html/administration/organization.html b/app/views/administration/organization.html similarity index 100% rename from html/administration/organization.html rename to app/views/administration/organization.html diff --git a/html/administration/roles.html b/app/views/administration/roles.html similarity index 100% rename from html/administration/roles.html rename to app/views/administration/roles.html diff --git a/html/administration/system.html b/app/views/administration/system.html similarity index 100% rename from html/administration/system.html rename to app/views/administration/system.html diff --git a/html/administration/userFormDialog.html b/app/views/administration/userFormDialog.html similarity index 100% rename from html/administration/userFormDialog.html rename to app/views/administration/userFormDialog.html diff --git a/html/administration/users.html b/app/views/administration/users.html similarity index 100% rename from html/administration/users.html rename to app/views/administration/users.html diff --git a/html/administration/usersettings.html b/app/views/administration/usersettings.html similarity index 100% rename from html/administration/usersettings.html rename to app/views/administration/usersettings.html diff --git a/html/administration/userslist.html b/app/views/administration/userslist.html similarity index 100% rename from html/administration/userslist.html rename to app/views/administration/userslist.html diff --git a/html/administration/viewuser.html b/app/views/administration/viewuser.html similarity index 100% rename from html/administration/viewuser.html rename to app/views/administration/viewuser.html diff --git a/html/clients/clients.html b/app/views/clients/clients.html similarity index 100% rename from html/clients/clients.html rename to app/views/clients/clients.html diff --git a/html/clients/createclient.html b/app/views/clients/createclient.html similarity index 100% rename from html/clients/createclient.html rename to app/views/clients/createclient.html diff --git a/html/clients/editclient.html b/app/views/clients/editclient.html similarity index 100% rename from html/clients/editclient.html rename to app/views/clients/editclient.html diff --git a/html/clients/viewclient.html b/app/views/clients/viewclient.html similarity index 100% rename from html/clients/viewclient.html rename to app/views/clients/viewclient.html diff --git a/html/clients/viewclientloanaccountdetails.html b/app/views/clients/viewclientloanaccountdetails.html similarity index 100% rename from html/clients/viewclientloanaccountdetails.html rename to app/views/clients/viewclientloanaccountdetails.html diff --git a/html/footer.html b/app/views/footer.html similarity index 100% rename from html/footer.html rename to app/views/footer.html diff --git a/html/header.html b/app/views/header.html similarity index 100% rename from html/header.html rename to app/views/header.html diff --git a/html/home.html b/app/views/home.html similarity index 100% rename from html/home.html rename to app/views/home.html diff --git a/html/login.html b/app/views/login.html similarity index 100% rename from html/login.html rename to app/views/login.html diff --git a/html/navigation/offices.html b/app/views/navigation/offices.html similarity index 100% rename from html/navigation/offices.html rename to app/views/navigation/offices.html diff --git a/html/organization/createemployee.html b/app/views/organization/createemployee.html similarity index 100% rename from html/organization/createemployee.html rename to app/views/organization/createemployee.html diff --git a/html/organization/createoffice.html b/app/views/organization/createoffice.html similarity index 100% rename from html/organization/createoffice.html rename to app/views/organization/createoffice.html diff --git a/html/organization/currencyconfig.html b/app/views/organization/currencyconfig.html similarity index 100% rename from html/organization/currencyconfig.html rename to app/views/organization/currencyconfig.html diff --git a/html/organization/editemployee.html b/app/views/organization/editemployee.html similarity index 100% rename from html/organization/editemployee.html rename to app/views/organization/editemployee.html diff --git a/html/organization/employees.html b/app/views/organization/employees.html similarity index 100% rename from html/organization/employees.html rename to app/views/organization/employees.html diff --git a/html/organization/managefunds.html b/app/views/organization/managefunds.html similarity index 100% rename from html/organization/managefunds.html rename to app/views/organization/managefunds.html diff --git a/html/organization/offices.html b/app/views/organization/offices.html similarity index 100% rename from html/organization/offices.html rename to app/views/organization/offices.html diff --git a/html/organization/viewemployee.html b/app/views/organization/viewemployee.html similarity index 100% rename from html/organization/viewemployee.html rename to app/views/organization/viewemployee.html diff --git a/html/organization/viewoffice.html b/app/views/organization/viewoffice.html similarity index 100% rename from html/organization/viewoffice.html rename to app/views/organization/viewoffice.html diff --git a/html/private/home_branchmanager.html b/app/views/private/home_branchmanager.html similarity index 100% rename from html/private/home_branchmanager.html rename to app/views/private/home_branchmanager.html diff --git a/html/private/home_funder.html b/app/views/private/home_funder.html similarity index 100% rename from html/private/home_funder.html rename to app/views/private/home_funder.html diff --git a/html/private/home_superuser.html b/app/views/private/home_superuser.html similarity index 100% rename from html/private/home_superuser.html rename to app/views/private/home_superuser.html diff --git a/html/products/charges.html b/app/views/products/charges.html similarity index 100% rename from html/products/charges.html rename to app/views/products/charges.html diff --git a/html/products/home.html b/app/views/products/home.html similarity index 100% rename from html/products/home.html rename to app/views/products/home.html diff --git a/html/products/loanproducts.html b/app/views/products/loanproducts.html similarity index 100% rename from html/products/loanproducts.html rename to app/views/products/loanproducts.html diff --git a/html/products/savingproducts.html b/app/views/products/savingproducts.html similarity index 100% rename from html/products/savingproducts.html rename to app/views/products/savingproducts.html diff --git a/html/products/viewcharge.html b/app/views/products/viewcharge.html similarity index 100% rename from html/products/viewcharge.html rename to app/views/products/viewcharge.html diff --git a/html/products/viewloanproduct.html b/app/views/products/viewloanproduct.html similarity index 100% rename from html/products/viewloanproduct.html rename to app/views/products/viewloanproduct.html diff --git a/html/products/viewsavingproduct.html b/app/views/products/viewsavingproduct.html similarity index 100% rename from html/products/viewsavingproduct.html rename to app/views/products/viewsavingproduct.html diff --git a/html/search/glresults.html b/app/views/search/glresults.html similarity index 100% rename from html/search/glresults.html rename to app/views/search/glresults.html diff --git a/html/start.html b/app/views/start.html similarity index 100% rename from html/start.html rename to app/views/start.html diff --git a/html/tasks.html b/app/views/tasks.html similarity index 100% rename from html/tasks.html rename to app/views/tasks.html diff --git a/js/loader.js b/js/loader.js deleted file mode 100644 index 41cb85e8..00000000 --- a/js/loader.js +++ /dev/null @@ -1,69 +0,0 @@ -(function() { - require.config({ - paths: { - 'jquery': '../lib/jquery/jquery', - 'jquery-ui': '../lib/jquery-ui/ui/jquery-ui', - 'data-tables': '../lib/datatables/media/js/jquery.dataTables', - 'blockUI': '../lib/blockui/jquery.blockUI', - 'angular': '../lib/angular/angular', - 'angular-resource': '../lib/angular-resource/angular-resource', - 'angular-translate': '../lib/angular-translate/angular-translate', - 'angular-translate-loader-static-files': '../lib/angular-translate-loader-static-files/angular-translate-loader-static-files', - 'angular-mocks': '../lib/angular-mocks/angular-mocks', - 'angularui': '../lib/angular-bootstrap/ui-bootstrap', - 'angularuitpls': '../lib/angular-bootstrap/ui-bootstrap-tpls', - 'underscore': '../lib/underscore/underscore', - 'webstorage': '../lib/angular-webstorage/angular-webstorage', - 'require-css': '../lib/require-css/css', - 'require-less': '../lib/require-less/less', - 'styles': '../stylesheets', - 'test': '../test/functional' - }, - shim: { - 'angular': { exports: 'angular' }, - 'angular-resource': { deps: ['angular'] }, - 'angular-translate': { deps: ['angular'] }, - 'angular-translate-loader-static-files': {deps: ['angular' , 'angular-translate'] }, - 'angularui': { deps: ['angular'] }, - 'angularuitpls': { deps: ['angular' ,'angularui' ] }, - 'angular-mocks': { deps: ['angular'] }, - 'webstorage': { deps: ['angular'] }, - 'jquery-ui': { deps: ['jquery'] }, - 'mifosX': { - deps: [ - 'angular', - 'angular-resource', - 'angular-translate', - 'angular-translate-loader-static-files', - 'angularui', - 'angularuitpls', - 'webstorage', - 'data-tables', - 'blockUI', - 'jquery-ui' - ], - exports: 'mifosX' - } - }, - packages: [ - { - name: 'css', - location: '../lib/require-css', - main: 'css' - }, - { - name: 'less', - location: '../lib/require-less', - main: 'less' - } - ] - }); - - require(['mifosXComponents', 'mifosXStyles'], function() { - require(['test/testInitializer'], function(testMode) { - if (!testMode) { - angular.bootstrap(document, ["MifosX_Application"]); - } - }); - }); -}()); diff --git a/js/mifosXComponents.js b/js/mifosXComponents.js deleted file mode 100644 index ab9e3b66..00000000 --- a/js/mifosXComponents.js +++ /dev/null @@ -1,74 +0,0 @@ -define(['underscore', 'mifosX'], function() { - var components = { - models: [ - 'LoggedInUser', - 'roleMap' - ], - controllers: [ - 'MainController', - 'LoginFormController', - 'UserController', - 'UserFormController', - 'UserSettingController', - 'RoleController', - 'ClientController', - 'ViewClientLoanDetailsController', - 'EditClientController', - 'LoanProductController', - 'ChargeController', - 'ViewChargeController', - 'SavingProductController', - 'ViewSavingProductController', - 'OfficesController', - 'ViewOfficeController', - 'CreateOfficeController', - 'ViewClientController', - 'CreateClientController', - 'TaskController', - 'CurrencyConfigController', - 'SearchController', - 'ViewLoanProductController', - 'UserListController', - 'CreateUserController', - 'ViewUserController', - 'EditUserController', - 'EmployeeController', - 'ViewEmployeeController', - 'EditEmployeeController', - 'CreateEmployeeController', - 'ManageFundsController', - 'AccFreqPostingController', - 'AccCoaController', - 'AccCreateGLAccountContoller', - 'AccViewGLAccountContoller', - 'AccEditGLAccountController', - 'ViewTransactionController', - 'JournalEntryController', - 'SearchTransactionController', - 'AccountingClosureController' - ], - filters: [ - 'StatusLookup' - ], - services: [ - 'ResourceFactoryProvider', - 'HttpServiceProvider', - 'AuthenticationService', - 'SessionManager', - 'Paginator' - ], - directives: [ - 'DataTablesDirective', - 'OverlayDirective', - 'DialogDirective' - ] - }; - - require(_.reduce(_.keys(components), function(list, group) { - return list.concat(_.map(components[group], function(name) { return group + "/" + name; })); - }, [ - 'routes', - 'initialTasks', - 'webstorage-configuration' - ])); -}); diff --git a/js/routes.js b/js/routes.js deleted file mode 100644 index c5074ec2..00000000 --- a/js/routes.js +++ /dev/null @@ -1,148 +0,0 @@ -(function(mifosX) { - var defineRoutes = function($routeProvider, $locationProvider) { - $routeProvider - .when('/', { - templateUrl: 'html/start.html' - }) - .when('/login', { - templateUrl: 'html/login.html' - }) - .when('/home', { - templateUrl: 'html/home.html' - }) - .when('/admin/roles', { - templateUrl: 'html/administration/roles.html' - }) - .when('/admin/users', { - templateUrl: 'html/administration/users.html' - }) - .when('/clients', { - templateUrl: 'html/clients/clients.html' - }) - .when('/createclient', { - templateUrl: 'html/clients/createclient.html' - }) - .when('/editclient/:id', { - templateUrl : 'html/clients/editclient.html' - }) - .when('/viewclient/:id', { - templateUrl: 'html/clients/viewclient.html' - }) - .when('/viewloanaccount/:id', { - templateUrl: 'html/clients/viewclientloanaccountdetails.html' - }) - .when('/organization', { - templateUrl: 'html/administration/organization.html' - }) - .when('/system', { - templateUrl: 'html/administration/system.html' - }) - .when('/loanproducts', { - templateUrl: 'html/products/loanproducts.html' - }) - .when('/charges', { - templateUrl: 'html/products/charges.html' - }) - .when('/viewcharge/:id', { - templateUrl: 'html/products/viewcharge.html' - }) - .when('/savingproducts', { - templateUrl: 'html/products/savingproducts.html' - }) - .when('/viewsavingproduct/:id', { - templateUrl: 'html/products/viewsavingproduct.html' - }) - .when('/offices', { - templateUrl: 'html/organization/offices.html' - }) - .when('/createoffice', { - templateUrl: 'html/organization/createoffice.html' - }) - .when('/viewoffice/:id', { - templateUrl: 'html/organization/viewoffice.html' - }) - .when('/tasks', { - templateUrl: 'html/tasks.html' - }) - .when('/viewcurrconfig', { - templateUrl: 'html/organization/currencyconfig.html' - }) - .when('/search/:query', { - templateUrl: 'html/search/glresults.html' - }) - .when('/viewloanproduct/:id', { - templateUrl: 'html/products/viewloanproduct.html' - }) - .when('/usersetting', { - templateUrl: 'html/administration/usersettings.html' - }) - .when('/userslist/', { - templateUrl: 'html/administration/userslist.html' - }) - .when('/createuser/', { - templateUrl: 'html/administration/createuser.html' - }) - .when('/viewuser/:id', { - templateUrl: 'html/administration/viewuser.html' - }) - .when('/edituser/:id', { - templateUrl: 'html/administration/edituser.html' - }) - .when('/employees', { - templateUrl: 'html/organization/employees.html' - }) - .when('/viewemployee/:id', { - templateUrl: 'html/organization/viewemployee.html' - }) - .when('/editemployee/:id', { - templateUrl: 'html/organization/editemployee.html' - }) - .when('/createemployee/', { - templateUrl: 'html/organization/createemployee.html' - }) - .when('/managefunds/', { - templateUrl: 'html/organization/managefunds.html' - }) - .when('/nav/offices', { - templateUrl: 'html/navigation/offices.html' - }) - .when('/accounting', { - templateUrl: 'html/accounting/accounting.html' - }) - .when('/accounting_coa', { - templateUrl: 'html/accounting/accounting_coa.html' - }) - .when('/createglaccount', { - templateUrl: 'html/accounting/createglaccounting.html' - }) - .when('/viewglaccount/:id', { - templateUrl: 'html/accounting/viewglaccounting.html' - }) - .when('/editglaccount/:id', { - templateUrl: 'html/accounting/editglaccounting.html' - }) - .when('/freqposting', { - templateUrl: 'html/accounting/freqposting.html' - }) - .when('/viewtransactions/:transactionId', { - templateUrl: 'html/accounting/view_transactions.html' - }) - .when('/journalentry', { - templateUrl: 'html/accounting/journalentry_posting.html' - }) - .when('/searchtransaction', { - templateUrl: 'html/accounting/search_transaction.html' - }) - .when('/accounts_closure', { - templateUrl: 'html/accounting/accounts_closure.html' - }) - .when('/closedaccountingDetails/:officeId', { - templateUrl: 'html/accounting/view_close_accounting.html' - }); - - $locationProvider.html5Mode(false); - }; - mifosX.ng.application.config(defineRoutes).run(function($log) { - $log.info("Routes definition completed"); - }); -}(mifosX || {})); diff --git a/test/SpecRunner.html b/test/SpecRunner.html index 0500cae7..47b64be5 100644 --- a/test/SpecRunner.html +++ b/test/SpecRunner.html @@ -5,13 +5,13 @@ Jasmine Spec Runner - - - - + + + + - - + + @@ -31,22 +31,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +