diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc index 80b827a1..717e3a03 100644 --- a/pandora/padma.jsonc +++ b/pandora/padma.jsonc @@ -529,7 +529,7 @@ "clipsColumns": 2, "columns": { "Colors": { - "columns": ["title", "director", "location", "source", "hue", "saturation", "brightness"], + "columns": ["title", "source", "project", "language", "hue", "saturation", "brightness"], "columnWidth": {} } }, @@ -549,7 +549,7 @@ "itemFind": {"conditions": [], "operator": "&"}, "itemSort": [{"key": "position", "operator": "+"}], "itemView": "info", - "listColumns": ["title", "director", "location", "source", "language", "duration"], + "listColumns": ["title", "source", "project", "director", "language", "duration"], "listColumnWidth": {}, "listSelection": [], "listSort": [{"key": "title", "operator": "+"}], diff --git a/static/js/pandora/infoView.padma.js b/static/js/pandora/infoView.padma.js index 031580ad..9b994d8d 100644 --- a/static/js/pandora/infoView.padma.js +++ b/static/js/pandora/infoView.padma.js @@ -132,7 +132,7 @@ pandora.ui.infoView = function(data) { $browserImages = []; - pandora.createLinks($text); + //pandora.createLinks($text); // Title ------------------------------------------------------------------- diff --git a/static/js/pandora/item.js b/static/js/pandora/item.js index 2690b4d1..f3a7b53b 100644 --- a/static/js/pandora/item.js +++ b/static/js/pandora/item.js @@ -125,7 +125,8 @@ pandora.ui.item = function() { annotationsRange: pandora.user.ui.annotationsRange, annotationsSize: pandora.user.ui.annotationsSize, annotationsSort: pandora.user.ui.annotationsSort, - censored: videoOptions.censored, + censored: videoOptions.censored, + clickLink: pandora.clickLink, cuts: result.data.cuts || [], duration: result.data.duration, enableSubtitles: pandora.user.ui.videoSubtitles, @@ -225,6 +226,7 @@ pandora.ui.item = function() { annotationsSize: pandora.user.ui.annotationsSize, annotationsSort: pandora.user.ui.annotationsSort, censored: videoOptions.censored, + clickLink: pandora.clickLink, cuts: result.data.cuts || [], duration: result.data.duration, enableSubtitles: pandora.user.ui.videoSubtitles, diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js index a0935fa5..bb717585 100644 --- a/static/js/pandora/utils.js +++ b/static/js/pandora/utils.js @@ -177,7 +177,7 @@ pandora.clickLink = function(e) { if (e.target.hostname == document.location.hostname) { pandora.URL.push(e.target.pathname); } else { - document.location.href = '/url=' + encodeURIComponent(e.target.href); + window.open('/url=' + encodeURIComponent(e.target.href), '_blank'); } };