[gen] First draft of a system for locking pages when editing it.

gen/ui/edit.pt

@@ -8,6 +8,7 @@
                 phaseInfo      python: contextObj.getAppyPhases(currentOnly=True, layoutType=layoutType);
                 phase          phaseInfo/name;
                 page           request/page|python:contextObj.getDefaultEditPage();
+                dummy          python: contextObj.setLock(user, page);
                 confirmMsg     request/confirmMsg | nothing;
                 groupedWidgets python: contextObj.getGroupedAppyTypes(layoutType, page, cssJs=cssJs);"
     tal:on-error="structure python: tool.manageError(error)">

gen/ui/portlet.pt

@@ -115,7 +115,8 @@
 </tal:comment>
 <table metal:define-macro="phases" class="portletContent"
        tal:define="singlePhase python: phases and (len(phases) == 1);
-                   page python: req.get('page', 'main')">
+                   page python: req.get('page', 'main');
+                   mayEdit python: contextObj.allows('Modify portal content')">
   <tal:phase repeat="phase phases">
     <tal:comment replace="nothing">The box containing phase-related information</tal:comment>
     <tr tal:define="singlePage python: len(phase['pages']) == 1">
@@ -132,10 +133,19 @@
           <a tal:attributes="href python: contextObj.getUrl(page=aPage)"
              tal:content="structure python: _('%s_page_%s' % (contextObj.meta_type, aPage))">
           </a>
-          <a tal:condition="python: contextObj.allows('Modify portal content') and phase['pagesInfo'][aPage]['showOnEdit']"
-             tal:attributes="href python: contextObj.getUrl(mode='edit', page=aPage)">
-           <img title="Edit" tal:attributes="src string: $appUrl/ui/edit.gif"/>
-          </a>
+          <tal:icons define="locked python: contextObj.isLocked(user, aPage);
+                             editable python: mayEdit and phase['pagesInfo'][aPage]['showOnEdit']">
+           <a tal:condition="python: editable and not locked"
+              tal:attributes="href python: contextObj.getUrl(mode='edit', page=aPage)">
+            <img tal:attributes="src string: $appUrl/ui/edit.png;
+                                 title python: _('object_edit')"/>
+           </a>
+           <a tal:condition="python: editable and locked">
+            <img style="cursor: help"
+                 tal:attributes="src string: $appUrl/ui/locked.png;
+                                 title python: _('page_locked', mapping={'user':tool.getUserName(locked)})"/>
+           </a>
+          </tal:icons>
         </div>
         <tal:comment replace="nothing">Next lines: links</tal:comment>
         <tal:links define="links python: phase['pagesInfo'][aPage].get('links')" tal:condition="links">

gen/ui/result.pt

@@ -95,7 +95,7 @@
          <a tal:define="navInfo python:'search.%s.%s.%d.%d' % (className, searchName, repeat['obj'].number()+startNumber, totalNumber);"
             tal:attributes="href python: obj.getUrl(mode='edit', page=obj.getDefaultEditPage(), nav=navInfo)"
             tal:condition="obj/mayEdit">
-          <img tal:attributes="src string: $appUrl/ui/edit.gif;
+          <img tal:attributes="src string: $appUrl/ui/edit.png;
                                title python: _('object_edit')"/></a><img
             tal:condition="obj/mayDelete" style="cursor:pointer"
             tal:attributes="src string: $appUrl/ui/delete.png;

gen/ui/template.pt

@@ -175,7 +175,7 @@
           <span tal:content="python: userInfo[0]"></span>
           <a tal:condition="python: userInfo[1]"
              tal:attributes="href python: userInfo[1]">
-            <img tal:attributes="src string: $appUrl/ui/edit.gif"/>
+            <img tal:attributes="src string: $appUrl/ui/edit.png"/>
           </a>
         </td>
        </tr>

gen/ui/view.pt

@@ -8,6 +8,7 @@
                 phase          phaseInfo/name;
                 cssJs          python: {};
                 page           req/page|python:contextObj.getDefaultViewPage();
+                dummy          python: contextObj.removeMyLock(user, page);
                 groupedWidgets python: contextObj.getGroupedAppyTypes(layoutType, page, cssJs=cssJs);"
     tal:on-error="structure python: tool.manageError(error)">
 

gen/ui/widgets/ref.pt

@@ -27,7 +27,7 @@
     <td tal:condition="python: not appyType['noForm'] and obj.mayEdit() and appyType['delete']">
        <a tal:define="navInfo python:'ref.%s.%s:%s.%d.%d' % (contextObj.UID(), fieldName, appyType['pageName'], repeat['obj'].number()+startNumber, totalNumber);"
           tal:attributes="href python: obj.getUrl(mode='edit', page='main', nav=navInfo)">
-        <img tal:attributes="src string: $appUrl/ui/edit.gif;
+        <img tal:attributes="src string: $appUrl/ui/edit.png;
                              title python: _('object_edit')"/>
        </a>
     </td>