From 666191355e9b278006963fd9584a90f73d1f4bbe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20Kr=E6mmer=20Nielsen?= Date: Fri, 12 Dec 2008 03:11:51 +0100 Subject: [PATCH] Changed TTV lookup links to use ttvpumpe.opdatering.tv2.dk interface --- content/quickbox.js | 14 ++++++++++++-- content/tv2developer.js | 5 +++-- version | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/content/quickbox.js b/content/quickbox.js index 45427a5..6723b3a 100644 --- a/content/quickbox.js +++ b/content/quickbox.js @@ -324,7 +324,17 @@ var TV2DeveloperQuickBox = { } if (action != 'go-bugzilla') { action_uses_opdatering = true; - site = (action == 'go-userid' ? 'login' : 'i2'); + switch (action) { + case 'go-userid': + site = 'login'; + break; + case 'go-ttv-page': + site = 'ttvpumpe'; + break; + default: + site = 'i2'; + break; + } } break; case 'go-pdolog': @@ -374,7 +384,7 @@ var TV2DeveloperQuickBox = { uri = '/tool/query/?id=&2=&3=&_checkbox=1&content_id='+longest_id+'&4=&5=0&6=&action=Query&timeout=1'; break; case 'go-ttv-page': - uri = '/tool/ttv/?1=' + longest_id + '&2=0'; + uri = '/?channel=TV+2&page='+longest_id+'#'+longest_id; break; case 'go-tango-page': uri = '/tango/entry.php?url='+action_on_url_encoded; diff --git a/content/tv2developer.js b/content/tv2developer.js index 77d1aff..840b631 100644 --- a/content/tv2developer.js +++ b/content/tv2developer.js @@ -398,13 +398,14 @@ var TV2Developer = { if (tv2_sitename == 'ttv') { links.push(new this.TV2LinkSplit()); var ttv_page = /side=([0-9]+)/.exec(tv2_uri); + var ttvpumpelink = 'ttvpumpe'+updatepostfix; if (ttv_page) { skip_treenodes = true; links.push(new this.TV2LinkWithLabel('ttvpage', TV2Util.getStr('lookupTTVPage') + ' ' + ttv_page[1], - i2link + '/tool/ttv/?1=' + ttv_page[1] + '&2=0', /* hardcoded to TV 2 TTV */ + 'http://' + ttvpumpelink + '/?channel=TV+2&page=' + ttv_page[1] + '#' + ttv_page[1], /* hardcoded to TV 2 TTV */ TV2Util.getStr('lookupTTVPage.accesskey'))); } - /*links.push(new this.TV2Link('ttvpumpe', 'ttvpumpe'+updatepostfix, '/', TV2Util.getStr('ttvpumpe.accesskey')));*/ + /*links.push(new this.TV2Link('ttvpumpe', ttvpumpelink, '/', TV2Util.getStr('ttvpumpe.accesskey')));*/ links.push(new this.TV2Link('ttvpumpe', 'ttvpumpe.opdatering.tv2.dk', '/', TV2Util.getStr('ttvpumpe.accesskey'))); } diff --git a/version b/version index 35ad344..62d5dbd 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.11.4 +0.11.5 -- 2.52.0