paste.perl

diff shuntv4/admin_console.tmplt upgrade/admin_console.tmplt
31c31
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/carousel-default.tmplt upgrade/carousel-default.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/carousel
diff shuntv4/carousel-hidden-textareas.tmplt upgrade/carousel-hidden-textareas.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/carousel
34c34
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/default-eu-user-screen.tmplt upgrade/default-eu-user-screen.tmplt
4c4
< Parent      : root/import
---
> Parent      : shopping-cart-collateral-items
diff shuntv4/default-feedback.tmplt upgrade/default-feedback.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/survey
diff shuntv4/default-manage-ad-sku-template.tmplt upgrade/default-manage-ad-sku-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/ad-sku
diff shuntv4/default_product.tmplt upgrade/default_product.tmplt
27d26
< 	<div style="clear:both"></div>
28a28
> 	<div style="clear:both"></div>
diff shuntv4/default-purchase-ad-sku-template.tmplt upgrade/default-purchase-ad-sku-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/ad-sku
diff shuntv4/default-shopping-cart-template.tmplt upgrade/default-shopping-cart-template.tmplt
216c216
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/default-test-results.tmplt upgrade/default-test-results.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/survey
diff shuntv4/default-view-profile-template.tmplt upgrade/default-view-profile-template.tmplt
87c87
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/default-webgui-account-activation-template.tmplt upgrade/default-webgui-account-activation-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/auth/webgui/create
diff shuntv4/default-webgui-welcome-message-template.tmplt upgrade/default-webgui-welcome-message-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/auth/webgui/create
diff shuntv4/editstory.tmplt upgrade/editstory.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
diff shuntv4/edit.tmplt upgrade/edit.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/account/friendmanager
diff shuntv4/ems-badge-listing-default.tmplt upgrade/ems-badge-listing-default.tmplt
146c146
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/ems-schedule-listing-default2.tmplt upgrade/ems-schedule-listing-default2.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/ems
diff shuntv4/equal-cols.js.snpt upgrade/equal-cols.js.snpt
4c4
< Parent      : root/import
---
> Parent      : root/import/matrix
diff shuntv4/flash-style-3-template.tmplt upgrade/flash-style-3-template.tmplt
34c34
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/flash-tutorial-template.tmplt upgrade/flash-tutorial-template.tmplt
28c28
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/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 shuntv4/inbox_notification.tmplt upgrade/inbox_notification.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/account/inbox
diff shuntv4/inbox-sms-notification.tmplt upgrade/inbox-sms-notification.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/account/inbox
diff shuntv4/keywordlist.tmplt upgrade/keywordlist.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
diff shuntv4/layout.css.snpt upgrade/layout.css.snpt
4c4
< Parent      : root/import
---
> Parent      : root/import/layout
diff shuntv4/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 shuntv4/matrix-default-screenshots.tmplt upgrade/matrix-default-screenshots.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/matrix
diff shuntv4/my-purchases-detail-default.tmplt upgrade/my-purchases-detail-default.tmplt
171c171
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/one_over_two.tmplt upgrade/one_over_two.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/layout
diff shuntv4/q_and_a.tmplt upgrade/q_and_a.tmplt
94c94
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/storyarchive.tmplt upgrade/storyarchive.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
diff shuntv4/storytemplatetopic.tmplt upgrade/storytemplatetopic.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
diff shuntv4/storytopic.tmplt upgrade/storytopic.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
Only in shuntv4: surveyedit2.css.snpt
diff shuntv4/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 shuntv4/thingy-default.tmplt upgrade/thingy-default.tmplt
52c52
<   isPackage: '1'
---
>   isPackage: '0'
diff shuntv4/webgui.css.snpt upgrade/webgui.css.snpt
40c40
<   isPackage: '1'
---
>   isPackage: '0'