Commit Graph

219 Commits

Author SHA1 Message Date
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
Th3M3
fd983a2b68 improve multiselect
Signed-off-by: Th3M3 <the_me@outlook.de>
2020-04-05 14:56:28 +02:00
Adam Warner
49da88949c Merge pull request #1074 from XhmikosR/favicons
New favicons.
2020-03-11 19:41:46 +00:00
TheME
9fde58d7e0 make id names unique, ...* (#1170)
* - remove unneeded code
- fix php notice in log if url parameter 'type' is not set

Signed-off-by: Th3M3 the_me@outlook.de
2020-02-21 12:04:51 -08:00
DL6ER
2d975b8bac Simplify domain management by using the same page for both locations where domains can be edited. This removes a large amount of duplicated code, each prone to its own bugs.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-14 20:31:54 +01:00
8633brown
8d60ef30f5 only print hostname in title if gethostname function returns a valid hostname
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
2020-02-12 22:16:05 -07:00
8633brown
908c24c6c5 Add "-" separator between title and hostname
Co-Authored-By: Dan Schaper <dan@glacialmagma.com>
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
2020-02-12 21:57:42 -07:00
8633brown
5676ca6e3d resolve change request
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
2020-02-12 13:40:44 -07:00
8633brown
84f635296c add gethostname function to html title
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
2020-02-11 18:48:19 -07:00
Samu Voutilainen
b7e9bd492c Use piholeFTLConfig() to resolve pihole-FTL.conf contents
Signed-off-by: Samu Voutilainen <smar@smar.fi>
2020-01-19 16:07:33 +02:00
XhmikosR
0ed702197a Change logo link to point to the dashboard.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-08 18:36:11 +02:00
Adam Warner
b447d526d9 Merge pull request #1104 from pi-hole/fonts
Move fonts to the header.php
2020-01-04 16:09:43 +00:00
DL6ER
250457abc3 Merge branch 'devel' into tweak/customDNS_page 2019-12-28 16:47:42 +01:00
XhmikosR
cee3d536bc Move fonts to the header.php
`@import` is discouraged because it's blocking.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-26 18:00:21 +02:00
DL6ER
6ad0960a77 Add a nicer domain/IP adding block.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-20 16:12:10 +00:00
DL6ER
ee91b3bc87 Update nav icons.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-20 12:12:14 +00:00
DL6ER
7dc5c5cb94 Fix navigation submenu.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-20 08:40:45 +00:00
DL6ER
ae08443fa5 Merge branch 'devel' into new/group-management 2019-12-17 15:06:45 +00:00
DL6ER
d0d1174010 Use bootstrap notify for notifications.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-17 12:48:25 +00:00
XhmikosR
19da9999df New favicons.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-16 23:18:28 +02:00
XhmikosR
4b06680ba8 header: hide hostname on small devices
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-16 21:15:49 +02:00
DL6ER
a83c9c9828 Add tooltips for creation and modification times for domains and adlists.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 17:22:20 +00:00
DL6ER
b62c550ad7 Use toggle for Enabled/Disabled switch
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 16:45:24 +00:00
DL6ER
70589fa844 Add Adlists group management
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 15:41:14 +00:00
DL6ER
600c16c269 Add Client group management
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 14:40:29 +00:00
DL6ER
3e23aa67a1 Add group management page
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 11:55:22 +00:00
XhmikosR
81357eb5b0 Change the no JavaScript text as per the suggestions
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 21:36:58 +02:00