Changeset 3138
- Timestamp:
- 01/18/11 14:13:05
- Files:
-
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/de_DE/localeSettings.xsl (modified) (1 diff)
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/default/localeSettings.xsl (modified) (1 diff)
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/localeSettings.xsl (modified) (1 diff)
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/calendars.xsl (modified) (1 diff)
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl (modified) (2 diffs)
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js (modified) (2 diffs)
- trunk/deployment/webuser/webapp/resources/demoskins/de_DE/localeSettings.xsl (modified) (1 diff)
- trunk/deployment/webuser/webapp/resources/demoskins/default/localeSettings.xsl (modified) (1 diff)
- trunk/deployment/webuser/webapp/resources/demoskins/es_ES/localeSettings.xsl (modified) (1 diff)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/calendars.xsl (modified) (1 diff)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/de_DE/localeSettings.xsl
r3134 r3138 90 90 </xsl:template> 91 91 92 <!-- Declare the JavaScript access control strings. --> 93 <!-- These are for display and can be translated. --> 92 <!-- Declare the access control strings. --> 94 93 <xsl:template name="bedeworkAccessStrings"> 95 <script type="text/javascript"> 96 </script> 94 <!-- The default JavaScript strings are found in resources/javascript/bedework/bedeworkAccess.js which 95 gets deployed to the /bedework-common/ libraries during the build. Overrides are found in 96 resources/javascript/bedework/lang/ and are included here. --> 97 <script type="text/javascript" src="/bedework-common/javascript/bedework/lang/bwAccessStrings-de_DE.js"> </script> 98 99 <!-- The XSL strings are found in resources/xsl/lang --> 97 100 </xsl:template> 98 101 releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/default/localeSettings.xsl
r3134 r3138 94 94 </xsl:template> 95 95 96 <!-- Declare the JavaScript access control strings. --> 97 <!-- These are for display and can be translated. --> 96 <!-- Declare the access control strings. --> 98 97 <xsl:template name="bedeworkAccessStrings"> 99 <!-- U.S. English strings are the default; this template must remain, but no translations are needed.-->98 <!-- The XSL strings are found in resources/xsl/lang --> 100 99 </xsl:template> 101 100 releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/localeSettings.xsl
r3134 r3138 90 90 </xsl:template> 91 91 92 <!-- Declare the JavaScript access control strings. --> 93 <!-- These are for display and can be translated. --> 92 <!-- Declare the access control strings. --> 94 93 <xsl:template name="bedeworkAccessStrings"> 95 <script type="text/javascript"> 96 </script> 94 <!-- The default JavaScript strings are found in resources/javascript/bedework/bedeworkAccess.js which 95 gets deployed to the /bedework-common/ libraries during the build. Overrides are found in 96 resources/javascript/bedework/lang/ and are included here. --> 97 <script type="text/javascript" src="/bedework-common/javascript/bedework/lang/bwAccessStrings-es_ES.js"> </script> 98 99 <!-- The XSL strings are found in resources/xsl/lang --> 97 100 </xsl:template> 98 101 releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/calendars.xsl
r3044 r3138 771 771 772 772 <div id="sharingBox"> 773 <h3><xsl:copy-of select="$bwStr-CuCa-CurrentAccess"/> Current Access:</h3>773 <h3><xsl:copy-of select="$bwStr-CuCa-CurrentAccess"/></h3> 774 774 <div id="bwCurrentAccessWidget"> </div> 775 775 <script type="text/javascript"> releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl
r3132 r3138 64 64 <link rel="stylesheet" href="/bedework-common/default/default/bedeworkAccess.css"/> 65 65 <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkAccess.js"> </script> 66 <xsl:call-template name="bedeworkAccessStrings"/> 66 67 <!-- initialize calendar acls, if present --> 67 68 <xsl:if test="/bedework/currentCalendar/acl/ace"> … … 225 226 --> 226 227 <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkAccess.js"> </script> 228 <xsl:call-template name="bedeworkAccessStrings"/> 227 229 <link rel="stylesheet" href="/bedework-common/default/default/bedeworkAccess.css"/> 228 230 releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js
r3134 r3138 312 312 }; 313 313 314 // add a group of attendees returned from the CardDAV server 315 // uids - an array of uids to add 316 this.addGroupOfAttendees = function(uids) { 317 // display the processing message 318 $("#bwSchedProcessingMsg").show(); 319 320 // the json string we'll send to the server 321 var attendees = ""; 322 var isFirst = true; 323 324 for (var i = 0; i<uids.length; i++) { 325 var attendeeIsNew = true; 326 var uid = uids[i]; 327 328 // check to see if attendee already exists 329 for (var j=0; j < bwGrid.attendees.length; j++) { 330 if (uid.indexOf("mailto:") == -1) { 331 uid = "mailto:" + uid; 332 } 333 if (uid == bwGrid.attendees[j].uid) { 334 attendeeIsNew = false; 335 break; 336 } 337 } 338 339 if (attendeeIsNew) { 340 if (!isFirst) attendees += "&"; 341 attendees += 'attjson={"uri":"' + uid + '"}'; 342 isFirst = false; 343 } 344 } 345 346 // send the json string to the server: 347 $.ajax({ 348 type: "POST", 349 url: bwGrid.attUrlPrefix, 350 data: attendees + "&attendee=true&submit=add&list=yes&skinName=widget", 351 dataType: "json", 352 success: function(responseData){ 353 354 // the local array is overwritten with attendee data returned from the ajax call 355 if (responseData.attendees != undefined && responseData.attendees.length) { 356 bwGrid.attendees.length = 0; 357 for (var k=0; k < responseData.attendees.length; k++) { 358 var att = responseData.attendees[k]; 359 // strip off mailto: from uids to store locally 360 var attUri = att.uid; 361 if (attUri.indexOf("mailto:") != -1) { 362 attUri = attUri.substr(7); 363 } 364 var newAttendee = new bwAttendee(att.name, attUri, att.role, att.status, att.type); 365 bwGrid.attendees.push(newAttendee); 366 } 367 bwGrid.requestFreeBusy(); 368 } else { // no attendees were returned 369 alert(bwErrorAttendees); 370 } 371 372 // got attendees?? set the param that will trigger a 373 // scheduling request. For now, just set this every time 374 // (we'll trim back later) 375 if (bwGrid.attendees.length) { 376 $("input.bwEventFormSubmit").each(function(k) { 377 $(this).attr("name","submitAndSend"); 378 $(this).val(bwEventSubmitMeetingDisp); 379 }); 380 } 381 }, 382 error: function(msg) { 383 // there was a problem 384 alert("Error: " + msg.statusText); 385 } 386 }); 387 388 // hide the processing message 389 $("#bwSchedProcessingMsg").hide(); 390 } 391 314 392 this.addAttendeeFromGrid = function() { 315 393 var uid = $("#bwAddAttendee").val(); … … 319 397 if (uid.indexOf(",") != -1) { 320 398 // we have a list of uids from a group 321 alert("can't add a group yet, but soon..."); 399 // alert("can't add a group yet, but soon..."); 400 var uids = uid.split(","); 401 bwGrid.addGroupOfAttendees(uids); 322 402 } else { 323 403 // we have a single uid trunk/deployment/webuser/webapp/resources/demoskins/de_DE/localeSettings.xsl
r3133 r3138 90 90 </xsl:template> 91 91 92 <!-- Declare the JavaScript access control strings. --> 93 <!-- These are for display and can be translated. --> 92 <!-- Declare the access control strings. --> 94 93 <xsl:template name="bedeworkAccessStrings"> 95 <script type="text/javascript"> 96 </script> 94 <!-- The default JavaScript strings are found in resources/javascript/bedework/bedeworkAccess.js which 95 gets deployed to the /bedework-common/ libraries during the build. Overrides are found in 96 resources/javascript/bedework/lang/ and are included here. --> 97 <script type="text/javascript" src="/bedework-common/javascript/bedework/lang/bwAccessStrings-de_DE.js"> </script> 98 99 <!-- The XSL strings are found in resources/xsl/lang --> 97 100 </xsl:template> 98 101 trunk/deployment/webuser/webapp/resources/demoskins/default/localeSettings.xsl
r3133 r3138 94 94 </xsl:template> 95 95 96 <!-- Declare the JavaScript access control strings. --> 97 <!-- These are for display and can be translated. --> 96 <!-- Declare the access control strings. --> 98 97 <xsl:template name="bedeworkAccessStrings"> 99 <!-- U.S. English strings are the default; this template must remain, but no translations are needed.-->98 <!-- The XSL strings are found in resources/xsl/lang --> 100 99 </xsl:template> 101 100 trunk/deployment/webuser/webapp/resources/demoskins/es_ES/localeSettings.xsl
r3133 r3138 90 90 </xsl:template> 91 91 92 <!-- Declare the JavaScript access control strings. --> 93 <!-- These are for display and can be translated. --> 92 <!-- Declare the access control strings. --> 94 93 <xsl:template name="bedeworkAccessStrings"> 95 <script type="text/javascript"> 96 </script> 94 <!-- The default JavaScript strings are found in resources/javascript/bedework/bedeworkAccess.js which 95 gets deployed to the /bedework-common/ libraries during the build. Overrides are found in 96 resources/javascript/bedework/lang/ and are included here. --> 97 <script type="text/javascript" src="/bedework-common/javascript/bedework/lang/bwAccessStrings-es_ES.js"> </script> 98 99 <!-- The XSL strings are found in resources/xsl/lang --> 97 100 </xsl:template> 98 101 trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/calendars.xsl
r3044 r3138 771 771 772 772 <div id="sharingBox"> 773 <h3><xsl:copy-of select="$bwStr-CuCa-CurrentAccess"/> Current Access:</h3>773 <h3><xsl:copy-of select="$bwStr-CuCa-CurrentAccess"/></h3> 774 774 <div id="bwCurrentAccessWidget"> </div> 775 775 <script type="text/javascript"> trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl
r3131 r3138 64 64 <link rel="stylesheet" href="/bedework-common/default/default/bedeworkAccess.css"/> 65 65 <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkAccess.js"> </script> 66 <xsl:call-template name="bedeworkAccessStrings"/> 66 67 <!-- initialize calendar acls, if present --> 67 68 <xsl:if test="/bedework/currentCalendar/acl/ace"> … … 225 226 --> 226 227 <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkAccess.js"> </script> 228 <xsl:call-template name="bedeworkAccessStrings"/> 227 229 <link rel="stylesheet" href="/bedework-common/default/default/bedeworkAccess.css"/> 228 230
