Fix bug 698938 - Invitations Dialog: Selected option is not totally obvious.,a=philipp
authorPhilipp Kewisch <mozilla@kewis.ch>
Wed, 02 Nov 2011 23:40:59 +0100
changeset 9332 e3a8ca5a6614413d6853d94978bfaa8e0a9e031f
parent 9331 99fef5dc1a0e8436b6056183b34f3c9124d35c92
child 9333 01a98a8c26a518060fae544c4301f46526924f13
push idunknown
push userunknown
push dateunknown
reviewersphilipp
bugs698938
Fix bug 698938 - Invitations Dialog: Selected option is not totally obvious.,a=philipp
calendar/base/content/dialogs/calendar-invitations-list.xml
calendar/base/jar.mn
calendar/base/themes/gnomestripe/dialogs/calendar-invitations-dialog.css
calendar/base/themes/pinstripe/dialogs/calendar-invitations-dialog.css
calendar/base/themes/winstripe/dialogs/calendar-invitations-dialog.css
--- a/calendar/base/content/dialogs/calendar-invitations-list.xml
+++ b/calendar/base/content/dialogs/calendar-invitations-list.xml
@@ -75,21 +75,25 @@
           <xul:label anonid="recurrence" crop="end"/>
           <xul:label anonid="location" crop="end"/>
           <xul:label anonid="organizer" crop="end"/>
           <xul:label anonid="attendee" crop="end"/>
           <xul:label anonid="spacer" value="" hidden="true"/>
         </xul:vbox>
         <xul:vbox>
           <xul:button anonid="accept"
+            xbl:inherits="group=itemId"
+            type="radio"
             class="calendar-invitations-richlistitem-accept-button
             calendar-invitations-richlistitem-button"
             label="&calendar.invitations.list.accept.button.label;"
             oncommand="accept();"/>
           <xul:button anonid="decline"
+            xbl:inherits="group=itemId"
+            type="radio"
             class="calendar-invitations-richlistitem-decline-button
             calendar-invitations-richlistitem-button"
             label="&calendar.invitations.list.decline.button.label;"
             oncommand="decline();"/>
         </xul:vbox>
       </xul:hbox>
     </content>
 
@@ -209,16 +213,17 @@
             if (att) {
                 if (att.commonName && att.commonName.length > 0) {
                     attendeeString += att.commonName;
                 } else if (att.id) {
                     attendeeString += att.id.replace(/^mailto:/i, "");
                 }
             }
             attendeeLabel.setAttribute("value", attendeeString);
+            this.setAttribute("itemId", aItem.hashId);
           ]]>
         </body>
       </method>
 
       <method name="getCalendarItemParticipationStatus">
         <parameter name="aItem"/>
         <body><![CDATA[
           var att;
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -103,17 +103,16 @@ calendar.jar:
 % skin calendar classic/1.0 %skin/calendar/
 % style chrome://calendar/content/calendar-event-dialog.xul chrome://global/skin/toolbar.css
 % style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-task-view.css
     skin/calendar/abcard.png                               (themes/common/images/abcard.png)
     skin/calendar/alarm-flashing.png                       (themes/common/images/alarm-flashing.png)
     skin/calendar/alarm-icons.png                          (themes/common/images/alarm-icons.png)
     skin/calendar/calendar-alarms.css                      (themes/common/calendar-alarms.css)
     skin/calendar/calendar-creation-wizard.css             (themes/common/calendar-creation-wizard.css)
-    skin/calendar/calendar-invitations-dialog.css          (themes/common/dialogs/calendar-invitations-dialog.css)
     skin/calendar/calendar-occurrence-prompt.css           (themes/common/calendar-occurrence-prompt.css)
     skin/calendar/calendar-timezone-highlighter.css        (themes/common/dialogs/calendar-timezone-highlighter.css)
     skin/calendar/calendar-properties-dialog.css           (themes/common/dialogs/calendar-properties-dialog.css)
     skin/calendar/calendar-subscriptions-dialog.css        (themes/common/dialogs/calendar-subscriptions-dialog.css)
     skin/calendar/calendar-providerUninstall-dialog.css    (themes/common/calendar-providerUninstall-dialog.css)
     skin/calendar/calendar-overlay.png                     (themes/common/images/calendar-overlay.png)
     skin/calendar/calendar-printing.css                    (themes/common/calendar-printing.css)
     skin/calendar/calendar-status.png                      (themes/common/images/calendar-status.png)
@@ -133,16 +132,17 @@ calendar.jar:
     skin/calendar/widgets/nav-today-hov.svg                (themes/common/widgets/images/nav-today-hov.svg)
     skin/calendar/widgets/view-navigation.png              (themes/common/widgets/images/view-navigation.png)
     skin/calendar/cal-icon32.png                           (themes/@THEME@/images/cal-icon32.png)
     skin/calendar/calendar-alarm-dialog.css                (themes/@THEME@/dialogs/calendar-alarm-dialog.css)
     skin/calendar/calendar-daypicker.css                   (themes/@THEME@/calendar-daypicker.css)
     skin/calendar/calendar-event-dialog.css                (themes/@THEME@/dialogs/calendar-event-dialog.css)
     skin/calendar/calendar-event-dialog-attendees.png      (themes/@THEME@/dialogs/images/calendar-event-dialog-attendees.png)
     skin/calendar/calendar-event-dialog.png                (themes/@THEME@/dialogs/images/calendar-event-dialog.png)
+    skin/calendar/calendar-invitations-dialog.css          (themes/@THEME@/dialogs/calendar-invitations-dialog.css)
     skin/calendar/calendar-invitations-dialog-button-images.png  (themes/@THEME@/dialogs/images/calendar-invitations-dialog-button-images.png)
     skin/calendar/calendar-invitations-dialog-list-images.png  (themes/@THEME@/dialogs/images/calendar-invitations-dialog-list-images.png)
     skin/calendar/calendar-management.css                  (themes/@THEME@/calendar-management.css)
     skin/calendar/calendar-task-tree.css                   (themes/@THEME@/calendar-task-tree.css)
     skin/calendar/calendar-task-view.css                   (themes/@THEME@/calendar-task-view.css)
     skin/calendar/calendar-unifinder.css                   (themes/@THEME@/calendar-unifinder.css)
     skin/calendar/calendar-views.css                       (themes/@THEME@/calendar-views.css)
     skin/calendar/checkbox-images.png                      (themes/@THEME@/images/checkbox-images.png)
copy from calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
copy to calendar/base/themes/gnomestripe/dialogs/calendar-invitations-dialog.css
copy from calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
copy to calendar/base/themes/pinstripe/dialogs/calendar-invitations-dialog.css
--- a/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
+++ b/calendar/base/themes/pinstripe/dialogs/calendar-invitations-dialog.css
@@ -84,16 +84,20 @@ calendar-invitations-richlistitem[select
 .calendar-invitations-richlistitem-icon[status="DECLINED"] {
   list-style-image: url("chrome://calendar/skin/calendar-invitations-dialog-list-images.png");
   -moz-image-region: rect(0px 96px 32px 64px);
 }
 
 .calendar-invitations-richlistitem-button {
   margin-bottom: 10px;
   visibility: hidden;
+
+  /* Workaround for making the checked button actually look checked */
+  -moz-appearance: tab;
+  min-height: 20px;
 }
 
 calendar-invitations-richlistitem[selected="true"] .calendar-invitations-richlistitem-button {
   visibility: visible;
 }
 
 .calendar-invitations-richlistitem-button .button-icon {
   margin-top: 0px;
copy from calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
copy to calendar/base/themes/winstripe/dialogs/calendar-invitations-dialog.css