From ea7b7fa5466b1b03c61aa23647c9a35888c9d713 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 24 Oct 2014 17:36:35 +0000
Subject: [PATCH] Foundry support for Portal Workspace (but not for all
 portlets!)

git-svn-id: https://svn.libreccm.org/ccm/trunk@2919 8810af33-2d31-482b-a856-94f89814c4df
---
 .../web/themes/foundry/conf/css-files.xml     |   3 +
 .../web/themes/foundry/conf/global.xml        |   2 +
 .../web/themes/foundry/conf/templates.xml     |   3 +
 .../foundry/images/bebop/action-add.png       | Bin 0 -> 3008 bytes
 .../foundry/images/bebop/action-delete.png    | Bin 0 -> 3011 bytes
 .../foundry/images/bebop/action-edit.png      | Bin 0 -> 3003 bytes
 .../foundry/images/bebop/action-return.png    | Bin 0 -> 611 bytes
 .../foundry/foundry/images/bebop/action.png   | Bin 0 -> 3083 bytes
 .../foundry/images/bebop/checkbox-checked.gif | Bin 0 -> 67 bytes
 .../images/bebop/checkbox-grey-checked.gif    | Bin 0 -> 79 bytes
 .../images/bebop/checkbox-grey-unchecked.gif  | Bin 0 -> 64 bytes
 .../images/bebop/checkbox-unchecked.gif       | Bin 0 -> 64 bytes
 .../foundry/foundry/images/bebop/collapse.png | Bin 0 -> 262 bytes
 .../foundry/foundry/images/bebop/expand.png   | Bin 0 -> 290 bytes
 .../images/bebop/gray-triangle-down.gif       | Bin 0 -> 85 bytes
 .../foundry/images/bebop/gray-triangle-up.gif | Bin 0 -> 85 bytes
 .../foundry/foundry/images/bebop/treeNode.png | Bin 0 -> 301 bytes
 .../web/themes/foundry/foundry/lib.xsl        |   1 +
 .../lib/bebop/double-click-protection.xsl     |   2 +-
 .../foundry/foundry/lib/bebop/image.xsl       |   2 +-
 .../foundry/foundry/lib/bebop/label.xsl       |  12 +-
 .../themes/foundry/foundry/lib/bebop/link.xsl |   4 +-
 .../themes/foundry/foundry/lib/bebop/list.xsl |   2 +-
 .../foundry/foundry/lib/bebop/padding.xsl     |   1 -
 .../foundry/lib/bebop/system-information.xsl  |   1 -
 .../foundry/foundry/lib/bebop/table.xsl       |  16 +--
 .../themes/foundry/foundry/lib/bebop/tree.xsl |  18 ++-
 .../themes/foundry/foundry/lib/portlets.xsl   |  28 ++++
 .../foundry/lib/portlets/freeform-html.xsl    |  19 +++
 .../foundry/foundry/lib/template-tags.xsl     |   1 +
 .../foundry/lib/template-tags/admin/cms.xsl   |  27 ++++
 .../lib/template-tags/admin/common.xsl        |  67 ++++++++-
 .../foundry/lib/template-tags/html-tags.xsl   |   3 +-
 .../foundry/lib/template-tags/navigation.xsl  |   2 +-
 .../lib/template-tags/portal-workspace.xsl    | 129 ++++++++++++++++++
 .../web/themes/foundry/foundry/lib/utils.xsl  |  20 ++-
 .../web/themes/foundry/foundry/main.xsl       |  35 ++++-
 .../themes/foundry/foundry/styles/admin.css   |  38 +++---
 .../foundry/templates/admin-layout.xml        |  33 ++++-
 .../foundry/templates/portal-workspace.xml    |  65 +++++++++
 .../themes/foundry/texts/portal-workspace.xml |  33 +++++
 41 files changed, 506 insertions(+), 61 deletions(-)
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-add.png
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-delete.png
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-edit.png
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-return.png
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action.png
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-checked.gif
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-checked.gif
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-unchecked.gif
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-unchecked.gif
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/collapse.png
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/expand.png
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-down.gif
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-up.gif
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/treeNode.png
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets.xsl
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets/freeform-html.xsl
 create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl
 create mode 100644 ccm-sci-bundle/web/themes/foundry/templates/portal-workspace.xml
 create mode 100644 ccm-sci-bundle/web/themes/foundry/texts/portal-workspace.xml

diff --git a/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml b/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml
index 279f80d64..62b3251d7 100644
--- a/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml
+++ b/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml
@@ -3,6 +3,9 @@
     <application name="admin">
         <css-file internal="true">admin.css</css-file>
     </application>
+    <application name="cms-admin">
+        <css-file internal="true">admin.css</css-file>
+    </application>
     <application name="navigation">
         <css-file>public.css</css-file>
     </application>
diff --git a/ccm-sci-bundle/web/themes/foundry/conf/global.xml b/ccm-sci-bundle/web/themes/foundry/conf/global.xml
index 41028f926..ae54dd019 100644
--- a/ccm-sci-bundle/web/themes/foundry/conf/global.xml
+++ b/ccm-sci-bundle/web/themes/foundry/conf/global.xml
@@ -6,4 +6,6 @@
         <language locale="en"/>
     </supported-languages>
     
+    <setting id="site-logo">foundry/images/scientificcms_logo.png</setting>
+    
 </foundry:configuration>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml
index fcb031b59..35e32c11f 100644
--- a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml
+++ b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml
@@ -5,6 +5,9 @@
             <application name = "" page-class=""></application>
         -->
         <application name="admin" internal="true">admin-layout.xml</application>
