From ea9119bb15de660e309e4aa7dccbc4348b24e84b Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 4 Dec 2014 09:32:41 +0000 Subject: [PATCH] Editing a PortalWorkspace is now possible with Foundry. git-svn-id: https://svn.libreccm.org/ccm/trunk@3004 8810af33-2d31-482b-a856-94f89814c4df --- .../themes/foundry-base/conf/css-files.xml | 2 +- .../themes/foundry-base/conf/templates.xml | 3 + ccm-core/web/themes/foundry-base/start.xsl | 3 + .../foundry-base/styles/screen/portal.css | 2 + .../lib/template-tags/portal-workspace.xsl | 76 +++++++++++++++++ .../foundry/lib/template-tags/portlets.xsl | 1 + .../themes/foundry/foundry/styles/portal.css | 84 +++++++++++++++++++ 7 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 ccm-core/web/themes/foundry/foundry/styles/portal.css 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 1bcb2d2f1..263cc2417 100644 --- a/ccm-core/web/themes/foundry-base/conf/css-files.xml +++ b/ccm-core/web/themes/foundry-base/conf/css-files.xml @@ -19,7 +19,7 @@ admin.css - portal.css + portal.css public.css public.css diff --git a/ccm-core/web/themes/foundry-base/conf/templates.xml b/ccm-core/web/themes/foundry-base/conf/templates.xml index 02c15bc55..74390ca58 100644 --- a/ccm-core/web/themes/foundry-base/conf/templates.xml +++ b/ccm-core/web/themes/foundry-base/conf/templates.xml @@ -56,6 +56,9 @@ portlets/freeform-html.xml + + portlets/simple-portlet.xml + diff --git a/ccm-core/web/themes/foundry-base/start.xsl b/ccm-core/web/themes/foundry-base/start.xsl index f3620fcde..6c0e7258a 100644 --- a/ccm-core/web/themes/foundry-base/start.xsl +++ b/ccm-core/web/themes/foundry-base/start.xsl @@ -38,4 +38,7 @@ + + + diff --git a/ccm-core/web/themes/foundry-base/styles/screen/portal.css b/ccm-core/web/themes/foundry-base/styles/screen/portal.css index c86b7aaed..fd16f6764 100644 --- a/ccm-core/web/themes/foundry-base/styles/screen/portal.css +++ b/ccm-core/web/themes/foundry-base/styles/screen/portal.css @@ -50,3 +50,5 @@ div.portal-grid-row div.portal-col-100 { width: 100%; } + + 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 f0baa6e9f..bbdce6abc 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 @@ -168,6 +168,7 @@ + @@ -175,6 +176,9 @@ + @@ -182,6 +186,9 @@ + @@ -190,6 +197,7 @@ + @@ -203,6 +211,74 @@ + + + + diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/portlets.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/portlets.xsl index 374ea8359..05d575640 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/portlets.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/portlets.xsl @@ -32,6 +32,7 @@ + \ No newline at end of file diff --git a/ccm-core/web/themes/foundry/foundry/styles/portal.css b/ccm-core/web/themes/foundry/foundry/styles/portal.css new file mode 100644 index 000000000..ba568190c --- /dev/null +++ b/ccm-core/web/themes/foundry/foundry/styles/portal.css @@ -0,0 +1,84 @@ + +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%; +} + +ul.portlet-edit-links { + list-style: none; +} + +ul.portlet-edit-links:after { + content: "."; + display: block; + visibility: hidden; + clear: both; +} + +ul.portlet-edit-links li { + float: left; + width: 16.66%; +} + +ul.portlet-edit-links li a, +ul.portlet-edit-links li a:link, +ul.portlet-edit-links li a:visited{ + text-decoration: none; + color: #00e; +} + +ul.portlet-edit-links li a:hover, +ul.portlet-edit-links li a:active { + text-decoration: none; + color: #aae; +} + +ul.portlet-edit-links li span { + color: #ccc; +} \ No newline at end of file