# HG changeset patch
# User Myk Melez <myk@mozilla.org>
# Date 1217207642 25200
# Node ID 63d17a2ecac700ce7b4c45c98c9605430e148c75
# Parent  0a300c435fe677833f5f30279d19dbe550a4464e
split the OPML functionality into a separate tab in the subscribe page

diff -r 0a300c435fe6 -r 63d17a2ecac7 extension/content/subscribe.xul
--- a/extension/content/subscribe.xul	Sun Jul 27 18:07:44 2008 -0700
+++ b/extension/content/subscribe.xul	Sun Jul 27 18:14:02 2008 -0700
@@ -25,9 +25,11 @@
 
     <tabbox>
       <tabs>
-        <tab label="&feeds.label;"/>
-        <tab label="&twitter.label;"/>
+        <tab label="&feedsTab.label;"/>
+        <tab label="&twitterTab.label;"/>
+        <tab label="&opmlTab.label;"/>
       </tabs>
+
       <tabpanels>
         <tabpanel orient="vertical">
           <grid>
@@ -38,7 +40,7 @@
             <rows>
               <row align="center">
                 <hbox flex="1" pack="end">
-                  <label control="locationTextbox" value="Location:"/>
+                  <label control="locationTextbox" value="&location.label;"/>
                 </hbox>
                 <textbox id="locationTextbox"/>
               </row>
@@ -47,9 +49,6 @@
                 <hbox pack="start">
                   <button label="&subscribeButton.label;" default="true"
                           oncommand="Subscriber.subscribeFeed()"/>
-                  <spacer flex="1"/>
-                  <button id="importOPMLButton" label="&importOPMLButton.label;"
-                          oncommand="Subscriber.importOPML()"/>
                 </hbox>
               </row>
             </rows>
@@ -94,6 +93,12 @@
             </rows>
           </grid>
         </tabpanel>
+
+        <tabpanel orient="vertical" pack="center" align="center">
+          <button id="importOPMLButton" label="&importOPMLButton.label;"
+                  oncommand="Subscriber.importOPML()"/>
+        </tabpanel>
+
       </tabpanels>
     </tabbox>
 
diff -r 0a300c435fe6 -r 63d17a2ecac7 extension/locale/en-US/subscribe.dtd
--- a/extension/locale/en-US/subscribe.dtd	Sun Jul 27 18:07:44 2008 -0700
+++ b/extension/locale/en-US/subscribe.dtd	Sun Jul 27 18:14:02 2008 -0700
@@ -1,6 +1,11 @@
 <!ENTITY page.title                 "Snowl: Subscribe to Message Sources">
-<!ENTITY feeds.label                "Feeds">
-<!ENTITY twitter.label              "Twitter">
+
+<!ENTITY feedsTab.label             "Feeds">
+<!ENTITY twitterTab.label           "Twitter">
+<!ENTITY opmlTab.label              "OPML">
+
+<!ENTITY location.label             "Location:">
+
 <!ENTITY subscribeButton.label      "Subscribe">
-<!ENTITY importOPMLButton.label     "Import OPML...">
+<!ENTITY importOPMLButton.label     "Import OPML File...">
 <!ENTITY closeButton.label          "Close">