paste.perl

diff shunt/admin_console.tmplt upgrade/admin_console.tmplt
31c31
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/carousel-default.tmplt upgrade/carousel-default.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/carousel
diff shunt/carousel-hidden-textareas.tmplt upgrade/carousel-hidden-textareas.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/carousel
34c34
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default-answer-edit.tmplt upgrade/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-contributions-view.tmplt upgrade/default-contributions-view.tmplt
62c62
<                                     <span class="WGmessagerpp"><tmpl_var contributions_rpp></span>
---
>                                     <span class="WGProfile_messagerpp"><tmpl_var contributions_rpp></span>
diff shunt/default-eu-user-screen.tmplt upgrade/default-eu-user-screen.tmplt
4c4
< Parent      : root/import
---
> Parent      : shopping-cart-collateral-items
diff shunt/default-feedback.tmplt upgrade/default-feedback.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/survey
diff shunt/default-inbox-view-template.tmplt upgrade/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-manage-ad-sku-template.tmplt upgrade/default-manage-ad-sku-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/ad-sku
diff shunt/default_product.tmplt upgrade/default_product.tmplt
27d26
< 	<div style="clear:both"></div>
28a28
> 	<div style="clear:both"></div>
diff shunt/default-purchase-ad-sku-template.tmplt upgrade/default-purchase-ad-sku-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/ad-sku
diff shunt/default-question-edit.tmplt upgrade/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 upgrade/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 upgrade/default-shopping-cart-template.tmplt
216c216
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default-survey-edit.tmplt upgrade/default-survey-edit.tmplt
14,17d13
<     <style type="text/css">
<         body { margin:0; padding:0; }
<     </style>
<     
58,60c54,56
<     	<tmpl_if session.var.adminOn>
< 		<a href="?func=edit">^International(575,WebGUI);</a> |
<     	</tmpl_if>
---
> 	<a href="?func=edit">^International(575,WebGUI);</a> |
>     	<a href="?func=graph">^International('visualize','Asset_Survey');</a> |
>     	<a href="?func=editTestSuite">^International('test suite','Asset_Survey');</a> |
63a60,64
>     <div id="warnings-outer" style="display:none" class="wgWarning">
> 	<h2>^International(warnings,Asset_Survey);</h2>
>         <div id="warnings"></div>
>     </div>
>     
65,70c66,67
<         <table>
<             <tr><td>
<                 <ul id="sections" class="draglist"></ul>
<             </td></tr>
<             <tr><td>
<             <div class=buttons>
---
>     	<div id="sections-panel"></div>
> 	<div id=buttons class=buttons>
74,76c71
<             </div>
<             </td></tr>
<         </table>
---
>     	</div>
78a74
>     <div id="editor"></div>
Only in upgrade/: default-survey-summary.tmplt
diff shunt/default-survey-take.tmplt upgrade/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-test-results.tmplt upgrade/default-test-results.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/survey
diff shunt/default-thingyrecord-view.tmplt upgrade/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 upgrade/default-view-profile-template.tmplt
87c87
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default-webgui-account-activation-template.tmplt upgrade/default-webgui-account-activation-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/auth/webgui/create
22c22
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/default_webgui_anonymous_registration_template.tmplt upgrade/default_webgui_anonymous_registration_template.tmplt
130c130
<   isPackage: '1'
---
>   isPackage: '0'
Only in upgrade/: default-webgui-welcome-message-template.tmplt
diff shunt/editstory.tmplt upgrade/editstory.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
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 upgrade/: edit.tmplt
diff shunt/ems-badge-listing-default.tmplt upgrade/ems-badge-listing-default.tmplt
146c146
<   isPackage: '1'
---
>   isPackage: '0'
Only in upgrade/: ems-schedule-listing-default2.tmplt
diff shunt/equal-cols.js.snpt upgrade/equal-cols.js.snpt
4c4
< Parent      : root/import
---
> Parent      : root/import/matrix
diff shunt/flash-style-3-template.tmplt upgrade/flash-style-3-template.tmplt
34c34
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/flash-tutorial-template.tmplt upgrade/flash-tutorial-template.tmplt
28c28
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/hierarchical-top-nav.tmplt upgrade/hierarchical-top-nav.tmplt
2,6c2,6
< Asset ID    : fCibAeqRifEEAhFL6-pEKg
< Menu Title  : Prop Nav
< Parent      : root/import/prop-style
< Title       : Prop Nav
< URL         : webgui7/prop/hierarchical-top-nav
---
> Asset ID    : stevecoolmenu000000001
> Menu Title  : Site Nav
> Parent      : root/import/webgui-7-style-3
> Title       : Site Nav
> URL         : webgui7/style3/hierarchical-top-nav
51a52
> 
53c54
<     YAHOO.util.Event.onContentReady("navigation-<tmpl_var assetId>", function() {
---
>     YAHOO.util.Event.onAvailable("navigation-<tmpl_var assetId>", function() {
68d68
< <!-- Page-specific script -->
diff shunt/inbox_notification.tmplt upgrade/inbox_notification.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/account/inbox
diff shunt/inbox-sms-notification.tmplt upgrade/inbox-sms-notification.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/account/inbox
diff shunt/keywordlist.tmplt upgrade/keywordlist.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
diff shunt/layout.css.snpt upgrade/layout.css.snpt
4c4
< Parent      : root/import
---
> Parent      : root/import/layout
diff shunt/matrix.css.snpt upgrade/matrix.css.snpt
130c130,131
< #sortByClicks-button {
---
> #sortByClicks-button,
> #sortByName-button {
144c145,146
< #sortByClicks-button:hover {
---
> #sortByClicks-button:hover,
> #sortByName-button:hover {
diff shunt/matrix-default-detailed-listing.tmplt upgrade/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-screenshots-config.tmplt upgrade/matrix-default-screenshots-config.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/matrix
26c26
<    
---
> 
32c32
<    
---
> 
37c37
<    
---
> 
40c40
<    
---
> 
48c48
<    
---
> 
56c56
<    
---
> 
58d57
<     
diff shunt/matrix-default-screenshots.tmplt upgrade/matrix-default-screenshots.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/matrix
diff shunt/matrix-default-view-template.tmplt upgrade/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 upgrade/my-purchases-detail-default.tmplt
171c171
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/one_over_two.tmplt upgrade/one_over_two.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/layout
diff shunt/q_and_a.tmplt upgrade/q_and_a.tmplt
94c94
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/shop-account-layout.tmplt upgrade/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 upgrade/storyarchive.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
14a15
> <tmpl_if description><div><tmpl_var description></div></tmpl_if>
Only in upgrade/: storytemplate.tmplt
diff shunt/storytemplatetopic.tmplt upgrade/storytemplatetopic.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
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/storytopic.tmplt upgrade/storytopic.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
Only in shunt/: surveyedit2.css.snpt
diff shunt/surveyedit.css.snpt upgrade/surveyedit.css.snpt
2c2
< Asset ID    : F2CZVJtKtTs67DWwqDI96g
---
> Asset ID    : kwTL1SWCk0GlpiJ5zAAEPQ
4c4
< Parent      : root/import
---
> Parent      : root/import/survey
7a8,12
> #editor_container {
>     visibility: hidden;
>     z-index:  100;
> }
> 
31c36
<   background: url(^Extras(wobject/Survey/rel_interstitial_loading.gif);) no-repeat;
---
>   background: url(^Extras("wobject/Survey/rel_interstitial_loading.gif");) no-repeat;
40a46
> 
57,61d62
< div.workarea { 
< 	padding:10px; 
< 	padding-top:40px; 
< 	float:left 
< }
87,90d87
<     position: relative;
<     width: 340px; 
<     background: #f7f7f7;
<     border: 1px solid gray;
94d90
<     padding-bottom:20px;
98c94
<     margin: 5px;
---
>     margin: 1px;
117,139d112
< 
< li.ssection {
<     background-color: #E76300;
<     border:1px solid #7EA6B2;
<     cursor: move; 
<     min-height: 10px;
< }
< 
< li.squestion {
<     background-color: #CC6600;
<     border:1px solid #7EA6B2;
<     cursor: move; 
< 	padding-left:15px; 
<     width: 80%;
<     min-height: 10px;
< }
< li.newQuestion {
< #    background-color: #D1E6EC;
< #    border:1px solid #7EA6B2;
< #    cursor: move; 
< 	padding-left:25px; 
< }
< 
144,145c117
< 	padding-left:15px; 
<     width:80%;
---
> 	padding-left:10px; 
148d119
< 
150c121
<     background-color: #D1E6EC;
---
>     background-color: #F1FFB8;
153,154c124
< 	padding-left:50px; 
<     width:60%;
---
> 	padding-left:15px; 
157,163c127,150
< li.sanswer {
<     background-color: #CC6600;
<     border:1px solid #7EA6B2;
<     cursor: move; 
< 	padding-left:50px; 
<     width:60%;
<     min-height: 10px;
---
> #sections-panel li.selected {
>     background-image: url(^Extras("toolbar/bullet/moveRight.gif"););
>     background-position:99% center;
>     background-repeat: no-repeat;
>     font-weight:bold;
> }
> 
> #goto-yui-ac {
>     width:15em;
>     margin-top:0.5em;
> }
> .wGwarning {
>     background-color:#FF6666;
>     border:1px solid red;
>     margin:5px;
>     padding:10px;
> }
> .warning {
>     padding: 5px;
> }
> #sections-panel .bd {
>     overflow: auto;
>     background-color:#fff;
>     padding:10px;
165,169c152,159
< li.newAnswer {
< #    background-color: #D1E6EC;
< #    border:1px solid #7EA6B2;
<     padding-left:50px;    
< #    cursor: move; 
---
> #buttons {
>     height: 30px; 
> }
> #sections-panel_c .yui-resize .yui-resize-handle-r {
>     right: -6px; /* make room for the scroll-bars */
> }
> #sections-panel div.ft {
>     font-size: 100%;
171d160
< 
189,190c178,179
<   mimeType: text/html
<   processAsTemplate: '1'
---
>   mimeType: text/css
>   processAsTemplate: '0'
diff shunt/thingy-default.tmplt upgrade/thingy-default.tmplt
52c52
<   isPackage: '1'
---
>   isPackage: '0'
diff shunt/webgui.css.snpt upgrade/webgui.css.snpt
40c40
<   isPackage: '1'
---
>   isPackage: '0'