From 1c7d20bb3e0380adc440c836427970855653fb9c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristian=20Kr=E6mmer=20Nielsen?= <jkkn@jkkn.dk>
Date: Thu, 6 Dec 2007 02:57:57 +0100
Subject: [PATCH] Rewrote QuickLink box, now supports nice shorturls instead
 and auto selected environment and action occuring to them.

---
 content/browser_overlay.xul      |   1 +
 content/quickbox.xul             |  70 +++++---
 content/tv2developer-quickbox.js | 277 +++++++++++++++++++++++++++++++
 content/tv2developer-util.js     |  67 ++++++++
 content/tv2developer.js          | 254 +++++++---------------------
 locale/da-DK/tv2developer.dtd    |  11 +-
 locale/en-US/tv2developer.dtd    |  12 +-
 version                          |   2 +-
 8 files changed, 478 insertions(+), 216 deletions(-)
 create mode 100644 content/tv2developer-quickbox.js
 create mode 100644 content/tv2developer-util.js

diff --git a/content/browser_overlay.xul b/content/browser_overlay.xul
index f8cd06e..ed8b835 100755
--- a/content/browser_overlay.xul
+++ b/content/browser_overlay.xul
@@ -5,6 +5,7 @@
 <overlay id="tv2developer_overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+<script type="application/x-javascript" src="tv2developer-util.js" />
 <script type="application/x-javascript" src="tv2developer.js" />
 <script type="application/x-javascript" src="tv2developer-main.js" />
 <stringbundleset id="stringbundleset">
diff --git a/content/quickbox.xul b/content/quickbox.xul
index b43ba49..6110179 100755
--- a/content/quickbox.xul
+++ b/content/quickbox.xul
@@ -3,35 +3,63 @@
 <!DOCTYPE prefwindow SYSTEM "chrome://tv2developer/locale/tv2developer.dtd">
 <dialog
     id="tv2developer_quickbox"
-	title="&quickbox.title;"
+	title=""
 	buttons="accept,cancel"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	onload="TV2Developer.updateQuickbox()"
-	ondialogaccept="TV2Developer.goQuickbox()">
-<script type="application/x-javascript" src="tv2developer.js" />
+	onload="TV2DeveloperQuickBox.setupQuickbox()"
+	ondialogaccept="TV2DeveloperQuickBox.goQuickbox()">
+<script type="application/x-javascript" src="tv2developer-util.js" />
+<script type="application/x-javascript" src="tv2developer-quickbox.js" />
+
+<dialogheader title="&quickbox.title;"/>
 
 <stringbundleset id="stringbundleset">
     <stringbundle id="tv2developer_strings" src="chrome://tv2developer/locale/tv2developer.properties"/>
 </stringbundleset>
 
-<groupbox>
-<label value="&quickbox.enterprefix;" control="tv2prefix"/>
-<textbox id="tv2prefix"/>
+<vbox>
+    <label value="&quickbox.entershorturl;" control="shorturl" accesskey="&quickbox.entershorturl.accesskey;"/>
+    <textbox id="shorturl" size="80" oninput="TV2DeveloperQuickBox.updateQuickbox()" crop="end"/>
+    <label id="url" label="url" style="width:20em" value="" crop="end"/>
+</vbox>
 
-<radiogroup id="tv2postfix">
-  <grid>
-    <columns>
-  	<column/><column/><column/>
-    </columns>
-	<rows id="radiobox-rows" />
-  </grid>
-  <checkbox id="php4site" label="&quickbox.php4site;" accesskey="4" tooltiptext="&quickbox.php4site.tooltiptext;" />
-  <separator class="groove"/>
-  <radio id="go-node" label="&quickbox.nodeid;" accesskey="&quickbox.nodeid.accesskey;"/>
-  <radio id="go-content-id" label="&quickbox.contentid;" accesskey="&quickbox.contentid.accesskey;"/>
-  <radio id="go-ttv-page" label="&quickbox.ttvpage;" accesskey="&quickbox.ttvpage.accesskey;"/>
-</radiogroup>
+    <hbox>
+       <groupbox flex="2">
+        <caption label="Site type" />
+        <radiogroup id="sitetype" onselect="TV2DeveloperQuickBox.setManuel(this)">
+          <radio id="webroot"    label="webroot"    accesskey="w"/>
+          <radio id="opdatering" label="opdatering" accesskey="o"/>
+          <radio id="robot"      label="robot"      accesskey="r"/>
+          <radio id="template"   label="template"   accesskey="e"/>
+        </radiogroup>
+      </groupbox>
+      <groupbox flex="1">
+      	<caption label="Environment"/>
+      	<radiogroup id="environment" onselect="TV2DeveloperQuickBox.setManuel(this)">
+          <radio id="live"      label="Live site"       accesskey="l"/>
+          <radio id="test"      label="Test site"       accesskey="t"/>
+          <radio id="snapshot"  label="Snapshot site"   accesskey="s"/>
+          <hbox>
+            <radio id="othertest" label="&quickbox.othertestsite;" accesskey="&quickbox.othertestsite.accesskey;"/>
+            <textbox id="testname" size="10" maxlength="20" disabled="true"
+                onclick="TV2DeveloperQuickBox.setManuel(this)"
+                oninput="TV2DeveloperQuickBox.setManuel(this)"/>
+          </hbox>
+        </radiogroup>
+      </groupbox>
+    </hbox>
 
