diff --git a/simpleui/__init__.py b/simpleui/__init__.py index c35d9a74..00b0244c 100644 --- a/simpleui/__init__.py +++ b/simpleui/__init__.py @@ -1,2 +1,2 @@ def get_version(): - return '2.1.2b3' + return '2.1.2' diff --git a/simpleui/static/admin/simpleui-x/automatic/segment.js b/simpleui/static/admin/simpleui-x/automatic/segment.js index 2ce3aff2..307f82ba 100644 --- a/simpleui/static/admin/simpleui-x/automatic/segment.js +++ b/simpleui/static/admin/simpleui-x/automatic/segment.js @@ -39,6 +39,9 @@ function Segment() { var segment = new Segment(); function getIcon(name, icon) { + if(!name){ + return; + } var value = 'far fa-file'; if (icon) { //有默认图标的 diff --git a/simpleui/static/admin/simpleui-x/css/base.css b/simpleui/static/admin/simpleui-x/css/base.css index b6210c34..f4e0e04a 100644 --- a/simpleui/static/admin/simpleui-x/css/base.css +++ b/simpleui/static/admin/simpleui-x/css/base.css @@ -138,9 +138,6 @@ body, .el-dialog { width: 90%; } - .el-dialog__body{ - padding: 0px; - } } @media (max-width: 1024px) { .change-list .filtered .results, diff --git a/simpleui/static/admin/simpleui-x/css/index.css b/simpleui/static/admin/simpleui-x/css/index.css index a468088a..f28c3edc 100644 --- a/simpleui/static/admin/simpleui-x/css/index.css +++ b/simpleui/static/admin/simpleui-x/css/index.css @@ -186,6 +186,9 @@ body { .float-wrap .el-breadcrumb__item span { margin-left: 0px; } +.float-wrap .el-breadcrumb__separator { + margin-left: 5px!important; +} .quick-card { width: auto; display: inline-block !important; diff --git a/simpleui/static/admin/simpleui-x/css/index.css.map b/simpleui/static/admin/simpleui-x/css/index.css.map index 5b2dfb0c..91c1de82 100644 --- a/simpleui/static/admin/simpleui-x/css/index.css.map +++ b/simpleui/static/admin/simpleui-x/css/index.css.map @@ -1 +1 @@ -{"version":3,"sources":["index.less"],"names":[],"mappings":"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","file":"index.css"} \ No newline at end of file +{"version":3,"sources":["index.less"],"names":[],"mappings":"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","file":"index.css"} \ No newline at end of file diff --git a/simpleui/static/admin/simpleui-x/css/index.less b/simpleui/static/admin/simpleui-x/css/index.less index 43fba323..a1a77a57 100644 --- a/simpleui/static/admin/simpleui-x/css/index.less +++ b/simpleui/static/admin/simpleui-x/css/index.less @@ -213,6 +213,9 @@ html, body { .el-breadcrumb__item,.el-breadcrumb__item span{ margin-left: 0px; } + .el-breadcrumb__separator{ + margin-left: 5px!important; + } } .quick-card { diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js index bd164cda..81813994 100644 --- a/simpleui/static/admin/simpleui-x/js/index.js +++ b/simpleui/static/admin/simpleui-x/js/index.js @@ -348,12 +348,20 @@ var width = document.documentElement.clientWidth || document.body.clientWidth; if (width > 800) { this.pwdDialog = { - url: window.urls.changePassword, + url: window.urls.changePassword+'?dialog=1', name: language.change_password, show: true }; } else { - this.openTab({url: window.urls.changePassword, icon: 'far fa-edit', name: language.change_password}) + this.openTab({ + url: window.urls.changePassword, + icon: 'far fa-edit', + name: language.change_password, + breadcrumbs:[{ + name: language.change_password, + icon: 'far fa-edit' + }] + }) app.breadcrumbs = [language.change_password]; } } diff --git a/simpleui/static/admin/simpleui-x/theme/aircraft.css b/simpleui/static/admin/simpleui-x/theme/aircraft.css index 4d64ddb3..6e83e469 100644 --- a/simpleui/static/admin/simpleui-x/theme/aircraft.css +++ b/simpleui/static/admin/simpleui-x/theme/aircraft.css @@ -1,19 +1,22 @@ .el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active { - color: #414959 !important; + color: #2096c8 !important; } .el-button--text { - color: #414959 !important; + color: #2096c8 !important; } .el-button--primary:focus, .el-button--primary:hover { color: white; - border-color: rgba(65, 73, 89, 0.9) !important; - background-color: rgba(65, 73, 89, 0.8) !important; + border-color: rgba(32, 150, 200, 0.9) !important; + background-color: rgba(32, 150, 200, 0.8) !important; } .el-dropdown-menu__item:focus, .el-dropdown-menu__item:not(.is-disabled):hover { - background-color: rgba(65, 73, 89, 0.2) !important; - color: #414959 !important; + background-color: rgba(32, 150, 200, 0.2) !important; + color: #2096c8 !important; +} +.el-select-dropdown__item.selected { + color: #2096c8 !important; } input[type=text]:focus, input[type=password]:focus, @@ -24,107 +27,107 @@ input[type=tel]:focus, textarea:focus, select:focus, .vTextField:focus { - border-color: #414959 !important; + border-color: #2096c8 !important; } .el-button--primary { - background-color: #414959 !important; - border-color: #414959 !important; + background-color: #2096c8 !important; + border-color: #2096c8 !important; } tbody a:link, tbody a:visited { - color: #414959 !important; + color: #2096c8 !important; } tbody tr:hover td, tbody tr:hover th { - background-color: rgba(65, 73, 89, 0.2) !important; + background-color: rgba(32, 150, 200, 0.2) !important; } a:link, a:visited { - color: #414959 !important; + color: #2096c8 !important; } .results { color: inherit !important; } .el-select-dropdown__item.hover, .el-select-dropdown__item:hover { - background-color: rgba(65, 73, 89, 0.2) !important; + background-color: rgba(32, 150, 200, 0.2) !important; } .el-date-table td.today span { - color: #414959 !important; + color: #2096c8 !important; } .el-date-table td.available:hover { - color: #414959 !important; + color: #2096c8 !important; } .el-picker-panel__icon-btn:hover { - color: rgba(65, 73, 89, 0.8) !important; + color: rgba(32, 150, 200, 0.8) !important; } .el-range-editor.is-active, .el-range-editor.is-active:hover { - border-color: #414959 !important; + border-color: #2096c8 !important; } .el-date-table td.end-date span, .el-date-table td.start-date span { - background-color: #414959 !important; + background-color: #2096c8 !important; } .el-date-table td.in-range div, .el-date-table td.in-range div:hover, .el-date-table.is-week-mode .el-date-table__row.current div, .el-date-table.is-week-mode .el-date-table__row:hover div { - background-color: rgba(65, 73, 89, 0.2) !important; + background-color: rgba(32, 150, 200, 0.2) !important; } .el-time-panel__btn.confirm { - color: #414959 !important; + color: #2096c8 !important; } .el-pagination.is-background .el-pager li:not(.disabled).active { color: white; - background-color: #414959 !important; + background-color: #2096c8 !important; } .el-pagination.is-background .el-pager li:not(.disabled):hover { - color: #414959 !important; + color: #2096c8 !important; } .el-tabs--border-card > .el-tabs__header .el-tabs__item:not(.is-disabled):hover { - color: #414959 !important; + color: #2096c8 !important; } .navbar { - background-color: #02c0ce; + background-color: #3c8dbc; } .navbar .el-button:focus, .navbar .el-button:hover { - color: #414959 !important; + color: #2096c8 !important; } .navbar .el-button, .navbar .el-breadcrumb__item:last-child .el-breadcrumb__inner, .navbar .el-breadcrumb__item:last-child .el-breadcrumb__inner a, .navbar .el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover, .navbar .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover { - color: #FFF; + color: #fff; } .navbar .el-breadcrumb__inner, .navbar .el-breadcrumb__separator { - color: #FFF; + color: #fff; } .logo-wrap { - color: #586b7d !important; + color: #8aa4af !important; } .menu { - background-color: #e0e0e0 !important; + background-color: #2b3539 !important; } .menu .el-menu-item { - color: #586b7d !important; + color: #8aa4af !important; } .menu .el-menu-item:hover { - color: #213a53; + color: #FFF; } .menu .el-menu .is-active { - color: #414959 !important; + color: #2096c8 !important; } .menu .el-menu-item-group, .menu .el-menu-item { - background-color: #e0e0e0 !important; + background-color: #2b3539 !important; } .menu .el-menu-item:hover { - background-color: #d2d2dd !important; - color: #213a53 !important; + background-color: #1f272b !important; + color: #FFF !important; } .menu .el-menu-item i { color: inherit; @@ -136,38 +139,26 @@ a:visited { color: inherit; } .menu .el-submenu__title i { - color: #444 !important; + color: #FFF !important; } .menu .el-submenu__title { - color: #444 !important; - background-color: #ededed !important; + color: #FFF !important; + background-color: #212c32 !important; } .menu .el-submenu__title:hover, .menu .is-opened .el-submenu__title { - color: #444 !important; - background-color: #ededed !important; + color: #FFF !important; + background-color: #1f272b !important; } -.navbar, .logo-wrap { + color: #fff !important; + background-color: #3c8dbc !important; +} +.menu .el-menu .is-active { color: #FFF !important; - background: #4d5b76 !important; - background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #4d5b76), color-stop(1, #6f80a1)) !important; - background: -moz-gradient(linear, left bottom, left top, color-stop(0, #4d5b76), color-stop(1, #6f80a1)) !important; -} -.menu .el-menu li .is-active { - color: #586b7d !important; - border-left: #898aa4 3px solid; -} -.menu .el-submenu__title, -.menu .el-submenu.is-active .el-submenu__title { - border-top: 1px solid #fcfcfc; - border-bottom: 1px solid #c8c8cb; - background: #efeff0; - background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #efeff0), color-stop(1, #fafafa)); - font-size: 1em; -} -.menu .el-submenu__title:hover { - background: #efeff0; - background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #efeff0), color-stop(1, #ffffff)); +} +.navbar .el-button:focus, +.navbar .el-button:hover { + color: rgba(255, 255, 255, 0.7) !important; } /*# sourceMappingURL=aircraft.css.map */ \ No newline at end of file diff --git a/simpleui/static/admin/simpleui-x/theme/aircraft.css.map b/simpleui/static/admin/simpleui-x/theme/aircraft.css.map index 956874b2..3e0aef0e 100644 --- a/simpleui/static/admin/simpleui-x/theme/aircraft.css.map +++ b/simpleui/static/admin/simpleui-x/theme/aircraft.css.map @@ -1 +1 @@ -{"version":3,"sources":["base.less","aircraft.less"],"names":[],"mappings":"AACA,qBAAsB,mBAAmB,eAAc;EACrD,cAAA;;AAGF;EACE,cAAA;;AAGF,mBAAmB;AAAQ,mBAAmB;EAC5C,YAAA;EACA,mCAAA;EACA,uCAAA;;AAGF,uBAAuB;AAAQ,uBAAuB,IAAI,cAAc;EACtE,uCAAA;EACA,cAAA;;AAGF,KAAK,WAAW;AAAQ,KAAK,eAAe;AAAQ,KAAK,YAAY;AAAQ,KAAK,UAAU;AAAQ,KAAK,aAAa;AAAQ,KAAK,UAAU;AAAQ,QAAQ;AAAQ,MAAM;AAAQ,WAAW;EAC5L,qBAAA;;AAGF;EACE,yBAAA;EACA,qBAAA;;AAGF,KAAM,EAAC;AAAO,KAAM,EAAC;EACnB,cAAA;;AAGF,KAAM,GAAE,MAAO;AAAI,KAAM,GAAE,MAAO;EAChC,uCAAA;;AAGF,CAAC;AAAO,CAAC;EACP,cAAA;;AAGF;EACE,yBAAA;;AAGF,yBAAyB;AAAQ,yBAAyB;EACxD,uCAAA;;AAGF,cAAe,GAAE,MAAO;EACtB,cAAA;;AAGF,cAAe,GAAE,UAAU;EACzB,cAAA;;AAGF,0BAA0B;EACxB,4BAAA;;AAGF,gBAAgB;AAAY,gBAAgB,UAAU;EACpD,qBAAA;;AAGF,cAAe,GAAE,SAAU;AAAM,cAAe,GAAE,WAAY;EAC5D,yBAAA;;AAGF,cAAe,GAAE,SAAU;AAAK,cAAe,GAAE,SAAU,IAAG;AAAQ,cAAc,aAAc,oBAAmB,QAAS;AAAK,cAAc,aAAc,oBAAmB,MAAO;EACvL,uCAAA;;AAGF,mBAAmB;EACjB,cAAA;;AAGF,cAAc,cAAe,UAAU,GAAE,IAAI,WAAW;EACtD,YAAA;EACA,yBAAA;;AAGF,cAAc,cAAe,UAAU,GAAE,IAAI,WAAW;EACtD,cAAA;;AAGF,qBAAsB,mBAAmB,eAAc,IAAI,cAAc;EACvE,cAAA;;AAGF;EACE,yBAAA;;AADF,OAGE,WAAU;AAHZ,OAGoB,WAAU;EAC1B,cAAA;;AAJJ,OAOE;AAPF,OAOc,qBAAoB,WAAY;AAP9C,OAOqE,qBAAoB,WAAY,sBAAsB;AAP3H,OAO8H,qBAAoB,WAAY,sBAAsB,EAAC;AAPrL,OAO6L,qBAAoB,WAAY,sBAAqB;EAC9O,WAAA;;AARJ,OAWE;AAXF,OAWyB;EACrB,WAAA;;AAIJ;EACE,cAAA;;AAGF;EACE,yBAAA;;AADF,KAGE;EACE,cAAA;;AAJJ,KAOE,cAAa;EACX,cAAA;;AARJ,KAWE,SAAS;EACP,cAAA;;AAZJ,KAeE;AAfF,KAeuB;EACnB,yBAAA;;AAhBJ,KAmBE,cAAa;EACX,yBAAA;EACA,cAAA;;AArBJ,KAwBE,cAAc;EACZ,cAAA;;AAzBJ,KA4BE,mBACE;AA7BJ,KA4BE,mBACQ;AA7BV,KA4BE,mBACa;AA7Bf,KA4BE,mBACmB;EACf,cAAA;;AA9BN,KAkCE,mBAAmB;EACjB,WAAA;;AAnCJ,KAsCE;EACE,WAAA;EACA,yBAAA;;AAxCJ,KA2CE,mBAAkB;AA3CpB,KA2C4B,WAAW;EACnC,WAAA;EACA,yBAAA;;ACrIJ;AAAS;EACP,WAAA;EACA,mBAAA;EACA,YAAY,gDAAgD,wBAAwB,uBAApF;EACA,YAAY,6CAA6C,wBAAwB,uBAAjF;;AAGF,KACE,SAAS,GAAG;EACV,cAAA;EACA,8BAAA;;AAHJ,KAME;AANF,KAMsB,YAAW,UAAW;EACxC,6BAAA;EACA,gCAAA;EACA,mBAAA;EACA,YAAY,gDAAgD,wBAAwB,uBAApF;EACA,cAAA;;AAXJ,KAcE,mBAAkB;EAChB,mBAAA;EACA,YAAY,gDAAgD,wBAAwB,uBAApF","file":"aircraft.css"} \ No newline at end of file +{"version":3,"sources":["aircraft.less"],"names":[],"mappings":"AAAA,qBAAsB,mBAAmB,eAAc;EACrD,cAAA;;AAEF;EACE,cAAA;;AAEF,mBAAmB;AACnB,mBAAmB;EACjB,YAAA;EACA,qCAAA;EACA,yCAAA;;AAEF,uBAAuB;AACvB,uBAAuB,IAAI,cAAc;EACvC,yCAAA;EACA,cAAA;;AAEF,yBAAyB;EACvB,cAAA;;AAEF,KAAK,WAAW;AAChB,KAAK,eAAe;AACpB,KAAK,YAAY;AACjB,KAAK,UAAU;AACf,KAAK,aAAa;AAClB,KAAK,UAAU;AACf,QAAQ;AACR,MAAM;AACN,WAAW;EACT,qBAAA;;AAEF;EACE,yBAAA;EACA,qBAAA;;AAEF,KAAM,EAAC;AACP,KAAM,EAAC;EACL,cAAA;;AAEF,KAAM,GAAE,MAAO;AACf,KAAM,GAAE,MAAO;EACb,yCAAA;;AAEF,CAAC;AACD,CAAC;EACC,cAAA;;AAEF;EACE,yBAAA;;AAEF,yBAAyB;AACzB,yBAAyB;EACvB,yCAAA;;AAEF,cAAe,GAAE,MAAO;EACtB,cAAA;;AAEF,cAAe,GAAE,UAAU;EACzB,cAAA;;AAEF,0BAA0B;EACxB,8BAAA;;AAEF,gBAAgB;AAChB,gBAAgB,UAAU;EACxB,qBAAA;;AAEF,cAAe,GAAE,SAAU;AAC3B,cAAe,GAAE,WAAY;EAC3B,yBAAA;;AAEF,cAAe,GAAE,SAAU;AAC3B,cAAe,GAAE,SAAU,IAAG;AAC9B,cAAc,aAAc,oBAAmB,QAAS;AACxD,cAAc,aAAc,oBAAmB,MAAO;EACpD,yCAAA;;AAEF,mBAAmB;EACjB,cAAA;;AAEF,cAAc,cAAe,UAAU,GAAE,IAAI,WAAW;EACtD,YAAA;EACA,yBAAA;;AAEF,cAAc,cAAe,UAAU,GAAE,IAAI,WAAW;EACtD,cAAA;;AAEF,qBAAsB,mBAAmB,eAAc,IAAI,cAAc;EACvE,cAAA;;AAEF;EACE,yBAAA;;AAEF,OAAQ,WAAU;AAClB,OAAQ,WAAU;EAChB,cAAA;;AAEF,OAAQ;AACR,OAAQ,qBAAoB,WAAY;AACxC,OAAQ,qBAAoB,WAAY,sBAAsB;AAC9D,OAAQ,qBAAoB,WAAY,sBAAsB,EAAC;AAC/D,OAAQ,qBAAoB,WAAY,sBAAqB;EAC3D,WAAA;;AAEF,OAAQ;AACR,OAAQ;EACN,WAAA;;AAEF;EACE,cAAA;;AAEF;EACE,yBAAA;;AAEF,KAAM;EACJ,cAAA;;AAEF,KAAM,cAAa;EACjB,WAAA;;AAEF,KAAM,SAAS;EACb,cAAA;;AAEF,KAAM;AACN,KAAM;EACJ,yBAAA;;AAEF,KAAM,cAAa;EACjB,yBAAA;EACA,WAAA;;AAEF,KAAM,cAAc;EAClB,cAAA;;AAEF,KAAM,mBAAmB;AACzB,KAAM,mBAAmB;AACzB,KAAM,mBAAmB;AACzB,KAAM,mBAAmB;EACvB,cAAA;;AAEF,KAAM,mBAAmB;EACvB,WAAA;;AAEF,KAAM;EACJ,WAAA;EACA,yBAAA;;AAEF,KAAM,mBAAkB;AACxB,KAAM,WAAW;EACf,WAAA;EACA,yBAAA;;AAEF;EACE,WAAA;EACA,yBAAA;;AAEF,KAAM,SAAS;EACb,WAAA;;AAEF,OAAQ,WAAU;AAClB,OAAQ,WAAU;EAChB,+BAAA","file":"aircraft.css"} \ No newline at end of file diff --git a/simpleui/templates/admin/base.html b/simpleui/templates/admin/base.html index 2ae0186e..15f1ce43 100644 --- a/simpleui/templates/admin/base.html +++ b/simpleui/templates/admin/base.html @@ -20,13 +20,13 @@ {# #} - - + + {% if ""|get_language_code != 'zh-hans' %} - + diff --git a/simpleui/templates/admin/index.html b/simpleui/templates/admin/index.html index 76a68fd7..ee8bd424 100755 --- a/simpleui/templates/admin/index.html +++ b/simpleui/templates/admin/index.html @@ -110,7 +110,7 @@ - + {% endverbatim myclode %} @@ -289,8 +289,8 @@ - - + diff --git a/simpleui/templates/registration/password_change_form.html b/simpleui/templates/registration/password_change_form.html index 08a26855..8c0f974d 100644 --- a/simpleui/templates/registration/password_change_form.html +++ b/simpleui/templates/registration/password_change_form.html @@ -14,6 +14,16 @@ {% block title %}{{ title }}{% endblock %} {% block content %} + {% if request.GET.dialog == '1' %} + + {% endif %}