rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gen] On Page instances, one may now define a method for conditionnally showing the 'edit' button on 'view' layout. [gen] An app may now, on its Config class, define a method getHomeObject that must return an object that will be the home object for a given (class of) user(s). This object's menu will appear when the user is consulting a page with no tied menu (like a search for example). [gen] More ZPT->PX work.

Browse source
This commit is contained in:
Gaetan Delannay 2013-06-28 15:00:02 +02:00
parent 7fcd2f44d3
commit 2b5d286668
7 changed files with 217 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

31
gen/wrappers/__init__.py
View file

@ -244,7 +244,7 @@ class AbstractWrapper(object):
<x if="contextObj and phases and contextObj.mayNavigate()">
<table class="portletContent"
var="singlePhase=phases and (len(phases) == 1);
page=req.get('page', 'main');
page=req.get('page', '');
mayEdit=contextObj.mayEdit()">
<x for="phase in phases">:phase['px']</x>
</table>
@ -334,6 +334,7 @@ class AbstractWrapper(object):
</x>
</x>''')
# The message that is shown when a user triggers an action.
pxMessage = Px('''
<x var="messages=ztool.consumeMessages()" if="messages">
<div class="message">
@ -346,6 +347,7 @@ class AbstractWrapper(object):
</div>
</x>''')
# The page footer.
pxFooter = Px('''
<table cellpadding="0" cellspacing="0" width="100%" class="footer">
<tr>
@ -353,6 +355,15 @@ class AbstractWrapper(object):
<a href="http://appyframework.org" target="_blank">Appy</a></td></tr>
</table>''')
# Hook for defining a PX that proposes additional links, after the links
# corresponding to top-level pages.
pxLinks = ''
# Hook for defining a PX that proposes additional icons after standard
# icons in the user strip.
pxIcons = ''
# The template PX for all pages.
pxTemplate = Px('''
<html var="tool=self.tool; ztool=tool.o; user=tool.user;
isAnon=ztool.userIsAnon(); app=ztool.getApp();
@ -361,7 +372,9 @@ class AbstractWrapper(object):
req=ztool.REQUEST; resp=req.RESPONSE;
lang=ztool.getUserLanguage();
layoutType=ztool.getLayoutType();
contextObj=ztool.getPublishedObject(layoutType);
contextObj=ztool.getPublishedObject(layoutType) or \
ztool.getHomeObject();
showPortlet=ztool.showPortlet(contextObj, layoutType);
dir=ztool.getLanguageDirection(lang);
discreetLogin=ztool.getAttr('discreetLogin', source='config');
dleft=(dir == 'ltr') and 'left' or 'right';
@ -439,8 +452,9 @@ class AbstractWrapper(object):
<a class="pageLink" href=":appUrl" title=": _('app_home')">
<img src=":'%s/ui/home.gif' % appUrl" style="margin-right: 3px"/>
</a>
<!-- Additional links (or icons) from icons.pt -->
<!--metal:call use-macro="app/ui/icons/macros/links"/-->
<!-- Additional links -->
<x>:self.pxLinks</x>
<!-- Top-level pages -->
<a for="page in tool.pages" class="pageLink"
@ -513,8 +527,8 @@ class AbstractWrapper(object):
<a if="user.has_role('Manager')" href=":tool.url"
title=":_('%sTool' % appName)">
<img src=":'%s/ui/appyConfig.gif' % appUrl"/></a>
<!-- Additional icons from icons.pt -->
<!--metal:call use-macro="app/ui/icons/macros/icons"/-->
<!-- Additional icons -->
<x>:self.pxIcons</x>
<!-- Log out -->
<a href=":tool.url + '/performLogout'" title=":_('app_logout')">
<img src=":'%s/ui/logout.gif' % appUrl"/></a>
@ -534,7 +548,7 @@ class AbstractWrapper(object):
</tr>
<!-- The navigation strip -->
<tr if="contextObj and (layoutType == 'view')">
<tr if="contextObj and showPortlet and (layoutType != 'edit')">
<td>:self.pxNavigationStrip</td>
</tr>
<tr>
@ -542,8 +556,7 @@ class AbstractWrapper(object):
<table width="100%" cellpadding="0" cellspacing="0">
<tr valign="top">
<!-- The portlet -->
<td if="ztool.showPortlet(contextObj, layoutType)"
class="portlet">:self.pxPortlet</td>
<td if="showPortlet" class="portlet">:self.pxPortlet</td>
<!-- Page content -->
<td class="content">:content</td>
</tr>