-</groupbox>
+    <groupbox>
+      <caption label="Action"/>
+      <radiogroup id="action" onselect="TV2DeveloperQuickBox.setManuel(this)">
+      <hbox>
+      <radio id="go-site" label="&quickbox.makeurl;" accesskey="&quickbox.makeurl.accesskey;"/>
+        <checkbox id="php4site" label="&quickbox.php4site;" accesskey="&quickbox.php4site.accesskey;" tooltiptext="&quickbox.php4site.tooltiptext;"/>
+      </hbox>
+      <radio id="go-node" label="&quickbox.nodeid;" accesskey="&quickbox.nodeid.accesskey;"/>
+      <radio id="go-content-id" label="&quickbox.contentid;" accesskey="&quickbox.contentid.accesskey;"/>
+      <radio id="go-ttv-page" label="&quickbox.ttvpage;" accesskey="&quickbox.ttvpage.accesskey;"/>
+      </radiogroup>
+    </groupbox>
 
 </dialog>
diff --git a/content/tv2developer-quickbox.js b/content/tv2developer-quickbox.js
new file mode 100644
index 0000000..4ea6beb
--- /dev/null
+++ b/content/tv2developer-quickbox.js
@@ -0,0 +1,277 @@
+/* Functionality for the quick link box */
+/* @author Kristian Kræmmer Nielsen <jkkn@tv2.dk> */
+
+var TV2DeveloperQuickBox = {
+    	
+	_addCheckbox: function(here, id, label, accesskey) {
+		var radio = document.createElement('radio');
+		radio.setAttribute('id', id);
+		radio.setAttribute('label', label);
+		radio.setAttribute('accesskey', accesskey);
+		here.appendChild(radio);
+	},
+	
+	_autoChange: false,
+	_saveInitials: false, /* safe the alternative initials field */
+	
+	setManuel: function(target) {
+        if (target.id == 'environment') {
+            document.getElementById('testname').disabled = (target.selectedItem.id != 'othertest');
+            if (!this._autoChange) {
+                document.getElementById('testname').select();
+                document.getElementById('testname').focus();
+            }
+        }
+        if (target.id == 'action') {
+            document.getElementById('sitetype').disabled = (target.selectedItem.id != 'go-site');
+            document.getElementById('php4site').disabled = (target.selectedItem.id != 'go-site');
+        }
+	    if (!this._autoChange) { /* avoid updating if this was trigged by updateQuickbox() */
+	        if (target.id == 'testname' &&
+	            document.getElementById('environment').selectedItem.id != 'othertest') {
+	                document.getElementById('environment').selectedItem =
+	                    document.getElementById('othertest');
+	        }
+	        this.updateQuickbox(true);
+	    }
+	},
+
+    _reg_nodeid: /^(?!1234$)[0-9]+$/,
+    _reg_ttv: /^[0-9]{3}$/,
+    _reg_extract_nums: /([0-9]+)/g,
+    _reg_shortlink: /^((https?):\/?\/?)?([^/]*?)(tv2\.dk)?(\/.*)?$/,
+    _sitetypes: ['opdatering', 'robot', 'template'],
+    _envs:      ['test', 'snapshot'],
+	updateQuickbox: function(manual) {
+	    if (!manual) manual = false;
+	    var current_user = TV2Util.getPref('developer-initials');
+		var username = current_user;
+		var shorturl = document.getElementById('shorturl').value;
+		var auto_action;
+		
+        var tv2 = this._reg_shortlink.exec(shorturl);
+        if (tv2) {
+            var protocol = tv2[2];
+            var domain   = tv2[3];
+            var uri      = tv2[5];
+            var url      = '';
+            
+            var site = null;
+            var auto_sitetype = 'webroot';
+            var auto_env      = 'live';
+            var auto_username = null;
+            var auto_php4     = false;
+            var validState    = true;
+            
+            var parts = domain.split('.');
+            for (var i=0; i<parts.length; i++) {
+                var part = parts[i];
+                if (part.length == 0) continue;
+
+                // first take site name
+                if (!site) {
+                    site = part;
+                    continue;
+                }
+                
+                // detect short env (.t, .s, .dk,.. )
+                var used = false;
+                var env_part = part;
+                var env_php4 = false;
+                if (part.substr(part.length-1, 1) == '3') {
+                    env_part = part.substr(0, -1); // handle t3, te3, test3, snapshot3
+                    env_php4 = true;
+                }
+                for (var j=0; j<this._envs.length; j++) {
+                    if (this._envs[j].substr(0, env_part.length) == env_part) {
+                        auto_env = this._envs[j];
+                        used = true; break;
+                    }
+                }
+                if (used) {
+                    auto_php4 = env_php4;
+                    continue;
+                }
+
+                // optional username
+                if (part.length == 4 && !auto_username) {
+                    auto_username = part;
+                    if (auto_env == 'live') {
+                        auto_env = 'test';
+                    }
+                    continue;
+                }
+
+                // detect short sitetype (.o, .op, .opd,.. )
+                var used = false;
+                for (var j=0; j<this._sitetypes.length; j++) {
+                    if (this._sitetypes[j].substr(0, part.length) == part) {
+                        auto_sitetype = this._sitetypes[j];
+                        used = true; break;
+                    }
+                }
+                if (used) continue;
+          
+            }
+            
+            // defaults
+            if (!protocol) protocol = 'http';
+            if (!uri) uri = '/';
+            if (!site) site = '';
+            
+            // determind action and options set
+            var env;
+            var sitetype;
+            var php4;
+            var action;
+            if (manual) {
+                // read options
+                env = document.getElementById('environment').selectedItem.id;
+                sitetype = document.getElementById('sitetype').selectedItem.id;
+                action = document.getElementById('action').selectedItem.id;
+                php4 = document.getElementById('php4site').checked;
+                if (env == 'othertest') {
+                    env = 'test';
+                    username = document.getElementById('testname').value;
+                }
+            } else {
+                // determind action
+        		if (this._reg_ttv.exec(site)) {
+        	        auto_action = 'go-ttv-page';
+        		} else if (this._reg_nodeid.exec(site)) {
+        	        auto_action = 'go-node';
+        	    } else {
+        	        auto_action = 'go-site';
+                }
+                // set options
+                env = auto_env;
+                /* sitetype and php5 is only relevant if we are creating a link for a site */
+                if (auto_action == 'go-site') {
+                    sitetype = auto_sitetype;
+                    php4 = auto_php4;
+                } else {
+                    sitetype = 'opdatering';
+                    php4 = false;
+                }
+                action = auto_action;
+                
+                this._autoChange = true;
+                if (auto_username && auto_username != username) {
+                    username = auto_username;
+                    document.getElementById('environment').selectedItem=document.getElementById('othertest');
+                    document.getElementById('testname').value=username;
+                } else {
+                    document.getElementById('environment').selectedItem=document.getElementById(env);
+                }
+                document.getElementById('sitetype').selectedItem=document.getElementById(sitetype);
+                document.getElementById('action').selectedItem=document.getElementById(action);
+                document.getElementById('php4site').checked = php4;
+                this._autoChange = false;
+            }
+
+            // Handle actions
+            var longest_id = null;
+            switch (action) {
+            case 'go-node':
+            case 'go-content-id':
+            case 'go-ttv-page':
+                site = 'i2';
+                sitetype = 'opdatering';
+                php4 = false;
+                // find longest id in entered url
+                var max_len = 0;
+                var cur_id;
+                while ((cur_id = this._reg_extract_nums.exec(shorturl)) != null) {
+                    if (cur_id[1].length > max_len) {
+                        max_len = cur_id[1].length;
+                        longest_id = cur_id[1];
+                    }
+                }
+                if (!longest_id) {
+                    validState = false;
+                    longest_id = '?';
+                }
+                break;
+            }
+            switch (action) {
+            case 'go-node':
+                uri = '/tool/node/?id=' + longest_id;
+                break;
+            case 'go-content-id':
+                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';
+                break;
+            }
+
+            // Assemble domain
+            // handle www.tv2.dk
+            if (env == 'live' && sitetype == 'webroot') {
+                if (site == '' || site == 'www') {
+                    domain = '';
+                } else {
+                    domain = site + '.';
+                }
+            } else {
+                if (site == '') {
+                    domain = 'www.';
+                } else {
+                    domain = site + '.';
+                }
+            }
+            // handle environment
+            if (env == 'test') {
+                if (username == '') {
+                    validState = false;
+                    username = '?';
+                }
+                domain += username + '.';
+            }
+            // handle site type
+            if (sitetype != 'webroot') domain += sitetype + '.';
+            if (env != 'live') {
+                domain += env;
+                if (php4) domain += '3';
+                domain += '.';
+            }
+            // finish url
+            domain += 'tv2.dk';
+            url = protocol + '://' + domain + uri;
+            
+            document.getElementById('url').value = url;
+            if (manual && action=='go-site') {
+                // also change url in field
+                document.getElementById('shorturl').value = url;
+            }
+            
+            // are we using the alternativ initials?
+            this._saveInitials = (env == 'test' && username != current_user);
+            
+            document.getElementById('tv2developer_quickbox').getButton('accept').disabled = !validState;
+        }
+	},
+	
+	/* onload */
+	setupQuickbox: function() {
+	    if (window.arguments && window.arguments[0]) {
+	        document.getElementById('shorturl').value = window.arguments[0];
+	    }
+	    this.updateQuickbox();
+	    document.getElementById('php4site').addEventListener('CheckboxStateChange',
+	        function() { TV2DeveloperQuickBox.setManuel(this); }, false);
+	    // init saved fields
+		document.getElementById('testname').value = TV2Util.getPref('alternativ-initials', '');
+	},
+	
+	goQuickbox: function() {
+	    // init saved fields
+	    if (this._saveInitials) {
+		    TV2Util.setPref('alternativ-initials', document.getElementById('testname').value);
+		}
+        window.close();
+        opener.openUILink(document.getElementById('url').value, 'current', false, false, false);
+        /* allow ctrl, alt, but don't google */
+	}
+	
+};
diff --git a/content/tv2developer-util.js b/content/tv2developer-util.js
new file mode 100644
index 0000000..0866e76
--- /dev/null
+++ b/content/tv2developer-util.js
@@ -0,0 +1,67 @@
+
+/* Utility class for TV2 Developer Plugin */
+/* @author Kristian Kræmmer Nielsen <jkkn@tv2.dk> */
+
+var TV2Util = {
+    /* string methods for localizations */
+    _strs: null,
+    get strs() {
+        if (!this._strs) {
+            
+            this._strs = document.getElementById('tv2developer_strings');
+        }
+        return this._strs;
+    },
+    
+    getStr: function(str) {
+        try {
+            return this.strs.getString(str);
+        } catch(e) {
+            alert('Missing string: ' + str);
+			return '';
+        }
+    },
+    
+    /* preference functions */
+    _prefs: null,
+    get prefs() {
+        if (!this._prefs)
+            this._prefs =
+                Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getBranch('tv2developer.');
+        return this._prefs;
+    },
+
+    getPref: function(name, defValue) {
+        const CI=Components.interfaces.nsIPrefBranch;
+        const prefs=this.prefs;
+        try {
+          switch(prefs.getPrefType(name)) {
+            case CI.PREF_STRING:
+              return prefs.getCharPref(name);
+            case CI.PREF_INT:
+              return prefs.getIntPref(name);
+            case CI.PREF_BOOL:
+              return prefs.getBoolPref(name);
+          }
+        } catch(e) {alert(e)}
+        return defValue;
+    },
+  
+    setPref: function(name, value) {
+        const prefs=this.prefs;
+        switch(typeof(value)) {
+          case 'string':
+              prefs.setCharPref(name, value);
+              break;
+          case 'boolean':
+            prefs.setBoolPref(name, value);
+            break;
+          case 'number':
+            prefs.setIntPref(name, value);
+            break;
+          default:
+            throw new Error('Unsupported type '+typeof(value)+' for preference '+name);
+        }
+    }
+    
+};
diff --git a/content/tv2developer.js b/content/tv2developer.js
index 92f44ec..93c0e10 100755
--- a/content/tv2developer.js
+++ b/content/tv2developer.js
@@ -36,7 +36,7 @@ var TV2Developer = {
     /* method for initialize, reading properties, adding icon at firstrun, added keyshortcuts */
     init: function() {
         // init
-        this._lastAction = this.getPref('lastaction-linktype');
+        this._lastAction = TV2Util.getPref('lastaction-linktype');
         // add shortcuts depending on platform
         var shortcuts = document.getElementById('mainKeyset');
         // We take this from ui.key.chromeAccess (no other way it seems, jkkn)
@@ -58,8 +58,8 @@ var TV2Developer = {
         }
 
         // first run, add icon
-        if (this.getPref('firstRun')) {
-            this.setPref('firstRun', false);
+        if (TV2Util.getPref('firstRun')) {
+            TV2Util.setPref('firstRun', false);
             // add icon
              try {
                var firefoxnav = document.getElementById('nav-bar');
@@ -103,67 +103,6 @@ var TV2Developer = {
         parent.appendChild(newKey);
     },
             
-    /* string methods for localizations */
-    _strs: null,
-    get strs() {
-        if (!this._strs) {
-            
-            this._strs = document.getElementById('tv2developer_strings');
-        }
-        return this._strs;
-    },
-    
-    getStr: function(str) {
-        try {
-            return this.strs.getString(str);
-        } catch(e) {
-            alert('Missing string: ' + str);
-			return '';
-        }
-    },
-    
-    /* preference functions */
-    _prefs: null,
-    get prefs() {
-        if (!this._prefs)
-            this._prefs =
-                Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getBranch('tv2developer.');
-        return this._prefs;
-    },
-
-    getPref: function(name, defValue) {
-        const CI=Components.interfaces.nsIPrefBranch;
-        const prefs=this.prefs;
-        try {
-          switch(prefs.getPrefType(name)) {
-            case CI.PREF_STRING:
-              return prefs.getCharPref(name);
-            case CI.PREF_INT:
-              return prefs.getIntPref(name);
-            case CI.PREF_BOOL:
-              return prefs.getBoolPref(name);
-          }
-        } catch(e) {alert(e)}
-        return defValue;
-    },
-  
-    setPref: function(name, value) {
-        const prefs=this.prefs;
-        switch(typeof(value)) {
-          case 'string':
-              prefs.setCharPref(name, value);
-              break;
-          case 'boolean':
-            prefs.setBoolPref(name, value);
-            break;
-          case 'number':
-            prefs.setIntPref(name, value);
-            break;
-          default:
-            throw new Error('Unsupported type '+typeof(value)+' for preference '+name);
-        }
-    },
-    
     /* popup menu utility functions */
     emptyMenu: function(menu) {
       var children = menu.childNodes;
@@ -230,7 +169,7 @@ var TV2Developer = {
         var links = new Array();
         var currentURL = getBrowser().currentURI.spec;
         var encodedURL = encodeURIComponent(currentURL);
-        var initials = this.getPref('developer-initials');
+        var initials = TV2Util.getPref('developer-initials');
 
         // Adding links as appropiate if tv2.dk site
         var tv2 = this._reg_tv2.exec(currentURL);
@@ -271,20 +210,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, 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'));
+                links.push(new this.TV2Link('test_live_swap', testurl, tv2_uri, TV2Util.getStr('test.accesskey')));
+                links.push(new this.TV2Link('snapshot_live_swap', snapshoturl, tv2_uri, TV2Util.getStr('snapshot.accesskey')));
+                links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, TV2Util.getStr('testprompt.accesskey'), 'promptInitials'));
             } else if (tv2_testtype == 'snapshot') {
-                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'));
+                links.push(new this.TV2Link('snapshot_live_swap', liveurl, tv2_uri, TV2Util.getStr('live.accesskey')));
+                links.push(new this.TV2Link('test_snapshot_swap', testurl, tv2_uri, TV2Util.getStr('test.accesskey')));
+                links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, TV2Util.getStr('testprompt.accesskey'), 'promptInitials'));
             } else { // must be test
-                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')));
+                links.push(new this.TV2Link('test_live_swap', liveurl, tv2_uri, TV2Util.getStr('live.accesskey')));
+                links.push(new this.TV2Link('test_snapshot_swap', snapshoturl, tv2_uri, TV2Util.getStr('snapshot.accesskey')));
                 if (tv2_user != initials) {
-                    links.push(new this.TV2Link('test_swap', testurl, tv2_uri, this.getStr('test.accesskey')));
+                    links.push(new this.TV2Link('test_swap', testurl, tv2_uri, TV2Util.getStr('test.accesskey')));
                 }
-                links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, this.getStr('testprompt.accesskey'), 'promptInitials'));
+                links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, TV2Util.getStr('testprompt.accesskey'), 'promptInitials'));
             }
             
             links.push(new this.TV2LinkSplit());
