Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 608468 - Details View should include the add-on Summary text from AMO. r=dtownsend, a=blocking-final

Browse Source
This commit is contained in:
Blair McBride 2011-01-19 13:37:36 +13:00
parent acf3555766
commit b4ce8fce8b
6 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolkit/mozapps/extensions/content/extensions.js
View File

@ -2247,8 +2247,15 @@ var gDetailView = {
}
var desc = document.getElementById("detail-desc");
desc.textContent = aAddon.fullDescription ? aAddon.fullDescription
: aAddon.description;
desc.textContent = aAddon.description;
var fullDesc = document.getElementById("detail-fulldesc");
if (aAddon.fullDescription) {
fullDesc.textContent = aAddon.fullDescription;
fullDesc.hidden = false;
} else {
fullDesc.hidden = true;
}
var contributions = document.getElementById("detail-contributions");
if ("contributionURL" in aAddon && aAddon.contributionURL) {

5
toolkit/mozapps/extensions/content/extensions.xul
View File

@ -555,7 +555,10 @@
<vbox pack="center"> <!-- Necessary to work around bug 394738 -->
<image id="detail-screenshot" hidden="true"/>
</vbox>
<description id="detail-desc" flex="1"/>
<vbox flex="1">
<description id="detail-desc"/>
<description id="detail-fulldesc"/>
</vbox>
</hbox>
<vbox id="detail-contributions">
<description id="detail-contrib-description">

7
toolkit/mozapps/extensions/test/browser/browser_details.js
View File

@ -153,7 +153,8 @@ add_test(function() {
is(get("detail-icon").src, "chrome://foo/skin/icon64.png", "Icon should be correct");
is_element_hidden(get("detail-creator"), "Creator should be hidden");
is_element_hidden(get("detail-screenshot"), "Screenshot should be hidden");
is(get("detail-desc").textContent, "Longer description", "Description should be correct");
is(get("detail-desc").textContent, "Short description", "Description should be correct");
is(get("detail-fulldesc").textContent, "Longer description", "Full description should be correct");
is_element_visible(get("detail-contributions"), "Contributions section should be visible");
is_element_visible(get("detail-contrib-suggested"), "Contributions amount should be visible");
@ -258,6 +259,7 @@ add_test(function() {
is_element_visible(get("detail-screenshot"), "Screenshot should be visible");
is(get("detail-screenshot").src, "http://example.com/screenshot", "Should be showing the full sized screenshot");
is(get("detail-desc").textContent, "Short description", "Description should be correct");
is_element_hidden(get("detail-fulldesc"), "Full description should be hidden");
is_element_visible(get("detail-contributions"), "Contributions section should be visible");
is_element_hidden(get("detail-contrib-suggested"), "Contributions amount should be hidden");
@ -672,7 +674,8 @@ add_test(function() {
is(get("detail-icon").src, "chrome://foo/skin/icon264.png", "Icon should be correct");
is_element_hidden(get("detail-creator"), "Creator should be hidden");
is_element_hidden(get("detail-screenshot"), "Screenshot should be hidden");
is(get("detail-desc").textContent, "Longer description replacement", "Description should be correct");
is(get("detail-desc").textContent, "Short description replacement", "Description should be correct");
is(get("detail-fulldesc").textContent, "Longer description replacement", "Full description should be correct");
is_element_hidden(get("detail-contributions"), "Contributions section should be hidden");

6
toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
View File

@ -636,7 +636,7 @@
margin-bottom: 2em;
}
#detail-desc {
#detail-desc, #detail-fulldesc {
-moz-margin-start: 6px;
/* This is necessary to fix layout issues with multi-line descriptions, see
bug 592712*/
@ -645,6 +645,10 @@
min-width: 10em;
}
#detail-fulldesc {
margin-top: 1em;
}
#detail-contributions {
border-radius: 5px;
border: 1px solid ThreeDShadow;

6
toolkit/themes/pinstripe/mozapps/extensions/extensions.css
View File

@ -736,7 +736,7 @@
margin-bottom: 2em;
}
#detail-desc {
#detail-desc, #detail-fulldesc {
-moz-margin-start: 6px;
/* This is necessary to fix layout issues with multi-line descriptions, see
bug 592712*/
@ -745,6 +745,10 @@
min-width: 10em;
}
#detail-fulldesc {
margin-top: 1em;
}
#detail-contributions {
border-radius: 5px;
border: 1px solid rgba(50, 65, 92, 0.3);

6
toolkit/themes/winstripe/mozapps/extensions/extensions.css
View File

@ -802,7 +802,7 @@
margin-bottom: 2em;
}
#detail-desc {
#detail-desc, #detail-fulldesc {
-moz-margin-start: 6px;
/* This is necessary to fix layout issues with multi-line descriptions, see
bug 592712*/
@ -811,6 +811,10 @@
min-width: 10em;
}
#detail-fulldesc {
margin-top: 1em;
}
#detail-contributions {
border-radius: 5px;
border: 1px solid #D2DBE8;