From 8f529d68d3ab3e91bf1077124443415c0e307dfd Mon Sep 17 00:00:00 2001 From: rolux Date: Wed, 21 Mar 2012 09:36:11 +0000 Subject: [PATCH] keep friends from seeing extra item views, but allow them to see list sizes --- pandora/0xdb.jsonc | 3 ++- pandora/padma.jsonc | 3 ++- static/js/pandora/statusbar.js | 8 +++++++- static/js/pandora/usersDialog.js | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pandora/0xdb.jsonc b/pandora/0xdb.jsonc index 0ec608354..c13a54ef8 100644 --- a/pandora/0xdb.jsonc +++ b/pandora/0xdb.jsonc @@ -35,9 +35,10 @@ "canPlayClips": {"guest": 2, "member": 2, "friend": 4, "staff": 4, "admin": 4}, "canPlayVideo": {"guest": 1, "member": 1, "friend": 4, "staff": 4, "admin": 4}, "canSeeDebugMenu": {"staff": true, "admin": true}, + "canSeeExtraItemViews": {"staff": true, "admin": true}, "canSeeFiles": {"staff": true, "admin": true}, "canSeeItem": {"guest": 3, "member": 3, "friend": 4, "staff": 4, "admin": 4}, - "canSeeExtraItemViews": {"friend": true, "staff": true, "admin": true}, + "canSeeListSize": {"friend": true, "staff": true, "admin": true}, "canSendMail": {"staff": true, "admin": true}, "canUploadVideo": {"guest": false, "member": false, "staff": true, "admin": true} }, diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc index 22e1f38bb..cc815172f 100644 --- a/pandora/padma.jsonc +++ b/pandora/padma.jsonc @@ -33,9 +33,10 @@ "canPlayClips": {"guest": 1, "member": 1, "staff": 4, "admin": 4}, "canPlayVideo": {"guest": 1, "member": 1, "staff": 4, "admin": 4}, "canSeeDebugMenu": {"staff": true, "admin": true}, + "canSeeExtraItemViews": {"staff": true, "admin": true}, "canSeeFiles": {"staff": true, "admin": true}, "canSeeItem": {"guest": 1, "member": 1, "staff": 4, "admin": 4}, - "canSeeExtraItemViews": {"friend": true, "staff": true, "admin": true}, + "canSeeListSize": {"friend": true, "staff": true, "admin": true}, "canSendMail": {"staff": true, "admin": true}, "canUploadVideo": {"guest": false, "member": true, "staff": true, "admin": true} }, diff --git a/static/js/pandora/statusbar.js b/static/js/pandora/statusbar.js index d7f1bdc06..40bddc3a2 100644 --- a/static/js/pandora/statusbar.js +++ b/static/js/pandora/statusbar.js @@ -31,6 +31,8 @@ pandora.ui.statusbar = function() { function getText(data) { var ui = pandora.user.ui, + canSeeFiles = pandora.site.capabilities.canSeeFiles[pandora.user.level], + canSeeListSize = pandora.site.capabilities.canSeeListSize[pandora.user.level], itemName = ui.listView == 'clip' ? (data.items == 1 ? 'Clip' : 'Clips') : (pandora.site.itemName[data.items == 1 ? 'singular' : 'plural']), @@ -41,10 +43,14 @@ pandora.ui.statusbar = function() { } else if (data.duration) { parts.push(Ox.formatDuration(data.duration, 'short')); } - if (pandora.site.capabilities.canSeeFiles[pandora.user.level]) { + if (canSeeFiles) { data.files && parts.push(data.files + ' file' + (data.files == 1 ? '' : 's')); data.duration && parts.push(Ox.formatDuration(data.duration)); + } + if (canSeeListSize) { data.size && parts.push(Ox.formatValue(data.size, 'B')); + } + if (canSeeFiles) { data.pixels && parts.push(Ox.formatValue(data.pixels, 'px')); } return parts.join(', '); diff --git a/static/js/pandora/usersDialog.js b/static/js/pandora/usersDialog.js index faacd0df4..4a873ff10 100644 --- a/static/js/pandora/usersDialog.js +++ b/static/js/pandora/usersDialog.js @@ -130,7 +130,7 @@ pandora.ui.usersDialog = function() { align: 'center', format: function(value, data) { var userLevel = data.useragent.indexOf('Googlebot') > -1 - ? 'Robot' : value; + ? 'Robot' : Ox.toTitleCase(value); return Ox.Theme.formatColorLevel( userLevels.indexOf(userLevel), userLevels,