vertical slicing!

openMF · Sep 13, 2013 · dce231f · dce231f
1 parent 1c97195
commit dce231f
Show file tree

Hide file tree

Showing 184 changed files with 323 additions and 327 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "lib"
+  "directory": "app/bower_components"
 }
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 lib-cov
 lib
+app/bower_components
 *.seed
 *.log
 *.csv

diff --git a/font/FontAwesome.otf → app/fonts/FontAwesome.otf b/font/FontAwesome.otf → app/fonts/FontAwesome.otf
diff --git a/font/fontawesome-webfont.eot → app/fonts/fontawesome-webfont.eot b/font/fontawesome-webfont.eot → app/fonts/fontawesome-webfont.eot
diff --git a/font/fontawesome-webfont.svg → app/fonts/fontawesome-webfont.svg b/font/fontawesome-webfont.svg → app/fonts/fontawesome-webfont.svg
diff --git a/font/fontawesome-webfont.ttf → app/fonts/fontawesome-webfont.ttf b/font/fontawesome-webfont.ttf → app/fonts/fontawesome-webfont.ttf
diff --git a/font/fontawesome-webfont.woff → app/fonts/fontawesome-webfont.woff b/font/fontawesome-webfont.woff → app/fonts/fontawesome-webfont.woff
diff --git a/global-translations/locale-en.json → app/global-translations/locale-en.json b/global-translations/locale-en.json → app/global-translations/locale-en.json
diff --git a/global-translations/locale-es.json → app/global-translations/locale-es.json b/global-translations/locale-es.json → app/global-translations/locale-es.json
diff --git a/global-translations/locale-fr.json → app/global-translations/locale-fr.json b/global-translations/locale-fr.json → app/global-translations/locale-fr.json
diff --git a/global-translations/locale-hn.json → app/global-translations/locale-hn.json b/global-translations/locale-hn.json → app/global-translations/locale-hn.json
diff --git a/global-translations/locale-pt.json → app/global-translations/locale-pt.json b/global-translations/locale-pt.json → app/global-translations/locale-pt.json
diff --git a/global-translations/locale-zh.json → app/global-translations/locale-zh.json b/global-translations/locale-zh.json → app/global-translations/locale-zh.json
diff --git a/image/MifosX_logo.png → app/images/MifosX_logo.png b/image/MifosX_logo.png → app/images/MifosX_logo.png
diff --git a/image/blank_avatar.jpg → app/images/blank_avatar.jpg b/image/blank_avatar.jpg → app/images/blank_avatar.jpg
diff --git a/image/cubic_loader.gif → app/images/cubic_loader.gif b/image/cubic_loader.gif → app/images/cubic_loader.gif
diff --git a/image/favicon.ico → app/images/favicon.ico b/image/favicon.ico → app/images/favicon.ico
diff --git a/image/logo.jpg → app/images/logo.jpg b/image/logo.jpg → app/images/logo.jpg
diff --git a/image/user_new.png → app/images/user_new.png b/image/user_new.png → app/images/user_new.png
diff --git a/index.html → app/index.html b/index.html → app/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <link rel="icon" type="image/png" href="../prototype-app/image/favicon.ico" />
+    <link rel="icon" type="image/png" href="./images/favicon.ico" />
     <title>{{ 'label.product.title' | translate }}</title>
     <style>[data-ng-cloak] { display: none !important; }</style>
 </head>
@@ -39,7 +39,7 @@
     <table width="%100">
         <tr>
             <td width="30%">
-                <img src="../prototype-app/image/MifosX_logo.png" alt="MifosX" width="150">
+                <img src="./images/MifosX_logo.png" alt="MifosX" width="150">
             </td>    
             <td width="70%">
                 <h1>{{ 'label.product.name' | translate }}</h1>
@@ -103,7 +103,7 @@ <h1>{{ 'label.product.name' | translate }}</h1>
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </a>
-                <a class="brand" href="../">Mifos <strong>X</strong></a>
+                <a class="brand" href="../../">Mifos <strong>X</strong></a>
                 <div class="nav-collapse collapse" id="main-menu">
                     <ul class="nav" id="main-menu-left">
                         <li><a href="#"><i class="icon-home icon-white"></i>{{ 'link.home' | translate }}</a></li>
