Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-03-02 07:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,654 Commits 24 Branches 113 Tags
e213dce308abd54bee08cf4cd715d83850cb88ca
Commit Graph

195 Commits

Author SHA1 Message Date
DL6ER
e213dce308 Merge pull request #1394 from pi-hole/ren-fa-folder 
Remove version number from the Font Awesome folder.
 2020-05-29 22:10:25 +02:00
XhmikosR
2b93d569dd Move the gethostname() call to a variable. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 09:49:51 +03:00
XhmikosR
f1eb744ff5 Guard gethostname() calls 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 09:24:07 +03:00
XhmikosR
f5d68ffd88 Remove version number from the Font Awesome folder. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-27 09:22:37 +03:00
XhmikosR
30776108ee Use fa5 class on the sidebar toggle 
This was added in AdminLTE v2.4.13.

Also, remove unneeded related custom CSS while at it.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 21:12:15 +03:00
XhmikosR
b20b6797c1 HTML hidden attribute does not need a value. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-23 19:03:02 +03:00
XhmikosR
e70e108cce Use .hidden/.show for showing/hiding the reset buttons 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-23 13:04:13 +03:00
Adam Warner
71547422ec Merge pull request #1347 from pi-hole/improve-user-info-markup 
Improve user info markup
 2020-05-23 08:49:36 +01:00
Adam Warner
8c3ad9a1b9 Merge pull request #1335 from pi-hole/datatables 
Load the built DataTables bundle
 2020-05-23 08:08:17 +01:00
XhmikosR
442201d613 Improve user info markup 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-22 11:21:43 +03:00
XhmikosR
9d9cd8b7e6 Load the built DataTables bundle file. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-19 21:58:09 +03:00
XhmikosR
7ad275e1fd Move non-Bootstrap files outside of the bootstrap folder 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-19 16:31:25 +03:00
Adam Warner
dd599ad08d Merge pull request #1323 from pi-hole/XhmikosR-patch-7 
header.php: minor cleanup
 2020-05-18 19:12:50 +01:00
Adam Warner
89baa0b532 Merge pull request #1320 from pi-hole/XhmikosR-patch-2 
header.php: group stylesheets and scripts
 2020-05-18 19:10:18 +01:00
Adam Warner
84dd58e03e Merge pull request #1319 from pi-hole/XhmikosR-patch-4 
Use `text-uppercase` in sidebar
 2020-05-18 19:08:26 +01:00
Adam Warner
dd6b47e835 Merge pull request #1309 from pi-hole/XhmikosR-patch-3 
Improve navbar's hostname markup
 2020-05-18 19:07:38 +01:00
XhmikosR
b7fd000cef header.php: minor cleanup 
* remove unneeded inline styles
* use `strong` instead of `b`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-18 10:27:45 +03:00
XhmikosR
0029b3fccb header.php: group stylesheets and scripts 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-18 09:23:39 +03:00
XhmikosR
c66599c1b8 Use text-uppercase in sidebar 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 22:14:57 +03:00
XhmikosR
30b8c5f383 Improve navbar's hostname markup 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 17:20:48 +03:00
XhmikosR
6bfc95ff85 Remove unneeded stuff and fix linting 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 16:11:05 +03:00
DL6ER
f591280d58 Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-17 16:07:22 +03:00
DL6ER
b0f54f5451 Add new Pi-hole diagnostics page. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-17 16:07:21 +03:00
Adam Warner
ee0f9fdf68 Merge pull request #1310 from pi-hole/XhmikosR-patch-2 
Improve user-menu markup
 2020-05-17 13:23:32 +01:00
Adam Warner
61715ffcc2 Merge pull request #1304 from pi-hole/XhmikosR-patch-8 
header: fix `aria-expanded` for user-menu dropdown
 2020-05-17 13:16:36 +01:00
