From fdf849bab97d39457a1bdda6ab69b7c362d88908 Mon Sep 17 00:00:00 2001 From: REJack Date: Sat, 25 Jul 2020 23:50:56 +0200 Subject: [PATCH 01/10] add new login, register & recover-password v2 page --- build/scss/pages/_login_and_register.scss | 4 + pages/examples/login-v2.html | 91 +++++++++++++++++++ pages/examples/recover-password-v2.html | 66 ++++++++++++++ pages/examples/register-v2.html | 101 ++++++++++++++++++++++ 4 files changed, 262 insertions(+) create mode 100644 pages/examples/login-v2.html create mode 100644 pages/examples/recover-password-v2.html create mode 100644 pages/examples/register-v2.html diff --git a/build/scss/pages/_login_and_register.scss b/build/scss/pages/_login_and_register.scss index 17524cc3c..d0e262a93 100644 --- a/build/scss/pages/_login_and_register.scss +++ b/build/scss/pages/_login_and_register.scss @@ -32,6 +32,10 @@ margin-top: .5rem; width: 90%; } + + .card { + margin-bottom: 0; + } } .login-card-body, diff --git a/pages/examples/login-v2.html b/pages/examples/login-v2.html new file mode 100644 index 000000000..ec0ec50a6 --- /dev/null +++ b/pages/examples/login-v2.html @@ -0,0 +1,91 @@ + + + + + + AdminLTE 3 | Log in (v2) + + + + + + + + + + + +
+ +
+
+ AdminLTE +
+
+ + +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ + +
+
+ +
+ +
+ +
+
+ + + + +

+ I forgot my password +

+

+ Register a new membership +

+
+ +
+ +
+ + + + + + + + + + diff --git a/pages/examples/recover-password-v2.html b/pages/examples/recover-password-v2.html new file mode 100644 index 000000000..7bfa334f2 --- /dev/null +++ b/pages/examples/recover-password-v2.html @@ -0,0 +1,66 @@ + + + + + + AdminLTE 3 | Recover Password (v2) + + + + + + + + + + + +
+
+
+ AdminLTE +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+ +
+
+ +

+ Login +

+
+ +
+
+ + + + + + + + + + diff --git a/pages/examples/register-v2.html b/pages/examples/register-v2.html new file mode 100644 index 000000000..5339912cd --- /dev/null +++ b/pages/examples/register-v2.html @@ -0,0 +1,101 @@ + + + + + + AdminLTE 3 | Registration Page (v2) + + + + + + + + + + + +
+
+
+ AdminLTE +
+
+ + +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ + +
+
+ +
+ +
+ +
+
+ + + + I already have a membership +
+ +
+
+ + + + + + + + + + From 2ad27011edc078990163cd04ddaf002484ed20ab Mon Sep 17 00:00:00 2001 From: REJack Date: Fri, 11 Sep 2020 09:50:09 +0200 Subject: [PATCH 02/10] add datatables button example --- pages/tables/data.html | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pages/tables/data.html b/pages/tables/data.html index 1614f7dfa..bd52a9239 100644 --- a/pages/tables/data.html +++ b/pages/tables/data.html @@ -12,6 +12,7 @@ + @@ -1651,11 +1652,19 @@ - + + + + + + + + + @@ -1664,9 +1673,9 @@ + + + + + + + + + + + diff --git a/pages/search/enhanced.html b/pages/search/enhanced.html new file mode 100644 index 000000000..3711147e2 --- /dev/null +++ b/pages/search/enhanced.html @@ -0,0 +1,838 @@ + + + + + + AdminLTE 3 | Enhanced Search Form + + + + + + + + + + + +
+ + + + + + + + +
+ +
+
+

Enhanced Search

+
+ +
+ + +
+
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ +
+
+ Version 3.1.0-pre +
+ Copyright © 2014-2020 AdminLTE.io. All rights reserved. +
+ + + + +
+ + + + + + + + + + + + + + + diff --git a/pages/search/simple-results.html b/pages/search/simple-results.html new file mode 100644 index 000000000..718fb34a4 --- /dev/null +++ b/pages/search/simple-results.html @@ -0,0 +1,842 @@ + + + + + + AdminLTE 3 | Simple Search Results + + + + + + + + + +
+ + + + + + + + +
+ +
+
+

Search

+
+
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
2020-04-20 04:04pm
+

Lorem ipsum dolor sit amet

+

consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

+
+
+
+
+
+
+
+ Photo +
+
+
+
2020-04-20 10:14pm
+

Lorem ipsum dolor sit amet

+

consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

+
+
+
+
+
+
+
+ +
+
+
+
2020-04-20 11:54pm
+

Lorem ipsum dolor sit amet

+

consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

+
+
+
+
+
+
+
+
+
+
+ + +
+
+ Version 3.1.0-pre +
+ Copyright © 2014-2020 AdminLTE.io. All rights reserved. +
+ + + + +
+ + + + + + + + + + + + diff --git a/pages/search/simple.html b/pages/search/simple.html new file mode 100644 index 000000000..39c033bb6 --- /dev/null +++ b/pages/search/simple.html @@ -0,0 +1,797 @@ + + + + + + AdminLTE 3 | Simple Search Form + + + + + + + + + +
+ + + + + + + + +
+ +
+
+

