Skip to content

Commit 732b3e7

Browse files
committed
2rd rewrite of upload management error based on 3.0
Add file size before upload for SPIFFS and WebUpdate new embedded page based on 3.0 - display fw version - menu link link to wiki / github - auto detection of index.html.gz when uploaded - websocket to limit to one instance - build batch to generate page and fw file fix for Apple captive portal blocking websocket per @Nathan-ma suggestion Fix update partition size in [ESP420] for ESP32 change versio to 36
1 parent d39ea07 commit 732b3e7

File tree

11 files changed

+1371
-1023
lines changed

11 files changed

+1371
-1023
lines changed

embedded/nofile.h

Lines changed: 411 additions & 379 deletions
Large diffs are not rendered by default.

embedded/package-lock.json

Lines changed: 80 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

embedded/tool.html.gz

507 Bytes
Binary file not shown.

embedded/www/css/style.css

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
11
html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%; font-size:10px;}
22
body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333333;background-color:#ffffff;}
3-
.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px;}
43
table{border:0px;border-spacing:0;max-width:100%;}
5-
.table-bordered{ width:100%; border:1px solid #dddddd;margin-bottom:20px;}
64
td{white-space:nowrap; padding:2mm;}
75
th{text-align:left;}
86
.table>thead>tr>th,.table>tbody>tr>th,.table>thead>tr>td,.table>tbody>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #dddddd;}
9-
.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td{border:1px solid #dddddd;}
10-
.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px;}
117
.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9;}
12-
@media (min-width:768px){.container{width:750px;}}
13-
@media (min-width:992px){.container{width:970px;}}
14-
@media (min-width:1200px){.container{width:1170px;}}
15-
.nav{ width:100%; color:#cccccc;padding-left:10;padding-right:10;list-style:none;background-color:#333333;border-radius:6px ;margin-bottom:20px;}
168
a{position:relative;display:block;padding:10px 15px;text-decoration:none;color:#cccccc;}
179
.active{color:#ffffff;background-color:#000000;}
1810
.active a,a:hover,a:focus{color:#FFFFFF;}
1911
.panel{margin-bottom:20px;background-color:#ffffff;border:1px solid #dddddd;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05);}
2012
.panel-body{padding:15px;}
2113
.panel-heading{padding:10px 15px;color:#333333;background-color:#f5f5f5;border-color:#dddddd;border-top-right-radius:3px;border-top-left-radius:3px;border-bottom:1px solid #dddddd;}
22-
label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:bold;}
23-
.text-info{color:#31708f;}
2414
.form-control{display:block;width:auto;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555555;background-color:#ffffff
2515
;background-image:none;border:1px solid #cccccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
2616
* -webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;
@@ -32,24 +22,12 @@ background-image:none;border:1px solid transparent;white-space:nowrap;padding:6p
3222
* -webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}
3323
.btn-primary{color:#ffffff;background-color:#337ab7;border-color:#2e6da4;}
3424
.btn-primary:focus,.btn-primary:active,.btn-primary:hover,.btn-primary.focus,.btn-primary.active,.btn-primary.hover{color:#ffffff;background-color:#286090;border-color:#122b40;}
35-
caption{padding-top:8px;padding-bottom:8px;color:#777777;text-align:left;}
36-
.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px;}
37-
.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d;}
38-
.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442;}
39-
.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);}
40-
.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;}
41-
.has-error .control-label{color:#a94442;}
42-
.has-success .form-control {border-color: #3c763d;-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);}
43-
.has-success .form-control:focus {border-color: #2b542c;-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;}
44-
.has-success .control-label{color: #3c763d;}
45-
.btn-danger{color:#ffffff;background-color:#d9534f;border-color:#d43f3a;}
46-
.btn-danger:focus,.btn-danger:active,.btn-danger:hover,.btn-danger.focus,.btn-danger.active,.btn-danger.hover{color: #ffffff;background-color:#c9302c;border-color:#761c19;}
47-
.btnimg {cursor:hand; border-radius:6px ;;border:1px solid #FFFFFF;}
48-
.btnimg:hover{background-color:#F0F0F0;border-color:#00FFFF;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;}
25+
.btnimg {cursor:hand; border-radius:6px ;border:1px solid #FFFFFF;}
26+
.btnimg:hover{background-color:#F0F0F0;border-color:#6c6c6c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #808080;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #808080;}
4927
.btnroundimg {cursor:hand; border-radius:30px;}
50-
.btnroundimg:hover{background-color:#F0F0F0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;}
51-
.blacklink {color:#000000;}
52-
.blacklink:hover, .filelink:focus {color:#0094FF;}
28+
.btnroundimg:hover{background-color:#F0F0F0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #808080;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #808080;}
29+
.blacklink, .blacklink:active {color:#000000;}
30+
.blacklink:hover{color:#000000;}
5331
input[type="file"]::-webkit-file-upload-button{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;-ms-touch-action:manipulation; touch-action:manipulation;cursor:pointer;
5432
background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;
5533
* -webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none; color: #ffffff;background-color: #5bc0de;border-color: #46b8da;}
@@ -59,22 +37,7 @@ background-image:none;border:1px solid transparent;white-space:nowrap;padding:6p
5937
input[type="file"]::-webkit-file-upload-button:hover{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;-ms-touch-action:manipulation; touch-action:manipulation;cursor:pointer;
6038
background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;
6139
* -webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none; color: #ffffff;background-color: #31b0d5;border-color: #269abc;}
62-
.filelink {color:#000000;}
63-
.filelink:hover, .filelink:focus {color:#0094FF;}
6440
.panel-footer{padding:10px 15px;color:#31708f;background-color:#f5f5f5;border-color:#dddddd;border-top:1px solid #dddddd;}
65-
.loader {
66-
border: 4px solid #f3f3f3; /* Light grey */
67-
border-top: 4px solid #3498db; /* Blue */
68-
border-radius: 50%;
69-
width: 12px;
70-
height: 12px;
71-
animation: spin 2s linear infinite;
72-
}
73-
74-
@keyframes spin {
75-
0% { transform: rotate(0deg); }
76-
100% { transform: rotate(360deg); }
77-
}
7841
.panel-footer{padding:10px 15px;color:#31708f;background-color:#f5f5f5;border-color:#dddddd;border-top:1px solid #dddddd;}
7942

8043
.modal {
@@ -125,6 +88,9 @@ background-image:none;border:1px solid transparent;white-space:nowrap;padding:6p
12588
border-bottom-left-radius: 10px;
12689
border-bottom-right-radius: 10px;
12790
}
91+
.hide_it {
92+
display: none;
93+
}
12894

12995
@media (min-width: 768px) {
13096
.modal-content {

0 commit comments

Comments
 (0)