From c46324d7c897685d7be46ee004845d81d4857380 Mon Sep 17 00:00:00 2001 From: jkkn Date: Wed, 17 Oct 2007 15:19:29 +0000 Subject: [PATCH] moved shortcuts to locale and changes a bit --- content/tv2developer.js | 55 +++++++++++++++------------- locale/en-US/tv2developer.properties | 22 +++++++++-- version | 2 +- 3 files changed, 49 insertions(+), 30 deletions(-) diff --git a/content/tv2developer.js b/content/tv2developer.js index e360549..51de616 100755 --- a/content/tv2developer.js +++ b/content/tv2developer.js @@ -4,17 +4,17 @@ // // Keyboard shortcuts // . = Prompttest +// 2 = Back from i2 // A = Template // B = Robot -// C = Back from i2 -// C = Lookup content +// C = Viewcvs // D = Dynamic version // E = Node info // F = Tango interface // G = Look in tango // I = I2 tree +// K = Lookup content // L = Live -// M = W3c markup validator // N = Node lookup // O = Opdatering // P = Ttv page @@ -22,12 +22,12 @@ // R = Requeue in tango // S = Snapshot // T = Test +// T = tv2.dk // U = Node query tool -// V = Viewcvs +// V = W3C markup validator // W = Webroot // X = Examine database queries - var TV2Developer = { _lastAction: null, @@ -231,20 +231,20 @@ var TV2Developer = { // Add the two urls we are not at if (!tv2_testsite) { // always add swaps to snapshot and the test site - links.push(new this.TV2Link('test_live_swap', testurl, tv2_uri, 't')); - links.push(new this.TV2Link('snapshot_live_swap', snapshoturl, tv2_uri, 's')); - links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, '.', 'promptInitials')); + links.push(new this.TV2Link('test_live_swap', testurl, tv2_uri, this.getStr('test.accesskey'))); + links.push(new this.TV2Link('snapshot_live_swap', snapshoturl, tv2_uri, this.getStr('snapshot.accesskey'))); + links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, this.getStr('testprompt.accesskey'), 'promptInitials')); } else if (tv2_testtype == 'snapshot') { - links.push(new this.TV2Link('snapshot_live_swap', liveurl, tv2_uri, 'l')); - links.push(new this.TV2Link('test_snapshot_swap', testurl, tv2_uri, 't')); - links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, '.', 'promptInitials')); + links.push(new this.TV2Link('snapshot_live_swap', liveurl, tv2_uri, this.getStr('live.accesskey'))); + links.push(new this.TV2Link('test_snapshot_swap', testurl, tv2_uri, this.getStr('test.accesskey'))); + links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, this.getStr('testprompt.accesskey'), 'promptInitials')); } else { // must be test - links.push(new this.TV2Link('test_live_swap', liveurl, tv2_uri, 'l')); - links.push(new this.TV2Link('test_snapshot_swap', snapshoturl, tv2_uri, 's')); + links.push(new this.TV2Link('test_live_swap', liveurl, tv2_uri, this.getStr('live.accesskey'))); + links.push(new this.TV2Link('test_snapshot_swap', snapshoturl, tv2_uri, this.getStr('snapshot.accesskey'))); if (tv2_user != initials) { - links.push(new this.TV2Link('test_swap', testurl, tv2_uri, 't')); + links.push(new this.TV2Link('test_swap', testurl, tv2_uri, this.getStr('test.accesskey'))); } - links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, '.', 'promptInitials')); + links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, this.getStr('testprompt.accesskey'), 'promptInitials')); } links.push(new this.TV2LinkSplit()); @@ -257,9 +257,12 @@ var TV2Developer = { var robot = _prefix + '.robot' + _postfix; var normal = (tv2_testsite ? _prefix + '.' + tv2_testsite + '.tv2.dk' : live_sitename + 'tv2.dk'); - links.push(new this.TV2Link('opdatering_swap', (tv2_sitetype!='opdatering')?opdatering:normal, '/', (tv2_sitetype!='opdatering')?'o':'w')); - //links.push(new this.TV2Link('template_swap', (tv2_sitetype!='template')?template:normal, '/', (tv2_sitetype!='template')?'a':'w')); - links.push(new this.TV2Link('robot_swap', (tv2_sitetype!='robot')?robot:normal, '/', (tv2_sitetype!='robot')?'b':'w')); + links.push(new this.TV2Link('opdatering_swap', (tv2_sitetype!='opdatering')?opdatering:normal, '/', + (tv2_sitetype!='opdatering') ? this.getStr('opdatering.accesskey') : this.getStr('webroot.accesskey'))); + /*links.push(new this.TV2Link('template_swap', (tv2_sitetype!='template')?template:normal, '/', + (tv2_sitetype!='template') ? this.getStr('template.accesskey') : this.getStr('webroot.accesskey'))); */ + links.push(new this.TV2Link('robot_swap', (tv2_sitetype!='robot')?robot:normal, '/', + (tv2_sitetype!='robot') ? this.getStr('robot.accesskey') : this.getStr('webroot.accesskey'))); links.push(new this.TV2LinkSplit()); @@ -334,7 +337,7 @@ var TV2Developer = { /* link entered in I2 interface */ links.push(new this.TV2LinkSplit()); /* tango/entry, tango/requeue, tango/dynamic, tool/pdo_log */ - links.push(new this.TV2LinkWithLabel(onI2interface, onI2interface_url, onI2interface_url, 'c')); + links.push(new this.TV2LinkWithLabel(onI2interface, onI2interface_url, onI2interface_url, this.getStr('backI2.accesskey'))); } // Some special cases for some sites @@ -347,8 +350,8 @@ var TV2Developer = { i2link + '/tool/ttv/?1=' + ttv_page[1] + '&2=0', /* hardcoded to TV 2 TTV */ this.getStr('lookupTTVPage.accesskey'))); } - /*links.push(new this.TV2Link('ttvpumpe', 'ttvpumpe'+updatepostfix, '/', 'p'));*/ - links.push(new this.TV2Link('ttvpumpe', 'ttvpumpe.opdatering.tv2.dk', '/', 'p')); + /*links.push(new this.TV2Link('ttvpumpe', 'ttvpumpe'+updatepostfix, '/', this.getStr('ttvpumpe.accesskey')));*/ + links.push(new this.TV2Link('ttvpumpe', 'ttvpumpe.opdatering.tv2.dk', '/', this.getStr('ttvpumpe.accesskey'))); } // I2-Files and I2-Images @@ -417,15 +420,15 @@ var TV2Developer = { var live_sitename = (tv2_sitetype=='webroot' && tv2_sitename=='www') ? '': (tv2_sitename+'.'); var type = (tv2_sitetype=='webroot')? '' : tv2_sitetype+'.'; - links.push(new this.TV2Link('viewcvs_live', live_sitename + type + 'tv2.dk', tv2_uri, 'l')); - links.push(new this.TV2Link('viewcvs_test', tv2_sitename + '.' + initials + '.' + type + 'test' + testType + '.tv2.dk', tv2_uri, 't')); - links.push(new this.TV2Link('viewcvs_snapshot', tv2_sitename + '.' + type + 'snapshot' + testType + '.tv2.dk', tv2_uri, 's')); - links.push(new this.TV2Link('viewcvs_testprompt', tv2_sitename + '.?.' + type + 'test' + testType + '.tv2.dk', tv2_uri, '.', 'promptInitials')); + links.push(new this.TV2Link('viewcvs_live', live_sitename + type + 'tv2.dk', tv2_uri, this.getStr('live.accesskey'))); + links.push(new this.TV2Link('viewcvs_test', tv2_sitename + '.' + initials + '.' + type + 'test' + testType + '.tv2.dk', tv2_uri, this.getStr('test.accesskey'))); + links.push(new this.TV2Link('viewcvs_snapshot', tv2_sitename + '.' + type + 'snapshot' + testType + '.tv2.dk', tv2_uri, this.getStr('snapshot.accesskey'))); + links.push(new this.TV2Link('viewcvs_testprompt', tv2_sitename + '.?.' + type + 'test' + testType + '.tv2.dk', tv2_uri, this.getStr('testprompt.accesskey'), 'promptInitials')); } else { links.push(new this.TV2LinkWithLabel('disabled', this.getStr('notTV2Site'), null, '', null, true)); links.push(new this.TV2LinkSplit()); - links.push(new this.TV2Link('tv2dk', 'tv2.dk', '/', 't')); + links.push(new this.TV2Link('tv2dk', 'tv2.dk', '/', this.getStr('tv2dk.accesskey'))); } } diff --git a/locale/en-US/tv2developer.properties b/locale/en-US/tv2developer.properties index 8f4e788..9272cb6 100755 --- a/locale/en-US/tv2developer.properties +++ b/locale/en-US/tv2developer.properties @@ -1,5 +1,5 @@ lookupInViewCVS=Lookup this page in ViewCVS -lookupInViewCVS.accesskey=v +lookupInViewCVS.accesskey=c viewDynamicVersion=View dynamic version of this page viewDynamicVersion.accesskey=d @@ -18,7 +18,7 @@ lookupTTVPage.accesskey=p lookupContent=Lookup content ID lookupContent.type=type -lookupContent.accesskey=c +lookupContent.accesskey=k lookupTreeNode=Lookup tree node with ID lookupTreeNode.accesskey=n @@ -37,6 +37,22 @@ tangoInterface=Tango Interface tangoInterface.accesskey=f w3c=W3C Markup Validator -w3c.accesskey=m +w3c.accesskey=v + +live.accesskey=l +test.accesskey=t +snapshot.accesskey=s +testprompt.accesskey=. + +webroot.accesskey=w +opdatering.accesskey=o +template.accesskey=a +robot.accesskey=b + +backI2.accesskey=2 + +ttvpumpe.accesskey=p + +tv2dk.accesskey=t enterInitials=Enter TV 2 initials (e.x. jkkn): diff --git a/version b/version index 4b9fcbe..cb0c939 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.5.1 +0.5.2 -- 2.52.0