@@ -298,11 +237,11 @@ var TV2Developer = {
             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') ? this.getStr('opdatering.accesskey') : this.getStr('webroot.accesskey')));
+                                        (tv2_sitetype!='opdatering') ? TV2Util.getStr('opdatering.accesskey') : TV2Util.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'))); */
+                                        (tv2_sitetype!='template') ? TV2Util.getStr('template.accesskey') : TV2Util.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')));
+                                        (tv2_sitetype!='robot') ? TV2Util.getStr('robot.accesskey') : TV2Util.getStr('webroot.accesskey')));
             
             links.push(new this.TV2LinkSplit());
             
@@ -327,8 +266,8 @@ var TV2Developer = {
             } else {
                 viewcvs_type = 'viewcvs_test';
             }
-            links.push(new this.TV2LinkWithLabel(viewcvs_type, this.getStr('lookupInViewCVS'), viewcvs,
-                                                 this.getStr('lookupInViewCVS.accesskey')));
+            links.push(new this.TV2LinkWithLabel(viewcvs_type, TV2Util.getStr('lookupInViewCVS'), viewcvs,
+                                                 TV2Util.getStr('lookupInViewCVS.accesskey')));
 
             // Update and I2 base URL
             var updatepostfix = (tv2_user ? '.' + tv2_user : '')