+        <application name="navigation" class="portalPage">portal-workspace.xml</application>
+        <application name="none" class="cms-admin" internal="true">admin-layout.xml</application>
+        <application name="portal">portal-workspace.xml</application>
         <default>default-layout.xml</default>
     </applications>
     
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-add.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d423a37e08b4aba35afaf13e278897df5fc0520
GIT binary patch
literal 3008
zcmV;x3qSOUP)<h;3K|Lk000e1NJLTq000O8000OG1^@s6#1FoU00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z0002%Nkl<Zc-jQPu}T9$5C-6XcIGyBN#ufr=mV&r5L+t?t!yl;EG>OA3lYIu#8zvc
zKm!&gRwm(QcQfPn(WKo45g|%EIG<iTq>|Q8@AsF*^1O}>gh1fH;2@zLjHX@cl!!KM
ze*}OaQQ|(c^qSc0nVGp;nzTE|A@J`?S4+A%yZvbUqeF8G00;mG<jm}|->+9mCH-m9
zwYyQ2-q7KmvM$*q<dRl2=ncp2#@k!tqpOqamoDq_@$K$ZbN6FzDq3_=S2ZfG#>_%u
zn?_Ujol2TJ93p{HS2Z;2dbap{&L!){%^VH@_#Xhu3v~6M_iwNO0000<MNUMnLSTYs
CaGd}E

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-delete.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc710bbff97b294dd9109a8a7703299fce971ed4
GIT binary patch
literal 3011
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
FV1nA&ltBOh

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-edit.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bbd4dcf50b538769135a82f77f74d9ee30eea33
GIT binary patch
literal 3003
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

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-return.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-return.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a06e0eed2f9eea5401e4742adc1f837d45d76a7
GIT binary patch
literal 611
zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0006SNkl<ZIE|%~O-~b16o#Mav_s`1KnrOLiWCwMkO*QFH=;4_+(}&ev2X!D
zz=W`HrHOn0fh&U>SGqAVh8WQWQDY3C6r?~=zGga|xifRy>jnuHi6oxo$$g%4^X44*
z&(aS2aCki30gM38p5D*A`rX$L2|tKLj3?barv|;ixz#ohef?!}djTN)5AZrL+R@%S
z)Zc#|JNU`M(hM?CyMzBK7#>fbRf^H0sr1dkfh)us;%qvr2w6Z6{fUIjzzX1=VN{F_
z4PNDB*Eyu}DR^6;DU3)ZT3Kx2J@8#%q^q;9^-SLdqDLxmq(vlbpoMhwPy}7mDbGC&
zaBZyhQgvO`!>-;Q8ta>|<PU_1Qfbs8OBKkXN3j%8R7F7T7i_QjpCX2bENE0G<M<^P
zKM*LT&_fZ5r2yBr@uiC@6X*b$>AXm^M<-WTm+LKSy)zMOp|&Q5CtV!h!VU6>Adeq7
z<d)ZPZSV2S8*_eF0I1A#erayXd|s6Za^Ds|C#Cd~ZOz?in!@(Bu*DXE^w`L4APW9I
z0YC}x7CzY1vv19bs%9rPzx45RSc`Hj)lN|KaD0=^oOz&torEOdetmDf^o5+TWv*d)
zEz^BGae}&<IN9uXTw5F{*emikvfldKJL^TfMPFIW&L&+^NO?j~FvX+UDRbojc3)|L
x0W@B|-E`;Tjnoi(_UF*o2!wWitbpBx_yq)806Md00>A(O002ovPDHLkV1jE<6%hac

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7aa040a2880d9237a157fc42ec87fd1aef17073
GIT binary patch
literal 3083
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
Z0|2WfdrAnr%dP+b002ovPDHLkV1km5rP=@h

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-checked.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-checked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..abfe86602922112f0795831bbb2da8e2eb6688cb
GIT binary patch
literal 67
zcmZ?wbhEHb<YC}pXkY+=|Ns9h{$v3&bwDIYhJi_{rC<DX?%PAnLLsZ>#lCv=Qt{k1
N!v|(T$%n)ktN}r&6zl*1

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-checked.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-checked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..16fcc90cabe6f4ef4388f51dc50f4b026c9f0846
GIT binary patch
literal 79
zcmZ?wbhEHb<YC}pn8*MEGiS~`bLI>K1B2pE7O;R0hy=+qFe&u(tDnxj+fWg};Q4s&
a!A;tQ(^!o7cg(yiu_}IQXpECMgEasQsuq9%

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-unchecked.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-unchecked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c5175af82f62126475e0f01db9216aea5858a447
GIT binary patch
literal 64
zcmZ?wbhEHb<YC}pXkcKNIdkTjGiMZkvM_*v4u}BBFffU?^oyU)<vrY;6U6y$(-e39
NM!#jM%K{k~tN|Px5yb!i

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-unchecked.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-unchecked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2ef997f1c07d3ee87b6e0f4b77a28c88e01f737b
GIT binary patch
literal 64
zcmZ?wbhEHb<YC}pXkY+=|Ns9h{$v3&bwDIYhJi`ErC<DXF7M&)oFLA3o2Iz)H~KA8
KT^7i|U=0A?eh`xY

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/collapse.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/collapse.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0a5460e4ac8ecac3d2869a6ae7abb15e89277a6
GIT binary patch
literal 262
zcmV+h0r~!kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0002JNkl<ZIE~ekK@Ng25Jg|Hu)&Q>xta$s@doq)+`z=Wa4q5nmu_qb1*w}#
zVsrv46Mxc0XF4x`rUQR3CB&mV&yPx}y;SJEKNUrBkn*uH#<y)N9%GCLVl4m?0O$I-
z4iX8V0s7v}0ki~&UJkNs`;ly#>-0_n0MK=gy1smkzgd;Epal^y!lEIL5@4{_mQ{7$
zNtM>x5*VaKih(t-0aC)Z206e2H{dRABCraDI@~AQzz{$W$>Hzx1pMY#%=mDd;s5{u
M07*qoM6N<$g4}XuD*ylh

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/expand.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/expand.png
new file mode 100644
index 0000000000000000000000000000000000000000..6148bb2158b08931cabc646040a2cb84b3e6c0c2
GIT binary patch
literal 290
zcmV+-0p0$IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0002lNkl<ZIE~ekK?=e!5Jg|Lb)zUkH@Xqe<pBh5&|IK55ZtRL61U=}E=4hv
zrq#HKkt!pu1P20{pP9!`GVu2i2znz)l6epWQ>oEfyGYY?CY?u0DVyiHxRg>Bh(ZC-
z0x+iZLa*25bUMG)Nq`WbEKN;(&4Ew?G#(Cy!+{s$I0hig4!%wT08kW$-EI%Scs%m^
zqIf#_2>9X(BH#w~N8D_-wfs>h0V=KaYQ0`gBzIct6;Mfo6agKe543UL>cRjTI06@O
o5`m^`3|;PR1C;|^C5OL@JJ@__Rkm6@_y7O^07*qoM6N<$f^IZy(EtDd

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-down.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-down.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3ee21b37385a63bc1e736b2cd7fa053790eda75f
GIT binary patch
literal 85
zcmZ?wbhEHb<YM4tSi}GV|NsAQX=-`(;?cFs=l=iy4;Euk{K>+|z`)9&1LA_zGB8V7
h?9%o!;1YD3vM|c?bKBhQzLA#Go;fUvlTcx>1^}#M8$192

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-up.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-up.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3adf5bc336c7ce060e8af5723cb27232d77c5acf
GIT binary patch
literal 85
zcmZ?wbhEHb<YM4tSi}GV|NsAQX=-`(;?cFs=l=iy4;Euk{K>+|z`)9&1LA_zGB8U?
hNGbnbyz@B6Ozo(~)q8J#h@EWFbnB#N%xP5yYXH<)9rXYJ

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/treeNode.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/treeNode.png
new file mode 100644
index 0000000000000000000000000000000000000000..302370b5cf7b6d66958764d01af6e0f9e7b10a9f
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoI14-?iy0WWg+Z8+Vb&aw
z3YK(7Uq=RpjeRx011B>uFeoH@1o<*BRH-sBG&D0X{QS?r(D0Ihq11qZ;Z*_ygVhWM
z2J!q!@kiYl7#J3Nx;TbZ+)DcM|Gz!+#swQU3a;6)Z{NI$5w;ABM?AV%pD;8qBqc2{
zWZ+Pkq{F}}s57I3m4VTvSe}7J;Ot`tg@%lG%nb~SDrG?YS_T0JlYS6?CqDyI$07@b
zHhuvIlkbcU3>R(q7??Vq*)eb^%z6%2@vIP}16}?&Nc|ml21b|977QE)3?(O>w`YD^
SHi?0Ofx*+&&t;ucLK6U|*;Z@-

literal 0
HcmV?d00001

diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl
index 012db0aa9..e6f76b3c3 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl
@@ -24,6 +24,7 @@
                 version="2.0">
     
     <xsl:import href="lib/bebop.xsl"/>
+    <xsl:import href="lib/portlets.xsl"/>
     <xsl:import href="lib/global-vars.xsl"/>
     <xsl:import href="lib/template-parser.xsl"/>
     <xsl:import href="lib/template-tags.xsl"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/double-click-protection.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/double-click-protection.xsl
index 8b5d23f5f..7122f410e 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/double-click-protection.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/double-click-protection.xsl
@@ -43,7 +43,7 @@
         <xsl:if test="$dcp-on-buttons or $dcp-on-links">
             <xsl:variable name="waitMessage" 
                           select="foundry:get-static-text('bebop', 
-                                                          'double-click-protection/wait-message'"/>
+                                                          'double-click-protection/wait-message')"/>
                 
             <script language="javascript">
                 function doubleClickProtect(element) {
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/image.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/image.xsl
index c030e237a..96625349d 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/image.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/image.xsl
@@ -45,7 +45,7 @@
     <!-- EN Processing images -->
     <xsl:template name="bebop:image" match="bebop:image">
         <img class="bebop-image">
-            <xsl:call-template name="mandalay:process-attributes"/>
+            <xsl:call-template name="foundry:process-attributes"/>
         </img>
     </xsl:template>
 
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/label.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/label.xsl
index 3b9790f71..bb1bfc836 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/label.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/label.xsl
@@ -211,11 +211,9 @@
     
         <xsl:call-template name="foundry:bebop-label-text">
             <xsl:with-param name="text"
-                            select="replace(current(), '&apos;', '\&apos;)"/>
-        </xsl:with-param>
-        <xsl:with-param name="escape">
-            <xsl:value-of select="$escape"/>
-        </xsl:with-param>
+                            select="replace(current(), '&#x2019;', '&#x005C;&#x2019;')"/>
+            <!--select="replace(current(), '&apos;', '\&apos;')"/>-->
+            <xsl:with-param name="escape" select="$escape"/>
         </xsl:call-template>
     </xsl:template>
 
@@ -226,9 +224,9 @@
         <xsl:param name="escape">no</xsl:param>
     
         <!-- DE Keine leeren Labels ausgeben. Das original Theme wandelt diese in &#160; um. 
-                Das sollte nicht nötig sein -->
+        Das sollte nicht nötig sein -->
         <!-- EN Don't print empty Labels. Originally they were converted to &#160; 
-                but that shouldn't be needed -->
+        but that shouldn't be needed -->
         <xsl:if test="not(normalize-space($text)='')">
             <xsl:choose>
                 <xsl:when test="$escape='yes'">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl
index aec9776f5..654e5619d 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl
@@ -76,13 +76,13 @@
         <!-- EN A link with confirmation -->
         <xsl:variable name="confirm">
             <xsl:if test="boolean(@confirm)=true() or starts-with(@onclick, 'return')">
-                <xsl:value-of select="replace(./@onclick, '\', ''"/>
+                <xsl:value-of select="replace(./@onclick, '\', '')"/>
             </xsl:if>
         </xsl:variable>
     
         <a>
             <xsl:call-template name="foundry:process-attributes"/>
-            <xsl:attribute name="href" select="foundry:parse-link(./@href_no_javascript"/>
+            <xsl:attribute name="href" select="foundry:parse-link(./@href_no_javascript)"/>
             <xsl:attribute name="onclick">
                 <xsl:value-of select="$onclick"/>  
                 <xsl:value-of select="$dcp"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/list.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/list.xsl
index 0b0e051c3..8b7b116e0 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/list.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/list.xsl
@@ -61,7 +61,7 @@
     <!-- EN a horizontal list with spans -->
     <xsl:template match="bebop:list[@layout = 'horizontal']">
         <div>
-            <xsl:call-template name="mandalay:process-attributes"/>
+            <xsl:call-template name="foundry:process-attributes"/>
             <xsl:apply-templates mode="span"/>
         </div>
     </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/padding.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/padding.xsl
index fb8494b40..206857664 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/padding.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/padding.xsl
@@ -46,7 +46,6 @@
                       select="foundry:get-setting('bebop', 'padding/show-padding', 'false')"/>
         <xsl:variable name="border-color" 
                       select="foundry:get-setting('bebop', 'padding/border-color', 'ccc')"/>
-        </xsl:variable>
 
         <xsl:choose>
             <xsl:when test="$show-padding = 'true'">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/system-information.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/system-information.xsl
index 6c6d51680..bfad7f64f 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/system-information.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/system-information.xsl
@@ -43,7 +43,6 @@
     <xsl:template match="bebop:systemInformation">
         <a>
             <xsl:attribute name="href" select="foundry:parse-link(./@apphomepage)"/>
-            </xsl:attribute>
             <xsl:value-of select="./@appname"/>
         </a>
         <xsl:text>&nbsp;</xsl:text>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/table.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/table.xsl
index 5e4160a57..a1a5293bf 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/table.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/table.xsl
@@ -140,8 +140,8 @@
             <xsl:with-param name="title" select="'[X]'"/>
             <xsl:with-param name="src" 
                             select="foundry:parse-link(foundry:get-setting('bebop', 
-                                                                           'table/setImage/checkboxChecked', 
-                                                                           '/images/bebop/checkBoxChecked.gif'), 
+                                                                           'table/setImage/checkbox-checked', 
+                                                                           '/images/bebop/checkbox-checked.gif'), 
                                                        $theme-prefix)"/>
         </xsl:call-template>
     </xsl:template>
