From be85c435d6b7a619d57402835b79a4660a224892 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Mon, 25 Jun 2012 09:36:36 +0200
Subject: [PATCH 1/3] provide a few useful edit icons

---
 browser/icons/application_edit.png | Bin 0 -> 703 bytes
 browser/icons/page_edit.png        | Bin 0 -> 807 bytes
 browser/icons/report_edit.png      | Bin 0 -> 762 bytes
 browser/icons/vcard_edit.png       | Bin 0 -> 775 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 browser/icons/application_edit.png
 create mode 100644 browser/icons/page_edit.png
 create mode 100644 browser/icons/report_edit.png
 create mode 100644 browser/icons/vcard_edit.png

diff --git a/browser/icons/application_edit.png b/browser/icons/application_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb2efb8775442af862ef0ef111f371e5857928d3
GIT binary patch
literal 703
zcmV;w0zmzVP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!QAtEWR2Uhh
z!QE@kaU8($_vd$h=UC3>FxeKF=OosmQ6jmTLP{}-6iF>nO8f(+aY2!Xm^*5Av6NhR
zD0!Nar%`rnu~v@R4hO^8&iS41=VQN>+65QO>m_E!|B#IbuI^pAy5?9WYjHC`6;s8j
z!_-hy%sJEya}KA<gjn#aqa$^=^+eqnzh*_vsc2E$D=%U!;=i))6mZ7R2IgfmKN+jR
zz&wWe=8T4Ia~Z4MjXi{XGbNNSI1Df~oPuJg8cr2gFkHb1KHnw#{4$Z^D)yD#<JH;y
zJABLti6@8|<_RW-sNi{mh=+(nGuMgsKBb~+JBe9~`PMz3<gKRTzEelY155-2A_gj;
zYD5eQ>D$C|Z-~!ZLFQctG09Uhp@QPcl?mU}7$E{?cz}t3fC%LK?;}5+keI!OTyHb6
z@j}nbBm-HHT&CJnb^IYBAVSCka_RdNzT74;XDve?FCx*eM2ky^TZSvC<t*LT+UXU7
zfDs~y2q6)nFL|BphnpnkZeS>N4lf#zADBt{VLMZ58~8Xlk&tIj2}J+_M1=n24SuBB
zC|kIW{HG=&F(WrHgY=^pRBSp=QTYN)m5{Hh{2@SBTQi04uPMk>dS9PrQdx|l%yhmz
zOH#Sz0@1`YLTX0HPj&aS)SnFM)H&2CwbI1q`b)fRK1k<-HpW#}^Sv*{jiIgdH9W>t
zQ6<#EFflVmJF;g{aA;S(kLP%K=NdiTT|X03N>|n%ZExo<#LO72ZdK{vlG)|{vIVoS
lXs&IrKfQB(<E!`l!*8ZVD9)Bs;gA3T002ovPDHLkV1o10Km-5)

literal 0
HcmV?d00001

diff --git a/browser/icons/page_edit.png b/browser/icons/page_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..046811ed7a6ef16be1a54bb860e1f22c6dacdacf
GIT binary patch
literal 807
zcmV+?1K9kDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!xk*GpR2Ufr
z!B1$GbsPZj&+mDkce=Sb(GX{4jS{UGCL$d&@sNckLFa-xb@Ntq2%;`QL0vpd$~qW`
zhlrv&WJRE}Jj9yXYDhEtv)r7U(@poj@1E!P?ej?yVgDPaU+P}F>iHtsh1EzPArg^Q
zIZrOk#rNsfjaSbMAL;<4h;Z=jvu8dzyz8N&Nb7=z03ZUw?9z%8KQEa6yM5=kUnka&
z3?FJk2}L7q>na=T#;<7<DUpaw9a&X{<(1mLt$p?njM%t%yr*$ssCEA1BT{SX#S&6V
zy%EvqYBVGvkPBq$L?LNUe{SpIIo(4q=pWo^;m>U*P91x<gdjnIln4n#N{U4P@+oy(
zuzu^~<|lvGl{)&?ZqmD9OMeLvLD?WlA|<&FilldW#FkZ~`UjuZzIswuPx9B;gqwF#
z6z#bk1w;@iQ=v#nfku(6UOa6}e5?O~gIfQ6C^c_r_V(${^NwCWu(JE`XO{{HWTZrq
zk|HIoD_>fF`;`6%pVgWgRy0?1ZryL@%z52=-!fGXWGEn4M351<efeuWi$B`<$TK?A
z$27V^`__GCMn=u;8J0F|S7)GroI^wqOpl(_z3`KjyxG-@M`SIx=kGRiZo=Z;qf+mH
z)y<@?0u)eZ>L4<+7eDgwo|moqXT+s1&Kmn>-uQQ8mL7XY)w5Zk*(g+<3Y3tmkR!bL
zOUKaUtj_pX26sH+=Iorwu}MGd`_%O-_sS}8VpG#fJA)Fcs#ezwtZf?q<C^zB7`A)+
zpykawEIoPLqkZ>?Ac70mDv`rVs{$od?VPKeqf<-kUjNtS6ecB*mq<&M97K^6IVsDO
zt2$Ru!b+>2S<}_H>$RcInusU_8PMNdf(W{sNlJ3FkrwMJPeBPO#d}Y^a{9TH(#{Y)
l0D?dWAV4eUJX#h`!2gmISk&ZKd4B)^002ovPDHLkV1g&sd|Lnj

