generalize per-site permissions, r=norris

suite/common/pref/pref-cookies.xul

@@ -90,5 +90,53 @@
     </box>
 	</titledbox> 
   
+ 	<titledbox orient="vertical" id="imagesArea" style="display:none">
+  	<title><text value="&images;"/></title>  
+    <html:div>&imageDetails;</html:div>
+	<spring class="vgap"/>
+    <html:div>
+	  <html:input name="images" type="radio" id="networkImageBehaviour0"
+				  pref="true" preftype="int" prefindex="0" prefstring="network.image.imageBehavior"/>
+
+	<html:label for="networkImageBehaviour0" accesskey="&accAllImagesRadio.accesskey;" tabindex="0">
+
+   	<html:div>&accAllImagesRadio.label;</html:div>
+    </html:label>
+	</html:div>
+
+   <html:div>
+			  <html:input type="radio" name="images" id="networkImageBehaviour1"
+						  pref="true" preftype="int" prefindex="1" prefstring="network.image.imageBehavior"/>
+	      		<html:label for="networkImageBehaviour1" accesskey="&accpOrgImagesRadio.accesskey;" tabindex="0">
+
+				<html:div>&accpOrgImagesRadio.label;</html:div>
+      			</html:label>
+	</html:div>
+
+   <html:div>
+      			<html:input type="radio" name="images" id="networkImageBehaviour2"
+						  pref="true" preftype="int" prefindex="2" prefstring="network.image.imageBehavior"/>
+	      		<html:label for="networkImageBehaviour2" accesskey="&disImagesRadio.accesskey;" tabindex="0">	
+	
+  	    			<html:div>&disImagesRadio.label;</html:div>
+      			</html:label>
+	</html:div>
+
+
+  <html:div class="indent-second-label">
+      			<html:input type="checkbox" id="networkImageWarnAboutImages"
+						  pref="true" preftype="bool" prefstring="network.image.warnAboutImages"/>
+	      		<html:label for="networkImageWarnAboutImages" accesskey="&warnImagesCheck.accesskey;" tabindex="0">
+
+  	    			<html:div>&warnImagesCheck.label;</html:div>
+      			</html:label>
+	</html:div>    
+
+    <box align="horizontal" flex="1">
+      <spring flex="1"/>
+      <titledbutton value="&viewImages.label;" class="dialog push" onclick="viewCookies();"/>
+    </box>
+	</titledbox> 
+  
   
 </window>

suite/locales/en-US/chrome/common/pref/pref-cookies.dtd

@@ -7,11 +7,23 @@
 <!ENTITY cookies "Cookies">
 <!ENTITY accAllCookiesRadio.label "Accept all cookies">
 <!ENTITY accAllCookiesRadio.accesskey "a">
-<!ENTITY accpOrgCookiesRadio.label "Accept only cookies that get sent back to the originating server">
+<!ENTITY accpOrgCookiesRadio.label "Accept cookies that get sent back to the originating server only">
 <!ENTITY accpOrgCookiesRadio.accesskey "o">
-<!ENTITY disCookRadio.label "Disable cookies">
+<!ENTITY disCookRadio.label "Reject all cookies">
-<!ENTITY disCookRadio.accesskey "d">
+<!ENTITY disCookRadio.accesskey "r">
 <!ENTITY warnCookCheck.label "Warn me before accepting a cookie">
 <!ENTITY warnCookCheck.accesskey "w">
 <!ENTITY cookieDetails "Cookies are small pieces of information that websites store on your computer. This allows them to customize their websites to suit your individual preferences.">
 <!ENTITY viewCookies.label "View Stored Cookies">
+
+<!ENTITY images "Images">
+<!ENTITY imageDetails "Images are the pictures that websites display on your computer.">
+<!ENTITY accAllImagesRadio.label "Accept all images">
+<!ENTITY accAllImagesRadio.accesskey "a">
+<!ENTITY accpOrgImagesRadio.label "Accept images that come from the originating server only">
+<!ENTITY accpOrgImagesRadio.accesskey "o">
+<!ENTITY disImagesRadio.label "Reject all images">
+<!ENTITY disImagesRadio.accesskey "r">
+<!ENTITY warnImagesCheck.label "Warn me before accepting an image">
+<!ENTITY warnImagesCheck.accesskey "w">
+<!ENTITY viewImages.label "View Blocked Images">