Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work on improving 'updates found' page

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@174899 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ben%bengoodger.com
2005-06-20 23:23:45 +00:00
parent a1f611051b
commit a0fa232c8c
5 changed files with 77 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd
View File

@@ -10,7 +10,7 @@
<!ENTITY noupdatesfound.intro "There are no new updates available. &brandShortName; may check
periodically for new updates.">
<!ENTITY updatesfound.title "Updates Available">
<!ENTITY updatesfound.title "Update Available">
<!ENTITY forMoreInfo.label "For more information, ">
<!ENTITY clickHere.label "Click Here">
@@ -24,11 +24,11 @@
<!ENTITY later.label "Later">
<!ENTITY later.accesskey "a">
<!ENTITY download.label "Download &amp; Install &#0187;">
<!ENTITY download.label "Download &amp; Install Now &#0187;">
<!ENTITY download.accesskey "D">
<!ENTITY upgrade.evangelism "It is strongly recommended that you upgrade &brandShortName;
as soon as possible by clicking Download &amp; Install &#0187;.">
as soon as possible.">
<!ENTITY license.title "License Agreement">
<!ENTITY license.intro "To install this update you must agree to this license agreement.

1
mozilla/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
View File

@@ -45,3 +45,4 @@ restartLaterMessage=The update you just downloaded will be installed the next ti
resumePausedAfterCloseTitle=Software Update
resumePausedAfterCloseMessage=You have paused downloading this update. Do you want %S to download the update in the background while you continue to browse?

96
mozilla/toolkit/mozapps/update/content/updates.css
View File

@@ -1,14 +1,10 @@
/**
* General
*/
wizard[description=""] .wizard-header-description {
display: none;
}
#errorReason {
margin-top: 1px;
margin-bottom: 2px;
-moz-margin-start: 6px !important;
-moz-margin-end: 5px;
}
link {
-moz-binding: url("chrome://mozapps/content/update/updates.xml#link");
-moz-user-focus: normal;
@@ -37,6 +33,9 @@ link:focus {
border: 1px dotted black;
}
/**
* License Page
*/
license {
-moz-binding: url("chrome://mozapps/content/update/updates.xml#license");
display: -moz-deck;
@@ -60,46 +59,38 @@ license {
list-style-image: url("chrome://global/skin/icons/notfound.png");
}
#updateName {
font-weight: bold;
font-size: x-large;
/**
* Update Found Page
*/
#updatesfoundContent {
margin: 10px 44px 10px 44px;
}
#updateType[type=major] {
font-weight: bold;
color: #C00000;
wizard[currentpageid="updatesfound"] .wizard-buttons {
display: none;
}
#updateType[type=minor] {
wizard[currentpageid="updatesfound"] .wizard-page-box {
margin: 0px;
}
#installButtons {
margin: 10px;
}
#downloadNow {
font-weight: bold;
color: #FF0000;
padding-left: 15px;
padding-right: 15px;
}
#updateForMoreInfo {
margin-left: 5px;
}
#updateImage {
margin-right: 5px;
}
#update-info {
border-bottom: 2px solid;
-moz-border-bottom-colors: ThreeDFace ThreeDHighlight;
-moz-appearance: listbox;
margin: 10px;
background-color: #FFFFFF;
}
#update-info-inner {
background-color: InfoBackground;
color: InfoText;
display: -moz-box;
padding: 7px 5px 7px 7px;
}
#updateAvailable {
margin: 5px;
#updateName {
font-weight: bold;
font-size: larger;
}
#alertImage {
@@ -107,30 +98,13 @@ license {
margin-right: 5px;
}
.action-button-box {
margin: 7px;
}
#download-button {
font-weight: bold;
}
.bold {
font-weight: bold;
}
#incompatibleWarning {
margin-right: 50px;
}
#downloadingIntro {
margin: 10px 10px 0px 10px;
}
#downloadingFooter {
margin: 0px 4px 7px 4px;
}
/**
* Downloading Page
*/
#downloadName {
margin-top: 3px;
}
@@ -146,3 +120,13 @@ license {
list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
}
/**
* Error Page
*/
#errorReason {
margin-top: 1px;
margin-bottom: 2px;
-moz-margin-start: 6px !important;
-moz-margin-end: 5px;
}

