[HippoCMS-svn] [20633] hippo-collab/trunk: COLLAB-2
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
[HippoCMS-svn] [20633] hippo-collab/trunk: COLLAB-2
by bvdschans
::
Rate this Message:
Revision: 20633
Author: dtaylor Date: 2009-11-12 04:06:38 +0100 (Thu, 12 Nov 2009) Log Message: ----------- COLLAB-2 created new variant of clear decorator for wiki pages - titles are shown, but actions are hidden. also, title bars are the drag handle set the title of the wiki page bean thing to the portlet title Modified Paths: -------------- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Configuration.psml hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Installation.psml hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Upgrading.psml hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Website development.psml hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/default-page.psml hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/Conference Calendar.psml hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/Running a conference.psml hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/default-page.psml hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/_user/template/min.psml hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/_user/template/space-home.psml hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/WikiPageDetail.java hippo-collab/trunk/wiki/war/jsp/components/main/wikidetailpage.jsp Added Paths: ----------- hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/ hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/ hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/portal.css hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/styles.css hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/decorator.properties Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Configuration.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Configuration.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Configuration.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -5,7 +5,7 @@ <short-title>Page</short-title> <defaults></defaults> <fragment id="P-124c11f0212-1000a" type="layout" name="jetspeed-layouts::VelocityOneColumn"> - <fragment id="P-124c11f0212-1000c" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="P-124c11f0212-1000c" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property name="column" value="0"></property> <property name="row" value="0"></property> <preference readonly="false" name="HeaderPage"><value>/WEB-INF/jsp/portlet-common-headers.jsp</value></preference> Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Installation.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Installation.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Installation.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -5,7 +5,7 @@ <short-title>Page</short-title> <defaults></defaults> <fragment id="P-124c11ede53-10005" type="layout" name="jetspeed-layouts::VelocityOneColumn"> - <fragment id="P-124c11ede53-10007" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="P-124c11ede53-10007" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property name="column" value="0"></property> <property name="row" value="0"></property> <preference readonly="false" name="HeaderPage"><value>/WEB-INF/jsp/portlet-common-headers.jsp</value></preference> Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Upgrading.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Upgrading.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Upgrading.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -5,7 +5,7 @@ <short-title>Page</short-title> <defaults></defaults> <fragment id="P-124c11f208f-1000f" type="layout" name="jetspeed-layouts::VelocityTwoColumns"> - <fragment id="P-124c11f208f-10011" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="P-124c11f208f-10011" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property name="column" value="0"></property> <property name="row" value="0"></property> <preference readonly="false" name="HeaderPage"><value>/WEB-INF/jsp/portlet-common-headers.jsp</value></preference> Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Website development.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Website development.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/Website development.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -5,7 +5,7 @@ <short-title>Page</short-title> <defaults></defaults> <fragment id="P-124c136d630-10014" type="layout" name="jetspeed-layouts::VelocityOneColumn"> - <fragment id="P-124c136d630-10016" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="P-124c136d630-10016" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property name="column" value="0"></property> <property name="row" value="0"></property> <preference readonly="false" name="HeaderPage"><value>/WEB-INF/jsp/portlet-common-headers.jsp</value></preference> Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/default-page.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/default-page.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Hippo CMS 7 Documentation/default-page.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -5,7 +5,7 @@ <short-title>Docs Home</short-title> <defaults layout-decorator="collab" portlet-decorator="collab"></defaults> <fragment id="P-124c0f4cb84-10001" type="layout" name="jetspeed-layouts::VelocityOneColumn"> - <fragment id="P-124c0f51670-10003" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="P-124c0f51670-10003" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property name="column" value="0"></property> <property name="row" value="0"></property> <preference readonly="false" name="HeaderPage"><value>/WEB-INF/jsp/portlet-common-headers.jsp</value></preference> Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/Conference Calendar.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/Conference Calendar.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/Conference Calendar.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -5,7 +5,7 @@ <short-title>Page</short-title> <defaults></defaults> <fragment id="P-124bc9542cb-10001" type="layout" name="jetspeed-layouts::VelocityOneColumn" > - <fragment id="P-124bc9542cb-10003" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="P-124bc9542cb-10003" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property name="column" value="0"></property> <property name="row" value="0"></property> <preference name="hstPathInfo" readOnly="false"> @@ -39,7 +39,7 @@ <preference name="VISITLASTPAGE"><value>false</value></preference> <preference name="WIDTH"><value>100%</value></preference> </fragment> - <fragment id="P-124bc9a3325-1000c" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="P-124bc9a3325-1000c" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property name="column" value="0"></property> <property name="row" value="2"></property> <preference name="hstPathInfo" readOnly="false"> Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/Running a conference.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/Running a conference.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/Running a conference.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -5,7 +5,7 @@ <short-title>Page</short-title> <defaults></defaults> <fragment id="P-124bc961f95-10006" type="layout" name="jetspeed-layouts::VelocityOneColumn"> - <fragment id="P-124bc961f95-10008" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="P-124bc961f95-10008" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property name="column" value="0"></property> <property name="row" value="0"></property> <preference readonly="false" name="hstPathInfo"><value>/wiki/Running a conference.html</value></preference> Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/default-page.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/default-page.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Marketing/default-page.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -8,7 +8,7 @@ <short-title>Marketing</short-title> <defaults></defaults> <fragment id="marketing-1000" type="layout" name="jetspeed-layouts::VelocityOneColumn"> - <fragment id="P-124bc96f0ff-1000a" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="P-124bc96f0ff-1000a" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property name="column" value="0"></property> <property name="row" value="0"></property> <preference readonly="false" name="hstPathInfo"><value>/wiki/Marketing material.html</value></preference> Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/_user/template/min.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/_user/template/min.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/_user/template/min.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -20,7 +20,7 @@ <title>Page</title> <fragment id="_jsspacemin-1100" type="layout" name="jetspeed-layouts::VelocityOneColumn"> - <fragment id="_jsspacemin-1102" type="portlet" name="wiki::WikiHSTPortlet" decorator='clear'> + <fragment id="_jsspacemin-1102" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property layout="OneColumn" name="row" value="0" /> <property layout="OneColumn" name="column" value="0" /> </fragment> Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/_user/template/space-home.psml =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/_user/template/space-home.psml 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/_user/template/space-home.psml 2009-11-12 03:06:38 UTC (rev 20633) @@ -20,7 +20,7 @@ <title>Space Home</title> <fragment id="_jsspace-1000" type="layout" name="jetspeed-layouts::VelocityTwoColumns"> - <fragment id="_jsspace-1010" type="portlet" name="j2-admin::WelcomeToJetspeed"> + <fragment id="_jsspace-10101" type="portlet" name="wiki::WikiHSTPortlet" decorator='wiki'> <property layout="TwoColumns" name="row" value="0" /> <property layout="TwoColumns" name="column" value="0" /> </fragment> Added: hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/portal.css =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/portal.css (rev 0) +++ hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/portal.css 2009-11-12 03:06:38 UTC (rev 20633) @@ -0,0 +1,17 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + Property changes on: hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/portal.css ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/styles.css =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/styles.css (rev 0) +++ hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/styles.css 2009-11-12 03:06:38 UTC (rev 20633) @@ -0,0 +1,56 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +.wiki .PTitleLeft, +.wiki .PTitle, +.wiki .PTitleContent, +.wiki .PTitleRight, +.wiki .PContentLeft, +.wiki .PContent, +.wiki .PContentRight, +.wiki .PBottomLeft, +.wiki .PBottom, +.wiki .PBottomRight +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: inherit; + font-size: 7pt; +} + +.wiki .PTitle +{ + padding-bottom: 16px; + height:3px; +} + +.wiki .PTitleContent +{ + display: inline; + float: left; + clear:left; + white-space: normal; + padding-top: 2px; + padding-left: 4px; + font-size: 12px; + font-weight: bold; +} + +.wiki .PActionBar +{ + float: right; + display: inline; + padding:4px; +} Property changes on: hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/css/styles.css ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/decorator.properties =================================================================== --- hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/decorator.properties (rev 0) +++ hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/decorator.properties 2009-11-12 03:06:38 UTC (rev 20633) @@ -0,0 +1,26 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +id=wiki +template.type=velocity +template.extension=.vm +decorates=any +actions.factory=org.apache.jetspeed.decoration.ClearDecoratorActionsFactory +# option.actions valid values are: show | hide | dropdown | hover (default=show) +option.actions=hide +# option.title valid values are: show | hide (default=show) +option.title=show +# option.draghandle valid values are: a CSS selector | none (default: ".PTitle" selector) + Property changes on: hippo-collab/trunk/portal/src/main/webapp/decorations/portlet/wiki/decorator.properties ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/WikiPageDetail.java =================================================================== --- hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/WikiPageDetail.java 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/WikiPageDetail.java 2009-11-12 03:06:38 UTC (rev 20633) @@ -21,6 +21,8 @@ import javax.jcr.Session; import javax.portlet.PortletRequest; +import javax.portlet.PortletResponse; +import javax.portlet.RenderResponse; import javax.servlet.ServletConfig; import org.hippoecm.hst.component.support.bean.persistency.BasePersistenceHstComponent; @@ -118,6 +120,18 @@ log.warn("QueryException ", e); } } + PortletResponse portletResponse = ((HstPortletRequestContext) request.getRequestContext()).getPortletResponse(); + if (portletResponse instanceof RenderResponse) + { + if (crBean instanceof WikiPageBean) + { + String title = ((WikiPageBean)crBean).getTitle(); + if (title != null) + { + ((RenderResponse)portletResponse).setTitle(title); + } + } + } } @Override Modified: hippo-collab/trunk/wiki/war/jsp/components/main/wikidetailpage.jsp =================================================================== --- hippo-collab/trunk/wiki/war/jsp/components/main/wikidetailpage.jsp 2009-11-11 21:16:55 UTC (rev 20632) +++ hippo-collab/trunk/wiki/war/jsp/components/main/wikidetailpage.jsp 2009-11-12 03:06:38 UTC (rev 20633) @@ -82,7 +82,7 @@ <div> <c:choose> <c:when test="${not empty document.node}"> - <h2 class="InnerContent">${document.title}</h2> + <!-- <h2 class="InnerContent">${document.title}</h2> handled in the title --> </c:when> <c:otherwise> <span class="InnerContent" id="title"><input type="text" name="title" size="40" style="WIDTH: 60%" value="" /></span> _______________________________________________ Hippocms-svn mailing list Hippocms-svn@... http://lists.hippo.nl/mailman/listinfo/hippocms-svn |
| Free embeddable forum powered by Nabble | Forum Help |
