Commit 873ecf73 authored by ftang%netscape.com's avatar ftang%netscape.com
Browse files

fix 54957. add one control to decide show theme description or not. r=vishy sr=blizzard

parent 4b088c6d

xpfe/browser/resources/locale/en-US/navigator.properties

+5 −0
Original line number Diff line number Diff line
@@ -49,3 +49,8 @@ oldTheme=You have selected a theme which was designed for an earlier version of 
# XXX - this sucks and should only be temporary.

switchskins=Theme changes will take effect when you restart %S.

switchskinstitle=Apply Theme

# Localization Note: Use 'true' or 'false' to control the pref:theme to 

# show the English description or not

# for example, in Japanese build, instead of showing English description

# set the following value to false so it won't show up.

showskinsdescription=true

xpfe/components/prefwindow/resources/content/pref-themes.js

+20 −3
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


var gPrefutilitiesBundle;

var gBrandBundle;

var gShowDescription = true;



const DEBUG_USE_PROFILE = true;
@@ -28,6 +29,19 @@ function Startup() 
  var theSkinKids = document.getElementById("theSkinKids");

  if (theSkinKids.hasChildNodes() && theSkinKids.firstChild)

    tree.selectItem(theSkinKids.firstChild);

  try {

    var strbundle = srGetStrBundle("chrome://navigator/locale/navigator.properties");

  }

  catch(e) {

  }

  var showSkinsDescription = strbundle.GetStringFromName("showskinsdescription");

  if( showSkinsDescription == "false" )

  {

    gShowDescription = false;

    var description = document.getElementById("description");

    while (description.hasChildNodes())

      description.removeChild(description.firstChild);

  }

}



function applySkin()
@@ -119,6 +133,7 @@ function themeSelect() 
    catch (e) {

    }

    if (!oldTheme) {    

      if( gShowDescription ) 

        description.appendChild(descText);



      var locType = selectedItem.getAttribute("loctype");
@@ -147,10 +162,12 @@ function themeSelect() 
      

      newText = newText.replace(/%brand%/g, gBrandBundle.getString("brandShortName"));



      if( gShowDescription )  {

        descText = document.createTextNode(newText);

        description.appendChild(descText);

      }

    }

  }

  else {

    applyButton.setAttribute("disabled", true);

  }