bug 615014 - Add an icon to the Data Manager tab, r=IanN
authorRobert Kaiser <kairo@kairo.at>
Wed, 08 Dec 2010 20:17:11 +0100
changeset 6803 3108d458109f
parent 6802 63a0a5a6ddd1
child 6804 d3fa7383d7eb
push id5218
push userkairo@kairo.at
push dateWed, 08 Dec 2010 19:17:40 +0000
treeherdercomm-central@ecf45b984521 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs615014
bug 615014 - Add an icon to the Data Manager tab, r=IanN
suite/common/dataman/dataman.css
suite/common/dataman/dataman.xul
suite/themes/classic/communicator/dataman/datamanIcon-16.png
suite/themes/classic/jar.mn
suite/themes/modern/communicator/dataman/datamanIcon-16.png
suite/themes/modern/jar.mn
--- a/suite/common/dataman/dataman.css
+++ b/suite/common/dataman/dataman.css
@@ -30,16 +30,23 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
+@namespace xhtml "http://www.w3.org/1999/xhtml";
+
+/* HTML link elements do weird things to the layout if they are not hidden */
+xhtml|link {
+  display: none;
+}
+
 /* generic item gets used for permissions that don't need any special treatment */
 richlistitem.permission {
   -moz-binding: url('chrome://communicator/content/dataman/dataman.xml#perm-generic-item');
   -moz-box-orient: vertical;
 }
 
 richlistitem.permission[type="cookie"] {
   -moz-binding: url('chrome://communicator/content/dataman/dataman.xml#perm-cookie-item');
--- a/suite/common/dataman/dataman.xul
+++ b/suite/common/dataman/dataman.xul
@@ -43,20 +43,24 @@
 <!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % datamanDTD SYSTEM "chrome://communicator/locale/dataman/dataman.dtd">
 %datamanDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:xhtml="http://www.w3.org/1999/xhtml"
       id="dataman-page" title="&dataman.windowTitle;"
       onload="gDataman.initialize();"
       onunload="gDataman.shutdown();">
 
+  <xhtml:link rel="shortcut icon"
+              href="chrome://communicator/skin/dataman/datamanIcon-16.png"/>
+
   <script type="application/javascript"
           src="chrome://communicator/content/dataman/dataman.js"/>
 
   <stringbundleset id="datamanBundleSet">
     <stringbundle id="datamanBundle"
                   src="chrome://communicator/locale/dataman/dataman.properties"/>
   </stringbundleset>
 
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0aff568018be9dcbef951a54f17a763acddf452e
GIT binary patch
literal 390
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^PXN
zr}OT5AjMhW5n0T@z%2~Ij105pNB{-dOFVsD*>7=62rKJP6X}@=G=<I6#WBR<^wP<;
ze$0jft@iG-yAQB7Xf+&(pRmJKtB+Ci`hruM9aCCGw7v2iWHm3O%+kp2_f6b0Q89Ai
zQ_pFC-16_)^rw6_nR}0szvQs(=2cvFEq>`?p$i#)#9Wkg-L+@$GzOWuJjVODJ+DjL
z;Yog&JoR&|$F3wzrUOgP2&>#n+a~gI-h=CWw}iH+{;X#bRIE6^q=xZ9Lc!O$4|Z<-
zSWwW}5wPa9ROo%5Io-d5n|4}UE0vx9V6OXBq4$Ze`PS*5Gn!Yz+OR4qSH~is!NT75
zoYb1FlHsP(%*$_a?0KD^`-5}&-(JUnRK>kdcn>&Lu^eD%v^Z<>cHu?Ig!hFub?-k-
d%yVD-SN}lbexE&_9FIXE=;`X`vd$@?2>{&Tl>`6)
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -88,16 +88,17 @@ classic.jar:
   skin/classic/communicator/bookmarks/bookmark-item.png                 (communicator/bookmarks/bookmark-item.png)
   skin/classic/communicator/bookmarks/toolbarDropMarker.png             (communicator/bookmarks/toolbarDropMarker.png)
   skin/classic/communicator/bookmarks/unsortedBookmarks.png             (communicator/bookmarks/unsortedBookmarks.png)
   skin/classic/communicator/brand/throbber-anim.png                     (communicator/brand/throbber-anim.png)
   skin/classic/communicator/brand/throbber-single.png                   (communicator/brand/throbber-single.png)
   skin/classic/communicator/brand/throbber16-anim.png                   (communicator/brand/throbber16-anim.png)
   skin/classic/communicator/brand/throbber16-single.png                 (communicator/brand/throbber16-single.png)
   skin/classic/communicator/dataman/dataman.css                         (communicator/dataman/dataman.css)
+  skin/classic/communicator/dataman/datamanIcon-16.png                  (communicator/dataman/datamanIcon-16.png)
   skin/classic/communicator/directory/directory.css                     (communicator/directory/directory.css)
   skin/classic/communicator/feed-subscribe.css                          (communicator/feed-subscribe.css)
   skin/classic/communicator/feed-subscribe-ui.css                       (communicator/feed-subscribe-ui.css)
   skin/classic/communicator/fullscreen-video.css                        (communicator/fullscreen-video.css)
   skin/classic/communicator/directory/folder-clsd.gif                   (communicator/directory/folder-clsd.gif)
   skin/classic/communicator/directory/folder-open.gif                   (communicator/directory/folder-open.gif)
   skin/classic/communicator/directory/file.gif                          (communicator/directory/file.gif)
   skin/classic/communicator/downloads/dl-remove.png                     (communicator/downloads/dl-remove.png)
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0aff568018be9dcbef951a54f17a763acddf452e
GIT binary patch
literal 390
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^PXN
zr}OT5AjMhW5n0T@z%2~Ij105pNB{-dOFVsD*>7=62rKJP6X}@=G=<I6#WBR<^wP<;
ze$0jft@iG-yAQB7Xf+&(pRmJKtB+Ci`hruM9aCCGw7v2iWHm3O%+kp2_f6b0Q89Ai
zQ_pFC-16_)^rw6_nR}0szvQs(=2cvFEq>`?p$i#)#9Wkg-L+@$GzOWuJjVODJ+DjL
z;Yog&JoR&|$F3wzrUOgP2&>#n+a~gI-h=CWw}iH+{;X#bRIE6^q=xZ9Lc!O$4|Z<-
zSWwW}5wPa9ROo%5Io-d5n|4}UE0vx9V6OXBq4$Ze`PS*5Gn!Yz+OR4qSH~is!NT75
zoYb1FlHsP(%*$_a?0KD^`-5}&-(JUnRK>kdcn>&Lu^eD%v^Z<>cHu?Ig!hFub?-k-
d%yVD-SN}lbexE&_9FIXE=;`X`vd$@?2>{&Tl>`6)
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -44,16 +44,17 @@ modern.jar:
   skin/modern/communicator/bookmarks/tagContainerIcon.png          (communicator/bookmarks/tagContainerIcon.png)
   skin/modern/communicator/bookmarks/toolbarDropMarker.png         (communicator/bookmarks/toolbarDropMarker.png)
   skin/modern/communicator/bookmarks/unsortedBookmarks.png         (communicator/bookmarks/unsortedBookmarks.png)
   skin/modern/communicator/brand/throbber-anim.png                 (communicator/brand/throbber-anim.png)
   skin/modern/communicator/brand/throbber-single.png               (communicator/brand/throbber-single.png)
   skin/modern/communicator/brand/throbber16-anim.png               (communicator/brand/throbber16-anim.png)
   skin/modern/communicator/brand/throbber16-single.png             (communicator/brand/throbber16-single.png)
   skin/modern/communicator/dataman/dataman.css                     (communicator/dataman/dataman.css)
+  skin/modern/communicator/dataman/datamanIcon-16.png              (communicator/dataman/datamanIcon-16.png)
   skin/modern/communicator/directory/file-folder-closed.gif        (communicator/directory/file-folder-closed.gif)
   skin/modern/communicator/directory/file-folder-open.gif          (communicator/directory/file-folder-open.gif)
   skin/modern/communicator/directory/file-icon.gif                 (communicator/directory/file-icon.gif)
   skin/modern/communicator/directory/directory.css                 (communicator/directory/directory.css)
   skin/modern/communicator/downloads/dl-remove.png                 (communicator/downloads/dl-remove.png)
   skin/modern/communicator/downloads/downloadButtons.png           (communicator/downloads/downloadButtons.png)
   skin/modern/communicator/downloads/downloadmanager.css           (communicator/downloads/downloadmanager.css)
   skin/modern/communicator/feed-subscribe.css                      (communicator/feed-subscribe.css)