@@ -353,36 +292,36 @@ var TV2Developer = {
             var docWin = getBrowser().contentWindow;
             if (docWin.wrappedJSObject && docWin.wrappedJSObject.Tango_URL) {
                 tango = encodeURIComponent(docWin.wrappedJSObject.Tango_URL);
-                links.push(new this.TV2LinkWithLabel('tango/dynamic', this.getStr('viewDynamicVersion'),
+                links.push(new this.TV2LinkWithLabel('tango/dynamic', TV2Util.getStr('viewDynamicVersion'),
                         i2link + '/tango/dynamic.php?url='+tango+'&referer='+encodedURL, 
-                        this.getStr('viewDynamicVersion.accesskey'),
+                        TV2Util.getStr('viewDynamicVersion.accesskey'),
                         'flushCache'));
             }
             if (onI2interface != 'tango/entry' && onI2interface != 'tango/requeue') {
-                links.push(new this.TV2LinkWithLabel('tango/entry', this.getStr('lookupInTango'),
-                                i2link + '/tango/entry.php?url=' + tango, this.getStr('lookupInTango.accesskey')));
-                links.push(new this.TV2LinkWithLabel('tango/requeue', this.getStr('requeueInTango'),
-                                i2link + '/tango/requeue.php?url=' + tango, this.getStr('requeueInTango.accesskey')));
+                links.push(new this.TV2LinkWithLabel('tango/entry', TV2Util.getStr('lookupInTango'),
+                                i2link + '/tango/entry.php?url=' + tango, TV2Util.getStr('lookupInTango.accesskey')));
+                links.push(new this.TV2LinkWithLabel('tango/requeue', TV2Util.getStr('requeueInTango'),
+                                i2link + '/tango/requeue.php?url=' + tango, TV2Util.getStr('requeueInTango.accesskey')));
             }
             
             // Add run pdo_log link
             if ((onI2interface != 'tool/pdo_log/frameset') &&
                 ((!tv2_testsite && php5) || // only php5 live sites
                 (tv2_testsite && tv2_testsite != 'snapshot3' && tv2_testsite != 'test3'))) { /* not supported on php4 sites */
-                links.push(new this.TV2LinkWithLabel('tool/pdo_log/frameset', this.getStr('performDbPdoLog'),
+                links.push(new this.TV2LinkWithLabel('tool/pdo_log/frameset', TV2Util.getStr('performDbPdoLog'),
                    i2link + '/tool/pdo_log/frameset.php?url='+tango+'&autostop=1&prefix='+initials,
-                   this.getStr('performDbPdoLog.accesskey'),
+                   TV2Util.getStr('performDbPdoLog.accesskey'),
                    'flushCache'));
             }
             
-//            if (this.getPref('enable-secret', false)) {
+//            if (TV2Util.getPref('enable-secret', false)) {
 //            }
 
             if (onI2interface_url) {
                 /* 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, this.getStr('backI2.accesskey')));
+                links.push(new this.TV2LinkWithLabel(onI2interface, onI2interface_url, onI2interface_url, TV2Util.getStr('backI2.accesskey')));
             }
          
             // Some special cases for some sites 
@@ -391,12 +330,12 @@ var TV2Developer = {
                 var ttv_page = /side=([0-9]+)/.exec(tv2_uri);
                 if (ttv_page) {
                     skip_treenodes = true;
-                    links.push(new this.TV2LinkWithLabel('ttvpage', this.getStr('lookupTTVPage') + ' ' + ttv_page[1],
+                    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 */
-                                this.getStr('lookupTTVPage.accesskey')));
+                                TV2Util.getStr('lookupTTVPage.accesskey')));
                 }
-                /*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')));
+                /*links.push(new this.TV2Link('ttvpumpe', 'ttvpumpe'+updatepostfix, '/', TV2Util.getStr('ttvpumpe.accesskey')));*/
+                links.push(new this.TV2Link('ttvpumpe', 'ttvpumpe.opdatering.tv2.dk', '/', TV2Util.getStr('ttvpumpe.accesskey')));
             }
             
             // I2-Files and I2-Images
