Bug 1501402 - Include description in about:addons listing view again. r=jaws, a=RyanVM
authorMark Striemer <mstriemer@mozilla.com>
Wed, 24 Oct 2018 21:42:49 +0000
changeset 500933 761e9b73da90ed206ee661844f4a5cc6bb37fac8
parent 500932 9f3e14f67500fa0bb246abb3b6501067082578ae
child 500934 c96f6ed751bf51a86d910aad441c3b1538f674a7
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws, RyanVM
bugs1501402
milestone64.0
Bug 1501402 - Include description in about:addons listing view again. r=jaws, a=RyanVM Add the description back to the listing view. It might not get removed in the redesign so we'll keep it in for this version. Differential Revision: https://phabricator.services.mozilla.com/D9706
toolkit/mozapps/extensions/content/extensions.xml
toolkit/themes/shared/extensions/extensions.inc.css
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -622,16 +622,20 @@
                 <xul:spacer flex="5000"/> <!-- Necessary to make the name crop -->
               </xul:hbox>
             <xul:label anonid="date-updated" class="date-updated"
                        unknown="&addon.unknownDate;"/>
           </xul:hbox>
 
           <xul:hbox class="advancedinfo-container" flex="1">
             <xul:vbox class="description-outer-container" flex="1">
+              <xul:hbox class="description-container">
+                <xul:label anonid="description" class="description" crop="end" flex="1"/>
+                <xul:spacer flex="5000"/> <!-- Necessary to make the description crop -->
+              </xul:hbox>
               <xul:hbox class="relnotes-toggle-container">
                 <xul:button anonid="relnotes-toggle-btn" class="relnotes-toggle"
                             hidden="true" label="&cmd.showReleaseNotes.label;"
                             tooltiptext="&cmd.showReleaseNotes.tooltip;"
                             showlabel="&cmd.showReleaseNotes.label;"
                             showtooltip="&cmd.showReleaseNotes.tooltip;"
                             hidelabel="&cmd.hideReleaseNotes.label;"
                             hidetooltip="&cmd.hideReleaseNotes.tooltip;"
@@ -784,16 +788,20 @@
       </field>
       <field name="_icon">
         document.getAnonymousElementByAttribute(this, "anonid", "icon");
       </field>
       <field name="_dateUpdated">
         document.getAnonymousElementByAttribute(this, "anonid",
                                                 "date-updated");
       </field>
+      <field name="_description">
+        document.getAnonymousElementByAttribute(this, "anonid",
+                                                "description");
+      </field>
       <field name="_stateMenulist">
         document.getAnonymousElementByAttribute(this, "anonid",
                                                 "state-menulist");
       </field>
       <field name="_askToActivateMenuitem">
         document.getAnonymousElementByAttribute(this, "anonid",
                                                 "ask-to-activate-menuitem");
       </field>
@@ -905,16 +913,21 @@
           this.setAttribute("name", aAddon.name);
 
           var iconURL = AddonManager.getPreferredIconURL(aAddon, 32, window);
           if (iconURL)
             this._icon.src = iconURL;
           else
             this._icon.src = "";
 
+          if (this.mAddon.description)
+            this._description.value = this.mAddon.description;
+          else
+            this._description.hidden = true;
+
           let legacyWarning = legacyExtensionsEnabled && !this.mAddon.install &&
             isLegacyExtension(this.mAddon);
           this.setAttribute("legacy", legacyWarning);
           document.getAnonymousElementByAttribute(this, "anonid", "legacy").href = SUPPORT_URL + "webextensions";
 
           if (!("applyBackgroundUpdates" in this.mAddon) ||
               (this.mAddon.applyBackgroundUpdates == AddonManager.AUTOUPDATE_DISABLE ||
                (this.mAddon.applyBackgroundUpdates == AddonManager.AUTOUPDATE_DEFAULT &&
--- a/toolkit/themes/shared/extensions/extensions.inc.css
+++ b/toolkit/themes/shared/extensions/extensions.inc.css
@@ -421,19 +421,18 @@ richlistbox.list > richlistitem.addon {
   margin-top: 0.78rem;
 }
 
 .creator {
   font-size: 1.2rem;
 }
 
 .description-container {
-  margin-inline-start: 6px;
   -moz-box-align: center;
-  font-size: 1.25rem;
+  font-size: 1rem;
 }
 
 .description {
   margin: 0;
 }
 
 .warning,
 .pending,