@@ -152,8 +152,8 @@
             <xsl:with-param name="title" select="'[ ]'"/>
             <xsl:with-param name="src"
                             select="foundry:parse-link(foundry:get-setting('bebop',
-                                                                           'table/setImage/checkboxUnchecked',
-                                                                           '/images/bebop/checkBoxUnchecked.gif'),
+                                                                           'table/setImage/checkbox-unchecked',
+                                                                           '/images/bebop/checkBox-unchecked.gif'),
                                                        $theme-prefix)"/>
         </xsl:call-template>
     </xsl:template>
@@ -164,8 +164,8 @@
             <xsl:with-param name="title" select="'{X}'"/>
             <xsl:with-param name="src" 
                             select="foundry:parse-link(foundry:get-setting('bebop',
-                                                                           'table/setImage/checkboxGreyChecked',
-                                                                           '/images/bebop/checkBoxGreyChecked.gif'),
+                                                                           'table/setImage/checkbox-grey-checked',
+                                                                           '/images/bebop/checkbox-grey-checked.gif'),
                                                        $theme-prefix)"/>
         </xsl:apply-templates>
     </xsl:template>
@@ -176,8 +176,8 @@
             <xsl:with-param name="title" select="'{ }'"/>
             <xsl:with-param name="src"
                             select="foundry:parse-link(foundry:get-setting('bebop',