@@ -417,11 +356,11 @@ var TV2Developer = {
                         }
                     }
                     links.push(new this.TV2LinkSplit());
-                    links.push(new this.TV2LinkWithLabel('i2files', this.getStr('lookupContent') + ' ' + contentId[1] + ', ' +
-                        this.getStr('lookupContent.type') + ' ' + typeName,
+                    links.push(new this.TV2LinkWithLabel('i2files', TV2Util.getStr('lookupContent') + ' ' + contentId[1] + ', ' +
+                        TV2Util.getStr('lookupContent.type') + ' ' + typeName,
                         i2link + 
                             '/tool/query/?id=&_checkbox=1&2=&3='+typeId+'&content_id='+contentId[1]+'&4=&5=0&6=&action=Query&timeout=1',
-                            this.getStr('lookupContent.accesskey')
+                            TV2Util.getStr('lookupContent.accesskey')
                             ));
                 }
             }
@@ -436,9 +375,9 @@ var TV2Developer = {
                         links.push(new this.TV2LinkSplit());
                         first = false;
                     }
-                    links.push(new this.TV2LinkWithLabel('node', this.getStr('lookupTreeNode') + ' ' + nodeids[1],
+                    links.push(new this.TV2LinkWithLabel('node', TV2Util.getStr('lookupTreeNode') + ' ' + nodeids[1],
                                 i2node + nodeids[1],
-                                this.getStr('lookupTreeNode.accesskey')
+                                TV2Util.getStr('lookupTreeNode.accesskey')
                                 ));
                }
             }
