Skip to content

Commit ea5c969

Browse files
authored
ver. 1.1.2 update
Check CHANGES.md
1 parent 6a54809 commit ea5c969

File tree

13 files changed

+170
-111
lines changed

13 files changed

+170
-111
lines changed

CHANGES.md

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
1-
unreleased VER.
2-
- add multiple simultaneous text filters
3-
- on row click instead of show button + make refresh button like to top
1+
Unreleased VER.
2+
- add multiple text filters
43
- tail realtime parsing mode + gui autorefresh (with config seconds) (?)
54
- replace momentjs wih day.js or luxone(?)
5+
- make mailcow PR to integrate into
66
- maybe scrollTo by not all refreshes (?)
7-
- add configurable html titles (?)
8-
- exclude-marquee class remove
97
- remove python privex helpers code (?)
10-
- fix focus to password input on login load
11-
- save filters turn off must apply current last minutes
8+
- add configurable html titles (?)
9+
- save settings into cookies + accept cookies modal (?)
10+
11+
VER. 1.1.2
12+
- ~~exclude-marquee remove~~
13+
- ~~fix broken colResizable~~
14+
- ~~save filters turn off must apply current last minutes!~~
15+
- ~~loading circle during api call and request waiting~~
16+
- ~~fix focus to password input on login load~~
17+
- ~~fix of emails page if localStorage is empty (force reload page on error like "Cannot read properties of undefined (reading 'log_out')")~~
18+
- ~~fix wrong text search filter if reload button is clicked~~
19+
- ~~fix of notie z-index in firefox (under loading modal)~~
20+
- ~~fix not parsed statuses (unknown status?) for postfix~~
21+
- ~~on row click instead of show button~~
22+
- ~~make new refresh button~~
23+
- ~~fix settings show when reload with no locale loaded~~
1224

13-
VER. 1.1.1
14-
- ~~loading circle during api call and request waiting~~
15-
-
1625
VER. 1.1.0
1726
- ~~parser cuts the 1st symbol in queue ID (E6E6462414 instead of EE6E6462414 for example)~~
1827
- ~~add message subject to the parser and GUI~~
@@ -75,7 +84,6 @@ VER. 1.1.0
7584
- ~~filter autofill on click at cells according to its type (timestamp fills date, queue id fills text queue id etc.)~~
7685
- ~~sticky header gui switcher~~
7786
- ~~cleanup from tablesorter~~
78-
7987
VER. 1.0.0
8088
- ~~page goes to top when refresh without colResize~~
8189
- ~~save sticky header state in localStorage~~

docker-compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ services:
99
command: /app/run.sh ${COMMAND}
1010
ports:
1111
- ${PORT}:${PORT}
12+
restart: always
1213
volumes:
1314
- .:/app
1415
- /tmp:/tmp
@@ -20,6 +21,7 @@ services:
2021
rethinkdb:
2122
image: rethinkdb:2.4
2223
container_name: rethinkdb
24+
restart: always
2325
ports:
2426
- ${RETHINK_EXP_GUI_PORT}:8080
2527
volumes:

mlp/main.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
# !!! change version upon update !!!
3737
global VERSION
38-
VERSION ="1.1.1"
38+
VERSION ="1.1.2"
3939

4040
# postfix regexp
4141
postf_match = r'([A-Za-z]+[ \t]+[0-9]+[ \t]+[0-9]+\:[0-9]+:[0-9]+).*'
@@ -272,7 +272,10 @@ async def main():
272272
m['status']['code'] = "unknown"
273273
m['status']['message'] = "no status message found"
274274
"""subject decoder"""
275-
m['subject'] = decodev2(m.get('subject'))
275+
try:
276+
m['subject'] = decodev2(m.get('subject'))
277+
except:
278+
m['subject'] = m.get('subject')
276279
mfrom, mto = m.get('mail_from'), m.get('mail_to')
277280
"""samoilov to fix index out of range error"""
278281

mlp/static/css/style.css

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262

6363
/* on top from bottom offset */
6464
#back-to-top {
65-
bottom: 30px!important;
65+
bottom: 150px!important;
66+
right: 50px!important;
6667
}
6768

6869
/*to mark mouse over table row*/
@@ -71,28 +72,20 @@
7172
}
7273