literal 0
HcmV?d00001

diff --git a/browser/icons/report_edit.png b/browser/icons/report_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..c61a6d847795a2c6c9f0d8e6c69d3f72cec5e77d
GIT binary patch
literal 762
zcmV<W0tNkvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!j7da6R5;6x
zlWj;7aR7%0Lf@+|(WjM7g(4^@`chFrHU^=gQ4QbN)Pnrfm~*{anutUh5^46LYe;3<
z`8FM;b51Yamd-5|Qry&hgW24Rx0{n+cV}L%L3r?d{5|*F|Lz0;1cQTv=Zs}?bgIPA
zXC*)&5FFhiLUw%6VzKxKNE57NH`+7e5e|p91Se6cRNDxG$m}S|MQ>Fu+SB7fQB(wh
zKmdNfpU3O<Vs&+OT@YDdfKD10CD@Q`;Pd$q3WXvIbPsZ2s?34zavXxeActD(f=c5;
zK7+E>3FR9n6bx(yFW?LM)(cuM#(}134tA_DETWd7rfU%`9Ss=MUcwKe7(*}5qB2i-
zk1uGwpM#!f*=R`>adwu?cYRS;jk(Tzc!pa5-%tD+u18O4qC2Xf>4JzmAXc#PD9cj>
zmPQIePd8!CP=*zI1Hw)dY_GEEzXf-*VXTm&DS011zVX_L^0)8ccHG9=iU}(d*Wn(>
z!>C3EN6l48Pm59_3;GNo&c|{B_6$7JdMw!sutt#xjAwwFlEOQphN~tCL#8&w#Kauq
z3z~1q(fw40MoBC;o*w>)IdlG>aXKj16)Zb$Vxmd{%a;$BpP!F@3l^rJLA)0;b^@b%
zC6jFgH7P@IDh(c{Wc;}p7GpbRXJ@0o#O4ASx*lhtE=7p%ZEDzbPcYM;iom24?jaS%
ztCN_qjvKRw%nSZ4cwc%3@H#P8m4Z(7ZuByD?R}I8$5%ZT78bDi;tLcC#U8EX02<Sd
zph&(SG+6<<za0I=r%-=Q1Z#IQ>~=eBHXF=lGptrCNRnI^up*XB(T<aM4(%#TJ-$8k
sFe4%SxkMcPRCMB-<nYeq|NYLt0V*ZM)UiX7ssI2007*qoM6N<$f(sc+Hvj+t

literal 0
HcmV?d00001

diff --git a/browser/icons/vcard_edit.png b/browser/icons/vcard_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab0f6e73d640c84bd409a84efb9239f067491c65
GIT binary patch
literal 775
zcmV+i1Ni)jP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!nMp)JR5;6}
zlRHdPVHC%IxA*oUrBJ8^jPGI<F+n3C8X{tJ@eyG%PCBTGgKow|qm!G7gM)((Iv5k9
zgPV&ECR!<|)L7+J!qeIUMWCSG-h12cyAH}zojl3OIp4`S|L=cJ@>d+k;eSjU9UZ+4
z90QP2;y4ac$|Wv@_#^)I2TCfH$_D}g6<{%&x%_W&E|0}xLUSBPb-Uf%j0$Yy8`JSu
zIJqCV%4?_y)^fz#Pbd`P^79OaX=7w<3^T{$(;<Wqs<!yoy53vlQ|}l_Bp9ABaISs?
zAeYN=ZC@c$7R;{&AcR1hdjRArcha<d4F`0M){ahMsyg2o4u>h0T?8^6sNPyezP`j=
zwjWIh@oP9Qd7EC1rcL85DIsd_W@^d=?=OJ*&@}nP1cmEP;0x{~GgM8_i-!vgGKoIQ
zgH=4y>X`a$v%;^l>PHd)EBy@BisRqBhpB-cbj7B)WEI}h$^`~%ie~AWEJgZDDXY{m
zXHAOb1ZuV$&E1Qy>LAwWBXp0#$cJ8}qm%SCE&!ZA+%SI&!!WQc3u`h#f!T>~QwwJD
z4lX^9+q;1x=L>;DHyCK|#x)0!NF<0xqYMuZ<MDW~#=?+k#TRP9Oy0)j&SB4PWbEa8
zW~xq6SiT7<B}yz7>lQ-P2qCDiuU8_Gh+~hpQQ;Y9Yg04!_<a=B#++G8I{Y4K%mn+k
zTp9X(yB=k^7Ve!}f2N`N<lVed!AgHCWfeN+%sM7tze!6g+faR>ZE%SemW!ig<CeSI
z8qX4cbdkPrgo5=u$fx6}GF?4bd#QbJdB1CUA>Kchx4WJa+_9IUqH2;IpT3(}`$+Aj
z_Rhbl@sAabH~F)5Rh8PVnjntbie%Fhr;c9#IQTC){{(bKa?t*>JG%e?002ovPDHLk
FV1hfYVB7!z