-                                                                           'table/setImage/checkboxGreyUnchecked',
-                                                                           '/images/bebop/checkBoxGreyUnchecked.gif'),
+                                                                           'table/setImage/checkbox-grey-unchecked',
+                                                                           '/images/bebop/checkbox-grey-unchecked.gif'),
                                                        $theme-prefix)"/>
         </xsl:apply-templates>
     </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/tree.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/tree.xsl
index 8a5dab755..e663cfcc7 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/tree.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/tree.xsl
@@ -33,7 +33,7 @@
                 xmlns:cms="http://www.arsdigita.com/cms/1.0" 
                 xmlns:foundry="http://foundry.libreccm.org" 
                 xmlns:nav="http://ccm.redhat.com/navigation"
-                exclude-result-prefixes="xsl bebop cms foundry nav mandalay"
+                exclude-result-prefixes="xsl bebop cms foundry nav"
                 version="2.0">
   
     <!-- DE Eine Baumstruktur wird als UL angebildet. -->
@@ -53,11 +53,13 @@
                     <a class="bebop-tree-expanded" title="[-]" href="{@href}">
                         <img style="border:none" alt="[-]">
                             <xsl:attribute name="src"
-                                           select="foundry:parse-link('/images/bebop/collapse.png', 
-                                                                      $theme-prefix)"/>
+                                            select="foundry:gen-path('images/bebop/collapse.png', 
+                                                    true())"/>
+                                           <!--select="foundry:parse-link('/images/bebop/collapse.png', 
+                                                                      $theme-prefix)"/>-->
                         </img>
                     </a>
-                    <xsl:text>&nbsp;</xsl:text>
+                    &nbsp;
                     <xsl:apply-templates select="*[position() = 1]"/>
                     <ul style="list-style-type:none">
                         <xsl:apply-templates select="*[position() > 1]"/>
@@ -67,11 +69,13 @@
                     <a class="bebop:treeCollapsed" title="[+]" href="{@href}">
                         <img style="border:none" alt="[+]">
                             <xsl:attribute name="src" 
-                                           select="foundry:parse-link('/images/bebop/expand.png', 
-                                                                      $theme-prefix)"/>
+                                           select="foundry:gen-path('images/bebop/expand.png', 
+                                                                    true())"/>
+                                           <!--select="foundry:parse-link('/images/bebop/expand.png', 
+                                                                      $theme-prefix)"/>-->
                         </img>
                     </a>
-                    <xsl:text>&nbsp;</xsl:text>
+                    &nbsp;
                     <xsl:apply-templates/>
                 </xsl:when>
                 <xsl:otherwise>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets.xsl
