diff --git a/base/web/matrix.css b/base/web/matrix.css index e38d2852..e249f923 100644 --- a/base/web/matrix.css +++ b/base/web/matrix.css @@ -5,7 +5,8 @@ fieldset.web.matrix>div.output>table.content th i:hover { background-color:var(- fieldset.web.matrix>div.output>table.content td:hover { color:unset; } fieldset.web.matrix>div.output>table.content div.item { display:flex; align-items:center; cursor:default; } fieldset.web.matrix>div.output>table.content div.item:hover { background-color:unset; color:unset; } -fieldset.web.matrix>div.output>table.content div.item img { height:var(--header-height); width:var(--header-height); margin-right:var(--input-margin); } +fieldset.web.matrix>div.output>table.content div.item img { height:var(--header-height); width:var(--header-height); margin:var(--input-margin); } +/* fieldset.web.matrix>div.output>table.content div.item img { height:64px; width:64px; margin-right:var(--input-margin); } */ fieldset.web.matrix>div.output>table.content div.item div.title { text-align:left; } fieldset.web.matrix>div.output>table.content div.item div.title:hover { background-color:unset; } fieldset.web.matrix>div.output>table.content div.item div.title span:hover { background-color:var(--hover-bg-color); } @@ -13,6 +14,8 @@ fieldset.web.matrix>div.output>table.content div.item div.status i { font-size:v fieldset.web.matrix>div.output>table.content div.item div.status div.item:hover { background-color:var(--hover-bg-color); } fieldset.web.matrix>div.output>table.content div.item div.action { overflow:hidden; } fieldset.web.matrix>div.output>table.content div.item div.action input.icons { display:none; } +fieldset.web.matrix>div.output>table.content div.item.notice { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } +fieldset.web.matrix>div.output>table.content div.item.danger { background-color:var(--danger-bg-color); color:var(--danger-fg-color); } fieldset.web.matrix>div.output>table.content div.item.danger div.status { background-color:var(--danger-bg-color); color:var(--danger-fg-color); } fieldset.web.matrix>div.output>table.content div.item.danger div.status div.item { background-color:var(--danger-bg-color); color:var(--danger-fg-color); } fieldset.web.matrix>div.output>table.content div.item.danger div.status i { background-color:var(--danger-bg-color); color:var(--danger-fg-color); } diff --git a/base/web/matrix.js b/base/web/matrix.js index d11c198d..f5f1f1f4 100644 --- a/base/web/matrix.js +++ b/base/web/matrix.js @@ -10,7 +10,10 @@ Volcanos(chat.ONIMPORT, { can.core.Item(list, function(name, value) { var i = 0; if (name == ice.CONTEXTS) { return } var tr = can.page.Append(can, ui.tbody, [{type: html.TR, list: can.core.Item(domain, function(domain) { i++ var item = value[domain]||{} - return {type: html.TD, list: [{view: [[html.ITEM, can.core.Value(list, can.core.Keys(name, domain, nfs.VERSION)) != can.core.Value(list, can.core.Keys(name, ice.CONTEXTS, nfs.VERSION))? "danger": ""]], list: item.name? [ + return {type: html.TD, list: [{view: [[html.ITEM, + !list[name][ice.CONTEXTS]? html.NOTICE: list[name][domain] && (can.core.Value(list, can.core.Keys(name, domain, nfs.VERSION)) != can.core.Value(list, can.core.Keys(name, ice.CONTEXTS, nfs.VERSION)) + || can.core.Value(list, can.core.Keys(name, domain, mdb.TIME)) < can.core.Value(list, can.core.Keys(name, ice.CONTEXTS, mdb.TIME))) + ? html.DANGER: ""]], list: item.name? [ {img: can.misc.Resource(can, item.icons||nfs.USR_ICONS_VOLCANOS)}, {view: wiki.TITLE, list: [{text: item.name}, can.onappend.label(can, item, {version: icon.version, time: icon.compile, time: icon.compile}), can.onappend.buttons(can, item)]}, ]: [ @@ -20,7 +23,8 @@ Volcanos(chat.ONIMPORT, { }}, "", target) }}, ]}]} - }) }])._target; list[name][ice.CONTEXTS] || can.onappend.style(can, "danger", tr) + }) }])._target + // ; list[name][ice.CONTEXTS] || can.onappend.style(can, html.NOTICE, tr) }), can.onmotion.delay(can, function() { can.Status(mdb.COUNT, can.core.Item(list).length+"x"+can.core.Item(domain).length) }) }, }, [""])