@@ -223,7 +223,7 @@ <h1>{{ 'label.product.name' | translate }}</h1>
 </div>
 <!-- Le javascript
 ================================================== -->
-<script type='text/javascript' data-main="js/loader.js" src='lib/requirejs/require.js'></script>
+<script type='text/javascript' data-main="scripts/loader.js" src='bower_components/requirejs/require.js'></script>
 <!-- Placed at the end of the document so the pages load faster -->
 </body>
 </html>
diff --git a/js/controllers/AccCoaController.js → ...ontrollers/accounting/AccCoaController.js b/js/controllers/AccCoaController.js → ...ontrollers/accounting/AccCoaController.js
diff --git a/...ontrollers/AccCreateGLAccountContoller.js → ...accounting/AccCreateGLAccountContoller.js b/...ontrollers/AccCreateGLAccountContoller.js → ...accounting/AccCreateGLAccountContoller.js
diff --git a/js/controllers/AccEditGLAccountController.js → .../accounting/AccEditGLAccountController.js b/js/controllers/AccEditGLAccountController.js → .../accounting/AccEditGLAccountController.js
diff --git a/js/controllers/AccFreqPostingController.js → ...rs/accounting/AccFreqPostingController.js b/js/controllers/AccFreqPostingController.js → ...rs/accounting/AccFreqPostingController.js
diff --git a/js/controllers/AccViewGLAccountContoller.js → ...s/accounting/AccViewGLAccountContoller.js b/js/controllers/AccViewGLAccountContoller.js → ...s/accounting/AccViewGLAccountContoller.js
diff --git a/...ontrollers/AccountingClosureController.js → ...accounting/AccountingClosureController.js b/...ontrollers/AccountingClosureController.js → ...accounting/AccountingClosureController.js
diff --git a/js/controllers/JournalEntryController.js → ...lers/accounting/JournalEntryController.js b/js/controllers/JournalEntryController.js → ...lers/accounting/JournalEntryController.js
diff --git a/...ontrollers/SearchTransactionController.js → ...accounting/SearchTransactionController.js b/...ontrollers/SearchTransactionController.js → ...accounting/SearchTransactionController.js
diff --git a/js/controllers/ViewTransactionController.js → ...s/accounting/ViewTransactionController.js b/js/controllers/ViewTransactionController.js → ...s/accounting/ViewTransactionController.js
diff --git a/js/controllers/ClientController.js → ...ts/controllers/client/ClientController.js b/js/controllers/ClientController.js → ...ts/controllers/client/ClientController.js
diff --git a/js/controllers/CreateClientController.js → ...trollers/client/CreateClientController.js b/js/controllers/CreateClientController.js → ...trollers/client/CreateClientController.js
diff --git a/js/controllers/EditClientController.js → ...ontrollers/client/EditClientController.js b/js/controllers/EditClientController.js → ...ontrollers/client/EditClientController.js
diff --git a/js/controllers/ViewClientController.js → ...ontrollers/client/ViewClientController.js b/js/controllers/ViewClientController.js → ...ontrollers/client/ViewClientController.js
diff --git a/...ollers/ViewClientLoanDetailsController.js → ...ccount/ViewClientLoanDetailsController.js b/...ollers/ViewClientLoanDetailsController.js → ...ccount/ViewClientLoanDetailsController.js
diff --git a/js/controllers/LoginFormController.js → ...s/controllers/main/LoginFormController.js b/js/controllers/LoginFormController.js → ...s/controllers/main/LoginFormController.js
diff --git a/js/controllers/MainController.js → ...cripts/controllers/main/MainController.js b/js/controllers/MainController.js → ...cripts/controllers/main/MainController.js
diff --git a/js/controllers/SearchController.js → ...ipts/controllers/main/SearchController.js b/js/controllers/SearchController.js → ...ipts/controllers/main/SearchController.js
diff --git a/js/controllers/TaskController.js → ...cripts/controllers/main/TaskController.js b/js/controllers/TaskController.js → ...cripts/controllers/main/TaskController.js
diff --git a/js/controllers/CreateEmployeeController.js → .../organization/CreateEmployeeController.js b/js/controllers/CreateEmployeeController.js → .../organization/CreateEmployeeController.js
diff --git a/js/controllers/CreateOfficeController.js → ...rs/organization/CreateOfficeController.js b/js/controllers/CreateOfficeController.js → ...rs/organization/CreateOfficeController.js
diff --git a/js/controllers/CreateUserController.js → ...lers/organization/CreateUserController.js b/js/controllers/CreateUserController.js → ...lers/organization/CreateUserController.js
diff --git a/js/controllers/CurrencyConfigController.js → .../organization/CurrencyConfigController.js b/js/controllers/CurrencyConfigController.js → .../organization/CurrencyConfigController.js
diff --git a/js/controllers/EditEmployeeController.js → ...rs/organization/EditEmployeeController.js b/js/controllers/EditEmployeeController.js → ...rs/organization/EditEmployeeController.js
diff --git a/js/controllers/EditUserController.js → ...ollers/organization/EditUserController.js b/js/controllers/EditUserController.js → ...ollers/organization/EditUserController.js
diff --git a/js/controllers/EmployeeController.js → ...ollers/organization/EmployeeController.js b/js/controllers/EmployeeController.js → ...ollers/organization/EmployeeController.js
diff --git a/js/controllers/ManageFundsController.js → ...ers/organization/ManageFundsController.js b/js/controllers/ManageFundsController.js → ...ers/organization/ManageFundsController.js
diff --git a/js/controllers/OfficesController.js → ...rollers/organization/OfficesController.js b/js/controllers/OfficesController.js → ...rollers/organization/OfficesController.js
diff --git a/js/controllers/RoleController.js → ...ontrollers/organization/RoleController.js b/js/controllers/RoleController.js → ...ontrollers/organization/RoleController.js
diff --git a/js/controllers/ViewEmployeeController.js → ...rs/organization/ViewEmployeeController.js b/js/controllers/ViewEmployeeController.js → ...rs/organization/ViewEmployeeController.js
diff --git a/js/controllers/ViewOfficeController.js → ...lers/organization/ViewOfficeController.js b/js/controllers/ViewOfficeController.js → ...lers/organization/ViewOfficeController.js
diff --git a/js/controllers/ChargeController.js → ...s/controllers/product/ChargeController.js b/js/controllers/ChargeController.js → ...s/controllers/product/ChargeController.js
diff --git a/js/controllers/LoanProductController.js → ...trollers/product/LoanProductController.js b/js/controllers/LoanProductController.js → ...trollers/product/LoanProductController.js
diff --git a/js/controllers/SavingProductController.js → ...ollers/product/SavingProductController.js b/js/controllers/SavingProductController.js → ...ollers/product/SavingProductController.js
diff --git a/js/controllers/ViewChargeController.js → ...ntrollers/product/ViewChargeController.js b/js/controllers/ViewChargeController.js → ...ntrollers/product/ViewChargeController.js
diff --git a/js/controllers/ViewLoanProductController.js → ...lers/product/ViewLoanProductController.js b/js/controllers/ViewLoanProductController.js → ...lers/product/ViewLoanProductController.js
diff --git a/...ontrollers/ViewSavingProductController.js → ...rs/product/ViewSavingProductController.js b/...ontrollers/ViewSavingProductController.js → ...rs/product/ViewSavingProductController.js
diff --git a/js/controllers/UserController.js → ...cripts/controllers/user/UserController.js b/js/controllers/UserController.js → ...cripts/controllers/user/UserController.js
diff --git a/js/controllers/UserFormController.js → ...ts/controllers/user/UserFormController.js b/js/controllers/UserFormController.js → ...ts/controllers/user/UserFormController.js
diff --git a/js/controllers/UserListController.js → ...ts/controllers/user/UserListController.js b/js/controllers/UserListController.js → ...ts/controllers/user/UserListController.js
diff --git a/js/controllers/UserSettingController.js → ...controllers/user/UserSettingController.js b/js/controllers/UserSettingController.js → ...controllers/user/UserSettingController.js
diff --git a/js/controllers/ViewUserController.js → ...ts/controllers/user/ViewUserController.js b/js/controllers/ViewUserController.js → ...ts/controllers/user/ViewUserController.js
diff --git a/js/directives/DataTablesDirective.js → ...scripts/directives/DataTablesDirective.js b/js/directives/DataTablesDirective.js → ...scripts/directives/DataTablesDirective.js
diff --git a/js/directives/DialogDirective.js → app/scripts/directives/DialogDirective.js b/js/directives/DialogDirective.js → app/scripts/directives/DialogDirective.js
diff --git a/js/directives/OverlayDirective.js → app/scripts/directives/OverlayDirective.js b/js/directives/OverlayDirective.js → app/scripts/directives/OverlayDirective.js
diff --git a/js/filters/StatusLookup.js → app/scripts/filters/StatusLookup.js b/js/filters/StatusLookup.js → app/scripts/filters/StatusLookup.js
diff --git a/js/initialTasks.js → app/scripts/initialTasks.js b/js/initialTasks.js → app/scripts/initialTasks.js
diff --git a/app/scripts/loader.js 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 → app/scripts/mifosX.js b/js/mifosX.js → app/scripts/mifosX.js
diff --git a/app/scripts/mifosXComponents.js 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 → app/scripts/mifosXStyles.js b/js/mifosXStyles.js → 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 → app/scripts/models/LoggedInUser.js b/js/models/LoggedInUser.js → app/scripts/models/LoggedInUser.js
diff --git a/js/models/Role.js → app/scripts/models/Role.js b/js/models/Role.js → app/scripts/models/Role.js
diff --git a/js/models/roleMap.js → app/scripts/models/roleMap.js b/js/models/roleMap.js → app/scripts/models/roleMap.js
diff --git a/app/scripts/routes.js 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 → ...scripts/services/AuthenticationService.js b/js/services/AuthenticationService.js → ...scripts/services/AuthenticationService.js
diff --git a/js/services/HttpServiceProvider.js → app/scripts/services/HttpServiceProvider.js b/js/services/HttpServiceProvider.js → app/scripts/services/HttpServiceProvider.js
diff --git a/js/services/Paginator.js → app/scripts/services/Paginator.js b/js/services/Paginator.js → app/scripts/services/Paginator.js
diff --git a/js/services/ResourceFactoryProvider.js → ...ripts/services/ResourceFactoryProvider.js b/js/services/ResourceFactoryProvider.js → ...ripts/services/ResourceFactoryProvider.js
diff --git a/js/services/SessionManager.js → app/scripts/services/SessionManager.js b/js/services/SessionManager.js → app/scripts/services/SessionManager.js
diff --git a/js/webstorage-configuration.js → app/scripts/webstorage-configuration.js b/js/webstorage-configuration.js → app/scripts/webstorage-configuration.js
diff --git a/stylesheets/app.css → app/styles/app.css b/stylesheets/app.css → app/styles/app.css
diff --git a/stylesheets/bootstrap-combined.min.css → app/styles/bootstrap-combined.min.css b/stylesheets/bootstrap-combined.min.css → app/styles/bootstrap-combined.min.css
diff --git a/stylesheets/bootswatch.css → app/styles/bootswatch.css b/stylesheets/bootswatch.css → app/styles/bootswatch.css
diff --git a/stylesheets/data-tables/css/demo_page.css → app/styles/data-tables/css/demo_page.css b/stylesheets/data-tables/css/demo_page.css → app/styles/data-tables/css/demo_page.css
diff --git a/stylesheets/data-tables/css/demo_table.css → app/styles/data-tables/css/demo_table.css b/stylesheets/data-tables/css/demo_table.css → app/styles/data-tables/css/demo_table.css
diff --git a/...sheets/data-tables/css/demo_table_jui.css → ...styles/data-tables/css/demo_table_jui.css b/...sheets/data-tables/css/demo_table_jui.css → ...styles/data-tables/css/demo_table_jui.css
diff --git a/...ets/data-tables/css/jquery.dataTables.css → ...les/data-tables/css/jquery.dataTables.css b/...ets/data-tables/css/jquery.dataTables.css → ...les/data-tables/css/jquery.dataTables.css
diff --git a/...les/css/jquery.dataTables_themeroller.css → ...les/css/jquery.dataTables_themeroller.css b/...les/css/jquery.dataTables_themeroller.css → ...les/css/jquery.dataTables_themeroller.css
diff --git a/...eets/data-tables/images/Sorting icons.psd → ...yles/data-tables/images/Sorting icons.psd b/...eets/data-tables/images/Sorting icons.psd → ...yles/data-tables/images/Sorting icons.psd
diff --git a/...eets/data-tables/images/back_disabled.png → ...yles/data-tables/images/back_disabled.png b/...eets/data-tables/images/back_disabled.png → ...yles/data-tables/images/back_disabled.png
diff --git a/...heets/data-tables/images/back_enabled.png → ...tyles/data-tables/images/back_enabled.png b/...heets/data-tables/images/back_enabled.png → ...tyles/data-tables/images/back_enabled.png
diff --git a/...data-tables/images/back_enabled_hover.png → ...data-tables/images/back_enabled_hover.png b/...data-tables/images/back_enabled_hover.png → ...data-tables/images/back_enabled_hover.png
diff --git a/stylesheets/data-tables/images/favicon.ico → app/styles/data-tables/images/favicon.ico b/stylesheets/data-tables/images/favicon.ico → app/styles/data-tables/images/favicon.ico
diff --git a/...s/data-tables/images/forward_disabled.png → ...s/data-tables/images/forward_disabled.png b/...s/data-tables/images/forward_disabled.png → ...s/data-tables/images/forward_disabled.png
diff --git a/...ts/data-tables/images/forward_enabled.png → ...es/data-tables/images/forward_enabled.png b/...ts/data-tables/images/forward_enabled.png → ...es/data-tables/images/forward_enabled.png
diff --git a/...a-tables/images/forward_enabled_hover.png → ...a-tables/images/forward_enabled_hover.png b/...a-tables/images/forward_enabled_hover.png → ...a-tables/images/forward_enabled_hover.png
diff --git a/stylesheets/data-tables/images/sort_asc.png → app/styles/data-tables/images/sort_asc.png b/stylesheets/data-tables/images/sort_asc.png → app/styles/data-tables/images/sort_asc.png
diff --git a/.../data-tables/images/sort_asc_disabled.png → .../data-tables/images/sort_asc_disabled.png b/.../data-tables/images/sort_asc_disabled.png → .../data-tables/images/sort_asc_disabled.png
diff --git a/stylesheets/data-tables/images/sort_both.png → app/styles/data-tables/images/sort_both.png b/stylesheets/data-tables/images/sort_both.png → app/styles/data-tables/images/sort_both.png
diff --git a/stylesheets/data-tables/images/sort_desc.png → app/styles/data-tables/images/sort_desc.png b/stylesheets/data-tables/images/sort_desc.png → app/styles/data-tables/images/sort_desc.png
diff --git a/...data-tables/images/sort_desc_disabled.png → ...data-tables/images/sort_desc_disabled.png b/...data-tables/images/sort_desc_disabled.png → ...data-tables/images/sort_desc_disabled.png
diff --git a/stylesheets/font-awesome.min.css → app/styles/font-awesome.min.css b/stylesheets/font-awesome.min.css → 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/...ry-ui/redmond/images/animated-overlay.gif → ...ry-ui/redmond/images/animated-overlay.gif b/...ry-ui/redmond/images/animated-overlay.gif → ...ry-ui/redmond/images/animated-overlay.gif
diff --git a/...ond/images/ui-bg_flat_0_aaaaaa_40x100.png → ...ond/images/ui-bg_flat_0_aaaaaa_40x100.png b/...ond/images/ui-bg_flat_0_aaaaaa_40x100.png → ...ond/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/...nd/images/ui-bg_flat_55_fbec88_40x100.png → ...nd/images/ui-bg_flat_55_fbec88_40x100.png b/...nd/images/ui-bg_flat_55_fbec88_40x100.png → ...nd/images/ui-bg_flat_55_fbec88_40x100.png
diff --git a/...nd/images/ui-bg_glass_75_d0e5f5_1x400.png → ...nd/images/ui-bg_glass_75_d0e5f5_1x400.png b/...nd/images/ui-bg_glass_75_d0e5f5_1x400.png → ...nd/images/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/...nd/images/ui-bg_glass_85_dfeffc_1x400.png → ...nd/images/ui-bg_glass_85_dfeffc_1x400.png b/...nd/images/ui-bg_glass_85_dfeffc_1x400.png → ...nd/images/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/...nd/images/ui-bg_glass_95_fef1ec_1x400.png → ...nd/images/ui-bg_glass_95_fef1ec_1x400.png b/...nd/images/ui-bg_glass_95_fef1ec_1x400.png → ...nd/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/...es/ui-bg_gloss-wave_55_5c9ccc_500x100.png → ...es/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/...es/ui-bg_gloss-wave_55_5c9ccc_500x100.png → ...es/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/...ges/ui-bg_inset-hard_100_f5f8f9_1x100.png → ...ges/ui-bg_inset-hard_100_f5f8f9_1x100.png b/...ges/ui-bg_inset-hard_100_f5f8f9_1x100.png → ...ges/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/...ges/ui-bg_inset-hard_100_fcfdfd_1x100.png → ...ges/ui-bg_inset-hard_100_fcfdfd_1x100.png b/...ges/ui-bg_inset-hard_100_fcfdfd_1x100.png → ...ges/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/...edmond/images/ui-icons_217bc0_256x240.png → ...edmond/images/ui-icons_217bc0_256x240.png b/...edmond/images/ui-icons_217bc0_256x240.png → ...edmond/images/ui-icons_217bc0_256x240.png
diff --git a/...edmond/images/ui-icons_2e83ff_256x240.png → ...edmond/images/ui-icons_2e83ff_256x240.png b/...edmond/images/ui-icons_2e83ff_256x240.png → ...edmond/images/ui-icons_2e83ff_256x240.png
diff --git a/...edmond/images/ui-icons_469bdd_256x240.png → ...edmond/images/ui-icons_469bdd_256x240.png b/...edmond/images/ui-icons_469bdd_256x240.png → ...edmond/images/ui-icons_469bdd_256x240.png
diff --git a/...edmond/images/ui-icons_6da8d5_256x240.png → ...edmond/images/ui-icons_6da8d5_256x240.png b/...edmond/images/ui-icons_6da8d5_256x240.png → ...edmond/images/ui-icons_6da8d5_256x240.png
diff --git a/...edmond/images/ui-icons_cd0a0a_256x240.png → ...edmond/images/ui-icons_cd0a0a_256x240.png b/...edmond/images/ui-icons_cd0a0a_256x240.png → ...edmond/images/ui-icons_cd0a0a_256x240.png
diff --git a/...edmond/images/ui-icons_d8e7f3_256x240.png → ...edmond/images/ui-icons_d8e7f3_256x240.png b/...edmond/images/ui-icons_d8e7f3_256x240.png → ...edmond/images/ui-icons_d8e7f3_256x240.png
diff --git a/...edmond/images/ui-icons_f9bd01_256x240.png → ...edmond/images/ui-icons_f9bd01_256x240.png b/...edmond/images/ui-icons_f9bd01_256x240.png → ...edmond/images/ui-icons_f9bd01_256x240.png
diff --git a/...ry-ui/redmond/jquery-ui-1.10.3.custom.css → ...ry-ui/redmond/jquery-ui-1.10.3.custom.css b/...ry-ui/redmond/jquery-ui-1.10.3.custom.css → ...ry-ui/redmond/jquery-ui-1.10.3.custom.css
diff --git a/...i/redmond/jquery-ui-1.10.3.custom.min.css → ...i/redmond/jquery-ui-1.10.3.custom.min.css b/...i/redmond/jquery-ui-1.10.3.custom.min.css → ...i/redmond/jquery-ui-1.10.3.custom.min.css
diff --git a/stylesheets/mifosX.less → app/styles/mifosX.less b/stylesheets/mifosX.less → app/styles/mifosX.less
@@ -41,6 +41,6 @@ form {
   }
 }
 
