Permalink
Browse files

merge

  • Loading branch information...
2 parents aa752d2 + 1afc39d commit d6e5e6f44ee122ac68f612a098880be064e07c3a root committed Mar 22, 2012
View
@@ -5,6 +5,4 @@ var/cache/fontconfig/
var/cache/ldconfig/
var/cache/dictionaries-common
var/cache/apt/pkgcache.bin
-sys
-proc
/dev/null
@@ -60,7 +60,7 @@
<body dir="&locale.dir;">
<div>
-<a href="http://config.webconverger.com">
+<a id="webcURL" href="http://config.webconverger.com">
<img src="http://webconverger.com/img/logo.png" alt="Webconverger"/>
<p>Webconverger OS not running</p>
</a>
@@ -99,6 +99,12 @@
vendor.setAttribute("href", vendorURL);
}
+ var aboutwebc = "";
+ if (aboutwebc) {
+ var webc = document.getElementById("webcURL");
+ webc.setAttribute("href", aboutwebc);
+ }
+
// insert the version of the XUL application (!= XULRunner platform version)
var versionNum = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo)
@@ -60,7 +60,7 @@
<body dir="&locale.dir;">
<div>
-<a href="http://config.webconverger.com">
+<a id="webcURL" href="http://config.webconverger.com">
<img src="http://webconverger.com/img/logo.png" alt="Webconverger"/>
<p>Webconverger OS not running</p>
</a>
@@ -99,6 +99,12 @@
vendor.setAttribute("href", vendorURL);
}
+ var aboutwebc = "";
+ if (aboutwebc) {
+ var webc = document.getElementById("webcURL");
+ webc.setAttribute("href", aboutwebc);
+ }
+
// insert the version of the XUL application (!= XULRunner platform version)
var versionNum = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo)
@@ -60,7 +60,7 @@
<body dir="&locale.dir;">
<div>
-<a href="http://config.webconverger.com">
+<a id="webcURL" href="http://config.webconverger.com">
<img src="http://webconverger.com/img/logo.png" alt="Webconverger"/>
<p>Webconverger OS not running</p>
</a>
@@ -99,6 +99,12 @@
vendor.setAttribute("href", vendorURL);
}
+ var aboutwebc = "";
+ if (aboutwebc) {
+ var webc = document.getElementById("webcURL");
+ webc.setAttribute("href", aboutwebc);
+ }
+
// insert the version of the XUL application (!= XULRunner platform version)
var versionNum = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo)
View
@@ -40,13 +40,12 @@ for x in $( cmdline ); do
esac
done
-install_qa_url=${install_qa_url/&/\&amp;}
stamp=$( git show $webc_version |grep '^Date')
-cp ${link}/content/about.xhtml ${link}/content/about.xhtml.bak
+test -f ${link}/content/about.xhtml.bak || cp ${link}/content/about.xhtml ${link}/content/about.xhtml.bak
cat ${link}/content/about.xhtml.bak |
sub_literal 'OS not running' "${webc_version} ${stamp}" |
-sub_literal 'http://config.webconverger.com' "${install_qa_url}" > ${link}/content/about.xhtml
+sub_literal 'var aboutwebc = "";' "var aboutwebc = \"$(echo ${install_qa_url} | sed 's,&,&amp;,')\";" > ${link}/content/about.xhtml
}
update_cmdline() {
View
No changes.
View
No changes.

0 comments on commit d6e5e6f

Please sign in to comment.