Skip to content

Commit e5f734a

Browse files
Xav-74Xav-74
committed
Bugfix css compatibility with Jeedom core
1 parent 0d6204c commit e5f734a

3 files changed

Lines changed: 69 additions & 69 deletions

File tree

‎core/template/dashboard/instantInk_dashboard_flatdesign.html‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -38,67 +38,67 @@
3838

3939
<!-- Cartouches -->
4040
<div class="col-xs-6" id="tile" style="height:100px; width: 183px;">
41-
<div class="col-xs-12 progress-container-ink">
42-
<div class="col-xs-3 progress-ink">
43-
<div class="progress-bar-ink" id="progress-bar-ink_1">
44-
<div class="level black" style="height:70%"></div>
41+
<div class="col-xs-12 instantInk_progress-container-ink">
42+
<div class="col-xs-3 instantInk_progress-ink">
43+
<div class="instantInk_progress-bar-ink" id="instantInk_progress-bar-ink_1">
44+
<div class="instantInk_level instantInk_black" style="height:70%"></div>
4545
</div>
46-
<div class="line-ink"><span class="Cmd#cartridge_K_id#"></span></div>
46+
<div class="instantInk_line-ink"><span class="Cmd#cartridge_K_id#"></span></div>
4747
</div>
48-
<div class="col-xs-3 progress-ink">
49-
<div class="progress-bar-ink" id="progress-bar-ink_2">
50-
<div class="level cyan"></div>
48+
<div class="col-xs-3 instantInk_progress-ink">
49+
<div class="instantInk_progress-bar-ink" id="instantInk_progress-bar-ink_2">
50+
<div class="instantInk_level instantInk_cyan"></div>
5151
</div>
52-
<div class="line-ink"><span class="Cmd#cartridge_C_id#"></span></div>
52+
<div class="instantInk_line-ink"><span class="Cmd#cartridge_C_id#"></span></div>
5353
</div>
54-
<div class="col-xs-3 progress-ink">
55-
<div class="progress-bar-ink" id="progress-bar-ink_3">
56-
<div class="level magenta"></div>
54+
<div class="col-xs-3 instantInk_progress-ink">
55+
<div class="instantInk_progress-bar-ink" id="instantInk_progress-bar-ink_3">
56+
<div class="instantInk_level instantInk_magenta"></div>
5757
</div>
58-
<div class="line-ink"><span class="Cmd#cartridge_M_id#"></span></div>
58+
<div class="instantInk_line-ink"><span class="Cmd#cartridge_M_id#"></span></div>
5959
</div>
60-
<div class="col-xs-3 progress-ink">
61-
<div class="progress-bar-ink" id="progress-bar-ink_4">
62-
<div class="level yellow"></div>
60+
<div class="col-xs-3 instantInk_progress-ink">
61+
<div class="instantInk_progress-bar-ink" id="instantInk_progress-bar-ink_4">
62+
<div class="instantInk_level instantInk_yellow"></div>
6363
</div>
64-
<div class="line-ink"><span class="Cmd#cartridge_Y_id#"></span></div>
64+
<div class="instantInk_line-ink"><span class="Cmd#cartridge_Y_id#"></span></div>
6565
</div>
6666
</div>
6767
</div>
6868

