sort folders first + tweak thumbs ui

This commit is contained in:
ed 2021-05-25 21:15:54 +02:00
parent 483dd527c6
commit b36f905eab
3 changed files with 42 additions and 8 deletions

View file

@ -735,16 +735,28 @@ input[type="checkbox"]:checked+label {
overflow-wrap: break-word; overflow-wrap: break-word;
background: #383838; background: #383838;
border: 1px solid #444; border: 1px solid #444;
border-top: 1px solid #555;
box-shadow: 0 .1em .2em #222;
border-radius: .3em; border-radius: .3em;
padding: .3em .6em; padding: .3em;
margin: .5em; margin: .5em;
} }
#ggrid a img { #ggrid a img {
border-radius: .2em;
max-width: var(--grid-sz); max-width: var(--grid-sz);
max-height: var(--grid-sz); max-height: var(--grid-sz);
margin: 0 auto .5em auto; margin: 0 auto;
display: block; display: block;
} }
#ggrid a span {
padding: .2em .3em;
display: block;
}
#ggrid a:hover {
background: #444;
border-color: #555;
color: #fd9;
}
#pvol, #pvol,
#barbuf, #barbuf,
#barpos, #barpos,

View file

@ -831,8 +831,8 @@ var thegrid = (function () {
} }
html.push('<a href="' + href + html.push('<a href="' + href +
'"><img src="' + ihref + '">' + // /.cpr/dd/1.png '"><img src="' + ihref + '"><span>' +
ao.innerHTML + '</a>'); ao.innerHTML + '</span></a>');
} }
lfiles.style.display = 'none'; lfiles.style.display = 'none';
gfiles.style.display = 'block'; gfiles.style.display = 'block';
@ -1383,8 +1383,10 @@ var treectl = (function () {
nodes = sortfiles(nodes); nodes = sortfiles(nodes);
for (var a = 0; a < nodes.length; a++) { for (var a = 0; a < nodes.length; a++) {
var r = nodes[a], var r = nodes[a],
ln = ['<tr><td>' + r.lead + '</td><td><a href="' + hname = esc(uricom_dec(r.href)[0]),
top + r.href + '">' + esc(uricom_dec(r.href)[0]) + '</a>', r.sz]; sortv = (r.href.slice(-1) == '/' ? '\t' : '') + hname,
ln = ['<tr><td>' + r.lead + '</td><td sortv="' + sortv +
'"><a href="' + top + r.href + '">' + hname + '</a>', r.sz];
for (var b = 0; b < res.taglist.length; b++) { for (var b = 0; b < res.taglist.length; b++) {
var k = res.taglist[b], var k = res.taglist[b],
@ -1999,6 +2001,22 @@ var msel = (function () {
})(); })();
(function () {
try {
var tr = ebi('files').tBodies[0].rows;
for (var a = 0; a < tr.length; a++) {
var td = tr[a].cells[1],
href = td.firstChild.getAttribute('href'),
isdir = href.split('?')[0].slice(-1)[0] == '/',
txt = href.textContent;
td.setAttribute('sortv', (isdir ? '\t' : '') + txt);
}
}
catch (ex) { }
})();
function ev_row_tgl(e) { function ev_row_tgl(e) {
ev(e); ev(e);
filecols.toggle(this.parentElement.parentElement.getElementsByTagName('span')[0].textContent); filecols.toggle(this.parentElement.parentElement.getElementsByTagName('span')[0].textContent);

View file

@ -135,7 +135,7 @@ function clmod(obj, cls, add) {
function sortfiles(nodes) { function sortfiles(nodes) {
var sopts = jread('fsort', [["lead", -1, ""], ["href", 1, ""]]); var sopts = jread('fsort', [["href", 1, ""]]);
try { try {
var is_srch = false; var is_srch = false;
@ -163,8 +163,12 @@ function sortfiles(nodes) {
if ((v + '').indexOf('<a ') === 0) if ((v + '').indexOf('<a ') === 0)
v = v.split('>')[1]; v = v.split('>')[1];
else if (name == "href" && v) else if (name == "href" && v) {
if (v.slice(-1) == '/')
v = '\t' + v;
v = uricom_dec(v)[0] v = uricom_dec(v)[0]
}
nodes[b]._sv = v; nodes[b]._sv = v;
} }