mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 18:30:09 +00:00
reworked metadata view, now a bit more consize...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
2499326d03
commit
8fa53d4767
@ -525,11 +525,19 @@ body {
|
|||||||
|
|
||||||
/* metadata view */
|
/* metadata view */
|
||||||
/* remove preview text and center image... */
|
/* remove preview text and center image... */
|
||||||
|
.metadata-view .item.index {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
.metadata-view .item.preview {
|
.metadata-view .item.preview {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
.metadata-view .index .text,
|
||||||
.metadata-view .preview .text {
|
.metadata-view .preview .text {
|
||||||
|
float: initial;
|
||||||
|
}
|
||||||
|
.metadata-view .index .text:first-child,
|
||||||
|
.metadata-view .preview .text:first-child {
|
||||||
left: 50%;
|
left: 50%;
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
@ -542,7 +550,13 @@ body {
|
|||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
.metadata-view .text+.text+.text {
|
.metadata-view .text+.text+.text {
|
||||||
margin-left: 0.5em;
|
margin-left: 1em;
|
||||||
|
}
|
||||||
|
.metadata-view small span {
|
||||||
|
opacity: 0.7;
|
||||||
|
}
|
||||||
|
.metadata-view small small {
|
||||||
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -384,36 +384,64 @@ var MetadataUIActions = actions.Actions({
|
|||||||
// preview...
|
// preview...
|
||||||
make(['Preview:', this.updatePreview()],
|
make(['Preview:', this.updatePreview()],
|
||||||
{ cls: 'preview' })
|
{ cls: 'preview' })
|
||||||
make.Separator()
|
|
||||||
|
|
||||||
// essentials...
|
|
||||||
make(['$GID: ', image])
|
|
||||||
// NOTE: these are 1-based and not 0-based...
|
// NOTE: these are 1-based and not 0-based...
|
||||||
make(['Index: ',
|
make(['Position: ',
|
||||||
|
$('<small>')
|
||||||
|
.addClass('text')
|
||||||
|
.css({
|
||||||
|
whiteSpace: 'pre',
|
||||||
|
})
|
||||||
|
.html([
|
||||||
// ribbon...
|
// ribbon...
|
||||||
that.data.getImageOrder('ribbon', image) + 1
|
that.data.getImageOrder('ribbon', image) + 1
|
||||||
+'/'+
|
+'/'+
|
||||||
that.data.getImages(image).len
|
that.data.getImages(image).len
|
||||||
+ 'R',
|
+ '<small>R</small>',
|
||||||
// crop...
|
|
||||||
...((that.crop_stack && that.crop_stack.len > 0) ?
|
...((that.crop_stack && that.crop_stack.len > 0) ?
|
||||||
|
// crop...
|
||||||
[that.data.getImageOrder('loaded', image) + 1
|
[that.data.getImageOrder('loaded', image) + 1
|
||||||
+'/'+
|
+'/'+
|
||||||
that.data.getImages('loaded').len
|
that.data.getImages('loaded').len
|
||||||
+ 'C']
|
+ '<small>C</small>']
|
||||||
: []),
|
|
||||||
// global...
|
// global...
|
||||||
that.data.getImageOrder(image) + 1
|
: [that.data.getImageOrder(image) + 1
|
||||||
+'/'+
|
+'/'+
|
||||||
that.data.getImages('all').len
|
that.data.getImages('all').len
|
||||||
+ 'G', ])
|
+ '<small>G</small>']),
|
||||||
make(['Ribbon:',
|
// ribbon...
|
||||||
that.data.getRibbonOrder(image) + 1
|
'<span>R:</span>'+
|
||||||
|
(that.data.getRibbonOrder(image) + 1)
|
||||||
+'/'+
|
+'/'+
|
||||||
Object.keys(that.data.ribbons).length])
|
Object.keys(that.data.ribbons).length,
|
||||||
|
].join(' ')) ],
|
||||||
|
{ cls: 'index' })
|
||||||
make.Separator()
|
make.Separator()
|
||||||
|
|
||||||
|
// comment...
|
||||||
|
make.Editable(['$Comment: ',
|
||||||
|
function(){
|
||||||
|
return data && data.comment || '' }],
|
||||||
|
{
|
||||||
|
start_on: 'open',
|
||||||
|
edit_text: 'last',
|
||||||
|
multiline: true,
|
||||||
|
reset_on_commit: false,
|
||||||
|
editdone: function(evt, value){
|
||||||
|
if(value.trim() == ''){
|
||||||
|
return }
|
||||||
|
data = that.images[image] = that.images[image] || {}
|
||||||
|
data.comment = value
|
||||||
|
// mark image as changed...
|
||||||
|
that.markChanged
|
||||||
|
&& that.markChanged('images', [image])
|
||||||
|
},
|
||||||
|
})
|
||||||
|
make.Separator()
|
||||||
|
|
||||||
|
// gid...
|
||||||
|
make(['$GID: ', image])
|
||||||
|
|
||||||
|
|
||||||
if(data){
|
if(data){
|
||||||
// some abstractions...
|
// some abstractions...
|
||||||
var _basename = typeof(path) != 'undefined' ?
|
var _basename = typeof(path) != 'undefined' ?
|
||||||
@ -450,26 +478,6 @@ var MetadataUIActions = actions.Actions({
|
|||||||
{disabled: true})
|
{disabled: true})
|
||||||
}
|
}
|
||||||
|
|
||||||
// comment...
|
|
||||||
make.Editable(['$Comment: ',
|
|
||||||
function(){
|
|
||||||
return data && data.comment || '' }],
|
|
||||||
{
|
|
||||||
start_on: 'open',
|
|
||||||
edit_text: 'last',
|
|
||||||
multiline: true,
|
|
||||||
reset_on_commit: false,
|
|
||||||
editdone: function(evt, value){
|
|
||||||
if(value.trim() == ''){
|
|
||||||
return }
|
|
||||||
data = that.images[image] = that.images[image] || {}
|
|
||||||
data.comment = value
|
|
||||||
// mark image as changed...
|
|
||||||
that.markChanged
|
|
||||||
&& that.markChanged('images', [image])
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
// get other sections...
|
// get other sections...
|
||||||
that.callSortedAction('metadataSection', make, image, data, mode)
|
that.callSortedAction('metadataSection', make, image, data, mode)
|
||||||
}, {
|
}, {
|
||||||
|
|||||||
@ -711,6 +711,7 @@ var TagUIActions = actions.Actions({
|
|||||||
function(make, gid, image){
|
function(make, gid, image){
|
||||||
var that = this
|
var that = this
|
||||||
|
|
||||||
|
make.Separator()
|
||||||
make(['$Tags:',
|
make(['$Tags:',
|
||||||
function(){
|
function(){
|
||||||
return that.data.getTags(gid).join(', ') }],
|
return that.data.getTags(gid).join(', ') }],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user