[gen] Class.popup: finalized the development of 'popup' classes.
This commit is contained in:
Gaetan Delannay
parent
ef68bb420b
commit
e11e754305
11 changed files with 286 additions and 121 deletions
|
|
@ -176,22 +176,24 @@ class ToolWrapper(AbstractWrapper):
|
|||
'current' or ''">::_(className + '_plural')</a>
|
||||
</div>
|
||||
|
||||
<!-- Actions -->
|
||||
<x var="mayCreate=ztool.userMayCreate(rootClass);
|
||||
createMeans=ztool.getCreateMeans(rootClass)">
|
||||
<!-- Create a new object from a web form. -->
|
||||
<input type="button" class="buttonSmall button"
|
||||
if="mayCreate and ('form' in createMeans)"
|
||||
var2="label=_('query_create')" value=":label"
|
||||
<!-- Create instances of this class -->
|
||||
<form if="ztool.userMayCreate(rootClass) and \
|
||||
('form' in ztool.getCreateMeans(rootClass))" class="addForm"
|
||||
var2="target=ztool.getLinksTargetInfo(rootClass)"
|
||||
action=":'%s/do' % toolUrl" target=":target.target">
|
||||
<input type="hidden" name="action" value="Create"/>
|
||||
<input type="hidden" name="className" value=":className"/>
|
||||
<input type="hidden" name="popup"
|
||||
value=":(inPopup or (target.target != '_self')) and '1' or '0'"/>
|
||||
<input type="submit" class="buttonSmall button"
|
||||
var="label=_('query_create')" value=":label"
|
||||
onclick=":target.openPopup"
|
||||
style=":'%s; %s' % (url('add', bg=True), \
|
||||
ztool.getButtonWidth(label))"
|
||||
onclick=":'goto(%s)' % \
|
||||
q('%s/do?action=Create&className=%s' % \
|
||||
(toolUrl, className))"/>
|
||||
</x>
|
||||
ztool.getButtonWidth(label))"/>
|
||||
</form>
|
||||
|
||||
<!-- Searches -->
|
||||
<x if="ztool.advancedSearchEnabledFor(rootClass)">
|
||||
|
||||
<!-- Live search -->
|
||||
<form action=":'%s/do' % toolUrl">
|
||||
<input type="hidden" name="action" value="SearchObjects"/>
|
||||
|
|
@ -232,7 +234,8 @@ class ToolWrapper(AbstractWrapper):
|
|||
|
||||
# The message that is shown when a user triggers an action.
|
||||
pxMessage = Px('''
|
||||
<div var="messages=ztool.consumeMessages()" if="messages" class="message">
|
||||
<div var="messages=ztool.consumeMessages()" if="messages"
|
||||
class=":inPopup and 'messagePopup message' or 'message'">
|
||||
<!-- The icon for closing the message -->
|
||||
<img src=":url('close')" align=":dright" class="clickable"
|
||||
onclick="this.parentNode.style.display='none'"/>
|
||||
|
|
@ -308,8 +311,11 @@ class ToolWrapper(AbstractWrapper):
|
|||
(className, searchName, startNumber+currentNumber, totalNumber);
|
||||
cssClass=zobj.getCssFor('title')">
|
||||
<x>::zobj.getSupTitle(navInfo)</x>
|
||||
<a href=":zobj.getUrl(nav=navInfo, page=zobj.getDefaultViewPage())"
|
||||
if="enableLinks" class=":cssClass">:zobj.Title()</a><span
|
||||
<a if="enableLinks" class=":cssClass"
|
||||
var2="linkInPopup=inPopup or (target.target != '_self')"
|
||||
target=":target.target" onclick=":target.openPopup"
|
||||
href=":zobj.getUrl(nav=navInfo, page=zobj.getDefaultViewPage(), \
|
||||
inPopup=linkInPopup)">:zobj.Title()</a><span
|
||||
if="not enableLinks" class=":cssClass">:zobj.Title()</span><span
|
||||
style=":showSubTitles and 'display:inline' or 'display:none'"
|
||||
name="subTitle">::zobj.getSubTitle()</span>
|
||||
|
|
@ -320,9 +326,11 @@ class ToolWrapper(AbstractWrapper):
|
|||
<!-- Edit -->
|
||||
<td if="zobj.mayEdit()">
|
||||
<a var="navInfo='search.%s.%s.%d.%d' % \
|
||||
(className, searchName, loop.zobj.nb+1+startNumber, totalNumber)"
|
||||
(className, searchName, loop.zobj.nb+1+startNumber, totalNumber);
|
||||
linkInPopup=inPopup or (target.target != '_self')"
|
||||
target=":target.target" onclick=":target.openPopup"
|
||||
href=":zobj.getUrl(mode='edit', page=zobj.getDefaultEditPage(), \
|
||||
nav=navInfo)">
|
||||
nav=navInfo, inPopup=linkInPopup)">
|
||||
<img src=":url('edit')" title=":_('object_edit')"/></a>
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -429,7 +437,8 @@ class ToolWrapper(AbstractWrapper):
|
|||
newSearchUrl='%s/search?className=%s%s' % \
|
||||
(ztool.absolute_url(), className, refUrlPart);
|
||||
showSubTitles=req.get('showSubTitles', 'true') == 'true';
|
||||
resultMode=ztool.getResultMode(className)">
|
||||
resultMode=ztool.getResultMode(className);
|
||||
target=ztool.getLinksTargetInfo(ztool.getAppyClass(className))">
|
||||
|
||||
<x if="zobjects">
|
||||
<!-- Display here POD templates if required. -->
|
||||
|
|
@ -532,6 +541,17 @@ class ToolWrapper(AbstractWrapper):
|
|||
</form>
|
||||
</x>''', template=AbstractWrapper.pxTemplate, hook='content')
|
||||
|
||||
pxBack = Px('''
|
||||
<html>
|
||||
<head>
|
||||
<script src=":ztool.getIncludeUrl('appy.js')" type="text/javascript">
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<script type="text/javascript">backFromPopup()</script>
|
||||
</body>
|
||||
</html>''')
|
||||
|
||||
def isManager(self):
|
||||
'''Some pages on the tool can only be accessed by managers.'''
|
||||
if self.user.has_role('Manager'): return 'view'
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ class AbstractWrapper(object):
|
|||
# Buttons for going to next/previous objects if this one is among bunch of
|
||||
# referenced or searched objects. currentNumber starts with 1.
|
||||
pxNavigateSiblings = Px('''
|
||||
<div if="req.get('nav', None)" var2="ni=ztool.getNavigationInfo()">
|
||||
<div if="req.get('nav', None)" var2="ni=ztool.getNavigationInfo(inPopup)">
|
||||
<!-- Go to the source URL (search or referred object) -->
|
||||
<a if="ni.sourceUrl" href=":ni.sourceUrl"><img
|
||||
<a if="not inPopup and ni.sourceUrl" href=":ni.sourceUrl"><img
|
||||
var="gotoSource=_('goto_source');
|
||||
goBack=ni.backText and ('%s - %s' % (ni.backText, gotoSource)) \
|
||||
or gotoSource"
|
||||
|
|
@ -52,7 +52,7 @@ class AbstractWrapper(object):
|
|||
<tr>
|
||||
<!-- Breadcrumb -->
|
||||
<td var="sup=zobj.getSupBreadCrumb();
|
||||
breadcrumb=zobj.getBreadCrumb();
|
||||
breadcrumb=zobj.getBreadCrumb(inPopup=inPopup);
|
||||
sub=zobj.getSubBreadCrumb()" class="breadcrumb">
|
||||
<x if="sup">::sup</x>
|
||||
<x for="bc in breadcrumb" var2="nb=loop.bc.nb">
|
||||
|
|
@ -84,7 +84,8 @@ class AbstractWrapper(object):
|
|||
dummy=setattr(req, 'pxContext', _ctx_);
|
||||
lang=ztool.getUserLanguage(); q=ztool.quote;
|
||||
layoutType=ztool.getLayoutType();
|
||||
showPortlet=ztool.showPortlet(obj, layoutType);
|
||||
inPopup=req.get('popup') == '1';
|
||||
showPortlet=not inPopup and ztool.showPortlet(obj, layoutType);
|
||||
dir=ztool.getLanguageDirection(lang);
|
||||
cfg=ztool.getProductConfig(True);
|
||||
dleft=(dir == 'ltr') and 'left' or 'right';
|
||||
|
|
@ -170,9 +171,17 @@ class AbstractWrapper(object):
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Popup containing the Appy iframe -->
|
||||
<div id="iframePopup" class="popup" if="not inPopup"
|
||||
style="background-color: #fbfbfb">
|
||||
<img align=":dright" src=":url('close')" class="clickable"
|
||||
onclick="closePopup('iframePopup')"/>
|
||||
<iframe id="appyIFrame" name="appyIFrame" frameborder="0"></iframe>
|
||||
</div>
|
||||
|
||||
<table class=":(cfg.skin == 'wide') and 'mainWide main' or 'main'"
|
||||
align="center" cellpadding="0">
|
||||
<tr class="top">
|
||||
<tr class="top" if="not inPopup">
|
||||
<!-- Top banner -->
|
||||
<td var="bannerName=(dir == 'ltr') and 'banner' or 'bannerrtl'"
|
||||
style=":url(bannerName, bg=True) + '; background-repeat:no-repeat;\
|
||||
|
|
@ -213,7 +222,7 @@ class AbstractWrapper(object):
|
|||
</tr>
|
||||
|
||||
<!-- The user strip -->
|
||||
<tr height=":cfg.discreetLogin and '5px' or '28px'">
|
||||
<tr height=":cfg.discreetLogin and '5px' or '28px'" if="not inPopup">
|
||||
<td>
|
||||
<table class="userStrip">
|
||||
<tr>
|
||||
|
|
@ -297,7 +306,7 @@ class AbstractWrapper(object):
|
|||
</td>
|
||||
</tr>
|
||||
<!-- Footer -->
|
||||
<tr height="26px"><td>:tool.pxFooter</td></tr>
|
||||
<tr height="26px" if="not inPopup"><td>:tool.pxFooter</td></tr>
|
||||
</table>
|
||||
</body>
|
||||
</html>''', prologue=Px.xhtmlPrologue)
|
||||
|
|
@ -401,7 +410,7 @@ class AbstractWrapper(object):
|
|||
historyMaxPerPage=req.get('maxPerPage', 5);
|
||||
historyExpanded=req.get('appyHistory','collapsed')=='expanded';
|
||||
creator=zobj.Creator()">
|
||||
<table width="100%" class="summary">
|
||||
<table width="100%" class="summary" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<td colspan="2" class="by">
|
||||
<!-- Plus/minus icon for accessing history -->
|
||||
|
|
@ -461,7 +470,8 @@ class AbstractWrapper(object):
|
|||
<tr valign="top">
|
||||
<!-- Refresh -->
|
||||
<td if="zobj.isDebug()">
|
||||
<a href=":zobj.getUrl(mode=layoutType, page=page, refresh='yes')">
|
||||
<a href=":zobj.getUrl(mode=layoutType, page=page, refresh='yes', \
|
||||
inPopup=inPopup)">
|
||||
<img title="Refresh" style="vertical-align:top" src=":url('refresh')"/>
|
||||
</a>
|
||||
</td>
|
||||
|
|
@ -479,7 +489,8 @@ class AbstractWrapper(object):
|
|||
<!-- Button on the view page -->
|
||||
<input if="not isEdit" type="button" class="button" value=":label"
|
||||
style=":'%s; %s' % (url('previous', bg=True), buttonWidth)"
|
||||
onclick=":'goto(%s)' % q(zobj.getUrl(page=previousPage))"/>
|
||||
onclick=":'goto(%s)' % q(zobj.getUrl(page=previousPage, \
|
||||
inPopup=inPopup))"/>
|
||||
</td>
|
||||
|
||||
<!-- Save -->
|
||||
|
|
@ -506,7 +517,8 @@ class AbstractWrapper(object):
|
|||
var="label=_('object_edit')" value=":label"
|
||||
style=":'%s; %s' % (url('edit', bg=True), \
|
||||
ztool.getButtonWidth(label))"
|
||||
onclick=":'goto(%s)' % q(zobj.getUrl(mode='edit', page=page))"/>
|
||||
onclick=":'goto(%s)' % q(zobj.getUrl(mode='edit', page=page, \
|
||||
inPopup=inPopup))"/>
|
||||
|
||||
<!-- Locked -->
|
||||
<a if="editable and locked">
|
||||
|
|
@ -536,7 +548,8 @@ class AbstractWrapper(object):
|
|||
<!-- Button on the view page -->
|
||||
<input if="not isEdit" type="button" class="button" value=":label"
|
||||
style=":'%s; %s' % (url('next', bg=True), buttonWidth)"
|
||||
onclick=":'goto(%s)' % q(zobj.getUrl(page=nextPage))"/>
|
||||
onclick=":'goto(%s)' % q(zobj.getUrl(page=nextPage, \
|
||||
inPopup=inPopup))"/>
|
||||
</td>
|
||||
|
||||
<!-- Workflow transitions -->
|
||||
|
|
@ -590,6 +603,7 @@ class AbstractWrapper(object):
|
|||
enctype="multipart/form-data" action=":zobj.absolute_url()+'/do'">
|
||||
<input type="hidden" name="action" value="Update"/>
|
||||
<input type="hidden" name="button" value=""/>
|
||||
<input type="hidden" name="popup" value=":inPopup and '1' or '0'"/>
|
||||
<input type="hidden" name="page" value=":page"/>
|
||||
<input type="hidden" name="nav" value=":req.get('nav', None)"/>
|
||||
<input type="hidden" name="confirmed" value="False"/>
|
||||
|
|
@ -615,6 +629,7 @@ class AbstractWrapper(object):
|
|||
lang=ztool.getUserLanguage(); q=ztool.quote;
|
||||
action=req.get('action', None);
|
||||
px=req['px'].split(':');
|
||||
inPopup=req.get('popup') == '1';
|
||||
className=(len(px) == 3) and px[0] or None;
|
||||
field=className and zobj.getAppyType(px[1], className) or None;
|
||||
field=(len(px) == 2) and zobj.getAppyType(px[0]) or field;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue