Skip to content

Commit 48aee7b

Browse files
committed
tailwind 3 poc
1 parent 61717f2 commit 48aee7b

File tree

904 files changed

+21002
-16979
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

904 files changed

+21002
-16979
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,4 @@ plugins/plugins-available/omd
7878
plugins/plugins-available/pansnaps
7979
plugins/plugins-available/status-dashboard
8080
plugins/plugins-available/woshsh
81+
!root/thruk/vendor/unicons/Makefile

Changes

+15
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@ This file documents the revision history for the Monitoring Webinterface Thruk.
22

33
2.48.2 Fri Jul 1 14:36:30 CEST 2022
44
- make links clickable in comments and downtimes
5+
next 3.x:
6+
- deprecated configuration options:
7+
- use_pager
8+
- use_frames
9+
- use_new_command_box
10+
- info_popup_event_type
11+
- info_popup_options
12+
- deprecated plugins:
13+
- mobile
14+
- wml
15+
- statusmap
16+
- add collapsable side navigation
17+
- add delete icon to comments/downtimes popup
18+
19+
next:
520
- fix sidebar search not showing all service names
621
- Panorama:
722
- support non-numeric dashboard file names

MANIFEST

+500-1,382
Large diffs are not rendered by default.

MANIFEST.SKIP

+7
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ configure-stamp
6262
my_templates/
6363
panorama_default_view
6464
themes/themes-available/.*/images/logos/.*server.png
65+
themes/themes-available/.*/node_modules/
66+
themes/themes-available/.*/Makefile
67+
themes/themes-available/.*/package-lock.json
68+
themes/themes-available/.*/package.json
69+
themes/themes-available/.*/postcss.config.js
70+
themes/themes-available/.*/src/.*.css
71+
themes/themes-available/.*/tailwind.config.js
6572
nytprof/
6673
nytprof.out
6774
.~ko-6.1.3-perllint~

Makefile.PL

+5
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@ print `./script/thruk_patch_makefile.pl`;
157157
print `./script/thruk_create_combined_static_content.pl`;
158158
print "created cached js/css files\n";
159159

