diff --git a/ccm-core/web/themes/foundry-base/conf/css-files.xml b/ccm-core/web/themes/foundry-base/conf/css-files.xml index 817f45f99..170818cfb 100644 --- a/ccm-core/web/themes/foundry-base/conf/css-files.xml +++ b/ccm-core/web/themes/foundry-base/conf/css-files.xml @@ -9,8 +9,19 @@ public.css public.css + + + portal.css + public.css + public.css + + + portal.css + public.css + public.css public.css + public.css \ No newline at end of file diff --git a/ccm-core/web/themes/foundry-base/styles/screen/portal.css b/ccm-core/web/themes/foundry-base/styles/screen/portal.css new file mode 100644 index 000000000..c86b7aaed --- /dev/null +++ b/ccm-core/web/themes/foundry-base/styles/screen/portal.css @@ -0,0 +1,52 @@ + +div.portal-workspace-columns { + position: relative; +} + +div.portal-workspace-columns div.portal-col, +div.portal-grid-row div.portal-col { + float: left; + overflow: scroll; +} + +div.portal-workspace-columns div.portal-col-16, +div.portal-grid-row div.portal-col-16 { + width: 16.66%; +} + +div.portal-workspace-columns div.portal-col-20, +div.portal-grid-row div.portal-col-20 { + width: 20%; +} + +div.portal-workspace-columns div.portal-col-25, +div.portal-grid-row div.portal-col-25 { + width: 25%; +} + +div.portal-workspace-columns div.portal-col-30, +div.portal-grid-row div.portal-col-30 { + width: 30%; +} + + +div.portal-workspace-columns div.portal-col-33, +div.portal-grid-row div.portal-col-33 { + width: 33.33%; +} + +div.portal-workspace-columns div.portal-col-40, +div.portal-grid-row div.portal-col-40 { + width: 40%; +} + +div.portal-workspace-columns div.portal-col-50, +div.portal-grid-row div.portal-col-50 { + width: 50%; +} + +div.portal-workspace-columns div.portal-col-100, +div.portal-grid-row div.portal-col-100 { + width: 100%; +} + diff --git a/ccm-core/web/themes/foundry-base/templates/default-layout.xml b/ccm-core/web/themes/foundry-base/templates/default-layout.xml index 2b32bef2b..697806171 100644 --- a/ccm-core/web/themes/foundry-base/templates/default-layout.xml +++ b/ccm-core/web/themes/foundry-base/templates/default-layout.xml @@ -9,209 +9,16 @@ -
-
-
- - - -
- - layout/service-links/sitemap - - - layout/service-links/contact - - - layout/service-links/privacy - - - layout/service-links/help - -
-
-
- -
+
- - - +
-

-
- - -
- - - - - - + \ No newline at end of file diff --git a/ccm-core/web/themes/foundry-base/templates/fragments/header-with-nav.xml b/ccm-core/web/themes/foundry-base/templates/fragments/header-with-nav.xml new file mode 100644 index 000000000..b41f55a6f --- /dev/null +++ b/ccm-core/web/themes/foundry-base/templates/fragments/header-with-nav.xml @@ -0,0 +1,63 @@ + + +
+
+
+ + + +
+ + layout/service-links/sitemap + + + layout/service-links/contact + + + layout/service-links/privacy + + + layout/service-links/help + +
+
+
+ +
+ \ No newline at end of file diff --git a/ccm-core/web/themes/foundry-base/templates/fragments/second-level-nav.xml b/ccm-core/web/themes/foundry-base/templates/fragments/second-level-nav.xml new file mode 100644 index 000000000..7e32c7cd5 --- /dev/null +++ b/ccm-core/web/themes/foundry-base/templates/fragments/second-level-nav.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/ccm-core/web/themes/foundry-base/templates/portal-workspace-grid.xml b/ccm-core/web/themes/foundry-base/templates/portal-workspace-grid.xml index 7296e0415..427ebcb9b 100644 --- a/ccm-core/web/themes/foundry-base/templates/portal-workspace-grid.xml +++ b/ccm-core/web/themes/foundry-base/templates/portal-workspace-grid.xml @@ -9,53 +9,72 @@ - +
- + + - - - - - +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
diff --git a/ccm-core/web/themes/foundry-base/templates/portal-workspace.xml b/ccm-core/web/themes/foundry-base/templates/portal-workspace.xml index ada24efa6..c0594992b 100644 --- a/ccm-core/web/themes/foundry-base/templates/portal-workspace.xml +++ b/ccm-core/web/themes/foundry-base/templates/portal-workspace.xml @@ -77,12 +77,65 @@ - - -
- -
- + +
+ + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + +
diff --git a/ccm-core/web/themes/foundry/conf/css-files.xml b/ccm-core/web/themes/foundry/conf/css-files.xml index 16a7a821b..91c3f2ed2 100644 --- a/ccm-core/web/themes/foundry/conf/css-files.xml +++ b/ccm-core/web/themes/foundry/conf/css-files.xml @@ -10,6 +10,14 @@ bootstrap/css/bootstrap.min.css public.css + + portal.css + public.css + + + portal.css + public.css + public.css diff --git a/ccm-core/web/themes/foundry/doc/static-texts/user/css-files.html b/ccm-core/web/themes/foundry/doc/static-texts/user/css-files.html index 726e96d24..266d3e15b 100644 --- a/ccm-core/web/themes/foundry/doc/static-texts/user/css-files.html +++ b/ccm-core/web/themes/foundry/doc/static-texts/user/css-files.html @@ -14,28 +14,16 @@ css-files element. This element has multiple application child elements. Each application has an mandatory attribute name which contains the name of the application for which the CSS files - named in the element are loaded. There should be also an default + named in the element are loaded. To further distinguish between pages provided by the + same application the optional attribute class can be used. + There should be also an default element which determines the CSS files to load when no matching application element is found.

- The name of an application is generated as follows: + Some pages have no application name in the data tree XML. In this cases to name of + the application is set to none.

-
    -
  • - If the data tree contains an application attribute the value of - this attribute is used as name of the current application. -
    • -
  • - If there is no application but an class attribute the - value of the class attribute is used as name of the current - application. -
    • -
  • - If there is no application and no class attribute - the name of the current application is set to none. -
    • -

Each application element and the default element in css-files.xml can contain multiple css-file element. diff --git a/ccm-core/web/themes/foundry/foundry/lib.xsl b/ccm-core/web/themes/foundry/foundry/lib.xsl index 4808ff65b..14abf7cda 100644 --- a/ccm-core/web/themes/foundry/foundry/lib.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib.xsl @@ -24,7 +24,7 @@ version="2.0"> - + diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl index 08bd6e41f..a51673361 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl @@ -50,7 +50,11 @@ - + + + + + + - - + + + + + + + + + + + - - + @@ -93,7 +114,7 @@ conditional comments in the other CSS files instead? --> - + @@ -102,7 +123,7 @@ - + diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/portal-workspace-grid.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/portal-workspace-grid.xsl index ffb9f20af..83c866470 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/portal-workspace-grid.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/portal-workspace-grid.xsl @@ -30,49 +30,19 @@ - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
+ + + @@ -82,10 +52,6 @@ - @@ -101,48 +67,31 @@ - + - - -
- - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + - - -
- diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl index e85b5610c..f0baa6e9f 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl @@ -139,19 +139,15 @@ - + + - - - + @@ -165,35 +161,68 @@ - -
- - - - - - - - - - - - -
- + - -
- + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +