From ca4db4353d94fb20544fe979bb60bc402bb8f706 Mon Sep 17 00:00:00 2001 From: j Date: Tue, 20 May 2014 02:44:13 +0200 Subject: [PATCH] format. migration --- migrations/versions/4480ecc50e04_.py | 26 ++++++++++++++++++++++++++ static/js/browser.js | 2 +- static/js/infoView.js | 8 +++++--- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 migrations/versions/4480ecc50e04_.py diff --git a/migrations/versions/4480ecc50e04_.py b/migrations/versions/4480ecc50e04_.py new file mode 100644 index 0000000..03d2c2a --- /dev/null +++ b/migrations/versions/4480ecc50e04_.py @@ -0,0 +1,26 @@ +"""empty message + +Revision ID: 4480ecc50e04 +Revises: 3169519dc1e5 +Create Date: 2014-05-20 02:20:20.283739 + +""" + +# revision identifiers, used by Alembic. +revision = '4480ecc50e04' +down_revision = '3169519dc1e5' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.add_column('changelog', sa.Column('timestamp', sa.BigInteger(), nullable=True)) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_column('changelog', 'timestamp') + ### end Alembic commands ### diff --git a/static/js/browser.js b/static/js/browser.js index 3c72960..c1b2157 100644 --- a/static/js/browser.js +++ b/static/js/browser.js @@ -29,7 +29,7 @@ oml.ui.browser = function() { borderWidth: Math.round(size / 64) + 'px 0', borderStyle: 'solid', borderColor: 'rgba(' + color[2].join(', ') + ')', - margin: Math.round(size / 18) + 'px ' + Math.round(width / 2 - 14) + 'px', + margin: Math.round(size / 18) + 'px ' + Math.round(width / 2 - 8) + 'px', fontSize: Math.round(size / 16) + 'px', textAlign: 'center', color: 'rgba(' + color[2].join(', ') + ')', diff --git a/static/js/infoView.js b/static/js/infoView.js index a5a79ba..1d27e57 100644 --- a/static/js/infoView.js +++ b/static/js/infoView.js @@ -102,7 +102,7 @@ oml.ui.infoView = function(identifyData) { function formatValue(value, key, join) { value = Ox.encodeHTMLEntities(value); return value ? (Ox.isArray(value) ? value : [value]).map(function(value) { - return key ? + return key && !identifyData ? '' + value + '' : value; }).join(join || ', ') : ''; @@ -269,6 +269,8 @@ oml.ui.infoView = function(identifyData) { data = result.data; } + Ox.print('BOOK DATA', data) + var $mediaButton, isEditable = !data.mainid && data.mediastate == 'available', src = !identifyData @@ -406,7 +408,7 @@ oml.ui.infoView = function(identifyData) { textAlign: 'justify' }) .html( - Ox.formatValue(data.classification, 'classification') + formatValue(data.classification, 'classification') ) .appendTo($info); } @@ -437,7 +439,7 @@ oml.ui.infoView = function(identifyData) { }) .text( [ - data.extension.toUpperCase(), + (data.extension || '???').toUpperCase(), // FIXME Ox.formatValue(data.size, 'B') ].join(', ') )