From 1320d6fc6d4d98ff1c05092443d5d7bc6ac2ac05 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 7 Mar 2010 06:15:17 +0100 Subject: [PATCH] Support was added for branches (subdomains) --- content/quickbox.js | 52 +++++++++++++++++++++++++---------- content/quickbox.xul | 5 ++++ content/tv2developer.js | 45 ++++++++++++++++++++---------- locale/da-DK/tv2developer.dtd | 6 ++-- locale/en-US/tv2developer.dtd | 5 +++- version | 2 +- webroot/index.html | 1 + webroot/whatsnew.xhtml | 4 +++ 8 files changed, 86 insertions(+), 34 deletions(-) diff --git a/content/quickbox.js b/content/quickbox.js index c9ff1f5..2d8036f 100644 --- a/content/quickbox.js +++ b/content/quickbox.js @@ -15,7 +15,7 @@ var TV2DeveloperQuickBox = { _saveInitials: false, /* save the alternative initials field */ /* assemble a final url */ - _makeUrl: function(protocol, env, sitetype, php4, username, site, uri, dynsite) { + _makeUrl: function(protocol, env, sitetype, branch, php4, username, site, uri, dynsite) { var domain; // Assemble domain // Always remove -dyn on test and -static on live @@ -51,6 +51,10 @@ var TV2DeveloperQuickBox = { domain = site + '.'; } } + // handle branch + if (env != 'live' && branch) { + domain += branch + '.'; + } // handle environment if (env == 'test') { domain += username + '.'; @@ -105,10 +109,13 @@ var TV2DeveloperQuickBox = { document.getElementById('sitetype').disabled = !makeSiteURL; document.getElementById('php4branch').disabled = (action != 'go-gitweb'); document.getElementById('viewcontent').disabled = (action != 'go-gitweb'); - document.getElementById('environment').disabled = (action == 'go-gitweb'); + document.getElementById('environment').disabled = (action == 'go-gitweb' || action == 'go-bugzilla'); } document.getElementById('php4site').disabled = (!makeSiteURL || action == 'go-pdolog' || action == 'go-gitweb') || (environment && environment.id == 'live'); + document.getElementById('subdomain.label').disabled = + document.getElementById('subdomain').disabled = ((action == 'go-gitweb' || action == 'go-bugzilla') + || (environment && environment.id == 'live')); if (!this._autoChange) { /* avoid updating if this was triggered by updateQuickbox() */ if (target.id == 'testname' && document.getElementById('environment').selectedItem.id != 'othertest') { @@ -153,6 +160,7 @@ var TV2DeveloperQuickBox = { var auto_sitetype = 'webroot'; var auto_env = 'live'; var auto_username = null; + var auto_branch = ''; var auto_php4 = false; var validState = true; @@ -206,14 +214,6 @@ var TV2DeveloperQuickBox = { // optional username if (!auto_username) { - if (part.length == 5) { - var lastChar = part.substr(part.length-1, 1); - if (lastChar == '4' || lastChar == '5') { - part = part.substr(0, part.length-1); // handle 'jkkn4' as short for php4 site, ... - auto_php4 = (lastChar == '4'); - } - // will also continue into next if-statement since we cut off one character - } if (part.length == 4) { auto_username = part; if (auto_env == 'live') { @@ -222,7 +222,7 @@ var TV2DeveloperQuickBox = { continue; } } - + // detect short sitetype (.o, .op, .opd,.. ) var used = false; for (var j=0; j + + diff --git a/content/tv2developer.js b/content/tv2developer.js index 1661b1d..565b9f9 100644 --- a/content/tv2developer.js +++ b/content/tv2developer.js @@ -200,7 +200,8 @@ var TV2Developer = { }, /* Main function for adding all the links for the menu popup */ - _reg_tv2: /^https?:\/\/([^/.]*)?([^/]*?)(\.(robot|opdatering|template)\.?)?(\.(php4|php5)\.?)?(\.((test3?|snapshot3?|stage))\.)?tv2\.dk((\/[^#\?]*).*)?$/, + _reg_tv2: /^https?:\/\/([^/.]*)?(\.([^/]*?))?(\.(robot|opdatering|template)\.?)?(\.(php4|php5)\.?)?(\.((test3?|snapshot3?|stage))\.)?tv2\.dk((\/[^#\?]*).*)?$/, + _reg_branchuser: /(([^.]*?)\.)?([^.]*)/, _reg_php: /^(.*\.php)/, _reg_nodeid: /([0-9]{2,})/g, _reg_i2files: /\/([0-9]+)-/, @@ -222,18 +223,17 @@ var TV2Developer = { if (tv2 && !fromgitweb) { var skip_treenodes = false; var tv2_sitename = tv2[1]; - var tv2_user = tv2[2]; - var tv2_sitetype = tv2[4]; - var tv2_apptype = tv2[6]; // php4 or php5 - var tv2_testsite = tv2[8]; - var tv2_testtype = tv2[9]; /* no 3 */ - var tv2_uri = tv2[10]; - var tv2_uriOnly = tv2[11]; // no parameters, anchers + var tv2_branchuser = tv2[3]; + var tv2_sitetype = tv2[5]; + var tv2_apptype = tv2[7]; // php4 or php5 + var tv2_testsite = tv2[9]; + var tv2_testtype = tv2[10]; /* no 3 */ + var tv2_uri = tv2[11]; + var tv2_uriOnly = tv2[12]; // no parameters, anchers // Strip -dyn and -static if (tv2_sitename) tv2_sitename = tv2_sitename.replace(/-(dyn|static)$/, ''); - if (tv2_user) tv2_user = tv2_user.replace(/^\./, ''); - + // convert old URLs (.test3 / .snapshot3) if (tv2_testsite == 'test3') { tv2_testsite = 'test'; @@ -242,6 +242,21 @@ var TV2Developer = { tv2_testsite = 'snapshot'; tv2_apptype = 'php4'; } + + var tv2_user; + var tv2_branch; + // In stage and snapshot and test - split username and branch + if (tv2_testsite == 'snapshot' || tv2_testsite == 'stage' || tv2_testsite == 'test' && tv2_branchuser) { + if (tv2_testsite == 'test') { // if only one - this is the username + var bc = this._reg_branchuser.exec(tv2_branchuser); + if (bc) { + tv2_branch = bc[2]; + tv2_user = bc[3]; + } + } else { // we do not have usernames on snapshot/stage, so this is the branch + tv2_branch = tv2_branchuser; + } + } // php4 site var php4 = this._isPhp4(tv2_sitename); @@ -286,10 +301,10 @@ var TV2Developer = { } } - var testprompturl = git_sitename+'.'+'?'+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.test'+'.tv2.dk'; - var testurl = git_sitename+'.'+initials+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.test'+'.tv2.dk'; - var snapshoturl = git_sitename+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.snapshot'+'.tv2.dk'; - var stageurl = git_sitename+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.stage'+'.tv2.dk'; + var testprompturl = git_sitename+(tv2_branch?'.'+tv2_branch:'')+'.?'+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.test'+'.tv2.dk'; + var testurl = git_sitename+(tv2_branch?'.'+tv2_branch:'')+'.'+initials+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.test'+'.tv2.dk'; + var snapshoturl = git_sitename+(tv2_branch?'.'+tv2_branch:'')+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.snapshot'+'.tv2.dk'; + var stageurl = git_sitename+(tv2_branch?'.'+tv2_branch:'')+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.stage'+'.tv2.dk'; // Add the two urls we are not at if (!tv2_testsite) { // always add swaps to stage, snapshot and the test site @@ -320,7 +335,7 @@ var TV2Developer = { links.push(new this.TV2LinkSplit()); // Add link to .opdatering, .template, .robot - var _prefix = (tv2_testsite ? git_sitename : live_sitename) + (tv2_user ? '.' + tv2_user : ''); + var _prefix = (tv2_testsite ? git_sitename : live_sitename) + (tv2_branch?'.'+tv2_branch:'') + (tv2_user ? '.' + tv2_user : ''); var _postfix = (tv2_testsite ? '.'+tv2_apptype+'.'+tv2_testsite : '') + '.tv2.dk'; var opdatering = _prefix + '.opdatering' + _postfix; //var template = _prefix + '.template' + _postfix; diff --git a/locale/da-DK/tv2developer.dtd b/locale/da-DK/tv2developer.dtd index bd36c53..0b5def5 100644 --- a/locale/da-DK/tv2developer.dtd +++ b/locale/da-DK/tv2developer.dtd @@ -48,6 +48,9 @@ + + + @@ -64,8 +67,7 @@ - - + diff --git a/locale/en-US/tv2developer.dtd b/locale/en-US/tv2developer.dtd index ab07860..eee7d62 100644 --- a/locale/en-US/tv2developer.dtd +++ b/locale/en-US/tv2developer.dtd @@ -47,6 +47,9 @@ + + + @@ -63,7 +66,7 @@ - + diff --git a/version b/version index c37136a..ebf55b3 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.13.5 +0.13.6 diff --git a/webroot/index.html b/webroot/index.html index c373e5a..e9d2634 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -91,6 +91,7 @@
  • Skift mellem test, stage og snapshot ved at bruge forkortelser så som: t, st, s, t3 eller s
  • Skift mellem opdatering, robot, template ved at bruge forkortelser så som: o, r eller tem
  • Genkender andres test webs hvis der indtastes initialer på 4 bogstaver, eller der angives .t.
    • +
  • Genkender subdomain/branching i URL's, e.x. vmhf2010.query.jkkn.php5.test.tv2.dk, osv..
  • Slå sider op i Tango, vis den dynamiske version eller slå op i GIT direkte fra en forkortet URL
  • Genkender klasse-navne (start med stort bogstav) og slår dem op i GIT i globals, indtast f.eks.: ORM, tilføj / for at se pakke-bibliotek.
  • Navigér videre rundt i GitWeb let ved hjælp af korte url'er, prøv ALT+3 i GitWeb
    • diff --git a/webroot/whatsnew.xhtml b/webroot/whatsnew.xhtml index cf44c18..3accb0f 100644 --- a/webroot/whatsnew.xhtml +++ b/webroot/whatsnew.xhtml @@ -6,6 +6,10 @@

    What's new:

    +
  • 0.13.6
    • +
      +
    • Tilføjede support for branches/subdomains, e.x. vmhf2010.query.php5.stage.tv2.dk
      • +
  • 0.13.4
    • Tilføjede support for .stage.tv2.dk (forkortelsen er .st og genvej META+e)
      • -- 2.52.0