new file mode 100644
index 000000000..8195356c7
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets.xsl
@@ -0,0 +1,28 @@
+<?xml version="1.0"  encoding="utf-8"?>
+<!DOCTYPE stylesheet>
+<!--
+    Copyright 2014 Jens Pelzetter for the LibreCCM Foundation
+    
+    This file is part of the Foundry Theme Engine for LibreCCM
+    
+    Foundry is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Foundry is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Foundry  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                exclude-result-prefixes="xsl"
+                version="2.0">
+                
+    <xsl:import href="portlets/freeform-html.xsl"/>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets/freeform-html.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets/freeform-html.xsl
new file mode 100644
index 000000000..548001fdf
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets/freeform-html.xsl
@@ -0,0 +1,19 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:foundry="http://foundry.libreccm.org"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                xmlns:nav="http://ccm.redhat.com/navigation"
+                xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+                xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="xsl xs bebop foundry nav portal portlet"
+                version="2.0">
+    
+
+    <xsl:template match="bebop:portlet[@bebop:classname = 'com.arsdigita.portalworkspace.ui.portlet.FreeformHTMLPortletRenderer']">
+        <div class="portlet portlet-freeform-html">
+            <xsl:value-of disable-output-escaping="yes" select="./*"/>
+        </div>
+    </xsl:template>
+    
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl
index cb4c143de..abfe67402 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl
@@ -30,6 +30,7 @@
     <xsl:import href="template-tags/html-tags.xsl"/>
     <xsl:import href="template-tags/loaders.xsl"/>
     <xsl:import href="template-tags/navigation.xsl"/>
+    <xsl:import href="template-tags/portal-workspace.xsl"/>
     <xsl:import href="template-tags/subsite.xsl"/>
     
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
index e5cdcbb6b..fef592e11 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
@@ -137,6 +137,33 @@
     
     <!-- _______________________________________________________________________________________ -->
     
+    <xsl:template match="show-cms-content-view-menu">
+        <xsl:param name="layoutTree" select="."/>
+    
+        <xsl:variable name="layout" 
+                      select="foundry:get-setting('cms', 
+                                                  'content-view-menu/layout',
+                                                  'horizontal',
+                                                  ./layout)"/>
+            
+        <xsl:choose>
+            <xsl:when test="$layout = 'horizontal'">
+                <xsl:apply-templates select="$data-tree//*[contains(@class, 'cmsContentViewMenu')]"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <ul>
+                    <xsl:for-each select="$data-tree//*[contains(@class, 'cmsContentViewMenu')]">
+                        <li>
+                            <xsl:apply-templates/>
+                        </li>
+                    </xsl:for-each>
+                </ul>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <!-- _______________________________________________________________________________________ -->
+    
     <xsl:template match="show-content-type">
         <xsl:if test="$data-tree/bebop:contentType">
             <span id="contenttype">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
index d02480ba2..badd8e025 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
@@ -33,7 +33,52 @@
             <xsl:with-param name="layout-tree" select="."/>
         </xsl:apply-templates>
     </xsl:template>