11
mozilla/toolkit/mozapps/update/content/updates.js
View File

@@ -291,9 +291,6 @@ var gUpdatesAvailablePage = {
this._incompatibleItems = items;
}
var dlButton = document.getElementById("download-button");
dlButton.focus();
},
onInstallNow: function() {
@@ -301,6 +298,10 @@ var gUpdatesAvailablePage = {
document.documentElement.currentPage = document.getElementById(nextPageID);
},
onInstallLater: function() {
close();
},
showIncompatibleItems: function() {
openDialog("chrome://mozapps/content/update/incompatible.xul", "",
"dialog,centerscreen,modal,resizable,titlebar", this._incompatibleItems);
@@ -320,6 +321,8 @@ var gLicensePage = {
this._licenseContent.addEventListener("load", this.onLicenseLoad, false);
this._licenseContent.url = gUpdates.update.licenseURL;
document.documentElement._wizardButtons.removeAttribute("type");
},
onLicenseLoad: function() {
@@ -539,6 +542,8 @@ var gDownloadingPage = {
*
*/
onPageShow: function() {
document.documentElement._wizardButtons.removeAttribute("type");
this._downloadName = document.getElementById("downloadName");
this._downloadStatus = document.getElementById("downloadStatus");
this._downloadProgress = document.getElementById("downloadProgress");

53
mozilla/toolkit/mozapps/update/content/updates.xul
View File

@@ -80,23 +80,21 @@
</wizardpage>
<wizardpage id="updatesfound" pageid="updatesfound" next="downloading"
object="gUpdatesAvailablePage" flex="1"
object="gUpdatesAvailablePage" label="&updatesfound.title;"
onpageshow="gUpdatesAvailablePage.onPageShow();">
<vbox id="update-info" flex="1">
<vbox id="update-info-inner" flex="1">
<hbox align="start">
<vbox flex="1">
<description id="updateType">
&updateAvailable.placeholder;
</description>
<label id="updateName" crop="right"/>
<description class="updateForMoreInfo">&forMoreInfo.label;
<link id="updateMoreInfoURL">&clickHere.label;</link>.
</description>
</vbox>
<image id="updateImage" src="chrome://branding/content/icon64.png"/>
</hbox>
<separator flex="1"/>
<vbox flex="1" id="updatesfoundContent">
<description id="updateType">&updateAvailable.placeholder;</description>
<separator class="thin"/>
<label id="updateName" crop="right"/>
<separator class="thin"/>
<description>&upgrade.evangelism;</description>
<hbox>
<button label="More Details"/>
</hbox>
<vbox hidden="true">
<description class="updateForMoreInfo">&forMoreInfo.label;
<link id="updateMoreInfoURL">&clickHere.label;</link>.
</description>
<hbox align="start" id="incompatibleWarning" hidden="true">
<image id="alertImage"/>
<vbox flex="1">
@@ -107,19 +105,18 @@
</hbox>
</vbox>
</hbox>
<separator flex="1"/>
<description class="bold">&upgrade.evangelism;</description>
<separator/>
<hbox>
<button label="&later.label;" accesskey="&later.accesskey;"
oncommand="close();"/>
<separator flex="1"/>
<button id="download-button"
label="&download.label;" accesskey="&download.accesskey;"
oncommand="gUpdatesAvailablePage.onInstallNow();"/>
</hbox>
</vbox>
</vbox>
<separator flex="1"/>
</vbox>
<separator class="groove"/>
<hbox id="installButtons">
<button id="downloadLater" label="&later.label;" accesskey="&later.accesskey;"
oncommand="gUpdatesAvailablePage.onInstallLater();"/>
<spacer flex="1"/>
<button id="downloadNow" label="&download.label;" accesskey="&download.accesskey;"
oncommand="gUpdatesAvailablePage.onInstallNow();"/>
</hbox>
</wizardpage>
<wizardpage id="license" pageid="license" next="downloading"