17 files changed, 320 insertions, 44 deletions
diff --git a/bandwagon/skin/extensionsOverlay.css b/bandwagon/skin/extensionsOverlay.css
index ffce753..2581839 100644
--- a/bandwagon/skin/extensionsOverlay.css
+++ b/bandwagon/skin/extensionsOverlay.css
@@ -35,20 +35,27 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-radio#bandwagon-feeds-view {
-  list-style-image: url("chrome://bandwagon/skin/images/tango-addonfeed-32x32.png");
+radio#bandwagon-collections-view {
+  list-style-image: url("chrome://bandwagon/skin/images/icon32.png");
   -moz-image-region: rect(0px, 32px,  32px, 0px);
 }
 
-radio#bandwagon-feeds-view:hover, radio#bandwagon-feeds-view[selected="true"]  {
+radio#bandwagon-collections-view:hover, radio#bandwagon-collections-view[selected="true"]  {
   -moz-image-region: rect(0px, 32px,  32px, 0px);
 }
 
-radio[noimage="true"]#bandwagon-feeds-view {
+radio[noimage="true"]#bandwagon-collections-view {
   list-style-image: none;
   -moz-image-region: rect(0 0 0 0);
 }
 
+#bandwagon-link-splitter {
+  border-left: 1px solid #7A8490;
+  border-right: 1px solid #FEFEFE;
+  margin-left: 0.4em;
+  margin-right: 0.4em;
+}
+
 #bandwagon-sidebar-splitter {
   -moz-border-start: none;
   -moz-border-end: 1px solid #404040;
@@ -57,12 +64,12 @@ radio[noimage="true"]#bandwagon-feeds-view {
   background-image: none !important;
 }
 
-#bandwagon-feeds-list {
+#bandwagon-collections-list {
   margin-top: 0;
   margin-left: 0;
 }
 
-#bandwagon-feeditems-list {
+#bandwagon-addons-list {
   border: 2px solid;
   border-left: 0px !important;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
@@ -72,17 +79,17 @@ radio[noimage="true"]#bandwagon-feeds-view {
   /*overflow: auto;*/
 }
 
-#bandwagon-feed-title {
+#bandwagon-collection-title {
   font-size: 150%;
 }
 
-#bandwagon-feed-title,
-#bandwagon-feed-description,
-#bandwagon-feed-header {
+#bandwagon-collection-title,
+#bandwagon-collection-description,
+#bandwagon-collection-header {
   background: -moz-dialog;
 }
 
