Author: jmorliaguet Date: Sun May 28 13:30:27 2006 New Revision: 3258 Modified: cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/page_designer.pt cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/io.pt cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/settings.pt cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.pt
Log: - optimizations: we insert the MVC definitions directly in the source. Modified: cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt Sun May 28 13:30:27 2006 @@ -1,6 +1,9 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> -<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" + tal:define="model nocall:context/@@getModel; + view nocall:context/@@getView; + controller nocall:context/@@getController"> <head> <link rel="Stylesheet" type="text/css" href="++resource++authoring.css" /> <link rel="Stylesheet" type="text/css" href="++resource++cpsskins.css" /> @@ -14,69 +17,72 @@ <script type="text/javascript" src="++resource++cpsskins.js"></script> <script type="text/javascript" src="++resource++authoring.js"></script> - <ins class="model" cite="@@getModel?id=stylesheet"></ins> - <ins class="view" cite="@@getView?id=stylesheet"></ins> - + <ins class="model" tal:content="python: model('stylesheet')" /> + <ins class="view" tal:content="python: view('stylesheet')" /> </head> - <body> + <body> <div class="floatingHeader"> - <ins class="model" cite="@@getModel?id=action-pad"></ins> - <ins class="view" cite="@@getView?id=action-pad"></ins> - <ins class="model" cite="@@getModel?id=perspective-selector"></ins> - <ins class="view" cite="@@getView?id=perspective-selector"></ins> + <ins class="model" tal:content="python: model('action-pad')" /> + <ins class="view" tal:content="python: view('action-pad')" /> + <ins class="model" tal:content="python: model('perspective-selector')" /> + <ins class="view" tal:content="python: view('perspective-selector')" /> </div> <!-- Edit area for rendered content --> <div id="editArea"> - <ins class="controller" cite="@@getController?id=main-editor-perspectives"></ins> - <ins class="controller" cite="@@getController?id=main-editor-actions"></ins> - <ins class="controller" cite="@@getController?id=disable-links"></ins> + <ins class="controller" + tal:content="python: controller('main-editor-perspectives')" /> + <ins class="controller" + tal:content="python: controller('main-editor-actions')" /> + <ins class="controller" + tal:content="python: controller('disable-links')" /> <!-- top tabs --> - <ins class="model" cite="@@getModel?id=theme-tabs"></ins> - <ins class="view" cite="@@getView?id=theme-tabs"></ins> - <ins class="model" cite="@@getModel?id=page-tabs"></ins> - <ins class="view" cite="@@getView?id=page-tabs"></ins> - - <ins class="model" cite="@@getModel?id=location-selector"></ins> - <ins class="view" cite="@@getView?id=location-selector"></ins> - - <ins class="model" cite="@@getModel?id=page-mode-selector"></ins> - <ins class="view" cite="@@getView?id=page-mode-selector"></ins> - <ins class="controller" cite="@@getController?id=page-mode-perspectives"></ins> + <ins class="model" tal:content="python: model('theme-tabs')" /> + <ins class="view" tal:content="python: view('theme-tabs')" /> + <ins class="model" tal:content="python: model('page-tabs')" /> + <ins class="view" tal:content="python: view('page-tabs')" /> + + <ins class="model" tal:content="python: model('location-selector')" /> + <ins class="view" tal:content="python: view('location-selector')" /> + + <ins class="model" tal:content="python: model('page-mode-selector')" /> + <ins class="view" tal:content="python: view('page-mode-selector')" /> + <ins class="controller" + tal:content="python: controller('page-mode-perspectives')" /> <!-- rendered pages --> <div id="canvasArea"> - <ins class="model" cite="@@getModel?id=page-designer"></ins> - <ins class="view" cite="@@getView?id=page-designer"></ins> - <ins class="model" cite="@@getModel?id=content-author"></ins> - <ins class="view" cite="@@getView?id=content-author"></ins> - <ins class="controller" cite="@@getController?id=element-mover"></ins> + <ins class="model" tal:content="python: model('page-designer')" /> + <ins class="view" tal:content="python: view('page-designer')" /> + <ins class="model" tal:content="python: model('content-author')" /> + <ins class="view" tal:content="python: view('content-author')" /> + <ins class="controller" tal:content="python: controller('element-mover')" /> </div> <!-- Contextual menu --> - <ins class="view" cite="@@getView?id=context-menu"></ins> - <ins class="controller" cite="@@getController?id=menu-actions"></ins> - <ins class="controller" cite="@@getController?id=show-hide-menu"></ins> + <ins class="view" tal:content="python: view('context-menu')" /> + <ins class="controller" tal:content="python: controller('menu-actions')" /> + <ins class="controller" tal:content="python: controller('show-hide-menu')" /> </div> <!-- Main area for other screens --> <div id="mainArea"> - <ins class="model" cite="@@getModel?id=site-manager"></ins> - <ins class="view" cite="@@getView?id=site-manager"></ins> + <ins class="model" tal:content="python: model('site-manager')" /> + <ins class="view" tal:content="python: view('site-manager')" /> <!-- element editor --> - <ins class="model" cite="@@getModel?id=element-editor"></ins> - <ins class="view" cite="@@getView?id=element-editor"></ins> + <ins class="model" tal:content="python: model('element-editor')" /> + <ins class="view" tal:content="python: view('element-editor')" /> </div> <!-- Bottom area --> <div class="floatingFooter"> - <ins class="model" cite="@@getModel?id=portlet-factory"></ins> - <ins class="view" cite="@@getView?id=portlet-factory"></ins> - <ins class="controller" cite="@@getController?id=portlet-factory"></ins> + <ins class="model" tal:content="python: model('portlet-factory')" /> + <ins class="view" tal:content="python: view('portlet-factory')" /> + <ins class="controller" tal:content="python: controller('portlet-factory')" /> </div> </body> Modified: cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/page_designer.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/page_designer.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/page_designer.pt Sun May 28 13:30:27 2006 @@ -1,7 +1,7 @@ - -<ins class="model" cite="@@getModel?id=layout-mode"></ins> -<ins class="view" cite="@@getView?id=layout-mode"></ins> - -<ins class="model" cite="@@getModel?id=wysiwyg-mode"></ins> -<ins class="view" cite="@@getView?id=wysiwyg-mode"></ins> - +<tal:block define="model nocall:context/@@getModel; + view nocall:context/@@getView;"> + <ins class="model" tal:content="python: model('layout-mode')" /> + <ins class="view" tal:content="python: view('layout-mode')" /> + <ins class="model" tal:content="python: model('wysiwyg-mode')" /> + <ins class="view" tal:content="python: view('wysiwyg-mode')" /> +</tal:block> Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/io.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/io.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/io.pt Sun May 28 13:30:27 2006 @@ -1,9 +1,11 @@ - <table class="panel" cellpadding="0" cellspacing="0" - tal:define="info context/@@getSettingsInfo"> + tal:define="info context/@@getSettingsInfo; + model nocall:context/@@getModel; + view nocall:context/@@getView; + controller nocall:context/@@getController"> <tr> <td class="icon"> - <img src="++resource++io-48.png" /> + <img src="++resource++io-48.png" width="48" height="48"/> </td> <td class="section"> <div class="sections"> @@ -18,8 +20,8 @@ </div> </td> <td class="subsection"> - <ins class="model" cite="@@getModel?id=io-section"></ins> - <ins class="view" cite="@@getView?id=io-section"></ins> + <ins class="model" tal:content="python: model('io-section')" /> + <ins class="view" tal:content="python: view('io-section')" /> </td> </tr> </table> Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/settings.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/settings.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/settings.pt Sun May 28 13:30:27 2006 @@ -1,5 +1,8 @@ <table i18n:domain="cpsskins" class="panel" cellpadding="0" cellspacing="0" - tal:define="info context/@@getSettingsInfo"> + tal:define="info context/@@getSettingsInfo; + model nocall:context/@@getModel; + view nocall:context/@@getView; + controller nocall:context/@@getController"> <tr class="header"> <th style="width: 50px"></th> <th style="width: 150px">Category</th> @@ -21,8 +24,8 @@ </div> </td> <td class="subsection"> - <ins class="model" cite="@@getModel?id=settings-section"></ins> - <ins class="view" cite="@@getView?id=settings-section"></ins> + <ins class="model" tal:content="python: model('settings-section')" /> + <ins class="view" tal:content="python: view('settings-section')" /> </td> </tr> </table> Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.pt Sun May 28 13:30:27 2006 @@ -1,22 +1,27 @@ +<tal:block define="model nocall:context/@@getModel; + view nocall:context/@@getView; + controller nocall:context/@@getController"> + <h1>Site manager</h1> -<ins class="controller" cite="@@getController?id=site-manager-perspectives"></ins> +<ins class="controller" tal:content="python: controller('site-manager-perspectives')" /> <h2 onclick="javascript: CPSSkins.getControllerById('site-manager-perspectives').switchTo('settings')"> Settings</h2> -<ins class="model" cite="@@getModel?id=settings"></ins> -<ins class="view" cite="@@getView?id=settings"></ins> +<ins class="model" tal:content="python: model('settings')" /> +<ins class="view" tal:content="python: view('settings')" /> -<ins class="model" cite="@@getModel?id=setting-editor"></ins> -<ins class="view" cite="@@getView?id=setting-editor"></ins> +<ins class="model" tal:content="python: model('setting-editor')" /> +<ins class="view" tal:content="python: view('setting-editor')" /> <h2 onclick="javascript: CPSSkins.getControllerById('site-manager-perspectives').switchTo('negotiation')"> Negotiation</h2> -<ins class="model" cite="@@getModel?id=negotiation"></ins> -<ins class="view" cite="@@getView?id=negotiation"></ins> +<ins class="model" tal:content="python: model('negotiation')" /> +<ins class="view" tal:content="python: view('negotiation')" /> <h2 onclick="javascript: CPSSkins.getControllerById('site-manager-perspectives').switchTo('io')"> Import / export</h2> -<ins class="model" cite="@@getModel?id=io"></ins> -<ins class="view" cite="@@getView?id=io"></ins> +<ins class="model" tal:content="python: model('io')" /> +<ins class="view" tal:content="python: view('io')" /> +</tal:block> -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
