From: Kristian Kræmmer Nielsen Date: Mon, 2 Nov 2009 23:41:07 +0000 (+0100) Subject: Rewrote ViewVC functionality into supporting GitWeb X-Git-Url: https://git.jkkn.net/?a=commitdiff_plain;h=30c9445db11882cf35a8cc927c0d6aa9cb6ffb2b;p=tv2developer Rewrote ViewVC functionality into supporting GitWeb Better support for non-standard root folders in Git (using //) Added conf/flimmer shortcut. Bumbed version number Reverted patch to support Windows 7 Development environment --- diff --git a/FireFoxDev.bat b/FireFoxDev.bat index 1949d53..1d4e333 100755 --- a/FireFoxDev.bat +++ b/FireFoxDev.bat @@ -1,3 +1,3 @@ @echo off set MOZ_NO_REMOTE=1 -start "" "%ProgramFiles(x86)%\Mozilla Firefox\firefox.exe" -P dev \ No newline at end of file +start "" "%ProgramFiles%\Mozilla Firefox\firefox.exe" -P dev \ No newline at end of file diff --git a/content/quickbox.js b/content/quickbox.js index 310c72d..aa79be8 100644 --- a/content/quickbox.js +++ b/content/quickbox.js @@ -79,7 +79,7 @@ var TV2DeveloperQuickBox = { case 'go-tango-page': case 'go-tango-requeue': case 'go-dynamic': - case 'go-viewcvs': + case 'go-gitweb': case 'go-pdolog': return true; default: @@ -103,11 +103,11 @@ var TV2DeveloperQuickBox = { } if (target.id == 'action') { document.getElementById('sitetype').disabled = !makeSiteURL; - document.getElementById('php5branch').disabled = (action != 'go-viewcvs'); - document.getElementById('viewsource').disabled = (action != 'go-viewcvs'); - document.getElementById('environment').disabled = (action == 'go-viewcvs'); + document.getElementById('php4branch').disabled = (action != 'go-gitweb'); + document.getElementById('viewsource').disabled = (action != 'go-gitweb'); + document.getElementById('environment').disabled = (action == 'go-gitweb'); } - document.getElementById('php4site').disabled = (!makeSiteURL || action == 'go-pdolog' || action == 'go-viewcvs') + document.getElementById('php4site').disabled = (!makeSiteURL || action == 'go-pdolog' || action == 'go-gitweb') || (environment && environment.id == 'live'); if (!this._autoChange) { /* avoid updating if this was triggered by updateQuickbox() */ if (target.id == 'testname' && @@ -127,9 +127,9 @@ var TV2DeveloperQuickBox = { _reg_extract_nums: /([0-9]+)/g, _reg_shortlink: /^((https?):\/?\/?)?([^/]*?)(tv2\.dk)?((\/[^#\?]*).*)?$/, _reg_classname: /^[A-Z][a-zA-Z0-9_/]*(\.(p(hp?)?)?)?$/, - _reg_cvs_nopostfix: /^(?:archive|conf|default|phpincludes|symfoni|titoonic-includes)$/, - _reg_cvs_rootfolders: /^\/(((Java|build|inc|opdatering|robot|scripts|sql|template|views|php|php5|fonts|webroot)(\/|$)|\/))/, - _reg_cvs_dnsdomains: /^\/(tv2|tv2news|tv2film|sputnik|charlie|zulu)(\.|\.d|\.dk)?$/, + _reg_git_nopostfix: /^(?:archive|conf|default|phpincludes|symfoni|titoonic-includes)$/, + _reg_git_rootfolders: /^\/(((Java|build|inc|opdatering|robot|scripts|sql|template|views|php|php5|fonts|webroot)(\/|$)|\/))/, + _reg_git_dnsdomains: /^\/(tv2|tv2news|tv2film|sputnik|charlie|zulu)(\.|\.d|\.dk)?$/, _sitetypes: ['opdatering', 'robot', 'template'], _envs: ['test', 'snapshot'], updateQuickbox: function(manual) { @@ -280,7 +280,7 @@ var TV2DeveloperQuickBox = { } else if (this._reg_nodeid.exec(site)) { auto_action = 'go-node'; } else if (this._reg_classname.exec(shorturl)) { - auto_action = 'go-viewcvs'; + auto_action = 'go-gitweb'; } else { // if we are using the user input as an url we keep an eventually already selected action if (!this._shouldMakeURL(cur_action.id)) { @@ -373,7 +373,7 @@ var TV2DeveloperQuickBox = { action_uses_opdatering = true; site = 'i2'; break; - case 'go-viewcvs': + case 'go-gitweb': break; case 'go-username': action_uses_opdatering = true; @@ -424,11 +424,11 @@ var TV2DeveloperQuickBox = { case 'go-dynamic': uri = '/tango/dynamic.php?url='+action_on_url_encoded; break; - case 'go-viewcvs': + case 'go-gitweb': // Magically handle classnames (Enter as e.x. Tree_Node) var classname = this._reg_classname.exec(shorturl); - var php5branch = document.getElementById('php5branch').checked; - var cvs_viewsource = document.getElementById('viewsource').checked; + var php4branch = document.getElementById('php4branch').checked; + var git_viewsource = document.getElementById('viewsource').checked; if (classname) { // may want to move this section up a bit due to entered_url already set var clsname = classname[0]; // remove ".php" : @@ -438,58 +438,56 @@ var TV2DeveloperQuickBox = { clsname = clsname.replace(/_/g,'/'); // add php if not entered path ends on a slash: if (clsname.substr(-1) != '/') clsname += '.php' - else cvs_viewsource = false; // if ending with slash, always show directory listing + else git_viewsource = false; // if ending with slash, always show directory listing uri = uriOnly = '/' + clsname; site = 'globals'; // must update entered url manually since it was stored before these changes entered_url = this._makeUrl(protocol, env, sitetype, php4, username, site, uri, false); - if (!manual && !php5branch) { - // auto default to php5branch - this._autoChange = true; - php5branch = document.getElementById('php5branch').checked = true; - this._autoChange = false; - } } - var cvs_sitename = (!site) ? 'www' : site.replace(/-(static|dyn)/, ''); - url = 'http://flimmer.tv2.dk/viewvc/'; - var cvs_root = '/' + sitetype; - if (cvs_sitename == 'globals') { + var git_sitename = (!site) ? 'www' : site.replace(/-(static|dyn)/, ''); + url = 'http://flimmer.tv2.dk/git/'; + var git_root = '/' + sitetype; + if (git_sitename == 'globals') { // special support for globals - url += cvs_sitename; - cvs_root = '/php/TV2'; - } else if (this._reg_cvs_nopostfix.exec(cvs_sitename)) { - url += cvs_sitename; - cvs_root = ''; - if (cvs_sitename == 'conf') { + url += git_sitename; + git_root = '/php/TV2'; + } else if (this._reg_git_nopostfix.exec(git_sitename)) { + url += git_sitename; + git_root = ''; + if (git_sitename == 'conf') { // Magic shortcuts for the 'conf' project: var magicChangeShowSource = true; var magicToShowSource = true; if (uriOnly=='/dns') { uriOnly = '/hosts/dns-master/master/'; magicToShowSource = false; - } else if (dns_domain=this._reg_cvs_dnsdomains.exec(uriOnly)) { + } else if (dns_domain=this._reg_git_dnsdomains.exec(uriOnly)) { uriOnly = '/hosts/dns-master/master/'+dns_domain[1]+'.dk'; } else if (uriOnly=='/cron') { uriOnly = '/hosts/robot-new/cronrun.crontab'; } else if (uriOnly=='/cron4') { uriOnly = '/hosts/robot/cronrun.crontab'; + } else if (uriOnly=='/flimmer') { + uriOnly = '/hosts/flimmer/'; + magicToShowSource = false; } else { magicChangeShowSource = false; } - if (magicChangeShowSource && !manual && cvs_viewsource != magicToShowSource) { + if (magicChangeShowSource && !manual && git_viewsource != magicToShowSource) { // auto default to show source for files, not for directories this._autoChange = true; - cvs_viewsource = document.getElementById('viewsource').checked = magicToShowSource; + git_viewsource = document.getElementById('viewsource').checked = magicToShowSource; this._autoChange = false; } } } else { - url += cvs_sitename + '.tv2.dk'; + url += git_sitename + '.tv2.dk'; } + url += '.git'; // .git extension var entered_root = null; - if (uriOnly && (entered_root=this._reg_cvs_rootfolders.exec(uriOnly))) { - // checks for standard cvs project root folders like: webroot, inc, opdatering, scripts, ... - cvs_root = ''; + if (uriOnly && (entered_root=this._reg_git_rootfolders.exec(uriOnly))) { + // checks for standard git project root folders like: webroot, inc, opdatering, scripts, ... + git_root = ''; if (entered_root[1]=='/') { // you can exclude 'webroot/opdatering' by written two slashes: '//' uriOnly = uriOnly.substr(1); @@ -498,28 +496,34 @@ var TV2DeveloperQuickBox = { uriOnly += '/'; } } - var cvs_view = (!cvs_viewsource ? 'log' : 'markup') - url += cvs_root; // webroot, opdatering, robot,... + var git_view = (!git_viewsource ? 'history' : 'blob') if (!uriOnly) uriOnly = '/'; + uriOnly = git_root + uriOnly; // webroot, opdatering, robot,... var php = /^(.*\.php)/.exec(uriOnly); if (php) { - url += php[1] + '?view=' + cvs_view; - } else if(uriOnly.substr(-1) == '/') { - if (cvs_viewsource) { - url += uriOnly + 'index.php?view=' + cvs_view; + urlOnly = php[1]; + } else if (uriOnly.substr(-1) == '/') { + if (git_viewsource) { + uriOnly += 'index.php'; } else { + git_view = 'tree'; // we show the directory listing :-) - url += uriOnly; } - } else { - url += uriOnly + '?view=' + cvs_view; - } - if (php5branch) { - url += (url.indexOf('?')!=-1?'&':'?') + 'pathrev=PHP5'; - if (cvs_viewsource) { - url += '&revision=PHP5'; + } + if (uriOnly.length > 1) { + if (uriOnly.substr(-1) == '/') { // strip slash + uriOnly = uriOnly.substr(0, uriOnly.length-1); + } + if (uriOnly.length > 1) { + url += '?f=' + uriOnly.substr(1); } } + url += (url.indexOf('?')!=-1?';':'?') + 'a=' + git_view + ';'; + if (php4branch) { + url += 'hb=php4'; + } else { + url += 'hb=HEAD'; + } break; case 'go-pdolog': uri = '/tool/pdo_log/frameset.php?url='+action_on_url_encoded+'&autostop=1&prefix='+current_user; @@ -551,9 +555,10 @@ var TV2DeveloperQuickBox = { }, /* method to extract short url */ - _reg_fromviewcvs: /^https?:\/\/flimmer\.tv2.dk\/viewvc\/(([^/.]+)(?:\.tv2\.dk)?(?:\/(?:(webroot|robot|opdatering|template\/))|(\/[^#?/]*))([^#?]*)(.*)?)?/, - _reg_viewcvsbranch: /^\?(?:.*&)?pathrev=PHP5(?:&|#|$)/, - _reg_viewcvsviewsource: /^\?(?:.*&)?view=markup(?:&|#|$)/, + _reg_fromgitweb: /^https?:\/\/flimmer\.tv2\.dk\/git\/([^/]+)(?:\.tv2\.dk)?\.git.*?(?:f=(?:(webroot|robot|opdatering|template|([^;/&]+)))([^;&]*))/, + _reg_viewgitbranch1: /[?;&]hb=php4[&;#]?/, + _reg_viewgitbranch2: /[?;&]h=refs\/heads\/php4[&;#]?/, + _reg_viewgitviewtype: /[?;&]a=(blob|tree)[&;#]?/, _reg_fromi2if: /^http:\/\/i2\.(?:[^.]+\.)?opdatering\.(?:php5\.(?:test|snapshot)\.)?tv2\.dk\/(tango\/(entry|requeue|dynamic)|tool\/pdo_log\/frameset)\.php.*?(?:\?|&)url=([^&]+)/, _reg_fromloginif: /^http:\/\/login\.(?:([^.]+)\.)?opdatering\.(?:php5\.(test|snapshot)\.)?tv2\.dk\/opslag\.php.*?(?:\?|&)(user_id|username)=([^&]+)/, _reg_frombugzilla: /^http:\/\/bugzilla\.tv2\.dk\/(show_bug.cgi.*?(?:\?|&)id=([0-9]+))?/, @@ -621,39 +626,41 @@ var TV2DeveloperQuickBox = { } } - /* Extract link from ViewCVS site */ - var fromviewcvs = this._reg_fromviewcvs.exec(paramUrl); - if (fromviewcvs) { - var tv2_sitename = fromviewcvs[2]; - var tv2_sitetype = fromviewcvs[3]; - var tv2_rootfolder = fromviewcvs[4]; - var tv2_uri = fromviewcvs[5]; - var tv2_params = fromviewcvs[6]; - - action = 'go-viewcvs'; + /* Extract link from GitWeb site */ + var fromgitweb = this._reg_fromgitweb.exec(paramUrl); + if (fromgitweb) { + var tv2_sitename = fromgitweb[1]; + var tv2_sitetype = fromgitweb[2]; + var tv2_rootfolder = fromgitweb[3]; + var tv2_uri = fromgitweb[4]; + + action = 'go-gitweb'; if (tv2_sitename) { if (tv2_sitename == 'globals' && tv2_uri.indexOf('/php/TV2')==0) { tv2_uri = ''; } url = tv2_sitename; - if (tv2_sitetype) { - if (this._reg_cvs_nopostfix.exec(tv2_sitename)) { + if (!tv2_rootfolder) { + if (this._reg_git_nopostfix.exec(tv2_sitename)) { // always include sitetype url += '/'+tv2_sitetype; } else { url += (tv2_sitetype == 'webroot' ? '' : '.'+tv2_sitetype); } - } else if (this._reg_cvs_rootfolders.exec(tv2_rootfolder)) { + } else if (this._reg_git_rootfolders.exec(tv2_rootfolder)) { url += tv2_rootfolder; } else { - url += '/' + tv2_rootfolder; + url += '//' + tv2_rootfolder; } url += tv2_uri; - if (tv2_params) { - if (this._reg_viewcvsbranch.exec(tv2_params)) { - document.getElementById('php5branch').checked = true; - } - if (this._reg_viewcvsviewsource.exec(tv2_params)) { + if (this._reg_viewgitbranch1.exec(paramUrl) || this._reg_viewgitbranch2.exec(paramUrl)) { + document.getElementById('php4branch').checked = true; + } + var viewtype = this._reg_viewgitviewtype.exec(paramUrl) + if (viewtype) { + if (viewtype[1] == 'tree') { + url += '/'; + } else { // blob document.getElementById('viewsource').checked = true; } } @@ -681,7 +688,7 @@ var TV2DeveloperQuickBox = { this.updateQuickbox(); document.getElementById('php4site').addEventListener('CheckboxStateChange', function() { TV2DeveloperQuickBox.setManuel(this); }, false); - document.getElementById('php5branch').addEventListener('CheckboxStateChange', + document.getElementById('php4branch').addEventListener('CheckboxStateChange', function() { TV2DeveloperQuickBox.setManuel(this); }, false); document.getElementById('viewsource').addEventListener('CheckboxStateChange', function() { TV2DeveloperQuickBox.setManuel(this); }, false); diff --git a/content/quickbox.xul b/content/quickbox.xul index da0d4d0..d4d53fd 100644 --- a/content/quickbox.xul +++ b/content/quickbox.xul @@ -65,9 +65,9 @@ - + - + diff --git a/content/tv2developer.js b/content/tv2developer.js index cedc3a1..7c0f5eb 100644 --- a/content/tv2developer.js +++ b/content/tv2developer.js @@ -7,12 +7,12 @@ // 2 = Back from i2 // A = Template // B = Robot -// C = Viewcvs +// C = Gitweb // D = Dynamic version // E = Node info // F = Tango interface // G = Look in tango -// H = View source in ViewCVS +// H = View source in Gitweb // I = I2 tree // K = Lookup content // L = Live @@ -204,7 +204,7 @@ var TV2Developer = { _reg_php: /^(.*\.php)/, _reg_nodeid: /([0-9]{2,})/g, _reg_i2files: /\/([0-9]+)-/, - _reg_fromviewcvs: /^https?:\/\/flimmer\.tv2\.dk\/viewvc\/([^/]+)\.tv2\.dk\/(webroot|robot|opdatering|template)([^#\?]+)/, + _reg_fromgitweb: /^https?:\/\/flimmer\.tv2\.dk\/git\/([^/]+)\.tv2\.dk\.git.*(?:f=(webroot|robot|opdatering|template)([^;&]*))/, _reg_fromi2if: /^\/(tango\/(entry|requeue|dynamic)|tool\/pdo_log\/frameset)\.php.*?(\?|&)url=([^&]+)/, _reg_cutdomain: /^(.*)\.tv2\.dk$/, getLinks: function() { @@ -213,13 +213,13 @@ var TV2Developer = { var encodedURL = encodeURIComponent(currentURL); var initials = TV2Util.getPref('developer-initials'); - /* Check if we are on the ViewCVS site */ - var fromviewcvs = this._reg_fromviewcvs.exec(currentURL); + /* Check if we are on the Gitweb site */ + var fromgitweb = this._reg_fromgitweb.exec(currentURL); // Adding links as appropiate if tv2.dk site var tv2 = this._reg_tv2.exec(currentURL); - if (tv2 && !fromviewcvs) { + if (tv2 && !fromgitweb) { var skip_treenodes = false; var tv2_sitename = tv2[1]; var tv2_user = tv2[2]; @@ -250,7 +250,7 @@ var TV2Developer = { } // Handle sites with aliases (e.g. ol2008.tv2.dk is ol.tv2.dk on live... ) - var cvs_sitename; + var git_sitename; var live_sitename = (tv2_sitename ? tv2_sitename : 'www'); var docWin = getBrowser().contentWindow; @@ -259,7 +259,7 @@ var TV2Developer = { if (docObj.TV2_PROJECTNAME) { var nodomain = this._reg_cutdomain.exec(docObj.TV2_PROJECTNAME); if (nodomain) { - cvs_sitename = nodomain[1]; + git_sitename = nodomain[1]; } } if (docObj.TV2_LIVESITE) { @@ -273,8 +273,8 @@ var TV2Developer = { // Find live, test and snapshot url for current site var liveurl; var live_sitename_complete = ((live_sitename=='www') ? '' : live_sitename+'.') + 'tv2.dk'; - if (!cvs_sitename) { - cvs_sitename = tv2_sitename ? tv2_sitename : 'www'; + if (!git_sitename) { + git_sitename = tv2_sitename ? tv2_sitename : 'www'; } // Construct corresponding live URL @@ -286,9 +286,9 @@ var TV2Developer = { } } - var testprompturl = cvs_sitename+'.'+'?'+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.test'+'.tv2.dk'; - var testurl = cvs_sitename+'.'+initials+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.test'+'.tv2.dk'; - var snapshoturl = cvs_sitename+(tv2_sitetype?'.'+tv2_sitetype:'')+'.'+tv2_apptype+'.snapshot'+'.tv2.dk'; + 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'; // Add the two urls we are not at if (!tv2_testsite) { // always add swaps to snapshot and the test site @@ -311,7 +311,7 @@ var TV2Developer = { links.push(new this.TV2LinkSplit()); // Add link to .opdatering, .template, .robot - var _prefix = (tv2_testsite ? cvs_sitename : live_sitename) + (tv2_user ? '.' + tv2_user : ''); + var _prefix = (tv2_testsite ? git_sitename : live_sitename) + (tv2_user ? '.' + tv2_user : ''); var _postfix = (tv2_testsite ? '.'+tv2_apptype+'.'+tv2_testsite : '') + '.tv2.dk'; var opdatering = _prefix + '.opdatering' + _postfix; //var template = _prefix + '.template' + _postfix; @@ -327,33 +327,33 @@ var TV2Developer = { links.push(new this.TV2LinkSplit()); - // Add the ViewCVS link, inspired by Adrian Bak (ADBA) - var viewcvs = 'http://flimmer.tv2.dk/viewvc/' - + cvs_sitename + '.tv2.dk/' + (tv2_sitetype?tv2_sitetype:'webroot'); + // Add the GitWeb link, inspired by ViewCVS link, inspired by Adrian Bak (ADBA) + var gitweb = 'http://flimmer.tv2.dk/git/' + + git_sitename + '.tv2.dk.git?hb=HEAD;f=' + (tv2_sitetype?tv2_sitetype:'webroot'); var php = this._reg_php.exec(tv2_uriOnly); if (php) { - viewcvs += php[1]; + gitweb += php[1]; } else if(tv2_uriOnly.substr(-1) == '/') { // we add 'index.php' and say that's it! :-) - viewcvs += tv2_uriOnly + 'index.php'; + gitweb += tv2_uriOnly + 'index.php'; } else { - viewcvs += tv2_uriOnly; + gitweb += tv2_uriOnly; } - var viewcvs_source = viewcvs + '?view=markup'; - viewcvs += '?view=log'; - // we set a nice type so we can swap between using the button (test<>viewcvs, live<>viewcvs,...) - var viewcvs_type; + var gitweb_source = gitweb + ';a=blob'; + gitweb += ';a=history'; + // we set a nice type so we can swap between using the button (test<>gitweb, live<>gitweb,...) + var gitweb_type; if (!tv2_testsite) { - viewcvs_type = 'viewcvs_live'; + gitweb_type = 'gitweb_live'; } else if (tv2_testtype == 'snapshot') { - viewcvs_type = 'viewcvs_snapshot'; + gitweb_type = 'gitweb_snapshot'; } else { - viewcvs_type = 'viewcvs_test'; + gitweb_type = 'gitweb_test'; } - links.push(new this.TV2LinkWithLabel(viewcvs_type, TV2Util.getStr('lookupInViewCVSSource'), viewcvs_source, - TV2Util.getStr('lookupInViewCVSSource.accesskey'))); - links.push(new this.TV2LinkWithLabel(viewcvs_type, TV2Util.getStr('lookupInViewCVS'), viewcvs, - TV2Util.getStr('lookupInViewCVS.accesskey'))); + links.push(new this.TV2LinkWithLabel(gitweb_type, TV2Util.getStr('lookupInGitWebSource'), gitweb_source, + TV2Util.getStr('lookupInGitWebSource.accesskey'))); + links.push(new this.TV2LinkWithLabel(gitweb_type, TV2Util.getStr('lookupInGitWeb'), gitweb, + TV2Util.getStr('lookupInGitWeb.accesskey'))); // Update and I2 base URL var updatepostfix = (tv2_user ? '.' + tv2_user : '') @@ -471,11 +471,11 @@ var TV2Developer = { } else { - /* Add links to the site if viewing info at ViewCVS site */ - if (fromviewcvs) { - var tv2_sitename = fromviewcvs[1]; - var tv2_sitetype = fromviewcvs[2]; - var tv2_uri = fromviewcvs[3]; + /* Add links to the site if viewing info at GitWeb site */ + if (fromgitweb) { + var tv2_sitename = fromgitweb[1]; + var tv2_sitetype = fromgitweb[2]; + var tv2_uri = fromgitweb[3]; // cut off 'index.php' if (tv2_uri.substr(-10) == '/index.php') { @@ -489,10 +489,10 @@ 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, TV2Util.getStr('live.accesskey'))); - links.push(new this.TV2Link('viewcvs_test', tv2_sitename + '.' + initials + '.' + type + appType + 'test' + '.tv2.dk', tv2_uri, TV2Util.getStr('test.accesskey'))); - links.push(new this.TV2Link('viewcvs_snapshot', tv2_sitename + '.' + type + appType + 'snapshot' + '.tv2.dk', tv2_uri, TV2Util.getStr('snapshot.accesskey'))); - links.push(new this.TV2Link('viewcvs_testprompt', tv2_sitename + '.?.' + type + appType + 'test' + '.tv2.dk', tv2_uri, TV2Util.getStr('testprompt.accesskey'), 'promptInitials')); + links.push(new this.TV2Link('gitweb_live', live_sitename + type + 'tv2.dk', tv2_uri, TV2Util.getStr('live.accesskey'))); + links.push(new this.TV2Link('gitweb_test', tv2_sitename + '.' + initials + '.' + type + appType + 'test' + '.tv2.dk', tv2_uri, TV2Util.getStr('test.accesskey'))); + links.push(new this.TV2Link('gitweb_snapshot', tv2_sitename + '.' + type + appType + 'snapshot' + '.tv2.dk', tv2_uri, TV2Util.getStr('snapshot.accesskey'))); + links.push(new this.TV2Link('gitweb_testprompt', tv2_sitename + '.?.' + type + appType + 'test' + '.tv2.dk', tv2_uri, TV2Util.getStr('testprompt.accesskey'), 'promptInitials')); } else { links.push(new this.TV2LinkWithLabel('disabled', TV2Util.getStr('notTV2Site'), null, '', null, true)); diff --git a/locale/da-DK/tv2developer.dtd b/locale/da-DK/tv2developer.dtd index d0ec127..d572b74 100644 --- a/locale/da-DK/tv2developer.dtd +++ b/locale/da-DK/tv2developer.dtd @@ -57,11 +57,11 @@ - - + + - - + + diff --git a/locale/da-DK/tv2developer.properties b/locale/da-DK/tv2developer.properties index a760a8a..4fb849f 100644 --- a/locale/da-DK/tv2developer.properties +++ b/locale/da-DK/tv2developer.properties @@ -1,8 +1,8 @@ -lookupInViewCVS=ViewCVS: Vis loggen for siden -lookupInViewCVS.accesskey=c +lookupInGitWeb=GitWeb: Vis loggen for siden +lookupInGitWeb.accesskey=c -lookupInViewCVSSource=ViewCVS: Vis kildekoden for siden -lookupInViewCVSSource.accesskey=h +lookupInGitWebSource=GitWeb: Vis kildekoden for siden +lookupInGitWebSource.accesskey=h viewDynamicVersion=Vis den dynamiske version af siden viewDynamicVersion.accesskey=d diff --git a/locale/en-US/tv2developer.dtd b/locale/en-US/tv2developer.dtd index 93bfeac..9470cf3 100644 --- a/locale/en-US/tv2developer.dtd +++ b/locale/en-US/tv2developer.dtd @@ -56,11 +56,11 @@ - - + + - - + + diff --git a/locale/en-US/tv2developer.properties b/locale/en-US/tv2developer.properties index b669f3b..b1ad779 100644 --- a/locale/en-US/tv2developer.properties +++ b/locale/en-US/tv2developer.properties @@ -1,8 +1,8 @@ -lookupInViewCVS=ViewCVS: Lookup this page -lookupInViewCVS.accesskey=c +lookupInGitWeb=GitWeb: Lookup this page +lookupInGitWeb.accesskey=c -lookupInViewCVSSource=ViewCVS: View source of page -lookupInViewCVSSource.accesskey=h +lookupInGitWebSource=GitWeb: View source of page +lookupInGitWebSource.accesskey=h viewDynamicVersion=View dynamic version of this page viewDynamicVersion.accesskey=d diff --git a/version b/version index ac454c6..54d1a4f 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.12.0 +0.13.0 diff --git a/webroot/index.html b/webroot/index.html index defbd24..89c5cc2 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -24,7 +24,7 @@ -

Feature list på viewcvs.tv2.dk sider:

+

Feature list på flimmer.tv2.dk/git/ sider:

diff --git a/webroot/whatsnew.xhtml b/webroot/whatsnew.xhtml index 0e4621e..7d22174 100644 --- a/webroot/whatsnew.xhtml +++ b/webroot/whatsnew.xhtml @@ -6,6 +6,11 @@

What's new:

+