paste.perl

diff shunt/admin_console.tmplt shunt-20/admin_console.tmplt
31c31
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/carousel-hidden-textareas.tmplt shunt-20/carousel-hidden-textareas.tmplt
34c34
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default-answer-edit.tmplt shunt-20/default-answer-edit.tmplt
125c125,127
<     <textarea name='text' style="width:450px;height:150px;" id="texteditortarget"><tmpl_var text></textarea>
---
>     <div style="height: 200px">
>         <textarea name='text' id="texteditortarget"><tmpl_var text></textarea>
>     </div>
diff shunt/default-inbox-view-template.tmplt shunt-20/default-inbox-view-template.tmplt
20c20
<                             <span class="WGinbox_buttons"> <input type="button" value="^International(new message label,Account_Inbox);" onClick="<tmpl_if canSendMessages>location.href='<tmpl_var new_message_url>'<tmpl_else>alert('^International(no friends hover,Account_Inbox);');</tmpl_if>" /><input type="submit" value="^International(delete label,Account_Inbox);"></span>
---
>                             <span class="WGinbox_buttons"> <input type="button" value="^International(new message label,Account_Inbox);" onClick="<tmpl_if canSendMessages>location.href='<tmpl_var new_message_url>'<tmpl_else>alert('^International(no friends hover,Account_Inbox);');</tmpl_if>" /><input name="action" type="submit" value="^International(delete label,Account_Inbox);" /><input name="action" type="submit" value="^International(mark as read label,Account_Inbox);" /><input name="action" type="submit" value="^International(mark as unread label,Account_Inbox);" /></span>
28c28
<                                 <span class="WGinbox_messagerpp"><tmpl_var message_rpp></span>
---
>                                 <span class="WGinbox_messagerpp"><tmpl_var message_rpp> <tmpl_var userFilter></span>
61c61
<                                 <span class="WGinbox_messagerpp"><tmpl_var message_rpp></span>
---
>                                 <span class="WGinbox_messagerpp"><tmpl_var message_rpp> <tmpl_var userFilter></span>
diff shunt/default-question-edit.tmplt shunt-20/default-question-edit.tmplt
150c150,152
<     <textarea name='text' style="width:450px;height:150px;" id="texteditortarget"><tmpl_var text></textarea>
---
>     <div style="height: 200px">
>         <textarea name='text' id="texteditortarget"><tmpl_var text></textarea>
>     </div>
164c166
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default-section-edit.tmplt shunt-20/default-section-edit.tmplt
163,164c163,166
<     </p> 
<     <textarea name="text" maxlength="2056" style="width:450px;height:150px;" id="texteditortarget"><tmpl_var text></textarea>
---
>     </p>
>     <div style="height: 200px">
>         <textarea name="text" maxlength="2056" id="texteditortarget"><tmpl_var text></textarea>
>     </div>
178c180
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default-shopping-cart-template.tmplt shunt-20/default-shopping-cart-template.tmplt
216c216
<   isPackage: '1'
---
>   isPackage: '0'
Only in shunt-20: default-survey-summary.tmplt
diff shunt/default-survey-take.tmplt shunt-20/default-survey-take.tmplt
34a35
> 	    <input type=hidden id=surveyResponseRevision value=<tmpl_var revision>>
40c41
< <link rel="stylesheet" type="text/css" href="/survey.css" />
---
> <link rel="stylesheet" type="text/css" href="^/(survey.css);" />
50c51
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default-thingyrecord-view.tmplt shunt-20/default-thingyrecord-view.tmplt
20,22c20,23
< <tmpl_if message>
< <tmpl_var message>
< </tmpl_if>
---
> <tmpl_if addedToCart>
> <tmpl_var message><br />
> <a href="<tmpl_var url>">^International(continue shopping button,Shop);</a><br />
> <tmpl_else>
29c30
< 		<td><tmpl_var field_input></td>
---
> 		<td><tmpl_var field_input><tmpl_if field_price><em>(add $<tmpl_var field_price>)</em></tmpl_if></td>
43a45
> </tmpl_if>
diff shunt/default-view-profile-template.tmplt shunt-20/default-view-profile-template.tmplt
87c87
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default-webgui-account-activation-template.tmplt shunt-20/default-webgui-account-activation-template.tmplt
22c22
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default_webgui_anonymous_registration_template.tmplt shunt-20/default_webgui_anonymous_registration_template.tmplt
130c130
<   isPackage: '1'
---
>   isPackage: '0'
Only in shunt-20: default-webgui-welcome-message-template.tmplt
diff shunt/editstory.tmplt shunt-20/editstory.tmplt
57a58,60
> <fieldset class="photoContainer">
> <legend>^International(photo,WebGUI);</legend>
> <tmpl_if hasPhoto>
60c63,69
< <span><tmpl_var imgUploadForm></span>
---
> <span><p style="display:inline;vertical-align:middle;"><a href="<tmpl_var imgUrl>"><img src="<tmpl_var imgThumb>" alt="<tmpl_var imgFilename>" style="border-style:none;vertical-align:middle;" /><tmpl_var imgFilename></a></p></span>
> <div style="clear: both;"></div>
> </div>
> </tmpl_if>
> <div>
> <label><tmpl_if hasPhoto>^International(Replace image with new image,Asset_Story);<tmpl_else>^International(photo,WebGUI);</tmpl_if></label>
> <span><tmpl_var newUploadForm></span>
95c104
< <hr>
---
> </fieldset>
Only in shunt-20: edit.tmplt
diff shunt/ems-badge-listing-default.tmplt shunt-20/ems-badge-listing-default.tmplt
146c146
<   isPackage: '1'
---
>   isPackage: '0'
Only in shunt-20: ems-schedule-listing-default2.tmplt
diff shunt/flash-style-3-template.tmplt shunt-20/flash-style-3-template.tmplt
34c34
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/flash-tutorial-template.tmplt shunt-20/flash-tutorial-template.tmplt
28c28
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/matrix-default-detailed-listing.tmplt shunt-20/matrix-default-detailed-listing.tmplt
199c199
<             <strong class="title">Comments</strong>
---
>             <strong class="title">^International(Comments,WebGUI);</strong>
201c201
<             <a onclick="showHide('theLink','matrixMail');" href="javascript:return false" class="showLink" id="theLink">Send Creator a Message</a>
---
>             <a onclick="showHide('theLink','matrixMail');" href="javascript:return false" class="showLink" id="theLink">^International(Send Creator a Message,Asset_MatrixListing);</a>
239c239
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/matrix-default-view-template.tmplt shunt-20/matrix-default-view-template.tmplt
26c26
< var matrixUrl = '<tmpl_var matrix_url>';
---
> var matrix_url = '<tmpl_var matrix_url>';
28a29,34
>     if (YAHOO.env.ua.opera) {
>         String.prototype.trim = function() {
>          return this.replace(/^\s+|\s+$/g, '');
>         };
>     }
> 
351c357
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/my-purchases-detail-default.tmplt shunt-20/my-purchases-detail-default.tmplt
171c171
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/q_and_a.tmplt shunt-20/q_and_a.tmplt
94c94
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/shop-account-layout.tmplt shunt-20/shop-account-layout.tmplt
24a25,26
>                 <li <tmpl_if viewSalesIsActive>class="selected"</tmpl_if>><a href="<tmpl_var view_sales_url>" title="^International(my sales label,Account_Shop);"><em>^International(my sales label,Account_Shop);</em></a></li>
>                 <li <tmpl_if manageTaxIsActive>class="selected"</tmpl_if>><a href="<tmpl_var manage_tax_url>" title="^International(manage tax label,Account_Shop);"><em>^International(manage tax label,Account_Shop);</em></a></li>
diff shunt/storyarchive.tmplt shunt-20/storyarchive.tmplt
14a15
> <tmpl_if description><div><tmpl_var description></div></tmpl_if>
Only in shunt-20: storytemplate.tmplt
diff shunt/storytemplatetopic.tmplt shunt-20/storytemplatetopic.tmplt
23c23
< <p><span class="storyTitle"><tmpl_var title><br /></span>
---
> <p><span class="storyTitle"><tmpl_if headline><tmpl_var headline><tmpl_else><tmpl_var title></tmpl_if><br /></span>
29c29,58
< <p class="story"><tmpl_if location><span class="storyLocation"><tmpl_var location> &mdash; </span></tmpl_if><tmpl_var story></p>
---
> <p class="story"><tmpl_if location><span class="storyLocation"><tmpl_var location> &mdash; </span><br /></tmpl_if>
> <tmpl_if hasPhotos>
>     <span class="storyPhoto" id="photoContainer">
>     <tmpl_if singlePhoto>
>         <tmpl_loop photo_loop>
>             <tmpl_if imageCaption><span class="photoCaption"><tmpl_var imageCaption></span><br /></tmpl_if>
>             <tmpl_if imageLink><a href="<tmpl_var imageLink>"></tmpl_if><img src="<tmpl_var imageUrl>" <tmpl_if imageAlt>alt="<tmpl_var imageAlt>"</tmpl_if> <tmpl_if imageTitle>title="<tmpl_var imageTitle>"</tmpl_if> /><tmpl_if imageLink></a></tmpl_if><br />
>             <tmpl_if imageByline><span class="photoByline">^International(Source,Asset_Story);: <tmpl_var imageByline></span></tmpl_if>
>         </tmpl_loop>
>     <tmpl_else>
>         <ol id="photoCarousel">
>         <tmpl_loop photo_loop>
>             <li>
>             <tmpl_if imageCaption><span class="photoCaption"><tmpl_var imageCaption></span><br /></tmpl_if>
>             <tmpl_if imageLink><a href="<tmpl_var imageLink>"></tmpl_if><img src="<tmpl_var imageUrl>" <tmpl_if imageAlt>alt="<tmpl_var imageAlt>"</tmpl_if> <tmpl_if imageTitle>title="<tmpl_var imageTitle>"</tmpl_if> /><tmpl_if imageLink></a></tmpl_if><br />
>             <tmpl_if imageByline><span class="photoByline">^International(Source,Asset_Story);: <tmpl_var imageByline></span></tmpl_if>
>             </li>
>         </tmpl_loop>
>         </ol>
>         <script>
>         YAHOO.util.Event.onContentReady("photoContainer", function (ev) {
>             var carousel = new YAHOO.widget.Carousel("photoContainer", { numVisible: 1 });
>             carousel.render();
>             carousel.show();
>         });
>         </script>
>     </tmpl_if>
>     </span>
> </tmpl_if>
> <tmpl_var story></p>
diff shunt/surveyedit2.css.snpt shunt-20/surveyedit2.css.snpt
174c174
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/thingy-default.tmplt shunt-20/thingy-default.tmplt
52c52
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/webgui.css.snpt shunt-20/webgui.css.snpt
40c40
<   isPackage: '1'
---
>   isPackage: '0'