-@import url('mifosX_classes.less');
-@import url('mifosX_users.less');
-@import url('mifosX_dataTables.less');
+@import url('mifosX_classes');
+@import url('mifosX_users');
+@import url('mifosX_dataTables');
diff --git a/stylesheets/mifosX_classes.less → app/styles/mifosX_classes.less b/stylesheets/mifosX_classes.less → app/styles/mifosX_classes.less
diff --git a/stylesheets/mifosX_dataTables.less → app/styles/mifosX_dataTables.less b/stylesheets/mifosX_dataTables.less → app/styles/mifosX_dataTables.less
diff --git a/stylesheets/mifosX_users.less → app/styles/mifosX_users.less b/stylesheets/mifosX_users.less → app/styles/mifosX_users.less
diff --git a/stylesheets/skeleton/base.css → app/styles/skeleton/base.css b/stylesheets/skeleton/base.css → app/styles/skeleton/base.css
diff --git a/stylesheets/skeleton/layout.css → app/styles/skeleton/layout.css b/stylesheets/skeleton/layout.css → app/styles/skeleton/layout.css
diff --git a/stylesheets/skeleton/skeleton.css → app/styles/skeleton/skeleton.css b/stylesheets/skeleton/skeleton.css → app/styles/skeleton/skeleton.css
diff --git a/html/accounting/accounting.html → app/views/accounting/accounting.html b/html/accounting/accounting.html → app/views/accounting/accounting.html
diff --git a/html/accounting/accounting_coa.html → app/views/accounting/accounting_coa.html b/html/accounting/accounting_coa.html → app/views/accounting/accounting_coa.html
diff --git a/html/accounting/accounts_closure.html → app/views/accounting/accounts_closure.html b/html/accounting/accounts_closure.html → app/views/accounting/accounts_closure.html
diff --git a/html/accounting/createglaccounting.html → app/views/accounting/createglaccounting.html b/html/accounting/createglaccounting.html → app/views/accounting/createglaccounting.html
diff --git a/html/accounting/editglaccounting.html → app/views/accounting/editglaccounting.html b/html/accounting/editglaccounting.html → app/views/accounting/editglaccounting.html
diff --git a/html/accounting/freqposting.html → app/views/accounting/freqposting.html b/html/accounting/freqposting.html → app/views/accounting/freqposting.html
diff --git a/html/accounting/journalentry_posting.html → ...iews/accounting/journalentry_posting.html b/html/accounting/journalentry_posting.html → ...iews/accounting/journalentry_posting.html
diff --git a/html/accounting/search_transaction.html → app/views/accounting/search_transaction.html b/html/accounting/search_transaction.html → app/views/accounting/search_transaction.html
diff --git a/html/accounting/view_close_accounting.html → ...ews/accounting/view_close_accounting.html b/html/accounting/view_close_accounting.html → ...ews/accounting/view_close_accounting.html
diff --git a/html/accounting/view_transactions.html → app/views/accounting/view_transactions.html b/html/accounting/view_transactions.html → app/views/accounting/view_transactions.html
diff --git a/html/accounting/viewglaccounting.html → app/views/accounting/viewglaccounting.html b/html/accounting/viewglaccounting.html → app/views/accounting/viewglaccounting.html
diff --git a/html/administration/createuser.html → app/views/administration/createuser.html b/html/administration/createuser.html → app/views/administration/createuser.html
diff --git a/html/administration/edituser.html → app/views/administration/edituser.html b/html/administration/edituser.html → app/views/administration/edituser.html
diff --git a/html/administration/organization.html → app/views/administration/organization.html b/html/administration/organization.html → app/views/administration/organization.html
diff --git a/html/administration/roles.html → app/views/administration/roles.html b/html/administration/roles.html → app/views/administration/roles.html
diff --git a/html/administration/system.html → app/views/administration/system.html b/html/administration/system.html → app/views/administration/system.html
diff --git a/html/administration/userFormDialog.html → app/views/administration/userFormDialog.html b/html/administration/userFormDialog.html → app/views/administration/userFormDialog.html
diff --git a/html/administration/users.html → app/views/administration/users.html b/html/administration/users.html → app/views/administration/users.html
diff --git a/html/administration/usersettings.html → app/views/administration/usersettings.html b/html/administration/usersettings.html → app/views/administration/usersettings.html
diff --git a/html/administration/userslist.html → app/views/administration/userslist.html b/html/administration/userslist.html → app/views/administration/userslist.html
diff --git a/html/administration/viewuser.html → app/views/administration/viewuser.html b/html/administration/viewuser.html → app/views/administration/viewuser.html
diff --git a/html/clients/clients.html → app/views/clients/clients.html b/html/clients/clients.html → app/views/clients/clients.html
diff --git a/html/clients/createclient.html → app/views/clients/createclient.html b/html/clients/createclient.html → app/views/clients/createclient.html
diff --git a/html/clients/editclient.html → app/views/clients/editclient.html b/html/clients/editclient.html → app/views/clients/editclient.html
diff --git a/html/clients/viewclient.html → app/views/clients/viewclient.html b/html/clients/viewclient.html → app/views/clients/viewclient.html
diff --git a/...clients/viewclientloanaccountdetails.html → ...clients/viewclientloanaccountdetails.html b/...clients/viewclientloanaccountdetails.html → ...clients/viewclientloanaccountdetails.html
diff --git a/html/footer.html → app/views/footer.html b/html/footer.html → app/views/footer.html
diff --git a/html/header.html → app/views/header.html b/html/header.html → app/views/header.html
diff --git a/html/home.html → app/views/home.html b/html/home.html → app/views/home.html
diff --git a/html/login.html → app/views/login.html b/html/login.html → app/views/login.html
diff --git a/html/navigation/offices.html → app/views/navigation/offices.html b/html/navigation/offices.html → app/views/navigation/offices.html
diff --git a/html/organization/createemployee.html → app/views/organization/createemployee.html b/html/organization/createemployee.html → app/views/organization/createemployee.html
diff --git a/html/organization/createoffice.html → app/views/organization/createoffice.html b/html/organization/createoffice.html → app/views/organization/createoffice.html
diff --git a/html/organization/currencyconfig.html → app/views/organization/currencyconfig.html b/html/organization/currencyconfig.html → app/views/organization/currencyconfig.html
diff --git a/html/organization/editemployee.html → app/views/organization/editemployee.html b/html/organization/editemployee.html → app/views/organization/editemployee.html
diff --git a/html/organization/employees.html → app/views/organization/employees.html b/html/organization/employees.html → app/views/organization/employees.html
diff --git a/html/organization/managefunds.html → app/views/organization/managefunds.html b/html/organization/managefunds.html → app/views/organization/managefunds.html
diff --git a/html/organization/offices.html → app/views/organization/offices.html b/html/organization/offices.html → app/views/organization/offices.html
diff --git a/html/organization/viewemployee.html → app/views/organization/viewemployee.html b/html/organization/viewemployee.html → app/views/organization/viewemployee.html
diff --git a/html/organization/viewoffice.html → app/views/organization/viewoffice.html b/html/organization/viewoffice.html → app/views/organization/viewoffice.html
diff --git a/html/private/home_branchmanager.html → app/views/private/home_branchmanager.html b/html/private/home_branchmanager.html → app/views/private/home_branchmanager.html
diff --git a/html/private/home_funder.html → app/views/private/home_funder.html b/html/private/home_funder.html → app/views/private/home_funder.html
diff --git a/html/private/home_superuser.html → app/views/private/home_superuser.html b/html/private/home_superuser.html → app/views/private/home_superuser.html
diff --git a/html/products/charges.html → app/views/products/charges.html b/html/products/charges.html → app/views/products/charges.html
diff --git a/html/products/home.html → app/views/products/home.html b/html/products/home.html → app/views/products/home.html
diff --git a/html/products/loanproducts.html → app/views/products/loanproducts.html b/html/products/loanproducts.html → app/views/products/loanproducts.html
diff --git a/html/products/savingproducts.html → app/views/products/savingproducts.html b/html/products/savingproducts.html → app/views/products/savingproducts.html
diff --git a/html/products/viewcharge.html → app/views/products/viewcharge.html b/html/products/viewcharge.html → app/views/products/viewcharge.html
diff --git a/html/products/viewloanproduct.html → app/views/products/viewloanproduct.html b/html/products/viewloanproduct.html → app/views/products/viewloanproduct.html
diff --git a/html/products/viewsavingproduct.html → app/views/products/viewsavingproduct.html b/html/products/viewsavingproduct.html → app/views/products/viewsavingproduct.html
diff --git a/html/search/glresults.html → app/views/search/glresults.html b/html/search/glresults.html → app/views/search/glresults.html
diff --git a/html/start.html → app/views/start.html b/html/start.html → app/views/start.html
diff --git a/html/tasks.html → app/views/tasks.html b/html/tasks.html → app/views/tasks.html