-    
+
+    <xsl:template match="show-bebop-page-title">
+        <xsl:apply-templates select="$data-tree/bebop:title"/>
+    </xsl:template>
+            
+    <xsl:template match="show-body-column">
+        <xsl:choose>
+            <xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body[//bebop:formWidget] 
+                            | $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right[//bebop:formWidget]">
+                <form>
+                    <xsl:if test="not(@method)">
+                        <xsl:attribute name="method">post</xsl:attribute>
+                    </xsl:if>
+                    <xsl:call-template name="foundry:process-attributes"/>
+                    <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body 
+                                                 | $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right"/>
+                </form>
+            </xsl:when>
+      
+            <xsl:when test="$data-tree//bebop:currentPane/bebop:form[not(//bebop:layoutPanel)]">
+                <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form"/>
+            </xsl:when>
+      
+            <xsl:when test="$data-tree//bebop:currentPane/cms:container/*[name() != 'cms:container']">
+                <xsl:apply-templates select="$data-tree//bebop:currentPane/cms:container/*[name() != 'cms:container']"/>
+            </xsl:when>
+      
+            <xsl:when test="$data-tree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:body 
+                            | $data-tree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:right">
+                <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:body 
+                                             | $data-tree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:right"/>
+            </xsl:when>
+      
+            <xsl:otherwise>
+                <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:layoutPanel/bebop:body 
+                                             | $data-tree//bebop:currentPane/bebop:layoutPanel/bebop:right 
+                                             | $data-tree//bebop:currentPane/cms:itemSummary 
+                                             | $data-tree//bebop:currentPane/cms:categorySummary 
+                                             | $data-tree//bebop:currentPane/cms:linkSummary 
+                                             | $data-tree//bebop:currentPane/cms:lifecycleSummary 
+                                             | $data-tree//bebop:currentPane/cms:workflowSummary 
+                                             | $data-tree//bebop:currentPane/cms:transactionSummary"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+            
     <xsl:template match="show-left-column">
         <xsl:choose>
             <xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left[//bebop:formWidget]">
@@ -60,10 +105,30 @@
         </xsl:choose>
     </xsl:template>
     
+    <xsl:template match="show-system-information">
+        <div class="system-information">
+            <xsl:apply-templates select="$data-tree/bebop:systemInformation"/>
+        </div>
+    </xsl:template>
+    
     <xsl:template match="show-tabbed-pane">
         <xsl:apply-templates select="$data-tree/bebop:tabbedPane">
             <xsl:with-param name="layout-tree" select="."/>
         </xsl:apply-templates>
     </xsl:template>
+    
+    <xsl:template match="site-logo">
+        <xsl:variable name="src"
+                      select="foundry:get-setting('', 'site-logo', '')"/>
+        
+        <xsl:choose>
+            <xsl:when test="string-length($src) &gt; 0">
+                <img src="{foundry:gen-path($src)}"/> 
+            </xsl:when>
+            <xsl:otherwise>
+                <img src="{foundry:gen-path('images/scientificcms_logo.png', true())}"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index d4d57829f..c05091fbc 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -237,7 +237,8 @@
                         </div>
                         <div id="foundry-debug-panel-layout" class="foundry-debug-panel-box">
                             <xsl:variable name="app-layout-template-file" 
-                                          select="foundry:get-app-layout-template($data-tree/@application, $data-tree/@class)"/>
+                                          select="foundry:get-app-layout-template(foundry:get-current-application(), 
+                                                                                  foundry:get-current-application-class())"/>
                                 
                             <h2>Layout Template</h2>
                             <dl>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
index b27aeba69..260317339 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
@@ -6,7 +6,7 @@
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:nav="http://ccm.redhat.com/navigation"
                 exclude-result-prefixes="xsl bebop foundry nav"
-                version="1.0">
+                version="2.0">
     
     <foundry:doc-file>
         <foundry:doc-file-title>Tags for ccm-navigation</foundry:doc-file-title>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl
new file mode 100644
index 000000000..70936225f
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:foundry="http://foundry.libreccm.org"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                xmlns:nav="http://ccm.redhat.com/navigation"
+                xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+                xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="xsl xs bebop foundry nav portal portlet"
+                version="2.0">
+    
+    <foundry:doc-file>
+        <foundry:doc-file-title>Tags for portal-workspace</foundry:doc-file-title>
+        <foundry:doc-file-desc>
+            <p>
+                ToDo
+            </p>
+        </foundry:doc-file-desc>
+    </foundry:doc-file>
+    
+    <xsl:template match="portal-workspace">
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <xsl:template match="portal-workspace//portal-workspace-edit-links">
+        <xsl:if test="$data-tree/portal:workspace/portal:workspaceDetails/@canEdit = 'true'
+                      or $data-tree/portal:workspace/portal:workspaceDetails/@canAdmin = 'true'">
+            <xsl:choose>
+                <xsl:when test="$data-tree/portal:workspace/@id = 'view'">
+                    <xsl:value-of select="foundry:get-static-text('portal-workspace', 'view/link')"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <a href="{foundry:parse-link($data-tree/portal:workspace/portal:workspaceDetails//primaryURL)}"
+                       title="{foundry:get-static-text('portal-workspace', 'view/title')}">
+                        <xsl:value-of select="foundry:get-static-text('portal-workspace', 'view/link')"/>
+                    </a>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:if test="$data-tree/portal:workspace/portal:workspaceDetails/@canEdit = 'true'">
+                &nbsp;
+                <xsl:choose>
+                    <xsl:when test="$data-tree/portal:workspace/@id = 'edit'">
+                        <xsl:value-of select="foundry:get-static-text('portal-workspace', 'edit/link')"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <a href="{foundry:parse-link(concat($data-tree/portal:workspace/portal:workspaceDetails//primaryURL, 'edit.jsp'))}"
+                           title="{foundry:get-static-text('portal-workspace', 'edit/title')}">
+                            <xsl:value-of select="foundry:get-static-text('portal-workspace', 'edit/link')"/>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:if>
+            <xsl:if test="$data-tree/portal:workspace/portal:workspaceDetails/@canAdmin = 'true'">
+                &nbsp;
+                <xsl:choose>
+                    <xsl:when test="$data-tree/portal:workspace/@id = 'admin'">
+                        <xsl:value-of select="foundry:get-static-text('portal-workspace', 'admin/link')"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <a href="{foundry:parse-link(concat($data-tree/portal:workspace/portal:workspaceDetails//primaryURL, 'admin/index.jsp'))}"
+                           title="{foundry:get-static-text('portal-workspace', 'admin/title')}">
+                            <xsl:value-of select="foundry:get-static-text('portal-workspace', 'admin/link')"/>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:if>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="portal-workspace//portal-workspace-columns">
+        <xsl:apply-templates>
+            <xsl:with-param name="use-default-styles"
+                            tunnel="yes"
+                            select="./@use-default-styles = 'true'"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="portal-workspace//portal-workspace-columns/portal-workspace-column">
+        <xsl:param name="use-default-styles"
+                   as="xs:boolean"
+                   tunnel="yes"
+                   select="true()"/>
+        
+        <xsl:variable name="column-layout-tree" select="./*"/>
+        
+        <!--<pre>
+            <xsl:value-of select="concat('cell-number per split(layout) = ', 
+                                                    count(tokenize($data-tree/portal:workspace/portal:portal/@layout, ',')))"/>
+        </pre>
+        <pre>
+            <xsl:value-of select="concat('cell-number per max(cellNumber) = ', 
+                                                    max($data-tree/portal:workspace/portal:portal/bebop:portlet/@cellNumber))"/>
+        </pre>
+        
+        <xsl:for-each select="tokenize($data-tree/portal:workspace/portal:portal/@layout, ',')">
+            <pre>
+                <xsl:value-of select="concat('column: ', position(), '; width = ', current())"/>
+            </pre>
+        </xsl:for-each>-->
+        
+        <xsl:for-each select="tokenize($data-tree/portal:workspace/portal:portal/@layout, ',')">
+            <div>
+                <xsl:if test="$use-default-styles">
+                    <xsl:attribute name="style" 
+                                   select="concat('float:left; width = ', current(), ';')"/>
+                </xsl:if>
+                
+                <xsl:variable name="col-number" select="position()"/>
+                
+                <xsl:apply-templates select="$column-layout-tree">
+                    <xsl:with-param name="workspace-portlets"
+                                    tunnel="yes"
+                                    select="$data-tree/portal:workspace/portal:portal/bebop:portlet[@cellNumber = $col-number]"/>
+                </xsl:apply-templates>
+            </div>
+        </xsl:for-each>
+        
+    </xsl:template>
+    
+    <xsl:template match="portal-workspace//portal-workspace-columns/portal-workspace-column//portal-workspace-portlets">
+        <xsl:param name="workspace-portlets" tunnel="yes"/>
+        
+        <xsl:apply-templates select="$workspace-portlets"/>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
index e9628206a..15214a90b 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
@@ -170,7 +170,23 @@ XSLT 2.0 functions.
     <xsl:function name="foundry:gen-path" as="xs:string">
         <xsl:param name="path" as="xs:string"/>
         
-        <xsl:sequence select="concat($theme-prefix, '/', $path)"/>
+        <!--<xsl:sequence select="concat($theme-prefix, '/', $path)"/>-->
+        <xsl:sequence select="foundry:gen-path($path, false())"/>
+     </xsl:function>
+     
+     <xsl:function name="foundry:gen-path" as="xs:string">
+         <xsl:param name="path" as="xs:string"/>
+         <xsl:param name="internal" as="xs:boolean"/>
+         
+         <xsl:choose>
+             <xsl:when test="$internal = true()">
+                 <xsl:sequence select="concat($theme-prefix, '/foundry/', $path)"/>
+             </xsl:when>
+             <xsl:otherwise>
+                 <xsl:sequence select="concat($theme-prefix, '/', $path)"/>
+             </xsl:otherwise>
+         </xsl:choose>
+         
      </xsl:function>
     
     <foundry:doc section="devel" type="function">