Adam Warner
457ffb2a5d Merge pull request #1302 from pi-hole/xmr-update-fa 
Update Font Awesome to v5.13.0
 2020-05-17 13:12:49 +01:00
Adam Warner
f4722cf2a9 Merge pull request #1263 from pi-hole/xmr-animate-min 
Use the minified animate.css file.
 2020-05-17 13:05:38 +01:00
Adam Warner
0bf2f4e4cc Merge pull request #1300 from pi-hole/XhmikosR-patch-7 
header: Move license header at the top
 2020-05-17 11:16:08 +01:00
Adam Warner
34c9514e07 Merge pull request #1311 from pi-hole/XhmikosR-patch-11 
header: add X-UA-Compatible meta tag
 2020-05-17 11:11:11 +01:00
XhmikosR
acbe0edbd4 header: add X-UA-Compatible meta tag 
For consistency with Bootstrap 3.x.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 11:52:52 +03:00
XhmikosR
725334c93e Improve user-menu markup 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 11:28:21 +03:00
XhmikosR
d062cb0423 header: fix aria-expanded for user-menu dropdown 
It's not expanded by default, so it needs `aria-expanded="false"`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:53:44 +03:00
XhmikosR
f6bd1a28a2 Use fa-angle-left to see if sidebar transition works 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:44:55 +03:00
XhmikosR
8283f63c41 Simplify sidebar markup per the latest AdminLTE 2.x demo 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:44:05 +03:00
XhmikosR
db878379ea Update Font Awesome to v5.13.0 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:23:34 +03:00
XhmikosR
b416075cdc header: Move license header at the top 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:16:44 +03:00
XhmikosR
76d50c1897 Use the minified animate.css file. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-13 07:34:16 +03:00
DL6ER
eefbef678c Suppress white 'flashing' on page reloading in dark mode. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
05d5f02a36 Add theme chooser to Setting -> Web interface. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
064a0aae9c Use the iCheck library for input box styling. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
a08a85994e Initial (incomplete) support for themes. Currently, the default is the new Pi-hole dark theme. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:44:52 +02:00
XhmikosR
bfd944e41c Switch to the plain chart.js build and moment.js to v2.24 
This avoids including moment.js twice since chart.js bundle included moment.js

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-12 23:05:59 +03:00
Adam Warner
3d6a54ff97 Add hold-transition to body tag 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 16:33:07 +01:00
Adam Warner
3e94ff0f43 Update adminLTE to 2.4. 
- Change a few references per upgrade guide
 - define colors[] at the top of index.js as AdminLTE.options does not appear to exist. (there may be a better way of doing this)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 12:58:45 +01:00
XhmikosR
8db0957a28 Minor tweaks 
* use the background-color property instead of the background shorthand
* add multiple classes with one `addClass` call
* rename `underline` to `text-underline`
* use the CSS class `pointer` instead of adding CSS via JS
* change `border-color: transparent` to `border: 0` in the navbar right dropdown image
* add image dimensions in the dropdown donate image
* remove the obsolete and unneeded `center` element from network.php
* remove commented out PHP code from header.php
* fix wrong `form-control` class used in buttons

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 21:49:48 +03:00
DL6ER
73ee91a024 Merge branch 'master' into master-to-development-v5.0 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-10 22:00:07 +02:00
Adam Warner
d8706620de Replace paypal link with link to pi-hole.net donate page 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-09 12:57:15 +01:00
DL6ER
9cf73959fd Rename Custom DNS page. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 18:23:13 +00:00
Samu Voutilainen
39ec67829b Execute pihole through wrapper 
All different exec() calls basically just calls sudo pihole,
with various different syntaxes. Using a wrapper function
allows sanitization of arguments for better safety.

Signed-off-by: Samu Voutilainen <smar@smar.fi>
 2020-04-17 07:55:16 +03:00
DL6ER
a64810e00e Merge branch 'release/v5.0' into devel 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-08 12:25:18 +02:00