6969
<!-- Pages -->
7070
<div class="col-xs-12" id="tile" style="height:150px; width:372px;">
71-
<div class="col-xs-12 progress-container">
72-
<div class="col-xs-6 line" style="justify-content: left">
71+
<div class="col-xs-12 instantInk_progress-container">
72+
<div class="col-xs-6 instantInk_line" style="justify-content: left">
7373
<span>{{Pages de l'abonnement}}</span>
7474
</div>
75-
<div class="col-xs-6 line" style="justify-content: right">
75+
<div class="col-xs-6 instantInk_line" style="justify-content: right">
7676
<span class="Cmd#billingCycle_page_id#"></span>&nbsp;/&nbsp;<span class="Cmd#currentPlan_page_id#"></span>
7777
</div>
78-
<div class="progress" id="progress_1">
79-
<div class="progress-bar"></div>
78+
<div class="instantInk_progress" id="instantInk_progress_1">
79+
<div class="instantInk_progress-bar"></div>
8080
</div>
8181
</div>
82-
<div class="col-xs-12 progress-container">
83-
<div class="col-xs-6 line" style="justify-content: left">
82+
<div class="col-xs-12 instantInk_progress-container">
83+
<div class="col-xs-6 instantInk_line" style="justify-content: left">
8484
<span>{{Pages de report}}</span><span class="Cmd#currentPlan_rollover_id#"></span>
8585
</div>
86-
<div class="col-xs-6 line" style="justify-content: right">
86+
<div class="col-xs-6 instantInk_line" style="justify-content: right">
8787
<span class="Cmd#billingCycle_rollover_id#"></span>&nbsp;/&nbsp;<span class="Cmd#billingCycle_rollovermax_id#"></span>
8888
</div>
89-
<div class="progress" id="progress_2">
90-
<div class="progress-bar"></div>
89+
<div class="instantInk_progress" id="instantInk_progress_2">
90+
<div class="instantInk_progress-bar"></div>
9191
</div>
9292
</div>
93-
<div class="col-xs-12 progress-container">
94-
<div class="col-xs-6 line" style="justify-content: left">
93+
<div class="col-xs-12 instantInk_progress-container">
94+
<div class="col-xs-6 instantInk_line" style="justify-content: left">
9595
<span>{{Pages supplémentaires}}</span>
9696
</div>
97-
<div class="col-xs-6 line" style="justify-content: right">
97+
<div class="col-xs-6 instantInk_line" style="justify-content: right">
9898
<span class="Cmd#billingCycle_additional_id#"></span>&nbsp;/&nbsp;<span class="Cmd#currentPlan_additional_id#"></span>
9999
</div>
100-
<div class="progress" id="progress_3">
101-
<div class="progress-bar"></div>
100+
<div class="instantInk_progress" id="instantInk_progress_3">
101+
<div class="instantInk_progress-bar"></div>
102102
</div>
103103
</div>
104104
</div>
@@ -213,21 +213,21 @@
213213
jeedom.cmd.update['#billingCycle_page_id#'] =function(_options) {
214214
$('.Cmd#billingCycle_page_id#').empty().append('<span>'+_options.display_value+'</span>');
215215
var ratio = parseInt('#billingCycle_page#',10) / parseInt('#currentPlan_page#',10) * 100;
216-
$('#progress_1').empty().append('<div class="progress-bar" style="width: '+ratio+'%"></div>');
216+
$('#instantInk_progress_1').empty().append('<div class="instantInk_progress-bar" style="width: '+ratio+'%"></div>');
217217
}
218218
jeedom.cmd.update['#billingCycle_page_id#']({display_value: '#billingCycle_page#'});
219219

220220
jeedom.cmd.update['#billingCycle_rollover_id#'] =function(_options) {
221221
$('.Cmd#billingCycle_rollover_id#').empty().append('<span>'+_options.display_value+'</span>');
222222
var ratio = parseInt('#billingCycle_rollover#',10) / parseInt('#billingCycle_rollovermax#',10) * 100;
223-
$('#progress_2').empty().append('<div class="progress-bar" style="width: '+ratio+'%"></div>');
223+
$('#instantInk_progress_2').empty().append('<div class="instantInk_progress-bar" style="width: '+ratio+'%"></div>');
224224
}
225225
jeedom.cmd.update['#billingCycle_rollover_id#']({display_value: '#billingCycle_rollover#'});
226226

227227
jeedom.cmd.update['#billingCycle_additional_id#'] =function(_options) {
228228
$('.Cmd#billingCycle_additional_id#').empty().append('<span>'+_options.display_value+'</span>');
229229
var ratio = parseInt('#billingCycle_additional#',10) / parseInt('#currentPlan_additional#',10) * 100;
230-
$('#progress_3').empty().append('<div class="progress-bar" style="width: '+ratio+'%"></div>');
230+
$('#instantInk_progress_3').empty().append('<div class="instantInk_progress-bar" style="width: '+ratio+'%"></div>');
231231
}
232232
jeedom.cmd.update['#billingCycle_additional_id#']({display_value: '#billingCycle_additional#'});
233233

@@ -245,47 +245,47 @@
245245
jeedom.cmd.update['#cartridge_K_id#'] =function(_options) {
246246
if ( _options.display_value != '' && _options.display_value != null ) {
247247
$('.Cmd#cartridge_K_id#').empty().append('<span>'+_options.display_value+'%</span>');
248-
$('#progress-bar-ink_1').empty().append('<div class="level black" style="height: '+_options.display_value+'%"></div>');
248+
$('#instantInk_progress-bar-ink_1').empty().append('<div class="instantInk_level instantInk_black" style="height: '+_options.display_value+'%"></div>');
249249
}
250250
else {
251251
$('.Cmd#cartridge_K_id#').empty().append('<span>NA</span>');
252-
$('#progress-bar-ink_1').empty().append('<div class="level black" style="height: 0%"></div>');
252+
$('#instantInk_progress-bar-ink_1').empty().append('<div class="instantInk_level instantInk_black" style="height: 0%"></div>');
253253
}
254254
}
255255
jeedom.cmd.update['#cartridge_K_id#']({display_value: '#cartridge_K#'});
256256

257257
jeedom.cmd.update['#cartridge_C_id#'] =function(_options) {
258258
if ( _options.display_value != '' && _options.display_value != null ) {
259259
$('.Cmd#cartridge_C_id#').empty().append('<span>'+_options.display_value+'%</span>');
260-
$('#progress-bar-ink_2').empty().append('<div class="level cyan" style="height: '+_options.display_value+'%"></div>');
260+
$('#instantInk_progress-bar-ink_2').empty().append('<div class="instantInk_level instantInk_cyan" style="height: '+_options.display_value+'%"></div>');
261261
}
262262
else {
263263
$('.Cmd#cartridge_C_id#').empty().append('<span>NA</span>');
264-
$('#progress-bar-ink_2').empty().append('<div class="level cyan" style="height: 0%"></div>');
264+
$('#instantInk_progress-bar-ink_2').empty().append('<div class="instantInk_level instantInk_cyan" style="height: 0%"></div>');
265265
}
266266
}
267267
jeedom.cmd.update['#cartridge_C_id#']({display_value: '#cartridge_C#'});
268268

269269
jeedom.cmd.update['#cartridge_M_id#'] =function(_options) {
270270
if ( _options.display_value != '' && _options.display_value != null ) {
271271
$('.Cmd#cartridge_M_id#').empty().append('<span>'+_options.display_value+'%</span>');
272-
$('#progress-bar-ink_3').empty().append('<div class="level magenta" style="height: '+_options.display_value+'%"></div>');
272+
$('#instantInk_progress-bar-ink_3').empty().append('<div class="instantInk_level instantInk_magenta" style="height: '+_options.display_value+'%"></div>');
273273
}
274274
else {
275275
$('.Cmd#cartridge_M_id#').empty().append('<span>NA</span>');
276-
$('#progress-bar-ink_3').empty().append('<div class="level magenta" style="height: 0%"></div>');
276+
$('#instantInk_progress-bar-ink_3').empty().append('<div class="instantInk_level instantInk_magenta" style="height: 0%"></div>');
277277
}
278278
}
279279
jeedom.cmd.update['#cartridge_M_id#']({display_value: '#cartridge_M#'});
280280

281281
jeedom.cmd.update['#cartridge_Y_id#'] =function(_options) {
282282
if ( _options.display_value != '' && _options.display_value != null ) {
283283
$('.Cmd#cartridge_Y_id#').empty().append('<span>'+_options.display_value+'%</span>');
284-
$('#progress-bar-ink_4').empty().append('<div class="level yellow" style="height: '+_options.display_value+'%"></div>');
284+
$('#instantInk_progress-bar-ink_4').empty().append('<div class="instantInk_level instantInk_yellow" style="height: '+_options.display_value+'%"></div>');
285285
}
286286
else {
287287
$('.Cmd#cartridge_Y_id#').empty().append('<span>NA</span>');
288-
$('#progress-bar-ink_4').empty().append('<div class="level yellow" style="height: 0%"></div>');
288+
$('#instantInk_progress-bar-ink_4').empty().append('<div class="instantInk_level instantInk_yellow" style="height: 0%"></div>');
289289
}
290290
}
291291
jeedom.cmd.update['#cartridge_Y_id#']({display_value: '#cartridge_Y#'});

‎core/template/dashboard/instantInk_dashboard_style_dark.css‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@
5151
margin : 5px 0px 0px 0px !important;
5252
}
5353

54-
.progress-container{
54+
.instantInk_progress-container{
5555
height : 25px;
5656
margin-top : 10px !important;
5757
margin-bottom : 10px !important;
5858
}
5959

60-
.line{
60+
.instantInk_line{
6161
display : flex;
6262
font-size : 12px;
6363
padding : 0px 0px 0px 0px !important;
6464
}
6565

66-
.progress{
66+
.instantInk_progress{
6767
width: 100%;
6868
height: 10px;
6969
background : rgb(var(--bg-color)) !important;
@@ -72,22 +72,22 @@
7272
overflow : hidden;
7373
}
7474

75-
.progress-bar{
75+
.instantInk_progress-bar{
7676
height : 10px;
7777
background : var(--txt-color);
7878
border-radius : 5px;
7979
overflow : hidden;
8080
}
8181

82-
.progress-container-ink{
82+
.instantInk_progress-container-ink{
8383
height : 100px;
8484
}
8585

86-
.progress-ink{
86+
.instantInk_progress-ink{
8787
padding : 5px 0px 0px 5px !important;
8888
}
8989

90-
.progress-bar-ink{
90+
.instantInk_progress-bar-ink{
9191
width : 25px;
9292
height : 70px;
9393
border : solid;
@@ -99,13 +99,13 @@
9999
filter : contrast(75%);
100100
}
101101

102-
.level{
102+
.instantInk_level{
103103
position : absolute;
104104
bottom : 0;
105105
width : 100%;
106106
}
107107

108-
.black{
108+
.instantInk_black{
109109
background : linear-gradient(
110110
to top,
111111
#000000 0%,
@@ -114,7 +114,7 @@
114114
);
115115
}
116116

117-
.cyan{
117+
.instantInk_cyan{
118118
background : linear-gradient(
119119
to top,
120120
#00FFFF 0%,
@@ -123,7 +123,7 @@
123123
);
124124
}
125125

126-
.magenta{
126+
.instantInk_magenta{
127127
background : #FF00FF;
128128
background : linear-gradient(
129129
to top,
@@ -133,7 +133,7 @@
133133
);
134134
}
135135

136-
.yellow{
136+
.instantInk_yellow{
137137
background : #FFFF00;
138138
background : linear-gradient(
139139
to top,
@@ -143,7 +143,7 @@
143143
);
144144
}
145145

146-
.line-ink{
146+
.instantInk_line-ink{
147147
width : 30px;
148148
margin-top :2px;
149149
margin-left : -2px;

‎core/template/dashboard/instantInk_dashboard_style_light.css‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@
5151
margin : 5px 0px 0px 0px !important;
5252
}
5353

54-
.progress-container{
54+
.instantInk_progress-container{
5555
height : 25px;
5656
margin-top : 10px !important;
5757
margin-bottom : 10px !important;
5858
}
5959

60-
.line{
60+
.instantInk_line{
6161
display : flex;
6262
font-size : 12px;
6363
padding : 0px 0px 0px 0px !important;
6464
}
6565

66-
.progress{
66+
.instantInk_progress{
6767
width : 100%;
6868
height : 10px;
6969
background : rgb(var(--bg-color)) !important;
@@ -72,23 +72,23 @@
7272
overflow : hidden;
7373
}
7474

75-
.progress-bar{
75+
.instantInk_progress-bar{
7676
height : 10px;
7777
background : var(--txt-color);
7878
border-radius : 5px;
7979
overflow : hidden;
8080
}
8181

8282

83-
.progress-container-ink{
83+
.instantInk_progress-container-ink{
8484
height : 100px;
8585
}
8686

87-
.progress-ink{
87+
.instantInk_progress-ink{
8888
padding : 5px 0px 0px 5px !important;
8989
}
9090

91-
.progress-bar-ink{
91+
.instantInk_progress-bar-ink{
9292
width : 25px;
9393
height : 70px;
9494
border : solid;
@@ -100,13 +100,13 @@
100100
filter : contrast(75%);
101101
}
102102

103-
.level{
103+
.instantInk_level{
104104
position : absolute;
105105
bottom : 0;
106106
width : 100%;
107107
}
108108

109-
.black{
109+
.instantInk_black{
110110
background : linear-gradient(
111111
to top,
112112
#000000 0%,
@@ -115,7 +115,7 @@
115115
);
116116
}
117117

118-
.cyan{
118+
.instantInk_cyan{
119119
background : linear-gradient(
120120
to top,
121121
#00FFFF 0%,
@@ -124,7 +124,7 @@
124124
);
125125
}
126126

127-
.magenta{
127+
.instantInk_magenta{
128128
background : #FF00FF;
129129
background : linear-gradient(
130130
to top,
@@ -134,7 +134,7 @@
134134
);
135135
}
136136

137-
.yellow{
137+
.instantInk_yellow{
138138
background : #FFFF00;
139139
background : linear-gradient(
140140
to top,
@@ -144,7 +144,7 @@
144144
);
145145
}
146146

147-
.line-ink{
147+
.instantInk_line-ink{
148148
width : 30px;
149149
margin-top :2px;
150150
margin-left : -2px;

0 commit comments

Comments
 (0)