Author: jmorliaguet Date: Thu Jun 15 00:07:42 2006 New Revision: 3410 Modified: cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js cpsskins/branches/paris-sprint-2006/ui/screens/common/theme_tabs.pt cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/themepage.pt cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt
Log: - enable the contextual menu on cells and pageblocks Modified: cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js ============================================================================== --- cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js (original) +++ cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js Thu Jun 15 00:07:42 2006 @@ -2385,6 +2385,7 @@ Math.abs(this.mouseY != this.startY) > 2) return; var element = Event.element(e); + if (element.tagName.toLowerCase() == 'input') return; var selected = CPSSkins.Identifiable.getIdentifiable(element); if (!selected) return; if (!CPSSkins.Canvas.getModel(selected)) { @@ -2408,6 +2409,7 @@ this.startY = Event.pointerY(e); }, + callEvent: function(e) { Event.stop(e); var element = Event.element(e); Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/theme_tabs.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/common/theme_tabs.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/common/theme_tabs.pt Thu Jun 15 00:07:42 2006 @@ -12,6 +12,7 @@ <td tal:attributes="class python: selected and 'tabselected' or 'tab'"> <a tal:content="python: theme.title or 'No title'" tal:attributes="href string:@@setWorkTheme?name=${theme/name}" /> + <img alt="" width="12" height="12" src="++resource++edit-12.png" /> </td> <td tal:attributes="class python: selected and 'rtabselected' or 'rtab'"> <img alt="" width="5" height="5" src="++resource++rtab.png" /> Modified: cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt Thu Jun 15 00:07:42 2006 @@ -10,18 +10,14 @@ tal:attributes="width width"> <div class="cellEditHeader"> - <form action="@@editElement"> + <ins class="model" + tal:define="model nocall:context/@@getModel" + tal:content="python: model(info)" /> + <form action="@@editElement" tal:attributes="id string:c$cell_id"> <input type="hidden" name="id" tal:attributes="value cell_id" /> <input type="hidden" name="name" value="title" /> <input name="value" type="text" size="12" class="editable" tal:attributes="value title" /> - <ins class="model" - tal:define="model nocall:context/@@getModel" - tal:content="python: model(info)" /> - <img class="hover" - tal:attributes="id string:c$cell_id" width="12" height="12" - title="edit this cell" style="padding: 3px" - src="++resource++edit-12.png" /> </form> </div> Modified: cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css Thu Jun 15 00:07:42 2006 @@ -16,6 +16,7 @@ padding: 4px; vertical-align: middle; color: #000; + margin-bottom: 5px; } .pageBlockEditHeader a { @@ -46,12 +47,15 @@ } .pageBlockAddButton { - padding: 4px; text-align: left; - margin-top: 5px; - margin-bottom: 5px; + padding-left: 3px; + margin-bottom: 7px; + margin-top: 4px; } +.pageBlockAddButton img { + border: none; +} /* cell */ .sizer { Modified: cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt Thu Jun 15 00:07:42 2006 @@ -1,5 +1,4 @@ -<tal:block - define=" +<tal:block define=" info options/info; display info/display; title context/title; @@ -12,7 +11,11 @@ tal:attributes="width width"> <tr> <td> - <form class="pageBlockEditHeader" action="@@editElement"> + <ins class="model" + tal:define="model nocall:context/@@getModel" + tal:content="python: model(info)" /> + <form class="pageBlockEditHeader" action="@@editElement" + tal:attributes="id string: c$pageblock_id"> <span style="float:right"> <a href="" tal:attributes="href string:@@moveUp?id=$pageblock_id"> <img width="12" height="12" @@ -30,16 +33,6 @@ tal:attributes="value title" /> </form> - <div style="text-align: center"> - <ins class="model" - tal:define="model nocall:context/@@getModel" - tal:content="python: model(info)" /> - <img class="hover" - tal:attributes="id string:c$pageblock_id" width="12" height="12" - title="edit this page block" style="padding: 3px" - src="++resource++edit-12.png" /> - </div> - <form class="sizer" action="@@editElement"> <b class="left"></b> <b class="right"></b> Modified: cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/themepage.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/themepage.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/themepage.pt Thu Jun 15 00:07:42 2006 @@ -1,10 +1,12 @@ <div tal:define="id context/identifier" tal:attributes="id id"> + <div class="pageBlockAddButton"> <a title="Add a page block" tal:attributes="href string:@@addPageBlock?id=$id"> - <img style="border: 0; padding: 0.2em; width: 46px; height: 18px" + <img style="width: 46px; height: 18px" src="++resource++add-pageblock.png" /></a> + </div> <div tal:content="structure options/markup" /> Modified: cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt Thu Jun 15 00:07:42 2006 @@ -13,13 +13,4 @@ tal:attributes="id id" tal:content="structure options/markup" /> - <div style="text-align: center"> - <ins class="model" - tal:define="model nocall:context/@@getModel" - tal:content="python: model(info)" /> - <img class="hover" tal:attributes="id string:c$id" width="12" height="12" - title="edit this cell" style="padding: 3px" - src="++resource++edit-12.png" /> - </div> - </td> -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins