Fix bug 663400 - Changing view causes an error "this.tabbox is null". r=philippa=philipp
authorDecathlon <bv1578@gmail.com>
Thu, 27 Oct 2011 10:44:53 +0200
changeset 8956 8898520a1258e32a4883b6fd71453d2255b12d3e
parent 8955 e05b354769be4aad6a228341929cccb641222542
child 8957 177be7c55fd4ecfb416fba0507fddab3839faffb
push idunknown
push userunknown
push dateunknown
reviewersphilippa
bugs663400
Fix bug 663400 - Changing view causes an error "this.tabbox is null". r=philippa=philipp
calendar/base/content/calendar-views.xul
calendar/base/themes/pinstripe/calendar-views.css
--- a/calendar/base/content/calendar-views.xul
+++ b/calendar/base/content/calendar-views.xul
@@ -90,18 +90,18 @@
                   <spacer flex="1"/>
                   <label id="calendarWeek"
                          class="view-header"
                          type="end"
                          crop="start"/>
                </hbox>
             <hbox flex="1" class="navigation-bottombox"/>
          </vbox>
-         <vbox pack="end">
-             <tabs id="view-tabs"
+         <tabbox id="view-tabbox" pack="end">
+            <tabs id="view-tabs"
                    class="calview-tabs"
                    setfocus="true">
                <tab id="calendar-day-view-button"
                     label="&calendar.day.button.label;"
                     tooltiptext="&calendar.day.button.tooltip;"
                     calview="day"
                     observes="calendar_day-view_command"/>
                <tab id="calendar-week-view-button"
@@ -114,19 +114,19 @@
                     tooltiptext="&calendar.multiweek.button.tooltip;"
                     calview="multiweek"
                     observes="calendar_multiweek-view_command"/>
                <tab id="calendar-month-view-button"
                     label="&calendar.month.button.label;"
                     tooltiptext="&calendar.month.button.tooltip;"
                     calview="month"
                     observes="calendar_month-view_command"/>
-             </tabs>
-           <box class="navigation-bottombox"/>
-         </vbox>
+            </tabs>
+            <box class="navigation-bottombox"/>
+         </tabbox>
          <vbox>
            <vbox flex="1" class="navigation-spacer-box"/>
            <hbox class="navigation-bottombox"/>
          </vbox>
        </hbox>
        <deck flex="1"
             id="view-deck"
             persist="selectedIndex">
--- a/calendar/base/themes/pinstripe/calendar-views.css
+++ b/calendar/base/themes/pinstripe/calendar-views.css
@@ -723,18 +723,23 @@ agenda-richlist-item[status="CANCELLED"]
 .tabs-right {
     border-bottom: 2px solid #D2D2D2;
 }
 
 #view-tabs {
     padding-right: 20px;
 }
 
+#view-tabbox {
+    margin: 0;
+}
+
 .calview-tabs {
     margin-bottom: 0;
+    padding: 0;
 }
 
 tab[calview] {
     -moz-appearance: none;
     background-image: url("chrome://calendar/skin/calendar-day-label-back-vertical.png");
     background-color: #CCCCCC;
     color: #2E4E73;
     border: 1px solid #BDBDBD;