@@ -465,26 +404,26 @@ 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, 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'));
+                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 + 'test' + testType + '.tv2.dk', tv2_uri, TV2Util.getStr('test.accesskey')));
+                links.push(new this.TV2Link('viewcvs_snapshot', tv2_sitename + '.' + type + 'snapshot' + testType + '.tv2.dk', tv2_uri, TV2Util.getStr('snapshot.accesskey')));
+                links.push(new this.TV2Link('viewcvs_testprompt', tv2_sitename + '.?.' + type + 'test' + testType + '.tv2.dk', tv2_uri, TV2Util.getStr('testprompt.accesskey'), 'promptInitials'));
                 
             } else {
-                links.push(new this.TV2LinkWithLabel('disabled', this.getStr('notTV2Site'), null, '', null, true));
+                links.push(new this.TV2LinkWithLabel('disabled', TV2Util.getStr('notTV2Site'), null, '', null, true));
                 links.push(new this.TV2LinkSplit());
-                links.push(new this.TV2Link('tv2dk', 'tv2.dk', '/', this.getStr('tv2dk.accesskey')));
+                links.push(new this.TV2Link('tv2dk', 'tv2.dk', '/', TV2Util.getStr('tv2dk.accesskey')));
             }
         }
         
         // Utility links
         links.push(new this.TV2LinkSplit());
-        links.push(new this.TV2LinkWithLabel('link_tree', this.getStr('i2Tree'), 'http://i2.opdatering.tv2.dk/tree/', this.getStr('i2Tree.accesskey')));
-        links.push(new this.TV2LinkWithLabel('node', this.getStr('nodeInformationTool'), 'http://i2.opdatering.tv2.dk/tool/node/', this.getStr('nodeInformationTool.accesskey')));
-        links.push(new this.TV2LinkWithLabel('link_query', this.getStr('nodeQueryTool'), 'http://i2.opdatering.tv2.dk/tool/query/', this.getStr('nodeQueryTool.accesskey')));
-        links.push(new this.TV2LinkWithLabel('tango/entry', this.getStr('tangoInterface'), 'http://i2.opdatering.tv2.dk/tango/', this.getStr('tangoInterface.accesskey')));
-        links.push(new this.TV2LinkWithLabel('w3c', this.getStr('w3c'),
-            'http://validator.w3.org/check?uri=' + encodedURL, this.getStr('w3c.accesskey')));
+        links.push(new this.TV2LinkWithLabel('link_tree', TV2Util.getStr('i2Tree'), 'http://i2.opdatering.tv2.dk/tree/', TV2Util.getStr('i2Tree.accesskey')));
+        links.push(new this.TV2LinkWithLabel('node', TV2Util.getStr('nodeInformationTool'), 'http://i2.opdatering.tv2.dk/tool/node/', TV2Util.getStr('nodeInformationTool.accesskey')));
+        links.push(new this.TV2LinkWithLabel('link_query', TV2Util.getStr('nodeQueryTool'), 'http://i2.opdatering.tv2.dk/tool/query/', TV2Util.getStr('nodeQueryTool.accesskey')));
+        links.push(new this.TV2LinkWithLabel('tango/entry', TV2Util.getStr('tangoInterface'), 'http://i2.opdatering.tv2.dk/tango/', TV2Util.getStr('tangoInterface.accesskey')));
+        links.push(new this.TV2LinkWithLabel('w3c', TV2Util.getStr('w3c'),
+            'http://validator.w3.org/check?uri=' + encodedURL, TV2Util.getStr('w3c.accesskey')));
         return links;
         
     },