-bandwagonFeed {
+bandwagonCollection {
   padding-top: 6px;
   padding-bottom: 6px;
   -moz-padding-start: 7px;
@@ -90,7 +97,7 @@ bandwagonFeed {
   min-height: 25px;
 }
 
-bandwagonFeed[view="settings"] {
+bandwagonCollection[view="settings"] {
   padding-top: 0;
   padding-bottom: 0;
   -moz-padding-start: 0;
@@ -98,21 +105,21 @@ bandwagonFeed[view="settings"] {
   min-height: 0;
 }
 
-bandwagonFeed[selected="true"] {
+bandwagonCollection[selected="true"] {
   background-color: -moz-cellhighlight;
   color: -moz-cellhighlighttext;
 }
 
-bandwagonFeed[preview="true"] label[anonid="name"] {
+bandwagonCollection[preview="true"] label[anonid="name"] {
   font-style: italic;
 }
 
-richlistbox:focus > bandwagonFeed[selected="true"] {
+richlistbox:focus > bandwagonCollection[selected="true"] {
   background-color: Highlight;
   color: HighlightText;
 }
 
-bandwagonFeed label[anonid="unread"] {
+bandwagonCollection label[anonid="unread"] {
   background-color: blue;
   color: white;
   min-width: 1.7em;
@@ -120,12 +127,12 @@ bandwagonFeed label[anonid="unread"] {
   -moz-border-radius: 40%;
 }
 
-bandwagonFeed[view="settings"] label[anonid="unread"] {
+bandwagonCollection[view="settings"] label[anonid="unread"] {
   display: none;
 }
 
-bandwagonFeedItem,
-bandwagonFeedItemExpanded {
+bandwagonAddon,
+bandwagonAddonExpanded {
   padding-top: 6px;
   padding-bottom: 6px;
   -moz-padding-start: 7px;
@@ -134,28 +141,28 @@ bandwagonFeedItemExpanded {
   border-bottom: 1px dotted #C0C0C0;
 }
 
-bandwagonFeedItemExpanded {
+bandwagonAddonExpanded {
   background-color: -moz-cellhighlight;
   color: -moz-cellhighlighttext;
 }
 
-richlistbox:focus > bandwagonFeedItemExpanded {
+richlistbox:focus > bandwagonAddonExpanded {
   background-color: Highlight;
   color: HighlightText;
 }
 
-bandwagonFeedItem[read="false"] {
+bandwagonAddon[read="false"] {
   background-color: #fdf2ab;
   color: #585620;
 }
 
-bandwagonFeedItem .right, 
-bandwagonFeedItemExpanded .right { 
+bandwagonAddon .right, 
+bandwagonAddonExpanded .right { 
   text-align: right;
 }
 
-bandwagonFeedItem .icon,
-bandwagonFeedItemExpanded .icon {
+bandwagonAddon .icon,
+bandwagonAddonExpanded .icon {
   width: 32px;
   height: 32px;
   max-width: 32px;
@@ -164,8 +171,8 @@ bandwagonFeedItemExpanded .icon {
   min-height: 32px;
 }
 
-bandwagonFeedItem .name,
-bandwagonFeedItemExpanded .name {
+bandwagonAddon .name,
+bandwagonAddonExpanded .name {
   font-size: 110%;
 }
 
@@ -175,7 +182,7 @@ bandwagonFeedItemExpanded .name {
   height: 32px;
 }
 
-.feed-item-details {
+.addon-details {
   margin-top: 5px;
   margin-bottom: 5px;
   -moz-margin-start: 6px;
@@ -201,16 +208,15 @@ bandwagonFeedItemExpanded .name {
 */
 
 #bandwagon-button-subscribe {
-  list-style-image: url("chrome://bandwagon/skin/images/twisty-clsd.png");
+  list-style-image: url("chrome://bandwagon/skin/images/plus.png");
 }
 
 #bandwagon-button-update-all {
-  list-style-image: url("chrome://bandwagon/skin/images/Toolbar-small.png");
-  -moz-image-region: rect(0px 64px 16px 48px);
+  list-style-image: url("chrome://bandwagon/skin/images/reload.png");
 }
 
 #bandwagon-button-settings {
-  list-style-image: url("chrome://bandwagon/skin/images/wrench.png");
+  list-style-image: url("chrome://bandwagon/skin/images/gear.png");
 }
 
 .publishButton,
@@ -227,3 +233,25 @@ bandwagonFeedItemExpanded .name {
   margin-top: 1em;
   margin-bottom: 1em;
 }
+
+.fs-info-panel
+{
+  margin: 20px;
+}
+
+.fs-info-panel-header
+{
+  margin-left: 0px;
+  font-size: larger;
+  font-weight: bold;
+}
+
+.fs-info-panel-text
+{
+  margin-left: 0px;
+}
+
+bandwagonCollection description[anonid="commentdesc"]
+{
+  font-style: italic;
+}
diff --git a/bandwagon/skin/global.css b/bandwagon/skin/global.css
index bc8df95..461c0cb 100644
--- a/bandwagon/skin/global.css
+++ b/bandwagon/skin/global.css
@@ -34,7 +34,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
  
-.bandwagon-feeds-toolbox {
+.bandwagon-collections-toolbox {
   -moz-appearance: none;
   background-color: transparent !important;
   border: 0px;
diff --git a/bandwagon/skin/images/Toolbar-small.png b/bandwagon/skin/images/Toolbar-small.png
deleted file mode 100644
index 423e5a1..0000000
--- a/bandwagon/skin/images/Toolbar-small.png
+++ /dev/null
diff --git a/bandwagon/skin/images/addon-toolbar.png b/bandwagon/skin/images/addon-toolbar.png
new file mode 100644
index 0000000..a31028a
--- /dev/null
+++ b/bandwagon/skin/images/addon-toolbar.png
diff --git a/bandwagon/skin/images/gear.png b/bandwagon/skin/images/gear.png
new file mode 100644
index 0000000..735104b
--- /dev/null
+++ b/bandwagon/skin/images/gear.png
diff --git a/bandwagon/skin/images/icon32.png b/bandwagon/skin/images/icon32.png
new file mode 100644
index 0000000..d2c471b
--- /dev/null
+++ b/bandwagon/skin/images/icon32.png
diff --git a/bandwagon/skin/images/plus.png b/bandwagon/skin/images/plus.png
new file mode 100644
index 0000000..25f66fe
--- /dev/null
+++ b/bandwagon/skin/images/plus.png
diff --git a/bandwagon/skin/images/reload.png b/bandwagon/skin/images/reload.png
new file mode 100644
index 0000000..8c24c27
--- /dev/null
+++ b/bandwagon/skin/images/reload.png
diff --git a/bandwagon/skin/images/star32.png b/bandwagon/skin/images/star32.png
new file mode 100644
index 0000000..378e27c
--- /dev/null
+++ b/bandwagon/skin/images/star32.png
diff --git a/bandwagon/skin/images/tango-addonfeed-32x32.png b/bandwagon/skin/images/tango-addonfeed-32x32.png
deleted file mode 100644
index ca8da41..0000000
--- a/bandwagon/skin/images/tango-addonfeed-32x32.png
+++ /dev/null
diff --git a/bandwagon/skin/images/wrench.png b/bandwagon/skin/images/wrench.png
deleted file mode 100644
index 229bb6e..0000000
--- a/bandwagon/skin/images/wrench.png
+++ /dev/null
diff --git a/bandwagon/skin/platform/linux/browserOverlay.css b/bandwagon/skin/platform/linux/browserOverlay.css
new file mode 100644
index 0000000..deff4d3
--- /dev/null
+++ b/bandwagon/skin/platform/linux/browserOverlay.css
@@ -0,0 +1,56 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is bandwagon.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Brian King <brian (at) briks (dot) si>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * 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 ***** */
+
+/* ToolbarButton */
+#extensions-bandwagon-button {
+  list-style-image: url("chrome://bandwagon/skin/images/addon-toolbar.png");
+}
+
+.bandwagon-button {
+  -moz-image-region: rect(0px, 72px, 24px, 48px);
+}
+
+.bandwagon-button:hover  {
+  -moz-image-region: rect(0px, 72px, 24px, 48px);
+}
+
+[iconsize="small"] .bandwagon-button  {
+  -moz-image-region: rect(0px, 120px, 16px, 104px);
+}
+
+[iconsize="small"] .bandwagon-button:hover  {
+  -moz-image-region: rect(0px, 120px, 16px, 104px);
+}
diff --git a/bandwagon/skin/platform/mac/browserOverlay.css b/bandwagon/skin/platform/mac/browserOverlay.css
new file mode 100644
index 0000000..590dcb2
--- /dev/null
+++ b/bandwagon/skin/platform/mac/browserOverlay.css
@@ -0,0 +1,64 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is bandwagon.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Brian King <brian (at) briks (dot) si>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * 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 ***** */
+
+/* ToolbarButton */
+#extensions-bandwagon-button {
+  list-style-image: url("chrome://bandwagon/skin/images/addon-toolbar.png");
+}
+
+.bandwagon-button {
+  -moz-image-region: rect(0px, 156px, 23px, 120px);
+}
+
+.bandwagon-button[disabled="true"]  {
+  -moz-image-region: rect(23px, 156px, 46px, 120px);
+}
+
+.bandwagon-button:hover:active  {
+  -moz-image-region: rect(46px, 156px, 69px, 120px);
+}
+
+[iconsize="small"] .bandwagon-button  {
+  -moz-image-region: rect(0px, 156px, 23px, 120px);
+}
+
+[iconsize="small"] .bandwagon-button[disabled="true"]  {
+  -moz-image-region: rect(23px, 156px, 46px, 120px);
+}
+
+[iconsize="small"] .bandwagon-button:hover:active  {
+  -moz-image-region: rect(46px, 156px, 69px, 120px);
+}
diff --git a/bandwagon/skin/platform/vista/browserOverlay.css b/bandwagon/skin/platform/vista/browserOverlay.css
new file mode 100644
index 0000000..2cc8903
--- /dev/null
+++ b/bandwagon/skin/platform/vista/browserOverlay.css
@@ -0,0 +1,56 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is bandwagon.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Brian King <brian (at) briks (dot) si>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * 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 ***** */
+ 
+/* ToolbarButton */
+#extensions-bandwagon-button {
+  list-style-image: url("chrome://bandwagon/skin/images/addon-toolbar.png");
+}
+
+.bandwagon-button {
+  -moz-image-region: rect(0px, 24px, 24px, 0px);
+}
+
+.bandwagon-button:hover  {
+  -moz-image-region: rect(0px, 24px, 24px, 0px);
+}
+
+[iconsize="small"] .bandwagon-button  {
+  -moz-image-region: rect(0px, 88px, 16px, 72px);
+}
+
+[iconsize="small"] .bandwagon-button:hover  {
+  -moz-image-region: rect(0px, 88px, 16px, 72px);
+}
diff --git a/bandwagon/skin/platform/xp/browserOverlay.css b/bandwagon/skin/platform/xp/browserOverlay.css
new file mode 100644
index 0000000..4b66025
--- /dev/null
+++ b/bandwagon/skin/platform/xp/browserOverlay.css
@@ -0,0 +1,56 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is bandwagon.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Brian King <brian (at) briks (dot) si>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * 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 ***** */
+
+/* ToolbarButton */
+#extensions-bandwagon-button {
+  list-style-image: url("chrome://bandwagon/skin/images/addon-toolbar.png");
+}
+
+.bandwagon-button {
+  -moz-image-region: rect(0px, 48px, 24px, 24px);
+}
+
+.bandwagon-button:hover  {
+  -moz-image-region: rect(24px, 48px, 48px, 24px);
+}
+
+[iconsize="small"] .bandwagon-button  {
+  -moz-image-region: rect(0px, 104px, 16px, 88px);
+}
+
+[iconsize="small"] .bandwagon-button:hover  {
+  -moz-image-region: rect(16px, 104px, 32px, 88px);
+}
diff --git a/bandwagon/skin/publish.css b/bandwagon/skin/publish.css
index b471432..e6ffc65 100644
--- a/bandwagon/skin/publish.css
+++ b/bandwagon/skin/publish.css
@@ -33,3 +33,8 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+.dialog-header
+{
+    font-weight: bold;
+}
diff --git a/bandwagon/skin/settings.css b/bandwagon/skin/settings.css
index 5646fc4..c9dc228 100644
--- a/bandwagon/skin/settings.css
+++ b/bandwagon/skin/settings.css
@@ -19,6 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): David McNamara
+ *                 Brian King <brian (at) briks (dot) si>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -34,24 +35,34 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#feeds-list {
+radio[pane=paneManage] {
+  list-style-image: url("chrome://bandwagon/skin/images/star32.png");
+}
+
+radio[pane=paneGeneral] {
+  list-style-image: url("chrome://bandwagon/skin/images/icon32.png");
+}
+
+radio[pane=paneAuto] {
+  list-style-image: url("chrome://browser/skin/preferences/Options.png"); 
+  -moz-image-region: rect(0px, 224px, 32px, 192px)
+}
+
+#collections-list {
   min-width: 10em;
   max-width: 10em;
 }
 
-#feed-name {
+#collection-name {
   font-weight: bold;
   font-size: larger;
 }
 
-.all-check {
-  padding-left: 15px;
-}
-
-#add-feed-button {
-  list-style-image: url("chrome://bandwagon/skin/images/twisty-clsd.png");
+prefwindow description {
+  width: 30em;
 }
 
-#remove-feed-button {
-  list-style-image: url("chrome://bandwagon/skin/images/twisty-open.png");
+/* No caption for this groupbox (there to fix a clipping issue), so hide the border */
+#auto-groupbox {
+  border: none;
 }