160+
print `test -f themes/themes-available/Light/stylesheets/Light.css || make themes`;
161+
if($? != 0) {
162+
die("failed to build themes");
163+
}
164+
160165
print `./script/thruk_set_standard_header`;
161166
if($? != 0) {
162167
die("failed to update standard headers");

THANKS

+8-12
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,10 @@ jit-yc.js
9595
- https://philogb.github.io/jit/
9696
- MIT
9797

98-
jqm.js
99-
- http://jquerymobile.com
100-
- MIT
101-
10298
jquery.js
10399
- http://jquery.com/
104100
- MIT
105101

106-
jquery.mobile.router.js
107-
- https://github.com/azicchetti/jquerymobile-router
108-
- MIT
109-
110102
jquery-ui.js
111103
- http://jqueryui.com/
112104
- MIT
@@ -130,10 +122,6 @@ openlayer.js
130122
- https://github.com/openlayers/openlayers/
131123
- BSD
132124

133-
overlib.js:
134-
- https://github.com/overlib/overlib
135-
- Artistic
136-
137125
sprintf.js
138126
- https://github.com/kvz/locutus/blob/master/src/php/strings/sprintf.js
139127
- MIT
@@ -145,3 +133,11 @@ strftime.js
145133
bestiejs.js
146134
- https://github.com/bestiejs/platform.js
147135
- MIT
136+
137+
unicons
138+
- https://github.com/Iconscout/unicons
139+
- Apache-2.0
140+
141+
font-awesome
142+
- https://fontawesome.com/
143+
- CC BY 4.0

debian/thruk-base.install

-8
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,11 @@
1818
/usr/share/thruk/plugins/plugins-available/minemap
1919
/etc/thruk/plugins/plugins-available/minemap
2020
/etc/thruk/plugins/plugins-enabled/minemap
21-
/usr/share/thruk/plugins/plugins-available/mobile
22-
/etc/thruk/plugins/plugins-available/mobile
23-
/etc/thruk/plugins/plugins-enabled/mobile
2421
/usr/share/thruk/plugins/plugins-available/panorama
2522
/etc/thruk/plugins/plugins-available/panorama
2623
/etc/thruk/plugins/plugins-enabled/panorama
2724
/usr/share/thruk/plugins/plugins-available/shinken_features
2825
/etc/thruk/plugins/plugins-available/shinken_features
29-
/usr/share/thruk/plugins/plugins-available/statusmap
30-
/etc/thruk/plugins/plugins-available/statusmap
31-
/etc/thruk/plugins/plugins-enabled/statusmap
32-
/usr/share/thruk/plugins/plugins-available/wml
33-
/etc/thruk/plugins/plugins-available/wml
3426
/usr/share/thruk/plugins/plugins-available/core_scheduling
3527
/etc/thruk/plugins/plugins-available/core_scheduling
3628
/etc/thruk/ssi

docs/development/README

-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
== Thruk Development Guide
22

3-
=== Logo
4-
5-
Logo has been rendered with
6-
http://cooltext.com/
7-
Text Color: 414141
8-
BG: FFFFFF
9-
Font: Futuristic Fonts -> Oscilloscope 4
10-
Size: 90
11-
12-
133
=== Javascript Section Tags
144

155
just use figlet for that:

docs/documentation/action-menu.asciidoc

+9-8
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function js_basic_menu(data) {
114114
"icon":"../themes/{{theme}}/images/dropdown.png",
115115
"title": "javascript menu",
116116
"menu":[{
117-
"icon":"../themes/{{theme}}/images/link.png",
117+
"icon":"uil-link",
118118
"label":"test menu item",
119119
"action":"http://..."
120120
}]
@@ -135,12 +135,12 @@ function js_adv_menu(cfg) {
135135
"title": "javascript advanced menu",
136136
"menu":[
137137
{
138-
"icon":"../themes/{{theme}}/images/link.png",
138+
"icon":"uil-link",
139139
"label":"test menu item",
140140
"action":"http://..."
141141
},
142142
{
143-
"icon":"../themes/{{theme}}/images/folder.png",
143+
"icon":"fa-folder",
144144
"label":"list all hosts",
145145
"menu": js_adv_menu_submenu
146146
}
@@ -219,7 +219,7 @@ server actions.
219219
.....
220220
{% raw %}
221221
{
222-
"icon":"../themes/{{theme}}/images/arrow_refresh.png",
222+
"icon":"uil-redo",
223223
"label":"service restart",
224224
"action":"server://restart_service",
225225
"onclick": "return(confirm('Really restart service?'));"
@@ -241,10 +241,12 @@ function js_menu(d) {
241241
"title": "form menu",
242242
"menu":[
243243
{
244-
"icon":"../themes/{{theme}}/images/page_white_key.png",
245-
"html":"<b>test</b>"
244+
"icon":"uil-document-info",
245+
"html":"<div class='flexrow gap-1 flex-nowrap'>"
246+
+"<b>test</b>"
246247
+"<input type='text'>"
247248
+"<button onclick='test_form_handler(this)'>ok</button>"
249+
+"</div>"
248250
}
249251
]
250252
});
@@ -253,8 +255,7 @@ function js_menu(d) {
253255
function test_form_handler(btn) {
254256
// prevent clicking twice
255257
// and give user some response by adding a loading gif to the button
256-
jQuery(btn).attr('disabled', true)
257-
.html("<img src='"+url_prefix+"themes/"+theme+"/images/loading-icon.gif'>");
258+
jQuery(btn).attr('disabled', true).html("<div class='spinner'>");
258259
259260
// send user input as server action
260261
var input = jQuery(btn).prev().val();

docs/documentation/cgi-parameters.asciidoc

+1-14
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,6 @@ Values:
5151
Example: /thruk/cgi-bin/status.cgi?hidetop=1
5252

5353

54-
=== hidesearch
55-
56-
Pages: status pages
57-
58-
Description: Show/Hide the status filters
59-
60-
Values:
61-
62-
- 1: Hides the search filter
63-
- 2: Shows the search filter
64-
65-
Example: /thruk/cgi-bin/status.cgi?host=localhost&hidesearch=1
66-
67-
6854
=== minimal
6955

7056
Pages: status page
@@ -75,6 +61,7 @@ monitor screens where only the current problems should be displayed.
7561
Values:
7662

7763
- 1: Activates minimal mode
64+
- 2: Activates minimal mode but keeps backend sites panel
7865

7966

8067
Example: /thruk/cgi-bin/status.cgi?host=all&servicestatustypes=28&minimal=1

0 commit comments

Comments
 (0)