From ae2d70a028826ff924e2bcb2050acd0769fd1aaf Mon Sep 17 00:00:00 2001 From: yubaolee Date: Mon, 27 Apr 2015 00:10:02 +0800 Subject: [PATCH] change easyui to bootstrap --- DB.sql | Bin 34306 -> 51066 bytes OpenAuth.App/LoginApp.cs | 3 +- OpenAuth.Domain/Model/Button.cs | 2 +- OpenAuth.Domain/Model/Department.cs | 4 +- OpenAuth.Domain/Model/Menu.cs | 4 +- OpenAuth.Domain/Model/Role.cs | 4 +- OpenAuth.Domain/Model/User.cs | 2 + OpenAuth.Infrastructure/Mapping/UserMap.cs | 5 + OpenAuth.Web/App_Start/RouteConfig.cs | 2 +- OpenAuth.Web/Content/1.9.1/jquery.min.js | 5 + OpenAuth.Web/Content/avatars/avatar.png | Bin 0 -> 3991 bytes OpenAuth.Web/Content/avatars/avatar1.png | Bin 0 -> 4474 bytes OpenAuth.Web/Content/avatars/avatar2.png | Bin 0 -> 752 bytes OpenAuth.Web/Content/avatars/avatar3.png | Bin 0 -> 3912 bytes OpenAuth.Web/Content/avatars/avatar4.png | Bin 0 -> 3802 bytes OpenAuth.Web/Content/avatars/user.jpg | Bin 0 -> 1191 bytes OpenAuth.Web/Content/css/ace-ie.min.css | 1 + .../Content/css/ace-responsive.min.css | 1 + OpenAuth.Web/Content/css/ace-skins.min.css | 1 + OpenAuth.Web/Content/css/ace.min.css | 1 + .../Content/css/bootstrap-responsive.min.css | 9 + .../Content/css/bootstrap-timepicker.css | 121 + OpenAuth.Web/Content/css/bootstrap.min.css | 9 + OpenAuth.Web/Content/css/chosen-sprite.png | Bin 0 -> 646 bytes OpenAuth.Web/Content/css/chosen-sprite@2x.png | Bin 0 -> 872 bytes OpenAuth.Web/Content/css/chosen.css | 405 + OpenAuth.Web/Content/css/colorbox.css | 65 + OpenAuth.Web/Content/css/colorpicker.css | 127 + OpenAuth.Web/Content/css/datepicker.css | 441 + OpenAuth.Web/Content/css/daterangepicker.css | 170 + .../Content/css/font-awesome-ie7.min.css | 21 + OpenAuth.Web/Content/css/font-awesome.min.css | 30 + OpenAuth.Web/Content/css/fullcalendar.css | 533 + .../css/jquery-ui-1.10.2.custom.min.css | 5 + OpenAuth.Web/Content/css/jquery.gritter.css | 101 + OpenAuth.Web/Content/css/prettify.css | 28 + ...HCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff | Bin 0 -> 22656 bytes ...uBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff | Bin 0 -> 21956 bytes .../Content/font/fontawesome-webfont.woff | Bin 0 -> 34420 bytes OpenAuth.Web/Content/images/border.png | Bin 0 -> 112 bytes OpenAuth.Web/Content/images/controls.png | Bin 0 -> 2893 bytes OpenAuth.Web/Content/images/gritter-light.png | 0 OpenAuth.Web/Content/images/gritter.png | 0 OpenAuth.Web/Content/images/ie-spacer.gif | 0 OpenAuth.Web/Content/images/loading.gif | Bin 0 -> 9427 bytes .../Content/images/loading_background.png | Bin 0 -> 157 bytes OpenAuth.Web/Content/images/overlay.png | Bin 0 -> 182 bytes OpenAuth.Web/Content/img/alpha.png | Bin 0 -> 3271 bytes .../img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../Content/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes OpenAuth.Web/Content/img/hue.png | Bin 0 -> 2972 bytes OpenAuth.Web/Content/img/saturation.png | Bin 0 -> 8817 bytes OpenAuth.Web/Content/index.html | 1226 ++ OpenAuth.Web/Content/js/ace-elements.min.js | 1 + OpenAuth.Web/Content/js/ace.min.js | 1 + OpenAuth.Web/Content/js/bootbox.min.js | 17 + .../Content/js/bootstrap-colorpicker.min.js | 19 + .../Content/js/bootstrap-datepicker.min.js | 21 + .../Content/js/bootstrap-timepicker.min.js | 5 + OpenAuth.Web/Content/js/bootstrap.min.js | 6 + OpenAuth.Web/Content/js/chosen.jquery.min.js | 10 + OpenAuth.Web/Content/js/date.js | 145 + .../Content/js/daterangepicker.min.js | 9 + OpenAuth.Web/Content/js/excanvas.min.js | 1 + OpenAuth.Web/Content/js/fuelux.spinner.js | 201 + OpenAuth.Web/Content/js/fuelux.wizard.js | 168 + OpenAuth.Web/Content/js/fullcalendar.min.js | 7 + OpenAuth.Web/Content/js/jquery-1.9.1.min.js | 5 + .../Content/js/jquery-ui-1.10.2.custom.min.js | 6 + .../Content/js/jquery.autosize-min.js | 7 + .../Content/js/jquery.colorbox-min.js | 6 + .../Content/js/jquery.dataTables.bootstrap.js | 100 + .../Content/js/jquery.dataTables.min.js | 155 + .../Content/js/jquery.easy-pie-chart.min.js | 18 + OpenAuth.Web/Content/js/jquery.flot.min.js | 28 + .../Content/js/jquery.flot.pie.min.js | 56 + .../Content/js/jquery.flot.resize.min.js | 21 + OpenAuth.Web/Content/js/jquery.gritter.min.js | 1 + .../js/jquery.inputlimiter.1.3.1.min.js | 11 + OpenAuth.Web/Content/js/jquery.knob.min.js | 1 + .../Content/js/jquery.maskedinput.min.js | 7 + .../Content/js/jquery.slimscroll.min.js | 15 + .../Content/js/jquery.sparkline.min.js | 5 + .../Content/js/jquery.ui.touch-punch.min.js | 11 + .../Content/js/jquery.validate.min.js | 2 + OpenAuth.Web/Content/js/prettify.js | 30 + OpenAuth.Web/Content/js/spin.min.js | 1 + OpenAuth.Web/Controllers/HomeController.cs | 20 + OpenAuth.Web/OpenAuth.Web.csproj | 183 +- .../Scripts/easyui/jquery.easyui.min.js | 12183 ---------------- OpenAuth.Web/Scripts/easyui/themes/icon.css | 64 - .../Scripts/easyui/themes/icons/back.png | Bin 912 -> 0 bytes .../Scripts/easyui/themes/icons/blank.gif | Bin 43 -> 0 bytes .../Scripts/easyui/themes/icons/cancel.png | Bin 1133 -> 0 bytes .../Scripts/easyui/themes/icons/cut.png | Bin 1024 -> 0 bytes .../Scripts/easyui/themes/icons/edit_add.png | Bin 1088 -> 0 bytes .../easyui/themes/icons/edit_remove.png | Bin 625 -> 0 bytes .../Scripts/easyui/themes/icons/filesave.png | Bin 898 -> 0 bytes .../Scripts/easyui/themes/icons/help.png | Bin 1187 -> 0 bytes .../Scripts/easyui/themes/icons/mini_add.png | Bin 244 -> 0 bytes .../Scripts/easyui/themes/icons/mini_edit.png | Bin 161 -> 0 bytes .../easyui/themes/icons/mini_refresh.png | Bin 160 -> 0 bytes .../Scripts/easyui/themes/icons/no.png | Bin 922 -> 0 bytes .../Scripts/easyui/themes/icons/ok.png | Bin 883 -> 0 bytes .../Scripts/easyui/themes/icons/pencil.png | Bin 713 -> 0 bytes .../Scripts/easyui/themes/icons/print.png | Bin 1057 -> 0 bytes .../Scripts/easyui/themes/icons/redo.png | Bin 708 -> 0 bytes .../Scripts/easyui/themes/icons/reload.png | Bin 1045 -> 0 bytes .../Scripts/easyui/themes/icons/search.png | Bin 813 -> 0 bytes .../Scripts/easyui/themes/icons/sum.png | Bin 289 -> 0 bytes .../Scripts/easyui/themes/icons/tip.png | Bin 743 -> 0 bytes .../Scripts/easyui/themes/icons/undo.png | Bin 707 -> 0 bytes .../easyui/themes/metro-blue/accordion.css | 41 - .../easyui/themes/metro-blue/calendar.css | 185 - .../easyui/themes/metro-blue/combo.css | 58 - .../easyui/themes/metro-blue/combobox.css | 14 - .../easyui/themes/metro-blue/datagrid.css | 247 - .../easyui/themes/metro-blue/datebox.css | 40 - .../easyui/themes/metro-blue/dialog.css | 30 - .../easyui/themes/metro-blue/easyui.css | 2148 --- .../easyui/themes/metro-blue/images/Thumbs.db | Bin 35328 -> 0 bytes .../metro-blue/images/accordion_arrows.png | Bin 125 -> 0 bytes .../easyui/themes/metro-blue/images/blank.gif | Bin 43 -> 0 bytes .../metro-blue/images/calendar_arrows.png | Bin 173 -> 0 bytes .../themes/metro-blue/images/combo_arrow.png | Bin 103 -> 0 bytes .../metro-blue/images/datagrid_icons.png | Bin 243 -> 0 bytes .../metro-blue/images/datebox_arrow.png | Bin 626 -> 0 bytes .../metro-blue/images/layout_arrows.png | Bin 181 -> 0 bytes .../metro-blue/images/linkbutton_bg.png | Bin 1274 -> 0 bytes .../themes/metro-blue/images/loading.gif | Bin 1737 -> 0 bytes .../themes/metro-blue/images/menu_arrows.png | Bin 160 -> 0 bytes .../metro-blue/images/messager_icons.png | Bin 6116 -> 0 bytes .../metro-blue/images/pagination_icons.png | Bin 492 -> 0 bytes .../themes/metro-blue/images/panel_tools.png | Bin 191 -> 0 bytes .../metro-blue/images/searchbox_button.png | Bin 813 -> 0 bytes .../metro-blue/images/slider_handle.png | Bin 863 -> 0 bytes .../metro-blue/images/spinner_arrows.png | Bin 141 -> 0 bytes .../themes/metro-blue/images/tabs_icons.png | Bin 144 -> 0 bytes .../themes/metro-blue/images/tree_icons.png | Bin 3115 -> 0 bytes .../metro-blue/images/validatebox_arrows.png | Bin 166 -> 0 bytes .../metro-blue/images/validatebox_warning.png | Bin 921 -> 0 bytes .../easyui/themes/metro-blue/layout.css | 91 - .../easyui/themes/metro-blue/linkbutton.css | 121 - .../Scripts/easyui/themes/metro-blue/menu.css | 109 - .../easyui/themes/metro-blue/menubutton.css | 30 - .../easyui/themes/metro-blue/messager.css | 37 - .../easyui/themes/metro-blue/pagination.css | 66 - .../easyui/themes/metro-blue/panel.css | 118 - .../easyui/themes/metro-blue/progressbar.css | 30 - .../easyui/themes/metro-blue/propertygrid.css | 28 - .../easyui/themes/metro-blue/searchbox.css | 79 - .../easyui/themes/metro-blue/slider.css | 98 - .../easyui/themes/metro-blue/spinner.css | 59 - .../easyui/themes/metro-blue/splitbutton.css | 42 - .../Scripts/easyui/themes/metro-blue/tabs.css | 325 - .../Scripts/easyui/themes/metro-blue/tree.css | 157 - .../easyui/themes/metro-blue/validatebox.css | 53 - .../easyui/themes/metro-blue/window.css | 81 - OpenAuth.Web/Scripts/head.jpg | Bin 65454 -> 0 bytes OpenAuth.Web/Scripts/jquery-1.8.2.min.js | 2 - .../Scripts/jquery.unobtrusive-ajax.min.js | 5 - OpenAuth.Web/Scripts/json2.js | 482 - OpenAuth.Web/Views/Home/Index.cshtml | 489 +- OpenAuth.Web/Views/Home/Login.cshtml | 106 + OpenAuth.Web/Views/Home/_Layout.cshtml | 159 - OpenAuth.Web/Views/Shared/Error.cshtml | 16 - OpenAuth.Web/Views/Shared/Left.cshtml | 232 + OpenAuth.Web/Views/Shared/_Header.cshtml | 197 + OpenAuth.Web/Views/Shared/_Layout.cshtml | 57 +- OpenAuth.Web/Views/Web.config | 1 + OpenAuth.Web/Web.config | 2 + 171 files changed, 5584 insertions(+), 17324 deletions(-) create mode 100644 OpenAuth.Web/Content/1.9.1/jquery.min.js create mode 100644 OpenAuth.Web/Content/avatars/avatar.png create mode 100644 OpenAuth.Web/Content/avatars/avatar1.png create mode 100644 OpenAuth.Web/Content/avatars/avatar2.png create mode 100644 OpenAuth.Web/Content/avatars/avatar3.png create mode 100644 OpenAuth.Web/Content/avatars/avatar4.png create mode 100644 OpenAuth.Web/Content/avatars/user.jpg create mode 100644 OpenAuth.Web/Content/css/ace-ie.min.css create mode 100644 OpenAuth.Web/Content/css/ace-responsive.min.css create mode 100644 OpenAuth.Web/Content/css/ace-skins.min.css create mode 100644 OpenAuth.Web/Content/css/ace.min.css create mode 100644 OpenAuth.Web/Content/css/bootstrap-responsive.min.css create mode 100644 OpenAuth.Web/Content/css/bootstrap-timepicker.css create mode 100644 OpenAuth.Web/Content/css/bootstrap.min.css create mode 100644 OpenAuth.Web/Content/css/chosen-sprite.png create mode 100644 OpenAuth.Web/Content/css/chosen-sprite@2x.png create mode 100644 OpenAuth.Web/Content/css/chosen.css create mode 100644 OpenAuth.Web/Content/css/colorbox.css create mode 100644 OpenAuth.Web/Content/css/colorpicker.css create mode 100644 OpenAuth.Web/Content/css/datepicker.css create mode 100644 OpenAuth.Web/Content/css/daterangepicker.css create mode 100644 OpenAuth.Web/Content/css/font-awesome-ie7.min.css create mode 100644 OpenAuth.Web/Content/css/font-awesome.min.css create mode 100644 OpenAuth.Web/Content/css/fullcalendar.css create mode 100644 OpenAuth.Web/Content/css/jquery-ui-1.10.2.custom.min.css create mode 100644 OpenAuth.Web/Content/css/jquery.gritter.css create mode 100644 OpenAuth.Web/Content/css/prettify.css create mode 100644 OpenAuth.Web/Content/font/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff create mode 100644 OpenAuth.Web/Content/font/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff create mode 100644 OpenAuth.Web/Content/font/fontawesome-webfont.woff create mode 100644 OpenAuth.Web/Content/images/border.png create mode 100644 OpenAuth.Web/Content/images/controls.png create mode 100644 OpenAuth.Web/Content/images/gritter-light.png create mode 100644 OpenAuth.Web/Content/images/gritter.png create mode 100644 OpenAuth.Web/Content/images/ie-spacer.gif create mode 100644 OpenAuth.Web/Content/images/loading.gif create mode 100644 OpenAuth.Web/Content/images/loading_background.png create mode 100644 OpenAuth.Web/Content/images/overlay.png create mode 100644 OpenAuth.Web/Content/img/alpha.png create mode 100644 OpenAuth.Web/Content/img/glyphicons-halflings-white.png create mode 100644 OpenAuth.Web/Content/img/glyphicons-halflings.png create mode 100644 OpenAuth.Web/Content/img/hue.png create mode 100644 OpenAuth.Web/Content/img/saturation.png create mode 100644 OpenAuth.Web/Content/index.html create mode 100644 OpenAuth.Web/Content/js/ace-elements.min.js create mode 100644 OpenAuth.Web/Content/js/ace.min.js create mode 100644 OpenAuth.Web/Content/js/bootbox.min.js create mode 100644 OpenAuth.Web/Content/js/bootstrap-colorpicker.min.js create mode 100644 OpenAuth.Web/Content/js/bootstrap-datepicker.min.js create mode 100644 OpenAuth.Web/Content/js/bootstrap-timepicker.min.js create mode 100644 OpenAuth.Web/Content/js/bootstrap.min.js create mode 100644 OpenAuth.Web/Content/js/chosen.jquery.min.js create mode 100644 OpenAuth.Web/Content/js/date.js create mode 100644 OpenAuth.Web/Content/js/daterangepicker.min.js create mode 100644 OpenAuth.Web/Content/js/excanvas.min.js create mode 100644 OpenAuth.Web/Content/js/fuelux.spinner.js create mode 100644 OpenAuth.Web/Content/js/fuelux.wizard.js create mode 100644 OpenAuth.Web/Content/js/fullcalendar.min.js create mode 100644 OpenAuth.Web/Content/js/jquery-1.9.1.min.js create mode 100644 OpenAuth.Web/Content/js/jquery-ui-1.10.2.custom.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.autosize-min.js create mode 100644 OpenAuth.Web/Content/js/jquery.colorbox-min.js create mode 100644 OpenAuth.Web/Content/js/jquery.dataTables.bootstrap.js create mode 100644 OpenAuth.Web/Content/js/jquery.dataTables.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.easy-pie-chart.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.flot.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.flot.pie.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.flot.resize.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.gritter.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.inputlimiter.1.3.1.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.knob.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.maskedinput.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.slimscroll.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.sparkline.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.ui.touch-punch.min.js create mode 100644 OpenAuth.Web/Content/js/jquery.validate.min.js create mode 100644 OpenAuth.Web/Content/js/prettify.js create mode 100644 OpenAuth.Web/Content/js/spin.min.js delete mode 100644 OpenAuth.Web/Scripts/easyui/jquery.easyui.min.js delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icon.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/back.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/blank.gif delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/cancel.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/cut.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/edit_add.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/edit_remove.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/filesave.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/help.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/mini_add.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/mini_edit.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/mini_refresh.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/no.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/ok.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/pencil.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/print.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/redo.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/reload.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/search.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/sum.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/tip.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/icons/undo.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/accordion.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/calendar.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/combo.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/combobox.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/datagrid.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/datebox.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/dialog.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/easyui.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/Thumbs.db delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/accordion_arrows.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/blank.gif delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/calendar_arrows.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/combo_arrow.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/datagrid_icons.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/datebox_arrow.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/layout_arrows.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/linkbutton_bg.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/loading.gif delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/menu_arrows.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/messager_icons.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/pagination_icons.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/panel_tools.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/searchbox_button.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/slider_handle.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/spinner_arrows.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/tabs_icons.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/tree_icons.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/validatebox_arrows.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/images/validatebox_warning.png delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/layout.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/linkbutton.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/menu.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/menubutton.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/messager.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/pagination.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/panel.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/progressbar.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/propertygrid.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/searchbox.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/slider.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/spinner.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/splitbutton.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/tabs.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/tree.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/validatebox.css delete mode 100644 OpenAuth.Web/Scripts/easyui/themes/metro-blue/window.css delete mode 100644 OpenAuth.Web/Scripts/head.jpg delete mode 100644 OpenAuth.Web/Scripts/jquery-1.8.2.min.js delete mode 100644 OpenAuth.Web/Scripts/jquery.unobtrusive-ajax.min.js delete mode 100644 OpenAuth.Web/Scripts/json2.js create mode 100644 OpenAuth.Web/Views/Home/Login.cshtml delete mode 100644 OpenAuth.Web/Views/Home/_Layout.cshtml delete mode 100644 OpenAuth.Web/Views/Shared/Error.cshtml create mode 100644 OpenAuth.Web/Views/Shared/Left.cshtml create mode 100644 OpenAuth.Web/Views/Shared/_Header.cshtml diff --git a/DB.sql b/DB.sql index 2040a15da3bacbd62f066ef17d5dce04dda0c570..77a96cfdd16efe05ba1f0cabf75a94b753ae6cd0 100644 GIT binary patch literal 51066 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 delta 1882 zcma)5Ur1AN7~MZ;j3L8hjA3?B(Y3a%;*(o|YwnpJ;z@m*P|J4N$8%iyE2&`1%B{omR}Ne_I9S=1_{ zVJovOy$@REj{NoTn}?YyElrlVG{`N_OdTbME9KYItAT4+q0Nex|2f)9h%eE=P-P>h z=>Km%XT8Ps)&^YYpxRUBAjbO?0LVezgWuYwG+J^9is5`rov8Us#gDB>YK+`YxP z6v)J4XAznPwdlT6jitduGT82+b!-eAkY@{ggux!KMPw{s?Y0j2emN1a)ml9B&!e@k zUWOyKnh|5SP+PxM#s>KBEr6fQfj(A~UYpuu-<5EWJ8?Q(fSD(9j0-^%@gq)&A4*&; z2Sh0Nkp{TKIy{^XCBNBl2-*j7rjVH7o5xNOolBcYc zb1yg32a#fueReKUNM;zsN1EgW!AArLPc8Il`mK!di5n$=eQqHkDkw2CUVx2og|vV2 fjd|sm@r`-FPDSX^gi(eWV#qE>m7!K*r>x3fPLbL! diff --git a/OpenAuth.App/LoginApp.cs b/OpenAuth.App/LoginApp.cs index 56535765..b4166d37 100644 --- a/OpenAuth.App/LoginApp.cs +++ b/OpenAuth.App/LoginApp.cs @@ -34,11 +34,12 @@ namespace OpenAuth.App } else { + resp.UserId = user.UserId; + resp.Success = true; foreach (var role in user.Roles) { resp.UserRoleNames.Add(role.FullName); } - resp.Success = true; } return resp; } diff --git a/OpenAuth.Domain/Model/Button.cs b/OpenAuth.Domain/Model/Button.cs index 04f9db2e..c0cb1c56 100644 --- a/OpenAuth.Domain/Model/Button.cs +++ b/OpenAuth.Domain/Model/Button.cs @@ -17,7 +17,7 @@ namespace OpenAuth.Domain.Model public string Control_ID { get; set; } public string Category { get; set; } public string Description { get; set; } - public Nullable Enabled { get; set; } + public bool Enabled { get; set; } public Nullable SortCode { get; set; } public virtual ICollection RoleMenuButtons { get; set; } } diff --git a/OpenAuth.Domain/Model/Department.cs b/OpenAuth.Domain/Model/Department.cs index d411bbeb..c1917f2a 100644 --- a/OpenAuth.Domain/Model/Department.cs +++ b/OpenAuth.Domain/Model/Department.cs @@ -15,9 +15,9 @@ namespace OpenAuth.Domain.Model public string ParentId { get; set; } public string FullName { get; set; } public string Description { get; set; } - public Nullable Enabled { get; set; } + public bool Enabled { get; set; } public Nullable SortCode { get; set; } - public Nullable DeleteMark { get; set; } + public bool DeleteMark { get; set; } public virtual ICollection Roles { get; set; } public virtual ICollection Users { get; set; } } diff --git a/OpenAuth.Domain/Model/Menu.cs b/OpenAuth.Domain/Model/Menu.cs index f4ab6f05..7d33e1f4 100644 --- a/OpenAuth.Domain/Model/Menu.cs +++ b/OpenAuth.Domain/Model/Menu.cs @@ -20,8 +20,8 @@ namespace OpenAuth.Domain.Model public string NavigateUrl { get; set; } public string FormName { get; set; } public string Target { get; set; } - public Nullable IsUnfold { get; set; } - public Nullable Enabled { get; set; } + public bool IsUnfold { get; set; } + public bool Enabled { get; set; } public Nullable SortCode { get; set; } public virtual ICollection + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OpenAuth.Web/Views/Shared/_Header.cshtml b/OpenAuth.Web/Views/Shared/_Header.cshtml new file mode 100644 index 00000000..9403fbea --- /dev/null +++ b/OpenAuth.Web/Views/Shared/_Header.cshtml @@ -0,0 +1,197 @@ +
+
+
+ Ace Admin + +
+
+
\ No newline at end of file diff --git a/OpenAuth.Web/Views/Shared/_Layout.cshtml b/OpenAuth.Web/Views/Shared/_Layout.cshtml index fc01c32f..28d22bb7 100644 --- a/OpenAuth.Web/Views/Shared/_Layout.cshtml +++ b/OpenAuth.Web/Views/Shared/_Layout.cshtml @@ -1,20 +1,53 @@  - @ViewBag.Title - - + + Dashboard - Ace Admin + + + + + + + + + + + + + - - - - - - -
-

@ViewBag.Title

-
+ + + + + + + + + + + + + + + + + + + + + + @RenderBody() diff --git a/OpenAuth.Web/Views/Web.config b/OpenAuth.Web/Views/Web.config index ec8e5dd0..d89963ed 100644 --- a/OpenAuth.Web/Views/Web.config +++ b/OpenAuth.Web/Views/Web.config @@ -8,6 +8,7 @@ + diff --git a/OpenAuth.Web/Web.config b/OpenAuth.Web/Web.config index b35a50e5..3aa1f37d 100644 --- a/OpenAuth.Web/Web.config +++ b/OpenAuth.Web/Web.config @@ -12,6 +12,8 @@ + +