@@ -515,7 +531,7 @@ XSLT 2.0 functions.
             <xsl:when test="$node and $node != ''">
                 <xsl:sequence select="$node"/>
             </xsl:when>
-            <xsl:when test="$module = ''">
+            <xsl:when test="$module = '' and document(foundry:gen-path('conf/global.xml'))/foundry:configuration/setting[@id=$setting]">
                 <xsl:sequence select="document(foundry:gen-path('conf/global.xml'))/foundry:configuration/setting[@id=$setting]"/>
             </xsl:when>
             <xsl:when test="not($module = '') and document(foundry:gen-path(concat('conf/', $module, '.xml')))/foundry:configuration/setting[@id=$setting]">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
index 35a968e2b..1263522da 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
@@ -37,7 +37,7 @@
     
     <xsl:template match="bebop:page">
         
-        <xsl:variable name="application">
+        <!--<xsl:variable name="application">
             <xsl:choose>
                 <xsl:when test="./@application">
                     <xsl:value-of select="./@application"/>
@@ -46,12 +46,13 @@
                     <xsl:value-of select="'none'"/>
                 </xsl:otherwise>
             </xsl:choose>
-        </xsl:variable>
+        </xsl:variable>-->
         
         <xsl:variable name="class" select="@class" />
         
         <xsl:variable name="app-layout-template-file" 
-                      select="foundry:get-app-layout-template($application, $class)"/>
+                      select="foundry:get-app-layout-template(foundry:get-current-application(), 
+                                                              foundry:get-current-application-class())"/>
         
         <xsl:choose>
             <xsl:when test="$app-layout-template-file = ''">
@@ -66,8 +67,8 @@
                     <xsl:with-param name="template-file"
                                     select="$app-layout-template-file"/>
                     <xsl:with-param name="internal" 
-                                    select="foundry:app-layout-template-is-internal($application, 
-                                                                                    $class)"/>
+                                    select="foundry:app-layout-template-is-internal(foundry:get-current-application(), 
+                                                                                    foundry:get-current-application-class())"/>
                 </xsl:call-template>
             </xsl:otherwise>
         </xsl:choose>
@@ -117,6 +118,28 @@
         </xsl:choose>-->
     </xsl:template>
 
+    <xsl:function name="foundry:get-current-application">
+        <xsl:choose>
+            <xsl:when test="$data-tree/@application">
+                <xsl:sequence select="$data-tree/@application"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="'none'"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
+    <xsl:function name="foundry:get-current-application-class">
+        <xsl:choose>
+            <xsl:when test="$data-tree/@class">
+                <xsl:sequence select="$data-tree/@class"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="'none'"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+
     <xsl:function name="foundry:get-app-layout-template">
         <xsl:param name="application" as="xs:string"/>
         <xsl:param name="class" as="xs:string"/>
@@ -147,7 +170,7 @@
         
         <xsl:choose>
             <xsl:when test="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and @class=$class]">
-                <xsl:sequence select="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and @class=$class]/@interal = 'true'"/>
+                <xsl:sequence select="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and @class=$class]/@internal = 'true'"/>
             </xsl:when>
             <xsl:when test="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and not(@class)]">
                 <xsl:sequence select="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and not(@class)]/@internal = 'true'"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css b/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css
index 90badbc27..f6600323a 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css
@@ -220,7 +220,7 @@ div#cms-header .logo img {
     height: 100%;
 }
 
-div#cms-header .logo{
+div#cms-header .logo, div#cms-footer .logo{
     float: left;
 }
 
@@ -564,13 +564,13 @@ div#right div.column-content{
     width: 100%;
 }
 
-div#right div.column-head .contenttitle {
+div#right div.column-head .content-title {
     float: left;
     line-height: 30px;
     padding: 0 1em;
 }
 
-div#right div.column-head .contenttitle h1 {
+div#right div.column-head .content-title h1 {
     margin: 0;
     border: none;
     font:inherit;
@@ -587,18 +587,18 @@ div#right div.column-head #contentlanguagewidget{
 }
 */
 
-div#right div.column-head #contentviewmenu{
+div#right div.column-head #content-view-menu{
     float: right;
     padding: 0 1em;
     line-height: 30px;
 }
 
-div#right div.column-head #contentviewmenu .cms-contentViewMenu,
-div#right div.column-head #contentviewmenu .cms-global-navigation {
+div#right div.column-head #content-view-menu .cms-content-view-menu,
+div#right div.column-head #content-view-menu .cms-global-navigation {
     float: left;
 }
 
-div#right div.column-head #contentviewmenu a {
+div#right div.column-head #content-view-menu a {
     color:white;
 }
 
@@ -716,7 +716,7 @@ table + form {
     margin-top: 1em;
 }
 
-div.endFloat {
+div.end-float {
     clear: both;
     float: none;
 }
@@ -1410,7 +1410,7 @@ dl dd a:hover {
 .tile div + div {
     height: auto;
 }
-
+s
 img.cmsImageDisplay {
     float: left;
     max-height: 200px;
@@ -1422,7 +1422,7 @@ div.cmsImageInfoOverlay {
     margin-left: 2em;
 }
 
-div#cmsFooter{
+div#cms-footer{
     position: absolute;
     top: auto;
     bottom: 0px;
@@ -1433,7 +1433,7 @@ div#cmsFooter{
     font-size: 0.72em;
 }
 
-div#cmsFooter .systemInformation {
+div#cms-footer .system-information {
     float: left;
     width: 25%;
     color: #a4a4a4;
@@ -1442,31 +1442,31 @@ div#cmsFooter .systemInformation {
     vertical-align: 30px;
 }
 
-div#cmsFooter .systemInformation a {
+div#cms-footer .system-information a {
     color: inherit !important;
 }