@@ -503,9 +442,9 @@ var TV2Developer = {
         // add link to quickbox
         menu.appendChild(document.createElement('menuseparator'));
         var item = document.createElement('menuitem');
-        item.setAttribute('label', this.getStr('quickbox.menuitem')); 
-        item.setAttribute('accesskey', this.getStr('quickbox.accesskey'));
-        item.setAttribute('tooltiptext', this.getStr('quickbox.menuitem'));
+        item.setAttribute('label', TV2Util.getStr('quickbox.menuitem')); 
+        item.setAttribute('accesskey', TV2Util.getStr('quickbox.accesskey'));
+        item.setAttribute('tooltiptext', TV2Util.getStr('quickbox.menuitem'));
         item.setAttribute('oncommand', 'TV2Developer.openQuickbox(event)');
         menu.appendChild(item);
     },
@@ -577,11 +516,11 @@ var TV2Developer = {
             /* handle flags */
             if (tv2flags) {
                  if (tv2flags.indexOf('promptInitials') != -1) {
-                    var initials = prompt(this._strs.getString('enterInitials'), this.getPref('alternativ-initials', ''));
+                    var initials = prompt(TV2Util.getStr('enterInitials'), TV2Util.getPref('alternativ-initials', ''));
                     if (initials == '' || initials == null) {
                         return; // cancelled
                     }
-                    this.setPref('alternativ-initials', initials);
+                    TV2Util.setPref('alternativ-initials', initials);
                     url = url.replace('?', initials);
                  }
                  if (tv2flags.indexOf('flushCache') != -1) {
@@ -592,7 +531,7 @@ var TV2Developer = {
             openUILink(url, event, false, true, false); /* allow ctrl, not alt, and don't google */
             if (tv2linktype) {
                 this._lastAction = tv2linktype;
-                this.setPref('lastaction-linktype', tv2linktype);
+                TV2Util.setPref('lastaction-linktype', tv2linktype);
             }
         }
     },
@@ -606,87 +545,20 @@ var TV2Developer = {
         } catch(ex) {}
     },
 
-	/* Below is functionality for the quick link box */
-
-	_addCheckbox: function(here, id, label, accesskey) {
-		var radio = document.createElement('radio');
-		radio.setAttribute('id', id);
-		radio.setAttribute('label', label);
-		radio.setAttribute('accesskey', accesskey);
-		here.appendChild(radio);
-	},
-
-	updateQuickbox: function() {
-		var postfix = document.getElementById('radiobox-rows');
-		var username = this.getPref('developer-initials');
-		var php4 = '';
-		// add webroot links
-		var webroot = document.createElement('row');
-		this._addCheckbox(webroot, 'postfix-live', '.tv2.dk', this.getStr('quickbox.live.accesskey'));
-		this._addCheckbox(webroot, 'postfix-test', '.'+username+'.test'+php4+'.tv2.dk', this.getStr('quickbox.test.accesskey'));
-		this._addCheckbox(webroot, 'postfix-snapshot', '.snapshot'+php4+'.tv2.dk', this.getStr('quickbox.snapshot.accesskey'));
-		postfix.appendChild(webroot);
-		// add opdatering links
-		var opdatering = document.createElement('row');
-		this._addCheckbox(opdatering, 'postfix-live-opdatering', '.opdatering.tv2.dk', this.getStr('quickbox.live-opdatering.accesskey'));
-		this._addCheckbox(opdatering, 'postfix-test-opdatering', '.'+username+'.opdatering.test'+php4+'.tv2.dk', this.getStr('quickbox.test-opdatering.accesskey'));
-		this._addCheckbox(opdatering, 'postfix-snapshot-opdatering', '.opdatering.snapshot'+php4+'.tv2.dk', this.getStr('quickbox.snapshot-opdatering.accesskey'));
-		postfix.appendChild(opdatering);
-		// add robot links
-		var robot = document.createElement('row');
-		this._addCheckbox(robot, 'postfix-live-robot', '.robot.tv2.dk', this.getStr('quickbox.live-robot.accesskey'));
-		this._addCheckbox(robot, 'postfix-test-robot', '.'+username+'.robot.test'+php4+'.tv2.dk', this.getStr('quickbox.test-robot.accesskey'));
-		this._addCheckbox(robot, 'postfix-snapshot-robot', '.robot.snapshot'+php4+'.tv2.dk', this.getStr('quickbox.snapshot-robot.accesskey'));
-		postfix.appendChild(robot);
-		// select default radio button
-		var def = document.getElementById(this.getPref('lastaction-quickbox-postfix', 'postfix-live'));
-		if (def) {
-		    document.getElementById('tv2postfix').selectedItem = def;
-		}
-		document.getElementById('tv2prefix').value = this.getPref('lastaction-quickbox-prefix', '');
-		document.getElementById('php4site').checked = this.getPref('lastaction-quickbox-php4site', false);
-	},
-	
-	goQuickbox: function() {
-	    var prefix  =  document.getElementById('tv2prefix').value;
-	    var postfix_obj = document.getElementById('tv2postfix').selectedItem;
-	    var php4site = document.getElementById('php4site').checked;
-	    var url;
-	    this.setPref('lastaction-quickbox-prefix', prefix);
-	    this.setPref('lastaction-quickbox-postfix', postfix_obj.id);
-	    this.setPref('lastaction-quickbox-php4site', document.getElementById('php4site').checked);
-	    if (postfix_obj.id.substr(0, 8)=='postfix-') {
-	        if (prefix == '') {
-	            prefix = 'www';
-	        }
-	        var postfix = postfix_obj.label;
-	        if (php4site) { /* change test to test3, snapshot to snapshot3 */
-	            postfix = postfix.replace(/(test|snapshot)(\.tv2\.dk)/, '$13$2');
-	        }
-	        url = prefix+postfix;
-	    } else {
-	        var id = encodeURIComponent(prefix);
-	        if (postfix_obj.id == 'go-node') {
-	            url = 'http://i2.opdatering.tv2.dk/tool/node/?id=' + id;
-	        } else if (postfix_obj.id == 'go-content-id') {
-	            url = 'http://i2.opdatering.tv2.dk/tool/query/?id=&2=&3=&_checkbox=1&content_id='+id+'&4=&5=0&6=&action=Query&timeout=1';
-	        } else if (postfix_obj.id == 'go-ttv-page') {
-	            url = 'http://i2.opdatering.tv2.dk/tool/ttv/?1=' + id + '&2=0';
-	        }
-	    }
-        window.close();
-        opener.openUILink(url, 'current', false, false, false); /* allow ctrl, alt, but don't google */
-	},
-	
 	openQuickbox: function(event) {
-	    window.openDialog('chrome://tv2developer/content/quickbox.xul','tv2quickbox','modal,centerscreen,chrome,resizable=no');
+      var startUrl = '';
+      var urlbar = document.getElementById('urlbar');
+      if (urlbar) {
+          startUrl = urlbar.value;
+      }
+	    window.openDialog('chrome://tv2developer/content/quickbox.xul','tv2quickbox','modal,centerscreen,chrome,resizable=no,title=no', startUrl);
 	},
 	
 	/* Options */
 	openOptionsDialog: function(event) {
       var instantApply = getBoolPref("browser.preferences.instantApply", false);
       var features = "chrome,titlebar,toolbar,centerscreen" + (instantApply ? ",dialog=no" : ",modal");
-      window.openDialog('chrome://tv2developer/content/options.xul','tv2options',features);
+      window.openDialog('chrome://tv2developer/content/options.xul', 'tv2options', features);
   }
 
 
diff --git a/locale/da-DK/tv2developer.dtd b/locale/da-DK/tv2developer.dtd
index d3f9431..cc26ec9 100755
--- a/locale/da-DK/tv2developer.dtd
+++ b/locale/da-DK/tv2developer.dtd
@@ -17,10 +17,19 @@
 <!ENTITY about.accesskey "a">
 
 <!ENTITY quickbox.title "TV 2 | Quickbox">
-<!ENTITY quickbox.enterprefix "Indtast første del af tv2.dk domænet:">
+<!ENTITY quickbox.entershorturl "Indtast forkortet URL:">
+<!ENTITY quickbox.entershorturl.accesskey "u">
+
+<!ENTITY quickbox.othertestsite "Andet test site:">
+<!ENTITY quickbox.othertestsite.accesskey ".">
+
 <!ENTITY quickbox.php4site "PHP 4 site">
+<!ENTITY quickbox.php4site.accesskey "p">
 <!ENTITY quickbox.php4site.tooltiptext "Ændrér test til test3, snapshot til snapshot3.">
 
+<!ENTITY quickbox.makeurl "Konstruér URL til websiden">
+<!ENTITY quickbox.makeurl.accesskey "k">
+
 <!ENTITY quickbox.nodeid "Slå op som Node ID i I2">
 <!ENTITY quickbox.nodeid.accesskey "n">
 
diff --git a/locale/en-US/tv2developer.dtd b/locale/en-US/tv2developer.dtd
index 9e77a52..0b8a598 100755
--- a/locale/en-US/tv2developer.dtd
+++ b/locale/en-US/tv2developer.dtd
@@ -17,10 +17,19 @@
 <!ENTITY about.accesskey "a">
 
 <!ENTITY quickbox.title "TV 2 | Quickbox">
-<!ENTITY quickbox.enterprefix "Enter tv2.dk prefix:">
+<!ENTITY quickbox.entershorturl "Enter short URL:">
+<!ENTITY quickbox.entershorturl.accesskey "u">
+
+<!ENTITY quickbox.othertestsite "Other test site:">
+<!ENTITY quickbox.othertestsite.accesskey ".">
+
 <!ENTITY quickbox.php4site "PHP 4 site">
+<!ENTITY quickbox.php4site.accesskey "p">
 <!ENTITY quickbox.php4site.tooltiptext "Changes test to test3, snapshot to snapshot3.">
 
+<!ENTITY quickbox.makeurl "Make URL for website">
+<!ENTITY quickbox.makeurl.accesskey "m">
+
 <!ENTITY quickbox.nodeid "Lookup as Node ID">
 <!ENTITY quickbox.nodeid.accesskey "n">
 
@@ -29,4 +38,3 @@
 
 <!ENTITY quickbox.ttvpage "Lookup as TTV Page">
 <!ENTITY quickbox.ttvpage.accesskey "g">
-
diff --git a/version b/version
index 0426003..faef31a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.6.24
+0.7.0
-- 
2.52.0