From 2499326d039f357ffc8b4bb2fc64aa1181d688a3 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 11 Oct 2019 01:28:19 +0300 Subject: [PATCH] tweaking... Signed-off-by: Alex A. Naanou --- ui (gen4)/css/experimenting.css | 6 +++++ ui (gen4)/features/metadata.js | 39 +++++++++++++++++---------------- ui (gen4)/features/tags.js | 2 +- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ui (gen4)/css/experimenting.css b/ui (gen4)/css/experimenting.css index c96d3e10..500c7351 100755 --- a/ui (gen4)/css/experimenting.css +++ b/ui (gen4)/css/experimenting.css @@ -538,6 +538,12 @@ body { visibility: visible !important; } +.metadata-view .text+.text { + font-style: italic; +} +.metadata-view .text+.text+.text { + margin-left: 0.5em; +} /* DEBUG stuff... */ diff --git a/ui (gen4)/features/metadata.js b/ui (gen4)/features/metadata.js index 202acbd0..61e38241 100755 --- a/ui (gen4)/features/metadata.js +++ b/ui (gen4)/features/metadata.js @@ -382,34 +382,35 @@ var MetadataUIActions = actions.Actions({ }) } // preview... - make(['Preview:', this.updatePreview()], { - cls: 'preview', - }) + make(['Preview:', this.updatePreview()], + { cls: 'preview' }) make.Separator() // essentials... make(['$GID: ', image]) // NOTE: these are 1-based and not 0-based... - make(['Index (ribbon): ', + make(['Index: ', + // ribbon... that.data.getImageOrder('ribbon', image) + 1 - +'/'+ - that.data.getImages(image).len]) - // show this only when cropped... - make(['Index (global): ', - that.data.getImageOrder(image) + 1 - +'/'+ - that.data.getImages('all').len]) - // crop-specific stuff... - ;(that.crop_stack && that.crop_stack.len > 0) - && make(['Index (crop): ', - that.data.getImageOrder('loaded', image) + 1 +'/'+ - that.data.getImages('loaded').len]) - // ribbons order... - make(['Ribbon: ', + that.data.getImages(image).len + + 'R', + // crop... + ...((that.crop_stack && that.crop_stack.len > 0) ? + [that.data.getImageOrder('loaded', image) + 1 + +'/'+ + that.data.getImages('loaded').len + + 'C'] + : []), + // global... + that.data.getImageOrder(image) + 1 + +'/'+ + that.data.getImages('all').len + + 'G', ]) + make(['Ribbon:', that.data.getRibbonOrder(image) + 1 +'/'+ - Object.keys(that.data.ribbons).length]) + Object.keys(that.data.ribbons).length]) make.Separator() diff --git a/ui (gen4)/features/tags.js b/ui (gen4)/features/tags.js index 07d448ea..026fa7ec 100755 --- a/ui (gen4)/features/tags.js +++ b/ui (gen4)/features/tags.js @@ -711,7 +711,7 @@ var TagUIActions = actions.Actions({ function(make, gid, image){ var that = this - make(['Tags:', + make(['$Tags:', function(){ return that.data.getTags(gid).join(', ') }], {