Bug 435168 - New Calendar Wizard shows empty focus box next to "Show Alarms" check box. r=philipp
authorMartin Schroeder <mschroeder@mozilla.x-home.org>
Thu, 25 Jun 2009 16:03:44 +0200
changeset 2942 7b153b079c94c9d34eebee2b84dfcef1287d8b0e
parent 2941 879545f40db489eee9d2d718843921c90bd9f82b
child 2944 5d02eacab64bb60e2d6046164118827275ea8d83
push id2384
push usermschroeder@mozilla.x-home.org
push dateThu, 25 Jun 2009 14:04:02 +0000
treeherdercomm-central@7b153b079c94 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs435168
Bug 435168 - New Calendar Wizard shows empty focus box next to "Show Alarms" check box. r=philipp
calendar/base/themes/pinstripe/calendar-creation-wizard.css
calendar/base/themes/winstripe/calendar-creation-wizard.css
calendar/resources/content/calendarCreation.xul
--- a/calendar/base/themes/pinstripe/calendar-creation-wizard.css
+++ b/calendar/base/themes/pinstripe/calendar-creation-wizard.css
@@ -32,8 +32,12 @@
  * 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 ***** */
 
 #customize-rows > row {
     min-height: 26px;
 }
+
+.checkbox-no-label > .checkbox-label-box {
+    display: none;
+}
--- a/calendar/base/themes/winstripe/calendar-creation-wizard.css
+++ b/calendar/base/themes/winstripe/calendar-creation-wizard.css
@@ -32,8 +32,12 @@
  * 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 ***** */
 
 #customize-rows > row {
     min-height: 26px;
 }
+
+.checkbox-no-label > .checkbox-label-box {
+    display: none;
+}
--- a/calendar/resources/content/calendarCreation.xul
+++ b/calendar/resources/content/calendarCreation.xul
@@ -9,80 +9,79 @@
    -
    - 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 Mozilla Calendar Code.
    -
-   - The Initial Developer of the Original Code is Stuart Parmenter.
+   - The Initial Developer of the Original Code is
+   - Stuart Parmenter.
    - Portions created by the Initial Developer are Copyright (C) 2005
    - the Initial Developer. All Rights Reserved.
    -
-   - Contributor(s): Mike Shaver <shaver@mozilla.org> 
-   -                 Michiel van Leeuwen <mvl@exedo.nl>
-   -                 Simon Paquet <bugzilla@babylonsounds.com>
-   -                 Gary van der Merwe <garyvdm@gmail.com>
-   -                 Philipp Kewisch <mozilla@kewis.ch>
+   - Contributor(s):
+   -   Mike Shaver <shaver@mozilla.org>
+   -   Michiel van Leeuwen <mvl@exedo.nl>
+   -   Simon Paquet <bugzilla@babylonsounds.com>
+   -   Gary van der Merwe <garyvdm@gmail.com>
+   -   Philipp Kewisch <mozilla@kewis.ch>
+   -   Martin Schroeder <mschroeder@mozilla.x-home.org>
    -
    - 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 LGPL or the GPL. 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 ***** -->
 
-<!-- Style sheets -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-creation-wizard.css" type="text/css"?>
 
-<!DOCTYPE dialog 
-[
+<!DOCTYPE dialog [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendarCreation.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
-<!-- The Window  -->
-
 <wizard id="calendar-wizard"
         title="&wizard.title;"
         windowtype="Calendar:NewCalendarWizard"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onwizardfinish=""
         persist="screenX screenY">
 
    <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
    <script type="application/javascript" src="chrome://calendar/content/calendarCreation.js"/>
 
-   <wizardpage pageid="initialPage" 
+   <wizardpage pageid="initialPage"
                next="locationPage"
                label="&wizard.label;"
                description="&wizard.description;"
                onpageshow="checkRequired();"
                onpageadvanced="onInitialAdvance();">
         <description>&initialpage.description;</description>
         <radiogroup id="calendar-type">
             <radio value="local" label="&initialpage.computer.label;" selected="true"/>
             <radio value="remote" label="&initialpage.network.label;"/>
         </radiogroup>
    </wizardpage>
 
    <wizardpage pageid="locationPage"
                next="customizePage"
                label="&wizard.label;"
                onpageshow="initLocationPage();"
-               onpageadvanced="return prepareCreateCalendar()"
+               onpageadvanced="return prepareCreateCalendar();"
                description="&wizard.description;">
         <description>&locationpage.description;</description>
         <grid>
             <columns>
                 <column/>
                 <column flex="1"/>
             </columns>
             <rows>
@@ -98,17 +97,17 @@
                     <label value="&calendarproperties.location.label;" control="calendar-uri"/>
                     <!--  Due to bug 128066, dropping urls here doesn't trigger
                           events. To work around, we use the dragexit handler,
                           which is triggered. Unfortunately, the more logical
                           choice of dragdrop doesn't work here either.-->
                     <textbox id="calendar-uri"
                              required="true"
                              oninput="checkRequired();"
-                             ondragexit="checkRequired()"/>
+                             ondragexit="checkRequired();"/>
                 </row>
                 <!--
                 <description>&locationpage.login.description;</description>
                 <row align="center">
                     <label value="&locationpage.username.label;" control="calendar-username"/>
                     <textbox id="calendar-username"/>
                 </row>
                 <row align="center">
@@ -119,17 +118,17 @@
             </rows>
         </grid>
    </wizardpage>
 
    <wizardpage pageid="customizePage"
                description="&custompage.shortdescription;"
                label="&wizard.label;"
                next="finishPage"
-               onpageshow="initCustomizePage()"
+               onpageshow="initCustomizePage();"
                onpageadvanced="doCreateCalendar();">
         <description>&custompage.longdescription;</description>
         <grid>
             <columns>
                 <column/>
                 <column flex="1"/>
             </columns>
             <rows id="customize-rows">
@@ -144,21 +143,21 @@
                         <colorpicker id="calendar-color"
                                      class="small-margin"
                                      type="button"
                                      palettename="standard"/>
                     </hbox>
                 </row>
                 <row id="customize-suppressAlarms-row" align="center">
                     <label value="&calendarproperties.firealarms.label;:" control="fire-alarms"/>
-                    <checkbox id="fire-alarms" checked="true"/>
+                    <checkbox id="fire-alarms" checked="true" class="checkbox-no-label"/>
                 </row>
             </rows>
         </grid>
    </wizardpage>
 
-   <wizardpage pageid="finishPage" 
+   <wizardpage pageid="finishPage"
                description="&finishpage.shortdescription;"
                label="&wizard.label;"
                onpageshow="setCanRewindFalse();">
         <description>&finishpage.longdescription;</description>
    </wizardpage>
 </wizard>