From 672a019e1a9c544783f930af29680beecba25834 Mon Sep 17 00:00:00 2001 From: chiguangxu Date: Sun, 18 Mar 2018 14:57:48 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=B2=E8=A7=A3=E5=86=B3=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E8=8F=9C=E5=8D=95=E5=BD=93=E5=89=8D=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=97=A0=E9=80=89=E4=B8=AD=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E5=B7=B2=E8=A7=A3=E5=86=B3=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=97=A0=E6=95=88=EF=BC=9B=203=E3=80=81=E5=B7=B2=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=B7=A6=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=AF=BC=E8=88=AA=E6=9C=AA=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E5=BD=93=E5=89=8D=E8=8F=9C=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=9B=204=E3=80=81=E5=B7=B2=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E7=9A=84=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=8C=BA=E5=9F=9F=EF=BC=8C=E5=BF=85=E9=A1=BB=E7=82=B9?= =?UTF-8?q?=E5=BC=80=E2=80=9C=E7=AD=9B=E9=80=89=E2=80=9D=EF=BC=8C=E6=89=8D?= =?UTF-8?q?=E8=83=BD=E6=89=BE=E5=88=B0=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 2 +- .../resources/messages/message_ru.properties | 2 +- .../messages/message_zh_CN.properties | 2 +- src/main/webapp/WEB-INF/include/header.jsp | 4 + src/main/webapp/WEB-INF/include/left_menu.jsp | 22 +- src/main/webapp/WEB-INF/views/home.jsp | 105 +++++++- .../plugins/bootstrap-typeahead/README.md | 254 ++++++++++++++++++ .../bootstrap3-typeahead.min.js | 1 + .../static/global/plugins/typeahead/LICENSE | 19 -- .../static/global/plugins/typeahead/README.md | 188 ------------- .../plugins/typeahead/handlebars.min.js | 29 -- .../plugins/typeahead/typeahead.bundle.min.js | 8 - .../global/plugins/typeahead/typeahead.css | 68 ----- .../webapp/static/global/plugins/unicodes.js | 187 +++++++++++++ .../webapp/static/global/scripts/jeesite.js | 4 +- .../static/layouts/layout/css/layout.css | 7 +- .../layouts/layout/css/themes/default.css | 30 ++- .../static/layouts/layout/scripts/layout.js | 4 +- src/main/webapp/static/pages/scripts/home.js | 25 ++ 19 files changed, 607 insertions(+), 354 deletions(-) create mode 100644 src/main/webapp/static/global/plugins/bootstrap-typeahead/README.md create mode 100644 src/main/webapp/static/global/plugins/bootstrap-typeahead/bootstrap3-typeahead.min.js delete mode 100644 src/main/webapp/static/global/plugins/typeahead/LICENSE delete mode 100644 src/main/webapp/static/global/plugins/typeahead/README.md delete mode 100644 src/main/webapp/static/global/plugins/typeahead/handlebars.min.js delete mode 100644 src/main/webapp/static/global/plugins/typeahead/typeahead.bundle.min.js delete mode 100644 src/main/webapp/static/global/plugins/typeahead/typeahead.css create mode 100644 src/main/webapp/static/global/plugins/unicodes.js diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 151a00e5e..17e69595a 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -11,7 +11,7 @@ officeManage=office management userManage=user management notify=my notify help=help -home=home +home=Home panel=my panel userInfo=personal information updatePwd=update password diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index bfc2ce39a..0b41dd96d 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -11,7 +11,7 @@ officeManage=office management userManage=user management notify=my notify help=help -home=home +home=Home panel=my panel userInfo=personal information updatePwd=update password diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index aff485af6..66f7a90c0 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -11,7 +11,7 @@ officeManage=\u673a\u6784\u7ba1\u7406 userManage=\u7528\u6237\u7ba1\u7406 notify=\u6211\u7684\u540c\u5fd7 help=\u5173\u4e8e\u5e2e\u52a9 -home=\u5b98\u65b9\u9996\u9875 +home=\u9996\u9875 panel=\u6211\u7684\u9762\u677f userInfo=\u4e2a\u4eba\u4fe1\u606f updatePwd=\u4fee\u6539\u5bc6\u7801 diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp index 44ba82c87..2f5be988c 100644 --- a/src/main/webapp/WEB-INF/include/header.jsp +++ b/src/main/webapp/WEB-INF/include/header.jsp @@ -47,6 +47,10 @@ + + + + diff --git a/src/main/webapp/WEB-INF/include/left_menu.jsp b/src/main/webapp/WEB-INF/include/left_menu.jsp index 071075475..682412d8e 100644 --- a/src/main/webapp/WEB-INF/include/left_menu.jsp +++ b/src/main/webapp/WEB-INF/include/left_menu.jsp @@ -7,16 +7,17 @@