diff --git a/ccm-auth-http/web/__ccm__/apps/auth-http/xsl/index.xsl b/ccm-auth-http/web/themes/heirloom/apps/auth-http/xsl/index.xsl similarity index 75% rename from ccm-auth-http/web/__ccm__/apps/auth-http/xsl/index.xsl rename to ccm-auth-http/web/themes/heirloom/apps/auth-http/xsl/index.xsl index d5bc1f8da..3bde5b7e6 100755 --- a/ccm-auth-http/web/__ccm__/apps/auth-http/xsl/index.xsl +++ b/ccm-auth-http/web/themes/heirloom/apps/auth-http/xsl/index.xsl @@ -1,13 +1,14 @@ + - - + + diff --git a/ccm-bookmarks/web/__ccm__/apps/bookmarks/xsl/index.xsl b/ccm-bookmarks/web/themes/heirloom/apps/bookmarks/xsl/index.xsl similarity index 76% rename from ccm-bookmarks/web/__ccm__/apps/bookmarks/xsl/index.xsl rename to ccm-bookmarks/web/themes/heirloom/apps/bookmarks/xsl/index.xsl index a0cd112c8..09494b6d4 100755 --- a/ccm-bookmarks/web/__ccm__/apps/bookmarks/xsl/index.xsl +++ b/ccm-bookmarks/web/themes/heirloom/apps/bookmarks/xsl/index.xsl @@ -9,6 +9,6 @@ --> - + diff --git a/ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks-portlet.xsl b/ccm-bookmarks/web/themes/heirloom/packages/bookmarks/xsl/bookmarks-portlet.xsl similarity index 100% rename from ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks-portlet.xsl rename to ccm-bookmarks/web/themes/heirloom/packages/bookmarks/xsl/bookmarks-portlet.xsl diff --git a/ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks.xsl b/ccm-bookmarks/web/themes/heirloom/packages/bookmarks/xsl/bookmarks.xsl similarity index 91% rename from ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks.xsl rename to ccm-bookmarks/web/themes/heirloom/packages/bookmarks/xsl/bookmarks.xsl index aca2364b8..1cdcef594 100755 --- a/ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks.xsl +++ b/ccm-bookmarks/web/themes/heirloom/packages/bookmarks/xsl/bookmarks.xsl @@ -1,12 +1,10 @@ - - + @@ -18,26 +16,25 @@ - + + <xsl:value-of select="bebop:title"/> - - + + @@ -82,7 +79,7 @@ - + @@ -141,7 +138,7 @@ - + @@ -225,7 +222,7 @@
  
- + @@ -233,7 +230,7 @@ - + @@ -337,7 +334,7 @@ - + @@ -385,7 +382,7 @@ - + ]]> @@ -398,7 +395,7 @@ - + diff --git a/ccm-bundle/web/themes/static/aplaws-generic/admin-index.css b/ccm-bundle/web/themes/static/aplaws-generic/admin-index.css index 4210f401a..48adbe063 100644 --- a/ccm-bundle/web/themes/static/aplaws-generic/admin-index.css +++ b/ccm-bundle/web/themes/static/aplaws-generic/admin-index.css @@ -1 +1 @@ -@import url(/css/acs-master.css); +@import url(../../heirloom/css/acs-master.css); diff --git a/ccm-bundle/web/themes/static/aplaws-generic/category-step.xsl b/ccm-bundle/web/themes/static/aplaws-generic/category-step.xsl index 693fd7c38..8780861e0 100644 --- a/ccm-bundle/web/themes/static/aplaws-generic/category-step.xsl +++ b/ccm-bundle/web/themes/static/aplaws-generic/category-step.xsl @@ -1,50 +1,50 @@ - + - + - - + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/ccm-bundle/web/themes/static/aplaws-generic/content-center-index.xsl b/ccm-bundle/web/themes/static/aplaws-generic/content-center-index.xsl index 8ff5c3798..c2d313f50 100644 --- a/ccm-bundle/web/themes/static/aplaws-generic/content-center-index.xsl +++ b/ccm-bundle/web/themes/static/aplaws-generic/content-center-index.xsl @@ -1,42 +1,60 @@ - + - - + + + - /cms/admin/page + /packages/cms/xsl/admin/page <xsl:value-of select="bebop:title"/> - - + +
- + diff --git a/ccm-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl b/ccm-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl index 5c22541fa..7fa9efb68 100644 --- a/ccm-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl +++ b/ccm-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl @@ -1,20 +1,21 @@ - + - - + + + - /cms/admin/page + /packages/cms/xml/admin/page @@ -29,8 +30,8 @@ <xsl:value-of select="bebop:title"/> - - + + @@ -42,10 +43,10 @@