cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into bbmaster

Browse source
This commit is contained in:
Helmut Merz 2012-07-03 13:17:06 +02:00
commit 6b3b7dad7a
5 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
browser/icons/application_edit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 703 B

BIN
browser/icons/page_edit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 807 B

BIN
browser/icons/report_edit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 762 B

BIN
browser/icons/vcard_edit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 775 B

11
browser/liquid/body.pt
View file

@ -19,14 +19,18 @@
</div> </div>
<div id="menu" metal:define-macro="menu"> <div id="menu" metal:define-macro="menu">
<metal:left define-slot="portlet-left">
<tal:portlet repeat="macro controller/macros/portlet_left"> <tal:portlet repeat="macro controller/macros/portlet_left">
<metal:portlet use-macro="macro" /> <metal:portlet use-macro="macro" />
</tal:portlet> </tal:portlet>
</metal:left>
</div> </div>
<div id="content" metal:define-macro="content"> <div id="content" metal:define-macro="content">
<div metal:define-slot="actions"></div> <div metal:define-slot="breadcrumbs" />
<div metal:define-slot="message"></div> <div metal:define-slot="actions" />
<div metal:define-slot="message" />
<div metal:define-slot="view_modes" />
<metal:content define-slot="content"> <metal:content define-slot="content">
<tal:content define="item nocall:view/item; <tal:content define="item nocall:view/item;
level level|python: 1; level level|python: 1;
@ -37,8 +41,7 @@
</metal:content> </metal:content>
</div> </div>
<div id="sub-section" <div id="sub-section" metal:define-slot="portlet-right">
xtal:condition="view/isAuthenticated">
<tal:portlet repeat="macro controller/macros/portlet_right"> <tal:portlet repeat="macro controller/macros/portlet_right">
<metal:portlet use-macro="macro" /> <metal:portlet use-macro="macro" />
</tal:portlet> </tal:portlet>