Skip to content

Commit 7228b4d

Browse files
limetechlimetech
authored
Merge pull request unraid#2329 from unraid/fix/file-manager-issues
fix: file manager issues
2 parents a24e0f4 + 63135b6 commit 7228b4d

4 files changed

Lines changed: 91 additions & 93 deletions

File tree

‎emhttp/plugins/dynamix/Browse.page‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,8 @@ function fileEdit(id) {
271271
}
272272

273273
function fullWindow() {
274+
// this class is used to determine if the dialog is sized via the default CSS in default-dynamix.css or by JS when the user clicks the "expand" button.
275+
$('.ui-dialog').toggleClass('ui-dialog-content-full');
274276
if ($('.ui-dfm .ui-dialog-titlebar-close').html().indexOf('expand')>=0) {
275277
dfm.window.dialog('option','height',window.innerHeight-40);
276278
dfm.window.dialog('option','width',window.innerWidth);
@@ -999,7 +1001,8 @@ $(function(){
9991001
} else {
10001002
url.push('<i class="fa fa-home red-text"></i>');
10011003
}
1002-
$('span.left').html(url.join('<i class="fa fa-chevron-right"></i>')).append('<span class="right"><span class="dfm_filter"><input type="text" class="dfm_filter" oninput="filter(this.value)" autocomplete="off" spellcheck="false" placeholder="_(file type)_"><i class="fa fa-filter dfm_filter"></i></span><i class="fa fa-toggle-off" onclick="toggleTime()" style="cursor:pointer;margin-left:20px" title="_(Toggle Time/Age display)_"></i></span>');
1004+
$('.title .left').html(url.join('<i class="fa fa-chevron-right"></i>'));
1005+
$('.title .right').append('<span class="dfm_filter"><input type="text" id="dfm_filter" class="dfm_filter" oninput="filter(this.value)" autocomplete="off" spellcheck="false" placeholder="_(file type)_"><i class="fa fa-filter dfm_filter"></i></span><i class="fa fa-toggle-off" onclick="toggleTime()" style="cursor:pointer;" title="_(Toggle Time/Age display)_"></i>');
10031006
table = $('table.indexer');
10041007
thead = table.find('thead');
10051008
table.bind('sortEnd',function(e,t){

‎emhttp/plugins/dynamix/sheets/Browse.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ table.tablesorter.indexer tbody tr:hover td {
110110
background-color: var(--browse-table-tbody-tr-hover-td-bg-color);
111111
}
112112

113+
.ui-dialog-content dd {
114+
position: relative;
115+
116+
.fileTree {
117+
top: 4rem;
118+
}
119+
}
120+
113121
.Theme--black {
114122
tr.ace_optionsMenuEntry td select {
115123
color: var(--browse-text-color);

‎emhttp/plugins/dynamix/sheets/BrowseButton.css‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -165,51 +165,30 @@ i.job {
165165

166166
span.dfm_filter {
167167
position: relative;
168-
margin-left: 12px;
169-
top: -2px;
170168
}
171169
span.dfm_filter i {
172170
position: absolute;
173171
left: 10px;
174-
top: 4px;
172+
top: 6px;
175173
font-size: 1.4rem;
176174
}
177175
input.dfm_filter {
178176
border: none;
179177
width: 100px;
180178
background-color: var(--input-dfm-filter-bg-color);
181-
margin: -8px 0 0 0;
182179
padding-left: 30px;
180+
line-height: normal;
183181
}
184182
input.dfm_filter:focus {
185183
background-color: var(--input-dfm-filter-bg-color);
186184
}
187185
input#dfm_target {
188186
color: var(--input-dfm-target-text-color);
189187
}
190-
/* .fileTree {
191-
width: 500px;
192-
max-height: 320px;
193-
} */
194-
i.dfm_filter {
195-
margin-top: -2px;
196-
}
197188
div.autoheight {
198189
width: 100%;
199190
overflow-y: auto;
200191
}
201192
#dfm_jobs {
202193
padding: 2rem 0;
203-
}
204-
.Theme--sidebar {
205-
span.dfm_filter {
206-
margin-left: 0;
207-
top: -8px;
208-
}
209-
span.dfm_filter i {
210-
top: 8px;
211-
}
212-
i.dfm_filter {
213-
margin-top: -4px;
214-
}
215-
}
194+
}

‎emhttp/plugins/dynamix/styles/default-dynamix.css‎

Lines changed: 76 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,18 +1460,25 @@ div.icon-zip {
14601460
}
14611461

14621462
.ui-dialog {
1463-
/* Center the dialog no matter what */
1463+
box-sizing: border-box;
1464+
1465+
* {
1466+
box-sizing: border-box;
1467+
}
1468+
}
1469+
1470+
.ui-dialog:not(.ui-dialog-content-full) {
1471+
/*
1472+
- If there is no .ui-dialog-content-full class, then we need to center the dialog no matter what the library JS sets on the element.
1473+
- Otherwise, if we do have .ui-dialog-content-full on the element, then we need to use the library JS to position the dialog at "full screen" size.
1474+
*/
14641475
top: 50% !important;
14651476
left: 50% !important;
14661477
transform: translate(-50%, -50%) !important;
14671478
box-sizing: border-box;
14681479
width: 100% !important;
14691480
max-width: 100rem;
14701481

1471-
* {
1472-
box-sizing: border-box;
1473-
}
1474-
14751482
.ui-dialog-content {
14761483
display: flex;
14771484
flex-direction: column;
@@ -1492,75 +1499,76 @@ div.icon-zip {
14921499
margin-top: auto;
14931500
}
14941501

1495-
.ui-dialog-buttonpane {
1496-
.ui-dialog-buttonset {
1497-
button {
1498-
font-family: clear-sans;
1499-
font-size: 1.1rem;
1500-
font-weight: bold;
1501-
letter-spacing: 2px;
1502-
text-transform: uppercase;
1503-
margin: 10px 12px 10px 0;
1504-
padding: 9px 18px;
1505-
text-decoration: none;
1506-
white-space: nowrap;
1507-
cursor: pointer;
1508-
outline: none;
1509-
border-radius: 4px;
1510-
border: 0;
1511-
color: var(--dynamix-jquery-ui-button-text-color);
1512-
background:
1513-
-webkit-gradient(
1514-
linear,
1515-
left top,
1516-
right top,
1517-
from(var(--dynamix-jquery-ui-button-background-start)),
1518-
to(var(--dynamix-jquery-ui-button-background-end))
1519-
)
1520-
0 0 no-repeat,
1521-
-webkit-gradient(
1522-
linear,
1523-
left top,
1524-
right top,
1525-
from(var(--dynamix-jquery-ui-button-background-start)),
1526-
to(var(--dynamix-jquery-ui-button-background-end))
1527-
) 0 100% no-repeat,
1528-
-webkit-gradient(
1529-
linear,
1530-
left bottom,
1531-
left top,
1532-
from(var(--dynamix-jquery-ui-button-background-start)),
1533-
to(var(--dynamix-jquery-ui-button-background-start))
1534-
) 0 100% no-repeat,
1535-
-webkit-gradient(
1536-
linear,
1537-
left bottom,
1538-
left top,
1539-
from(var(--dynamix-jquery-ui-button-background-end)),
1540-
to(var(--dynamix-jquery-ui-button-background-end))
1541-
) 100% 100% no-repeat;
1542-
background:
1543-
linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end)) 0 0 no-repeat,
1544-
linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end)) 0 100% no-repeat,
1545-
linear-gradient(0deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-start)) 0 100% no-repeat,
1546-
linear-gradient(0deg, var(--dynamix-jquery-ui-button-background-end) 0, var(--dynamix-jquery-ui-button-background-end)) 100% 100% no-repeat;
1547-
background-size:
1548-
100% 2px,
1549-
100% 2px,
1550-
2px 100%,
1551-
2px 100%;
1502+
}
15521503

1553-
&:hover {
1554-
color: var(--dynamix-jquery-ui-button-hover-color);
1555-
background: -webkit-gradient(
1504+
.ui-dialog-buttonpane {
1505+
.ui-dialog-buttonset {
1506+
button {
1507+
font-family: clear-sans;
1508+
font-size: 1.1rem;
1509+
font-weight: bold;
1510+
letter-spacing: 2px;
1511+
text-transform: uppercase;
1512+
margin: 10px 12px 10px 0;
1513+
padding: 9px 18px;
1514+
text-decoration: none;
1515+
white-space: nowrap;
1516+
cursor: pointer;
1517+
outline: none;
1518+
border-radius: 4px;
1519+
border: 0;
1520+
color: var(--dynamix-jquery-ui-button-text-color);
1521+
background:
1522+
-webkit-gradient(
15561523
linear,
15571524
left top,
15581525
right top,
15591526
from(var(--dynamix-jquery-ui-button-background-start)),
15601527
to(var(--dynamix-jquery-ui-button-background-end))
1561-
);
1562-
background: linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end));
1563-
}
1528+
)
1529+
0 0 no-repeat,
1530+
-webkit-gradient(
1531+
linear,
1532+
left top,
1533+
right top,
1534+
from(var(--dynamix-jquery-ui-button-background-start)),
1535+
to(var(--dynamix-jquery-ui-button-background-end))
1536+
) 0 100% no-repeat,
1537+
-webkit-gradient(
1538+
linear,
1539+
left bottom,
1540+
left top,
1541+
from(var(--dynamix-jquery-ui-button-background-start)),
1542+
to(var(--dynamix-jquery-ui-button-background-start))
1543+
) 0 100% no-repeat,
1544+
-webkit-gradient(
1545+
linear,
1546+
left bottom,
1547+
left top,
1548+
from(var(--dynamix-jquery-ui-button-background-end)),
1549+
to(var(--dynamix-jquery-ui-button-background-end))
1550+
) 100% 100% no-repeat;
1551+
background:
1552+
linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end)) 0 0 no-repeat,
1553+
linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end)) 0 100% no-repeat,
1554+
linear-gradient(0deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-start)) 0 100% no-repeat,
1555+
linear-gradient(0deg, var(--dynamix-jquery-ui-button-background-end) 0, var(--dynamix-jquery-ui-button-background-end)) 100% 100% no-repeat;
1556+
background-size:
1557+
100% 2px,
1558+
100% 2px,
1559+
2px 100%,
1560+
2px 100%;
1561+
1562+
&:hover {
1563+
color: var(--dynamix-jquery-ui-button-hover-color);
1564+
background: -webkit-gradient(
1565+
linear,
1566+
left top,
1567+
right top,
1568+
from(var(--dynamix-jquery-ui-button-background-start)),
1569+
to(var(--dynamix-jquery-ui-button-background-end))
1570+
);
1571+
background: linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end));
15641572
}
15651573
}
15661574
}

0 commit comments

Comments
 (0)