Search

+
+
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ + +
+
+ Version 3.1.0-pre +
+ Copyright © 2014-2020 AdminLTE.io. All rights reserved. +
+ + + + +
+ + + + + + + + + + + + diff --git a/pages/tables/data.html b/pages/tables/data.html index bd52a9239..4a669364e 100644 --- a/pages/tables/data.html +++ b/pages/tables/data.html @@ -622,6 +622,29 @@ +
  • + + +

    + Search + +

    +     + +
  • MISCELLANEOUS
  • diff --git a/pages/tables/jsgrid.html b/pages/tables/jsgrid.html index 9a6be9543..20a629483 100644 --- a/pages/tables/jsgrid.html +++ b/pages/tables/jsgrid.html @@ -621,6 +621,29 @@
    • +
  • + + +

    + Search + +

    +     + +
  • MISCELLANEOUS
  • diff --git a/pages/tables/simple.html b/pages/tables/simple.html index 9e4d9e2e3..5dac545b8 100644 --- a/pages/tables/simple.html +++ b/pages/tables/simple.html @@ -618,6 +618,29 @@
    • +
  • + + +

    + Search + +

    +     + +
  • MISCELLANEOUS
  • diff --git a/pages/widgets.html b/pages/widgets.html index fffd0a937..289b9f529 100644 --- a/pages/widgets.html +++ b/pages/widgets.html @@ -620,6 +620,29 @@
    • +
  • + + +

    + Search + +

    +     + +
  • MISCELLANEOUS
  • From e6965ff86a9f0f04dc161044e79a16906e39355b Mon Sep 17 00:00:00 2001 From: REJack Date: Fri, 11 Sep 2020 11:28:16 +0200 Subject: [PATCH 04/10] add forgot password v2 demo --- pages/examples/forgot-password-v2.html | 57 ++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pages/examples/forgot-password-v2.html diff --git a/pages/examples/forgot-password-v2.html b/pages/examples/forgot-password-v2.html new file mode 100644 index 000000000..661be1eaa --- /dev/null +++ b/pages/examples/forgot-password-v2.html @@ -0,0 +1,57 @@ + + + + + + AdminLTE 3 | Forgot Password (v2) + + + + + + + + + + + + + + + + + + + + + + From 444b95ff4881e53c544d754eeebd6ef8c3459d73 Mon Sep 17 00:00:00 2001 From: REJack Date: Fri, 11 Sep 2020 11:33:57 +0200 Subject: [PATCH 05/10] rework login & register menu items in sidebar --- index.html | 78 ++++++++++++++++++++------ index2.html | 78 ++++++++++++++++++++------ index3.html | 78 ++++++++++++++++++++------ pages/UI/buttons.html | 78 ++++++++++++++++++++------ pages/UI/general.html | 78 ++++++++++++++++++++------ pages/UI/icons.html | 78 ++++++++++++++++++++------ pages/UI/modals.html | 78 ++++++++++++++++++++------ pages/UI/navbar.html | 78 ++++++++++++++++++++------ pages/UI/ribbons.html | 78 ++++++++++++++++++++------ pages/UI/sliders.html | 78 ++++++++++++++++++++------ pages/UI/timeline.html | 78 ++++++++++++++++++++------ pages/calendar.html | 78 ++++++++++++++++++++------ pages/charts/chartjs.html | 78 ++++++++++++++++++++------ pages/charts/flot.html | 78 ++++++++++++++++++++------ pages/charts/inline.html | 78 ++++++++++++++++++++------ pages/examples/404.html | 78 ++++++++++++++++++++------ pages/examples/500.html | 78 ++++++++++++++++++++------ pages/examples/blank.html | 78 ++++++++++++++++++++------ pages/examples/contacts.html | 78 ++++++++++++++++++++------ pages/examples/e-commerce.html | 78 ++++++++++++++++++++------ pages/examples/invoice.html | 78 ++++++++++++++++++++------ pages/examples/language-menu.html | 78 ++++++++++++++++++++------ pages/examples/legacy-user-menu.html | 78 ++++++++++++++++++++------ pages/examples/pace.html | 78 ++++++++++++++++++++------ pages/examples/profile.html | 78 ++++++++++++++++++++------ pages/examples/project-add.html | 78 ++++++++++++++++++++------ pages/examples/project-detail.html | 78 ++++++++++++++++++++------ pages/examples/project-edit.html | 78 ++++++++++++++++++++------ pages/examples/projects.html | 78 ++++++++++++++++++++------ pages/forms/advanced.html | 78 ++++++++++++++++++++------ pages/forms/editors.html | 78 ++++++++++++++++++++------ pages/forms/general.html | 78 ++++++++++++++++++++------ pages/forms/validation.html | 78 ++++++++++++++++++++------ pages/gallery.html | 78 ++++++++++++++++++++------ pages/layout/boxed.html | 78 ++++++++++++++++++++------ pages/layout/collapsed-sidebar.html | 78 ++++++++++++++++++++------ pages/layout/fixed-footer.html | 78 ++++++++++++++++++++------ pages/layout/fixed-sidebar-custom.html | 78 ++++++++++++++++++++------ pages/layout/fixed-sidebar.html | 78 ++++++++++++++++++++------ pages/layout/fixed-topnav.html | 78 ++++++++++++++++++++------ pages/layout/top-nav-sidebar.html | 78 ++++++++++++++++++++------ pages/mailbox/compose.html | 78 ++++++++++++++++++++------ pages/mailbox/mailbox.html | 78 ++++++++++++++++++++------ pages/mailbox/read-mail.html | 78 ++++++++++++++++++++------ pages/search/enhanced-results.html | 78 ++++++++++++++++++++------ pages/search/enhanced.html | 78 ++++++++++++++++++++------ pages/search/simple-results.html | 78 ++++++++++++++++++++------ pages/search/simple.html | 78 ++++++++++++++++++++------ pages/tables/data.html | 78 ++++++++++++++++++++------ pages/tables/jsgrid.html | 78 ++++++++++++++++++++------ pages/tables/simple.html | 78 ++++++++++++++++++++------ pages/widgets.html | 78 ++++++++++++++++++++------ 52 files changed, 3224 insertions(+), 832 deletions(-) diff --git a/index.html b/index.html index 57f18b595..05a1454fb 100644 --- a/index.html +++ b/index.html @@ -560,28 +560,74 @@
  • diff --git a/pages/widgets.html b/pages/widgets.html index 00c37fe37..ef967611b 100644 --- a/pages/widgets.html +++ b/pages/widgets.html @@ -535,6 +535,18 @@

    Contacts

    • +
  • + + +

    FAQ

    +     +
    • +
  • + + +

    Contact us

    +     +
  • From 6feb219d8b7a6ae67247f14f3260ce249e63e62e Mon Sep 17 00:00:00 2001 From: REJack Date: Mon, 14 Sep 2020 11:43:49 +0200 Subject: [PATCH 08/10] small contact-us changes --- pages/examples/contact-us.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/examples/contact-us.html b/pages/examples/contact-us.html index 6c776dc51..5aaa3855c 100644 --- a/pages/examples/contact-us.html +++ b/pages/examples/contact-us.html @@ -823,15 +823,15 @@
    -
    +
    -

    AdminLTE

    +

    AdminLTE

    123 Testing Ave, Testtown, 9876 NA
    Phone: +1 234 56789012

    -
    +
    From 12c4eb90e401b5e4706ac032718ada8c8d4d99c2 Mon Sep 17 00:00:00 2001 From: REJack Date: Mon, 14 Sep 2020 11:49:17 +0200 Subject: [PATCH 09/10] fix active menu in contact-us & faq --- pages/examples/contact-us.html | 8 ++++---- pages/examples/faq.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pages/examples/contact-us.html b/pages/examples/contact-us.html index 5aaa3855c..ebca18c5e 100644 --- a/pages/examples/contact-us.html +++ b/pages/examples/contact-us.html @@ -477,8 +477,8 @@
    • -
  • - +
  • +

    Pages @@ -548,8 +548,8 @@

    • -
  • - +
  • +

    Extras diff --git a/pages/examples/faq.html b/pages/examples/faq.html index 868231559..4d3b795f0 100644 --- a/pages/examples/faq.html +++ b/pages/examples/faq.html @@ -477,8 +477,8 @@

    • -
  • - +
  • +

    Pages @@ -548,8 +548,8 @@

    • -
  • - +
  • +

    Extras From dc00689d30941b8a7a6178b113f5299ee14d28f6 Mon Sep 17 00:00:00 2001 From: REJack Date: Mon, 14 Sep 2020 11:54:09 +0200 Subject: [PATCH 10/10] fix html validator errors/warnings --- pages/search/enhanced-results.html | 2 +- pages/search/enhanced.html | 9 +-------- pages/search/simple-results.html | 2 +- pages/search/simple.html | 7 +------ 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/pages/search/enhanced-results.html b/pages/search/enhanced-results.html index 55053e9f5..daba79b21 100644 --- a/pages/search/enhanced-results.html +++ b/pages/search/enhanced-results.html @@ -889,7 +889,7 @@

    - +
    diff --git a/pages/search/enhanced.html b/pages/search/enhanced.html index cd01aedb7..83848cd3d 100644 --- a/pages/search/enhanced.html +++ b/pages/search/enhanced.html @@ -801,17 +801,10 @@
    - -
    -
    -

    Enhanced Search

    -
    - -
    -
    +

    Enhanced Search

    diff --git a/pages/search/simple-results.html b/pages/search/simple-results.html index 8e891a5f9..13b7f5bc2 100644 --- a/pages/search/simple-results.html +++ b/pages/search/simple-results.html @@ -854,7 +854,7 @@
    - +
    diff --git a/pages/search/simple.html b/pages/search/simple.html index b15ef3a76..ae5b0b74c 100644 --- a/pages/search/simple.html +++ b/pages/search/simple.html @@ -799,16 +799,11 @@
    - -
    -
    -

    Search

    -
    -
    +

    Search