-div#cmsFooter .systemInformation a:hover {
+div#cms-footer .system-information a:hover {
     color: #ffffff;
 }
-div#cmsFooter .systemInformation .version {
+div#cms-footer .system-information .version {
     font-weight: normal;
 }
 
-div#cmsFooter .cms-global-navigation{
+div#cms-footer .cms-global-navigation{
     float: left;
     line-height: 30px;
     font-weight: bold;
 }
 
-div#cmsFooter .cms-global-navigation span:hover {
+div#cms-footer .cms-global-navigation span:hover {
     color: #ffffff;
 }
 
-div#cmsFooter .cms-global-navigation span a {
+div#cms-footer .cms-global-navigation span a {
     color: inherit !important;
 }
 
-div#cmsFooter .cms-global-navigation + .cms-global-navigation {
+div#cms-footer .cms-global-navigation + .cms-global-navigation {
     float: right;
 }
 div.column-content div.navbar{
@@ -1706,7 +1706,7 @@ table span.hint{
     line-height: 2em;
 }*/
 
-#cms-header, #cmsFooter {
+#cms-header, #cms-footer {
     min-width: 1200px;
 }
 
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/templates/admin-layout.xml b/ccm-sci-bundle/web/themes/foundry/foundry/templates/admin-layout.xml
index a7077b456..2cef00520 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/templates/admin-layout.xml
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/templates/admin-layout.xml
@@ -12,7 +12,8 @@
         <div id="cms-header" class="header-height">
             <div class="min-width">
                 <div class="logo">
-                    <img src-static="foundry/images/scientificcms_logo.png"/>
+                    <!--<img src-static="foundry/images/scientificcms_logo.png"/>-->
+                    <site-logo/>
                 </div>
                 
                 <div id="userwidget" class="cmsHeaderMenu">
@@ -51,7 +52,35 @@
                 </div>
             </div>
             <div id="right">
-                <h1>Admin</h1>
+                <div class="column-head">
+                    <div class="content-title">
+                        <show-bebop-page-title/>
+                    </div>
+                </div>
+                <div id="content-view-menu">
+                    <show-cms-content-view-menu/>
+                    <show-cms-global-navigation>
+                        <show-preview-link/>
+                    </show-cms-global-navigation>
+                </div>
+                <div id="content" class="column-content">
+                    <show-body-column/>
+                </div>
+            </div>
+            <div class="end-float"/>
+        </div>
+        
+        <div id="cms-footer">
+            <div class="min-width">
+                <show-system-information/>
+                <show-cms-global-navigation>
+                    <show-contentcenter-link/>
+                    <show-workspace-link/>
+                    <show-admincenter-link/>
+                </show-cms-global-navigation>
+                <show-cms-global-navigation>
+                    <use-help-link/>
+                </show-cms-global-navigation>
             </div>
         </div>
     </body>
diff --git a/ccm-sci-bundle/web/themes/foundry/templates/portal-workspace.xml b/ccm-sci-bundle/web/themes/foundry/templates/portal-workspace.xml
new file mode 100644
index 000000000..5ea46fa1f
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/templates/portal-workspace.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page-layout>
+    <head>
+        <title>
+            <separator>: </separator>
+            <show-text>layout/page/head/title</show-text>
+            <show-page-title/>
+        </title>
+        <load-css-files/>
+    </head>
+    <body>
+        <nav>
+            <navigation-home-link>
+                <a>
+                    <navigation-title/>
+                </a>
+            </navigation-home-link>
+            <h1>
+                <show-text>layout/page/head/title</show-text>: <show-page-title/>
+            </h1>
+            <navigation>
+                <div class="nav-wrapper">
+                    <navigation-links>
+                        <ul>
+                            <navigation-link>
+                                <li>
+                                    <a>
+                                        <navigation-link-label/>
+                                    </a>
+                                    <navigation-sublinks/>
+                                </li>
+                            </navigation-link>
+                        </ul>
+                    </navigation-links>
+                </div>
+            </navigation>
+            <breadcrumbs>
+                <div id="breadcrumbs">
+                    <breadcrumb-link>
+                        <a>
+                            <breadcrumb-label mode="mark"/>
+                        </a>
+                    </breadcrumb-link>
+                </div>
+                <breadcrumb-separator>
+                    <span class="breadcrumb-separator">/</span>
+                </breadcrumb-separator>
+            </breadcrumbs>
+        </nav>
+        <main>
+            <portal-workspace>
+                <divIfNotEmpty id="portal-workspace-edit-links" class="workspace-details">
+                    <portal-workspace-edit-links/>
+                </divIfNotEmpty>
+                <portal-workspace-columns use-default-styles="true">
+                    <portal-workspace-column>
+                        <div>
+                            <portal-workspace-portlets/>
+                        </div>
+                    </portal-workspace-column>
+                </portal-workspace-columns>
+            </portal-workspace>
+        </main>
+    </body>
+</page-layout>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/texts/portal-workspace.xml b/ccm-sci-bundle/web/themes/foundry/texts/portal-workspace.xml
new file mode 100644
index 000000000..ee10d4d97
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/texts/portal-workspace.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<foundry:static-texts xmlns:foundry="http://foundry.libreccm.org">
+    
+    <text id="admin/link">
+        <translation lang="de">Administrieren</translation>
+        <translation lang="en">Admin</translation>
+    </text>
+    <text id="admin/title">
+        <translation lang="de">Administrieren</translation>
+        <translation lang="en">Admin</translation>
+    </text>
+    
+    <text id="edit/link">
+        <translation lang="de">Bearbeiten</translation>
+        <translation lang="en">Edit</translation>
+    </text>
+    <text id="edit/title">
+        <translation lang="de">Bearbeiten</translation>
+        <translation lang="en">Edit</translation>
+    </text>
+    
+    <text id="view/link">
+        <translation lang="de">Ansehen</translation>
+        <translation lang="en">View</translation>
+    </text>
+    <text id="view/title">
+        <translation lang="de">Ansehen</translation>
+        <translation lang="en">View</translation>
+    </text>
+    
+    
+    
+</foundry:static-texts>
\ No newline at end of file