mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 13:55:43 +00:00
Bug 654530: Sync in-tree test pilot with AMO version. r=dtownsend
DONTBUILD as it is NPOTB on m-c
This commit is contained in:
Dave Townsend
parent
55d55e48ae
commit
5191666ce2
@ -75,12 +75,12 @@
|
||||
|
||||
<prefpane id="finished-studies-pane" class="tp-tab-panel">
|
||||
<richlistbox id="finished-studies-listbox" class="tp-study-list"
|
||||
disabled="true" />
|
||||
disabled="true"/>
|
||||
</prefpane>
|
||||
|
||||
<prefpane id="study-results-pane" class="tp-tab-panel">
|
||||
<richlistbox id="study-results-listbox" class="tp-study-list"
|
||||
disabled="true" />
|
||||
disabled="true"/>
|
||||
</prefpane>
|
||||
|
||||
<prefpane id="settings-pane" class="tp-tab-panel">
|
||||
|
||||
@ -38,11 +38,16 @@
|
||||
-moz-border-image: url(chrome://testpilot-os/skin/notification-tail-up.png) 26 56 22 18 / 26px 56px 22px 18px round stretch;
|
||||
}
|
||||
|
||||
/* tail-down uses the old styling; it doesn't look as good as the new styling,
|
||||
but the new styling doesn't work on 3.6.
|
||||
TODO: If someone is using 3.7.* or 4.* but is NOT on the beta channel and
|
||||
installed Test Pilot from AMO, they should get the new styling, similar
|
||||
to .tail-up! */
|
||||
.tail-down {
|
||||
-moz-border-image: url(chrome://testpilot-os/skin/notification-tail-down.png) 26 56 22 18 / 26px 56px 22px 18px round stretch;
|
||||
-moz-border-image: url(chrome://testpilot/skin/notification-tail-down.png) 26 50 22 18 / 26px 50px 22px 18px repeat;
|
||||
color: white;
|
||||
}
|
||||
|
||||
|
||||
.pilot-notification-popup-container {
|
||||
-moz-appearance: none;
|
||||
margin-right: -42px;
|
||||
@ -172,7 +177,7 @@ image.study-result {
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
padding: 2px;
|
||||
border-radius: 10000px;
|
||||
-moz-border-radius: 100%;
|
||||
margin-right: 25px;
|
||||
margin-bottom: 13px;
|
||||
}
|
||||
|
||||
@ -128,6 +128,7 @@ var TestPilotMenuUtils;
|
||||
let menuPopup = document.getElementById("pilot-menu-popup");
|
||||
let menuButton = document.getElementById(attachPointId);
|
||||
|
||||
// TODO failing here with "menuPopup is null" for Tracy
|
||||
if (menuPopup.parentNode != menuButton)
|
||||
menuButton.appendChild(menuPopup);
|
||||
|
||||
|
||||
@ -405,15 +405,9 @@ var stringBundle;
|
||||
|
||||
function onStatusPageLoad() {
|
||||
setStrings(PAGE_TYPE_STATUS);
|
||||
/* If an experiment ID (eid) is provided in the url params, show status
|
||||
* for that experiment. If not, show the main menu with status for all
|
||||
* installed experiments. */
|
||||
let eidString = getUrlParam("eid");
|
||||
if (eidString == "") {
|
||||
showStatusMenuPage();
|
||||
} else {
|
||||
loadExperimentPage();
|
||||
}
|
||||
/* An experiment ID (eid) must be provided in the url params. Show status
|
||||
* for that experiment.*/
|
||||
loadExperimentPage();
|
||||
}
|
||||
|
||||
function setStrings(pageType) {
|
||||
|
||||
@ -102,16 +102,16 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
|
||||
font-size: 16px;
|
||||
padding: 8px 12px;
|
||||
color: rgba(0, 0, 0, 0.8);
|
||||
border-radius: 0.5em;
|
||||
-moz-border-radius: 0.5em;
|
||||
-webkit-border-radius: 0.5em;
|
||||
box-shadow:
|
||||
-moz-box-shadow:
|
||||
inset rgba(0, 0, 0, 0.2) 0 1px 1px,
|
||||
inset rgba(255, 255, 255, 1) 0 3px 1px,
|
||||
inset rgba(255, 255, 255, 0.3) 0 16px 0px,
|
||||
inset rgba(0, 0, 0, 0.2) 0 -1px 1px,
|
||||
inset rgba(0, 0, 0, 0.1) 0 -2px 1px,
|
||||
rgba(255, 255, 255, 1) 0 1px,
|
||||
rgba(133, 153, 166, 0.3) 0px 1px 8.5px;
|
||||
rgba(133, 153, 166, 0.3) 0px 1px 12px;
|
||||
background-color: #e7eaec;
|
||||
//display: inline;
|
||||
}
|
||||
@ -122,16 +122,16 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
|
||||
padding: 8px 12px;
|
||||
width: 240px;
|
||||
color: rgba(0, 0, 0, 0.8);
|
||||
border-radius: 0.5em;
|
||||
-moz-border-radius: 0.5em;
|
||||
-webkit-border-radius: 0.5em;
|
||||
box-shadow:
|
||||
-moz-box-shadow:
|
||||
inset rgba(0, 0, 0, 0.2) 0 1px 1px,
|
||||
inset rgba(255, 255, 255, 1) 0 3px 1px,
|
||||
inset rgba(255, 255, 255, 0.3) 0 16px 0px,
|
||||
inset rgba(0, 0, 0, 0.2) 0 -1px 1px,
|
||||
inset rgba(0, 0, 0, 0.1) 0 -2px 1px,
|
||||
rgba(255, 255, 255, 1) 0 1px,
|
||||
rgba(133, 153, 166, 0.3) 0px 1px 8.5px;
|
||||
rgba(133, 153, 166, 0.3) 0px 1px 12px;
|
||||
background-color: #e7eaec;
|
||||
//display: inline;
|
||||
}
|
||||
@ -143,13 +143,13 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
|
||||
padding: 8px 24px;
|
||||
margin: 24px auto;
|
||||
color: rgba(0, 0, 0, 0.8);
|
||||
border-radius: 0.5em;
|
||||
-moz-border-radius: 0.5em;
|
||||
-webkit-border-radius: 0.5em;
|
||||
background: rgba(220, 240, 247, 0.8) url('chrome://testpilot/skin/callout.png') no-repeat top center;
|
||||
box-shadow:
|
||||
inset rgba(185, 221, 234, 0.2) 0 -10px 8.5px,
|
||||
-moz-box-shadow:
|
||||
inset rgba(185, 221, 234, 0.2) 0 -10px 12px,
|
||||
inset rgba(185, 221, 234, 1) 0 0px 1px,
|
||||
inset rgba(255, 255, 255, 0.2) 0 10px 8.5px;
|
||||
inset rgba(255, 255, 255, 0.2) 0 10px 12px;
|
||||
//display: inline;
|
||||
}
|
||||
|
||||
@ -161,13 +161,13 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
|
||||
padding: 8px 24px;
|
||||
margin: 8px auto;
|
||||
color: rgba(0, 0, 0, 0.8);
|
||||
border-radius: 0.5em;
|
||||
-moz-border-radius: 0.5em;
|
||||
-webkit-border-radius: 0.5em;
|
||||
background: rgba(220, 240, 247, 0.8) url('chrome://testpilot/skin/callout.png') no-repeat top center;
|
||||
box-shadow:
|
||||
inset rgba(185, 221, 234, 0.2) 0 -10px 8.5px,
|
||||
-moz-box-shadow:
|
||||
inset rgba(185, 221, 234, 0.2) 0 -10px 12px,
|
||||
inset rgba(185, 221, 234, 1) 0 0px 1px,
|
||||
inset rgba(255, 255, 255, 0.2) 0 10px 8.5px;
|
||||
inset rgba(255, 255, 255, 0.2) 0 10px 12px;
|
||||
//display: inline;
|
||||
}
|
||||
|
||||
@ -197,7 +197,7 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
|
||||
padding: 4px 40px;
|
||||
width: 800px;
|
||||
text-align: left;
|
||||
border-radius: 0.25em;
|
||||
-moz-border-radius: 0.25em;
|
||||
-webkit-border-radius: 0.25em;
|
||||
border-top: 1px solid #adb6ba;
|
||||
border-left: 1px solid #adb6ba;
|
||||
@ -223,8 +223,8 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
|
||||
font-size: 14px;
|
||||
text-shadow: 1px 1px 1px rgba(173, 182, 186, 1);
|
||||
background-color: rgba(173, 182, 186, 0.3);
|
||||
box-shadow:
|
||||
inset rgba(0, 0, 0, 0.2) 0 -10px 8.5px;
|
||||
-moz-box-shadow:
|
||||
inset rgba(0, 0, 0, 0.2) 0 -10px 12px;
|
||||
padding: 9px 8px 8px 8px;
|
||||
}
|
||||
|
||||
@ -255,4 +255,4 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
|
||||
|
||||
p.embiggened {
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
@ -28,9 +28,7 @@
|
||||
<div class="home_callout">
|
||||
<img class="homeIcon"
|
||||
src="chrome://testpilot/skin/images/home_comments.png">
|
||||
<a id="comments-and-discussions-link"
|
||||
onclick="
|
||||
openLink('http://groups.google.com/group/mozilla-labs-testpilot');">
|
||||
<a id="comments-and-discussions-link" onclick="openLink('http://groups.google.com/group/mozilla-labs-testpilot');">
|
||||
</a>
|
||||
</div><br>
|
||||
<div class="home_callout">
|
||||
|
||||
@ -24,6 +24,11 @@
|
||||
<span id="please-take-text"></span>
|
||||
<a class="function-link" id="background-survey-text"
|
||||
onclick="TestPilotWelcomePage.openPilotSurvey();"></a>!</p>
|
||||
<p class="embiggened">
|
||||
<a class="function-link" id="privacy-policy-link"
|
||||
style="text-decoration: underline"
|
||||
href="http://www.mozilla.com/en-US/privacy-policy.html"></a>
|
||||
</p>
|
||||
<p class="embiggened">
|
||||
<a class="function-link" id="open-studies-window-link"
|
||||
onclick="TestPilotWindowUtils.openAllStudiesWindow();"></a>
|
||||
@ -45,8 +50,6 @@
|
||||
</div>
|
||||
<div id="footer">
|
||||
<img class="mozLogo" src="chrome://testpilot/skin/mozilla-logo.png">
|
||||
<a href="http://www.mozilla.com/en-US/privacy-policy.html"
|
||||
id="privacy-policy-link"></a>
|
||||
<a href="http://www.mozilla.com/en-US/about/legal.html"
|
||||
id="legal-notices-link"></a>
|
||||
</div>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
|
||||
<Description about="urn:mozilla:install-manifest">
|
||||
<em:id>testpilot@labs.mozilla.com</em:id>
|
||||
<em:version>1.0.9</em:version>
|
||||
<em:version>1.1.1</em:version>
|
||||
<em:type>2</em:type>
|
||||
|
||||
<!-- Target Application this extension can install into,
|
||||
|
||||
@ -75,9 +75,9 @@ DbUtils.createTable = function createTable(connection, tableName, schema){
|
||||
logger.debug("File is " + file + "\n");
|
||||
try{
|
||||
if(!connection.tableExists(tableName)){
|
||||
// TODO why don't we use connection.createTable here??
|
||||
connection.executeSimpleSQL(schema);
|
||||
}
|
||||
else{
|
||||
} else{
|
||||
logger.debug("database table: " + tableName + " already exists\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -259,13 +259,13 @@ let TestPilotSetup = {
|
||||
|
||||
if (currVersion != self.version) {
|
||||
if(!self._isBetaChannel()) {
|
||||
// Don't show first run page in ffx4 beta version.
|
||||
self._prefs.setValue(VERSION_PREF, self.version);
|
||||
let browser = self._getFrontBrowserWindow().getBrowser();
|
||||
let url = self._prefs.getValue(FIRST_RUN_PREF, "");
|
||||
let tab = browser.addTab(url);
|
||||
browser.selectedTab = tab;
|
||||
}
|
||||
// Don't show first run page in ffx4 beta version.
|
||||
}
|
||||
|
||||
// Install tasks. (This requires knowing the version, so it is
|
||||
|
||||
Loading…
Reference in New Issue
Block a user