paste.perl

diff shunt-20/carousel-default.tmplt upgrade/carousel-default.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/carousel
diff shunt-20/carousel-hidden-textareas.tmplt upgrade/carousel-hidden-textareas.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/carousel
diff shunt-20/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-20/default-eu-user-screen.tmplt upgrade/default-eu-user-screen.tmplt
4c4
< Parent      : root/import
---
> Parent      : shopping-cart-collateral-items
diff shunt-20/default-feedback.tmplt upgrade/default-feedback.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/survey
diff shunt-20/default-manage-ad-sku-template.tmplt upgrade/default-manage-ad-sku-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/ad-sku
diff shunt-20/default_product.tmplt upgrade/default_product.tmplt
27d26
< 	<div style="clear:both"></div>
28a28
> 	<div style="clear:both"></div>
diff shunt-20/default-purchase-ad-sku-template.tmplt upgrade/default-purchase-ad-sku-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/ad-sku
diff shunt-20/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>
diff shunt-20/default-survey-summary.tmplt upgrade/default-survey-summary.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/survey
diff shunt-20/default-test-results.tmplt upgrade/default-test-results.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/survey
diff shunt-20/default-webgui-account-activation-template.tmplt upgrade/default-webgui-account-activation-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/auth/webgui/create
diff shunt-20/default-webgui-welcome-message-template.tmplt upgrade/default-webgui-welcome-message-template.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/auth/webgui/create
diff shunt-20/editstory.tmplt upgrade/editstory.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
diff shunt-20/ems-schedule-listing-default2.tmplt upgrade/ems-schedule-listing-default2.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/ems
diff shunt-20/equal-cols.js.snpt upgrade/equal-cols.js.snpt
4c4
< Parent      : root/import
---
> Parent      : root/import/matrix
diff shunt-20/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-20/inbox_notification.tmplt upgrade/inbox_notification.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/account/inbox
diff shunt-20/inbox-sms-notification.tmplt upgrade/inbox-sms-notification.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/account/inbox
diff shunt-20/keywordlist.tmplt upgrade/keywordlist.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
diff shunt-20/layout.css.snpt upgrade/layout.css.snpt
4c4
< Parent      : root/import
---
> Parent      : root/import/layout
diff shunt-20/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-20/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-20/matrix-default-screenshots.tmplt upgrade/matrix-default-screenshots.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/matrix
diff shunt-20/one_over_two.tmplt upgrade/one_over_two.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/layout
diff shunt-20/storyarchive.tmplt upgrade/storyarchive.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
diff shunt-20/storytemplatetopic.tmplt upgrade/storytemplatetopic.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
diff shunt-20/storytopic.tmplt upgrade/storytopic.tmplt
4c4
< Parent      : root/import
---
> Parent      : root/import/storymanager
Only in shunt-20/: surveyedit2.css.snpt
diff shunt-20/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'