literal 0
HcmV?d00001


From e720d1c5a5dd0aa75fa1b154e54db2118c89cf3b Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sat, 30 Jun 2012 20:38:08 +0200
Subject: [PATCH 2/3] provide slots for left and right portlet columns to allow
 overriding by more specific skins

---
 browser/liquid/body.pt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/browser/liquid/body.pt b/browser/liquid/body.pt
index 4348d89..78660fd 100644
--- a/browser/liquid/body.pt
+++ b/browser/liquid/body.pt
@@ -19,9 +19,11 @@
     </div>
 
     <div id="menu" metal:define-macro="menu">
-      <tal:portlet repeat="macro controller/macros/portlet_left">
-        <metal:portlet use-macro="macro" />
-      </tal:portlet>
+      <metal:left define-slot="portlet-left">
+        <tal:portlet repeat="macro controller/macros/portlet_left">
+          <metal:portlet use-macro="macro" />
+        </tal:portlet>
+      </metal:left>
     </div>
 
     <div id="content" metal:define-macro="content">
@@ -37,11 +39,10 @@
       </metal:content>
     </div>
 
-    <div id="sub-section"
-         xtal:condition="view/isAuthenticated">
-      <tal:portlet repeat="macro controller/macros/portlet_right">
-        <metal:portlet use-macro="macro" />
-      </tal:portlet>
+    <div id="sub-section" metal:define-slot="portlet-right">
+        <tal:portlet repeat="macro controller/macros/portlet_right">
+          <metal:portlet use-macro="macro" />
+        </tal:portlet>
     </div>
 
     <div id="footer" class="footer" metal:define-macro="footer">

From 14538e90e7e188be130014bbd853bba144ddfc7e Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sun, 1 Jul 2012 13:07:22 +0200
Subject: [PATCH 3/3] add breadcrumbs and view_modes (tabs) macros to liquid
 base template

---
 browser/liquid/body.pt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/liquid/body.pt b/browser/liquid/body.pt
index 78660fd..e223acb 100644
--- a/browser/liquid/body.pt
+++ b/browser/liquid/body.pt
@@ -27,8 +27,10 @@
     </div>
 
     <div id="content" metal:define-macro="content">
-      <div metal:define-slot="actions"></div>
-      <div metal:define-slot="message"></div>
+      <div metal:define-slot="breadcrumbs" />
+      <div metal:define-slot="actions" />
+      <div metal:define-slot="message" />
+      <div metal:define-slot="view_modes" />
       <metal:content define-slot="content">
         <tal:content define="item nocall:view/item;
                              level level|python: 1;