7374
/*for all tables*/
74-
.emails-list td:not(:last-child):not(.exclude-marquee), .emails-list th:not(.exclude-marquee) {
75-
text-align: center!important;
75+
.emails-list td:not(:last-child), .emails-list th {
76+
/*text-align: center!important;*/
77+
overflow: hidden;
78+
text-overflow: ellipsis;
7679
}
7780

7881
/*for resizable tables*/
7982

80-
.emails-list:is(.resizable) td:not(:last-child):not(.exclude-marquee) {
81-
overflow: hidden;
82-
text-overflow: ellipsis;
83+
.emails-list:is(.resizable) td, .emails-list:is(.resizable) th {
8384
white-space: nowrap;
84-
text-align: center!important;
85-
}
86-
87-
.emails-list:is(.resizable) th:not(.exclude-marquee) {
88-
overflow: hidden;
89-
white-space: nowrap;
90-
text-overflow: ellipsis;
91-
text-align: center!important;
9285
}
9386

9487
/* for non-resizable tables*/
95-
.emails-list:not(.resizable) td:not(:last-child):not(.exclude-marquee):hover, .emails-list:not(.resizable) th:not(:last-child):not(.exclude-marquee):hover {
88+
.emails-list:not(.resizable) td:hover, .emails-list:not(.resizable) th:hover {
9689
overflow: auto;
9790
white-space: initial!important;
9891
text-overflow: initial;
@@ -101,10 +94,6 @@
10194
table-layout: fixed;
10295
}
10396

104-
.emails-list:not(.resizable) td:not(:last-child):not(.exclude-marquee), .emails-list:not(.resizable) th:not(.exclude-marquee) {
105-
overflow: hidden;
106-
text-overflow: ellipsis;
107-
}
10897

10998
.emails-list:not(.resizable) #timestamp, .emails-list:not(.resizable) #queue_id, .emails-list:not(.resizable) #first_attempt, .emails-list:not(.resizable) #last_attempt {
11099
width: 8%;
@@ -127,7 +116,7 @@
127116

128117
/* sort stylings*/
129118

130-
.emails-list th:not(.exclude-marquee) {
119+
.emails-list th:not(#refresh-button), .emails-list td {
131120
transition: none!important;
132121
cursor: pointer!important;
133122
}
@@ -136,15 +125,18 @@
136125
background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7)!important;
137126
background-position: center right!important;
138127
background-repeat: no-repeat!important;
128+
/*background-color: #e1dcdc!important;*/
139129
}
140130

141131
.emails-list th.desc {
142132
background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7)!important;
143133
background-position: center right!important;
144134
background-repeat: no-repeat!important;
135+
/*background-color: #e1dcdc!important;*/
145136
}
146-
147-
137+
/*.sorted_column {
138+
background-color: #e1dcdc!important;
139+
}*/
148140
/*for sticky pager*/
149141
.ui.buttons {
150142
z-index: 5;
@@ -157,10 +149,12 @@
157149
flex-wrap: wrap;
158150
}
159151

160-
/*change notification z-index*/
152+
/*change notification z-index and fix of notie blurring when modal blur is on in firefox*/
161153
.notie-alert {
162154
z-index: 1002!important;
155+
filter: initial!important;
163156
}
157+
164158
/*fix sematicui paddings
165159
.ui.fluid.container:has(.login) {
166160
height: 70%!important;
@@ -238,9 +232,8 @@
238232
}
239233

240234

241-
242235
@media only screen and (min-width: 767px) and (max-width: 1000px){
243-
.exclude-marquee button span, #user-settings > div.logo button span{
236+
#refresh-button button span, #user-settings > div.logo button span{
244237
display:none!important
245238
}
246239
}

mlp/static/js/local_settings.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@
6262
// default gui settings
6363
'settings': {
6464
page_limit: 50,
65-
default_period: 20,
65+
default_period: 60,
6666
sticky: true,
6767
blurring: true,
6868
//marquee: false,
6969
colored: true,
7070
resizable: false,
71-
filters: true,
71+
filters: false,
7272
locale: "en",
7373
status_color: {
7474
NOFILTER: 'rgba(255, 255, 255, 1)',
@@ -77,7 +77,8 @@
7777
reject: 'rgba(255, 175, 175, 1)',
7878
bounced: 'rgba(186, 210, 245, 1)',
7979
multiple: 'rgba(232, 179, 255, 1)',
80-
unknown: 'rgba(249, 251, 140, 1)'
80+
unknown: 'rgba(249, 251, 140, 1)',
81+
sorted: 'rgba(255, 255, 255, 0.4)'
8182
},
8283
status_icon: {
8384
deferred: "<i class='hourglass half icon'></i>",

0 commit comments

Comments
 (0)