Fix bug 534045 - Invite Attendees dialog: icons are messed up in case of participation role NON-PARTICIPANT. r=philipp

calendar/base/content/dialogs/calendar-event-dialog-attendees.xml

@@ -1248,12 +1248,14 @@
                 return;
             }
             var role = target.getAttribute("role");
-            if (role == "CHAIR") {
+            if (role == "NON-PARTICIPANT") {
                 target.setAttribute("role", "REQ-PARTICIPANT");
             } else if (role == "REQ-PARTICIPANT") {
                 target.setAttribute("role", "OPT-PARTICIPANT");
             } else if (role == "OPT-PARTICIPANT") {
                 target.setAttribute("role", "CHAIR");
+            } else if (role == "CHAIR") {
+                target.setAttribute("role", "NON-PARTICIPANT");
             }
             return;
         }

calendar/base/content/dialogs/calendar-event-dialog-attendees.xul

@@ -149,16 +149,14 @@
               <label value="&event.attendee.role.required;"/>
               <box class="legend" status="FREE"/>
               <label value="&event.freebusy.legend.free;"/>
-              <box class="legend" status="BUSY_UNAVAILABLE"/>
-              <label value="&event.freebusy.legend.busy_unavailable;"/>
+              <box class="legend" status="UNKNOWN"/>
+              <label value="&event.freebusy.legend.unknown;"/>
             </row>
             <row align="center">
               <image class="role-icon" role="OPT-PARTICIPANT"/>
               <label value="&event.attendee.role.optional;"/>
               <box class="legend" status="BUSY_TENTATIVE"/>
               <label value="&event.freebusy.legend.busy_tentative;"/>
-              <box class="legend" status="UNKNOWN"/>
-              <label value="&event.freebusy.legend.unknown;"/>
             </row>
             <row align="center">
               <image class="role-icon" role="CHAIR"/>
@@ -166,6 +164,12 @@
               <box class="legend" status="BUSY"/>
               <label value="&event.freebusy.legend.busy;"/>
             </row>
+            <row align="center">
+              <image class="role-icon" role="NON-PARTICIPANT"/>
+              <label value="&event.attendee.role.nonparticipant;"/>
+              <box class="legend" status="BUSY_UNAVAILABLE"/>
+              <label value="&event.freebusy.legend.busy_unavailable;"/>
+            </row>
           </rows>
         </grid>
       </hbox>

calendar/base/themes/pinstripe/dialogs/calendar-event-dialog.css

@@ -639,6 +639,13 @@ daypicker-monthday {
     -moz-image-region: rect(0px 201px 16px 180px);
 }
 
+.role-icon[role="NON-PARTICIPANT"] {
+    -moz-image-region: rect(0px 222px 16px 201px);
+}
+.role-icon[role="NON-PARTICIPANT"][disabled="true"] {
+    -moz-image-region: rect(0px 222px 16px 201px);
+}
+
 .zoom-in-icon {
     margin: 3px 3px;
     list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);

calendar/base/themes/winstripe/dialogs/calendar-event-dialog.css

@@ -647,6 +647,13 @@ daypicker-monthday {
     -moz-image-region: rect(0px 201px 16px 180px);
 }
 
+.role-icon[role="NON-PARTICIPANT"] {
+    -moz-image-region: rect(0px 222px 16px 201px);
+}
+.role-icon[role="NON-PARTICIPANT"][disabled="true"] {
+    -moz-image-region: rect(0px 222px 16px 201px);
+}
+
 .zoom-in-icon {
     margin: 3px 3px;
     list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);

calendar/locales/en-US/chrome/calendar/calendar-event-dialog.dtd

@@ -363,6 +363,7 @@
 <!ENTITY event.attendee.role.required           "Required Attendee">
 <!ENTITY event.attendee.role.optional           "Optional Attendee">
 <!ENTITY event.attendee.role.chair              "Chair">
+<!ENTITY event.attendee.role.nonparticipant     "Non Participant">
 
 <!-- Timezone dialog -->
 <!ENTITY timezone.title.label            "Please Specify the Timezone">