From: Kristian Kraemmer Nielsen Date: Sat, 3 Apr 2010 03:58:18 +0000 (+0200) Subject: Added way to lookup R7 Program IDs X-Git-Url: https://git.jkkn.net/?a=commitdiff_plain;h=c29d0aa6ecce456c111688b5b652c12e8b545522;p=tv2developer Added way to lookup R7 Program IDs At the same time less used actions were placed into a drop down selection box with their own access keys. --- diff --git a/content/quickbox.js b/content/quickbox.js index 2d8036f..1a360d9 100644 --- a/content/quickbox.js +++ b/content/quickbox.js @@ -91,9 +91,29 @@ var TV2DeveloperQuickBox = { } }, + /* Updates action selection (handles drop down if needed) */ + _setCurAction: function(action) { + if (action.tagName != 'menuitem') { + document.getElementById('action').selectedItem = action; + } else { + document.getElementById('action').selectedItem = + document.getElementById('go-other'); + document.getElementById('action-other').selectedItem = action; + } + }, + + /* Returns selected action (hanlding drop down of actions) */ + _getCurAction: function() { + var action = document.getElementById('action').selectedItem; + if (action.id == 'go-other') { + action = document.getElementById('action-other').selectedItem; + } + return action; + }, + /* Change action manually */ setManuel: function(target, doReturnFocus) { - if (typeof doReturnFocus == 'undefined') doReturnFocus = true; + if (typeof doReturnFocus == 'undefined') doReturnFocus = true; var action = document.getElementById('action').selectedItem.id; var makeSiteURL = this._shouldMakeURL(action); var environment = document.getElementById('environment').selectedItem; @@ -110,6 +130,11 @@ var TV2DeveloperQuickBox = { document.getElementById('php4branch').disabled = (action != 'go-gitweb'); document.getElementById('viewcontent').disabled = (action != 'go-gitweb'); document.getElementById('environment').disabled = (action == 'go-gitweb' || action == 'go-bugzilla'); + document.getElementById('action-other').disabled = (action != 'go-other'); + if (action == 'go-other' && !this._autoChange) { + document.getElementById('action-other').focus(); + doReturnFocus = false; + } } document.getElementById('php4site').disabled = (!makeSiteURL || action == 'go-pdolog' || action == 'go-gitweb') || (environment && environment.id == 'live'); @@ -274,7 +299,7 @@ var TV2DeveloperQuickBox = { // read options env = document.getElementById('environment').selectedItem.id; sitetype = document.getElementById('sitetype').selectedItem.id; - action = document.getElementById('action').selectedItem.id; + action = this._getCurAction().id; php4 = document.getElementById('php4site').checked; if (env == 'othertest') { env = 'test'; @@ -285,12 +310,13 @@ var TV2DeveloperQuickBox = { } } else { // determind action - var cur_action = document.getElementById('action').selectedItem; + var cur_action = this._getCurAction(); // lock action and environment for these actions switch (cur_action.id) { case 'go-content-id': case 'go-userid': case 'go-username': + case 'go-r7program': case 'go-bugzilla': case 'go-registry': auto_action = cur_action.id; @@ -336,7 +362,7 @@ var TV2DeveloperQuickBox = { branch = auto_branch; document.getElementById('subdomain').value=branch; document.getElementById('sitetype').selectedItem=document.getElementById(sitetype); - document.getElementById('action').selectedItem=document.getElementById(action); + this._setCurAction(document.getElementById(action)); document.getElementById('php4site').checked = php4; this._autoChange = false; } @@ -356,6 +382,7 @@ var TV2DeveloperQuickBox = { case 'go-content-id': case 'go-ttv-page': case 'go-userid': + case 'go-r7program': case 'go-bugzilla': // find longest id in entered url var max_len = 0; @@ -421,6 +448,10 @@ var TV2DeveloperQuickBox = { // Just assume a username was entered uri = '/opslag.php?username=' + escape(shorturl); break; + case 'go-r7program': + // Lookup R7 using longest id entered + uri = '/tool/r7/?1=' + longest_id; + break; case 'go-bugzilla': // Use longest_id as bugzilla number uri = '/show_bug.cgi?format=multiple&id=' + longest_id; @@ -744,7 +775,7 @@ var TV2DeveloperQuickBox = { } this._autoChange = true; - document.getElementById('action').selectedItem = document.getElementById(action); + this._setCurAction(document.getElementById(action)); document.getElementById('shorturl').value = url; this._autoChange = false; diff --git a/content/quickbox.xul b/content/quickbox.xul index 5c78060..b6435ce 100644 --- a/content/quickbox.xul +++ b/content/quickbox.xul @@ -84,10 +84,16 @@ - - + + + + + + + + diff --git a/content/tv2developer.js b/content/tv2developer.js index bb5db12..289db71 100644 --- a/content/tv2developer.js +++ b/content/tv2developer.js @@ -5,6 +5,7 @@ // Keyboard shortcuts // . = Prompttest // 2 = Back from i2 +// 7 = Lookup R7 video clip // A = Template // B = Robot // C = Gitweb @@ -205,6 +206,7 @@ var TV2Developer = { _reg_php: /^(.*\.php)/, _reg_nodeid: /([0-9]{2,})/g, _reg_i2files: /\/([0-9]+)-/, + _reg_r7program: /-([0-9]+)\//, _reg_fromgitweb: /^https?:\/\/flimmer\.tv2\.dk\/git\/\?p=([^/]+)\.tv2\.dk\.git.*(?:f=(webroot|robot|opdatering|template)([^;&]*))/, _reg_fromi2if: /^\/(tango\/(entry|requeue|dynamic)|tool\/pdo_log\/frameset)\.php.*?(\?|&)url=([^&]+)/, _reg_cutdomain: /^(.*)\.tv2\.dk$/, @@ -478,6 +480,20 @@ var TV2Developer = { } } + // Sputnik R7 program links + if (tv2_sitename == 'sputnik') { + var programId = this._reg_r7program.exec(tv2_uriOnly); + if (programId) { + skip_treenodes = true; + links.push(new this.TV2LinkSplit()); + links.push(new this.TV2LinkWithLabel('r7program', TV2Util.getStr('lookupR7Program') + ' ' + programId[1], + i2link + + '/tool/r7/?1='+programId[1], + TV2Util.getStr('lookupR7Program.accesskey') + )); + } + } + // Try to extract node id and add links to the node tool if (!skip_treenodes) { var i2node = i2link + '/tool/node/?id='; diff --git a/locale/da-DK/tv2developer.dtd b/locale/da-DK/tv2developer.dtd index 0b5def5..9a69cde 100644 --- a/locale/da-DK/tv2developer.dtd +++ b/locale/da-DK/tv2developer.dtd @@ -83,18 +83,26 @@ - - - - - - + + + + + + + + + + + + + + diff --git a/locale/da-DK/tv2developer.properties b/locale/da-DK/tv2developer.properties index 5d658b8..f670a6e 100644 --- a/locale/da-DK/tv2developer.properties +++ b/locale/da-DK/tv2developer.properties @@ -23,6 +23,9 @@ lookupContent=Åbn I2 content ID lookupContent.type=type lookupContent.accesskey=k +lookupR7Program=Åbn R7 Program ID +lookupR7Program.accesskey=7 + lookupTreeNode=Åbn I2 node med ID lookupTreeNode.accesskey=n notTV2Site=Ikke på et tv2.dk site diff --git a/locale/en-US/tv2developer.dtd b/locale/en-US/tv2developer.dtd index eee7d62..748a9bd 100644 --- a/locale/en-US/tv2developer.dtd +++ b/locale/en-US/tv2developer.dtd @@ -82,18 +82,26 @@ - - - - - - + + + + + + + + + + + + + + diff --git a/locale/en-US/tv2developer.properties b/locale/en-US/tv2developer.properties index d7ba405..17ab78f 100644 --- a/locale/en-US/tv2developer.properties +++ b/locale/en-US/tv2developer.properties @@ -23,6 +23,9 @@ lookupContent=Lookup content ID lookupContent.type=type lookupContent.accesskey=k +lookupR7Program=Lookup R7 Program ID +lookupR7Program.accesskey=7 + lookupTreeNode=Lookup tree node with ID lookupTreeNode.accesskey=n notTV2Site=Not a tv2.dk site diff --git a/version b/version index 5daaa7b..0580518 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.13.7 +0.13.8 \ No newline at end of file diff --git a/webroot/index.html b/webroot/index.html index e9d2634..26e046a 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -60,6 +60,10 @@
  • Returnér til tilhørende url fra følgende interfaces:
    PDO_Log, Tango Query, Tango Requeue og Dynamic Version.
    • +

    Feature liste på sputnik:

    +
      +
    • R7_Program Id'er genkendes og det tilbydes at slå disse op i I2.
      • +

    Generelle links

    • tv2.dk (hvis ikke allerede på en tv2.dk side).
      • @@ -98,6 +102,7 @@
    • Genkender URL angivet som parameter i fleste i2-interfaces
    • Ved GitWeb genkendes specielle sites så som globals og specielle mapper så som inc, brug dobbelt slash (//) efter projektnavn for at undgå dette.
    • Slå TV 2 Login brugere op pr. navn eller id
      • +
    • Slå R7 programmer op i I2 via deres R7 Program id
    • Slå Bugzilla opgave op
    • Slå et I2 Regsitry namespace op i node-værktøjet
    • Eksempler på GIT opslags tricks:
      • diff --git a/webroot/whatsnew.xhtml b/webroot/whatsnew.xhtml index 3accb0f..87599ae 100644 --- a/webroot/whatsnew.xhtml +++ b/webroot/whatsnew.xhtml @@ -6,6 +6,10 @@

      What's new:

      +
    • 0.13.8
      • +
        +
      • Genkender nu R7 id'er på Sputnik og kan slå disse op.
        • +
    • 0.13.6
      • Tilføjede support for branches/subdomains, e.x. vmhf2010.query.php5.stage.tv2.dk