Author: mfang
Date: 2009-05-20 13:32:07 +0200 (Wed, 20 May 2009)
New Revision: 35324
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/project.properties
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/css/stijl.css
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/css/stijl.css
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/css/stijl.css
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/css/stijl.css
Log:
CMSC-1103 Inline text editor removes a lot of text from edited introduction
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/project.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/project.properties
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/project.properties
2009-05-20 11:32:07 UTC (rev 35324)
@@ -2,10 +2,13 @@
maven.multiproject.excludes=maven-base/project.xml
# BUILD staging and live wars
-#maven.multiproject.includes=war-live/project.xml,war-staging/project.xml,war/project.xml
+maven.multiproject.includes=war-live/project.xml,war-staging/project.xml,war/project.xml
# BUILD single (simple) war
#maven.multiproject.includes=war-single/project.xml,war/project.xml
# BUILD community (simple) war
#maven.multiproject.includes=war-community/project.xml,war/project.xml
+
+# BUILD staging war
+#maven.multiproject.includes=war-staging/project.xml,war/project.xml
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
2009-05-20 11:32:07 UTC (rev 35324)
@@ -36,11 +36,14 @@
<cmsc-bm:linkedimages width="220" position="top-left" style="float:
left; padding: 0px 20px 20px 0px;" />
<cmsc-bm:linkedimages width="220" position="top-right" style="float:
right; padding: 0px 0px 20px 20px;" />
+ <c:if test="${edit}">
+ <div id="content_${elementId}_intro" class="intro">
+ </c:if>
<mm:field name="intro" escape="none">
<mm:isnotempty>
- <p class="intro" id="content_${elementId}_intro"><mm:write /></p>
+ <p><mm:write /></p>
<c:if test="${edit}">
-
+ </div>
<script type="text/javascript">
new
InPlaceEditor.Local('content_${elementId}_intro', {minHeight:300,
htmlarea:true, formId:'contentportlet'});
</script>
@@ -49,11 +52,11 @@
</mm:field>
<c:if test="${edit}">
- <div id="content_${elementId}_body">
+ <div id="content_${elementId}_body" class="body">
</c:if>
<mm:field name="body" escape="none">
<mm:isnotempty>
- <p class="body"><mm:write /></p>
+ <p><mm:write /></p>
</mm:isnotempty>
</mm:field>
<c:if test="${edit}">
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
2009-05-20 11:32:07 UTC (rev 35324)
@@ -32,11 +32,14 @@
<cmsc-bm:linkedimages width="220" position="top-left" style="float:
left; padding: 0px 20px 20px 0px;" />
<cmsc-bm:linkedimages width="220" position="top-right" style="float:
right; padding: 0px 0px 20px 20px;" />
+ <c:if test="${edit}">
+ <div id="content_${elementId}_intro" class="intro">
+ </c:if>
<mm:field name="intro" escape="none">
<mm:isnotempty>
- <p class="intro" id="content_${elementId}_intro"><mm:write /></p>
+ <p><mm:write /></p>
<c:if test="${edit}">
-
+ </div>
<script type="text/javascript">
new
InPlaceEditor.Local('content_${elementId}_intro', {minHeight:300,
htmlarea:true, formId:'contentportlet'});
</script>
@@ -45,11 +48,11 @@
</mm:field>
<c:if test="${edit}">
- <div id="content_${elementId}_body">
+ <div id="content_${elementId}_body" class="body">
</c:if>
<mm:field name="body" escape="none">
<mm:isnotempty>
- <p class="body"><mm:write /></p>
+ <p><mm:write /></p>
</mm:isnotempty>
</mm:field>
<c:if test="${edit}">
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/css/stijl.css
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/css/stijl.css
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/css/stijl.css
2009-05-20 11:32:07 UTC (rev 35324)
@@ -293,7 +293,7 @@
margin: 0;
}
-.content p.intro
+.content div.intro
{
margin-bottom: 1em;
}
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
2009-05-20 11:32:07 UTC (rev 35324)
@@ -37,11 +37,14 @@
<cmsc-bm:linkedimages width="220" position="top-left" style="float:
left; padding: 0px 20px 20px 0px;" />
<cmsc-bm:linkedimages width="220" position="top-right" style="float:
right; padding: 0px 0px 20px 20px;" />
+ <c:if test="${edit}">
+ <div id="content_${elementId}_intro" class="intro">
+ </c:if>
<mm:field name="intro" escape="none">
<mm:isnotempty>
- <p class="intro" id="content_${elementId}_intro"><mm:write /></p>
+ <p><mm:write /></p>
<c:if test="${edit}">
-
+ </div>
<script type="text/javascript">
new
InPlaceEditor.Local('content_${elementId}_intro', {minHeight:300,
htmlarea:true, formId:'contentportlet'});
</script>
@@ -50,11 +53,11 @@
</mm:field>
<c:if test="${edit}">
- <div id="content_${elementId}_body">
+ <div id="content_${elementId}_body" class="body">
</c:if>
<mm:field name="body" escape="none">
<mm:isnotempty>
- <p class="body"><mm:write /></p>
+ <p><mm:write /></p>
</mm:isnotempty>
</mm:field>
<c:if test="${edit}">
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
2009-05-20 11:32:07 UTC (rev 35324)
@@ -33,11 +33,14 @@
<cmsc-bm:linkedimages width="220" position="top-left" style="float:
left; padding: 0px 20px 20px 0px;" />
<cmsc-bm:linkedimages width="220" position="top-right" style="float:
right; padding: 0px 0px 20px 20px;" />
+ <c:if test="${edit}">
+ <div id="content_${elementId}_intro" class="intro">
+ </c:if>
<mm:field name="intro" escape="none">
<mm:isnotempty>
- <p class="intro" id="content_${elementId}_intro"><mm:write /></p>
+ <p><mm:write /></p>
<c:if test="${edit}">
-
+ </div>
<script type="text/javascript">
new
InPlaceEditor.Local('content_${elementId}_intro', {minHeight:300,
htmlarea:true, formId:'contentportlet'});
</script>
@@ -46,11 +49,11 @@
</mm:field>
<c:if test="${edit}">
- <div id="content_${elementId}_body">
+ <div id="content_${elementId}_body" class="body">
</c:if>
<mm:field name="body" escape="none">
<mm:isnotempty>
- <p class="body"><mm:write /></p>
+ <p><mm:write /></p>
</mm:isnotempty>
</mm:field>
<c:if test="${edit}">
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/css/stijl.css
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/css/stijl.css
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/css/stijl.css
2009-05-20 11:32:07 UTC (rev 35324)
@@ -293,7 +293,7 @@
margin: 0;
}
-.content p.intro
+.content div.intro
{
margin-bottom: 1em;
}
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
2009-05-20 11:32:07 UTC (rev 35324)
@@ -37,11 +37,14 @@
<cmsc-bm:linkedimages width="220" position="top-left" style="float:
left; padding: 0px 20px 20px 0px;" />
<cmsc-bm:linkedimages width="220" position="top-right" style="float:
right; padding: 0px 0px 20px 20px;" />
+ <c:if test="${edit}">
+ <div id="content_${elementId}_intro" class="intro">
+ </c:if>
<mm:field name="intro" escape="none">
<mm:isnotempty>
- <p class="intro" id="content_${elementId}_intro"><mm:write /></p>
+ <p><mm:write /></p>
<c:if test="${edit}">
-
+ </div>
<script type="text/javascript">
new
InPlaceEditor.Local('content_${elementId}_intro', {minHeight:300,
htmlarea:true, formId:'contentportlet'});
</script>
@@ -50,11 +53,11 @@
</mm:field>
<c:if test="${edit}">
- <div id="content_${elementId}_body">
+ <div id="content_${elementId}_body" class="body">
</c:if>
<mm:field name="body" escape="none">
<mm:isnotempty>
- <p class="body"><mm:write /></p>
+ <p><mm:write /></p>
</mm:isnotempty>
</mm:field>
<c:if test="${edit}">
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
2009-05-20 11:32:07 UTC (rev 35324)
@@ -33,11 +33,14 @@
<cmsc-bm:linkedimages width="220" position="top-left" style="float:
left; padding: 0px 20px 20px 0px;" />
<cmsc-bm:linkedimages width="220" position="top-right" style="float:
right; padding: 0px 0px 20px 20px;" />
+ <c:if test="${edit}">
+ <div id="content_${elementId}_intro" class="intro">
+ </c:if>
<mm:field name="intro" escape="none">
<mm:isnotempty>
- <p class="intro" id="content_${elementId}_intro"><mm:write /></p>
+ <p><mm:write /></p>
<c:if test="${edit}">
-
+ </div>
<script type="text/javascript">
new
InPlaceEditor.Local('content_${elementId}_intro', {minHeight:300,
htmlarea:true, formId:'contentportlet'});
</script>
@@ -46,11 +49,11 @@
</mm:field>
<c:if test="${edit}">
- <div id="content_${elementId}_body">
+ <div id="content_${elementId}_body" class="body">
</c:if>
<mm:field name="body" escape="none">
<mm:isnotempty>
- <p class="body"><mm:write /></p>
+ <p><mm:write /></p>
</mm:isnotempty>
</mm:field>
<c:if test="${edit}">
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/css/stijl.css
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/css/stijl.css
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/css/stijl.css
2009-05-20 11:32:07 UTC (rev 35324)
@@ -293,7 +293,7 @@
margin: 0;
}
-.content p.intro
+.content div.intro
{
margin-bottom: 1em;
}
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view.jsp
2009-05-20 11:32:07 UTC (rev 35324)
@@ -37,11 +37,14 @@
<cmsc-bm:linkedimages width="220" position="top-left" style="float:
left; padding: 0px 20px 20px 0px;" />
<cmsc-bm:linkedimages width="220" position="top-right" style="float:
right; padding: 0px 0px 20px 20px;" />
+ <c:if test="${edit}">
+ <div id="content_${elementId}_intro" class="intro">
+ </c:if>
<mm:field name="intro" escape="none">
<mm:isnotempty>
- <p class="intro" id="content_${elementId}_intro"><mm:write /></p>
+ <p><mm:write /></p>
<c:if test="${edit}">
-
+ </div>
<script type="text/javascript">
new
InPlaceEditor.Local('content_${elementId}_intro', {minHeight:300,
htmlarea:true, formId:'contentportlet'});
</script>
@@ -50,11 +53,11 @@
</mm:field>
<c:if test="${edit}">
- <div id="content_${elementId}_body">
+ <div id="content_${elementId}_body" class="body">
</c:if>
<mm:field name="body" escape="none">
<mm:isnotempty>
- <p class="body"><mm:write /></p>
+ <p><mm:write /></p>
</mm:isnotempty>
</mm:field>
<c:if test="${edit}">
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/templates/view/demo/news/detail_view_simple.jsp
2009-05-20 11:32:07 UTC (rev 35324)
@@ -33,11 +33,14 @@
<cmsc-bm:linkedimages width="220" position="top-left" style="float:
left; padding: 0px 20px 20px 0px;" />
<cmsc-bm:linkedimages width="220" position="top-right" style="float:
right; padding: 0px 0px 20px 20px;" />
+ <c:if test="${edit}">
+ <div id="content_${elementId}_intro" class="intro">
+ </c:if>
<mm:field name="intro" escape="none">
<mm:isnotempty>
- <p class="intro" id="content_${elementId}_intro"><mm:write /></p>
+ <p><mm:write /></p>
<c:if test="${edit}">
-
+ </div>
<script type="text/javascript">
new
InPlaceEditor.Local('content_${elementId}_intro', {minHeight:300,
htmlarea:true, formId:'contentportlet'});
</script>
@@ -46,11 +49,11 @@
</mm:field>
<c:if test="${edit}">
- <div id="content_${elementId}_body">
+ <div id="content_${elementId}_body" class="body">
</c:if>
<mm:field name="body" escape="none">
<mm:isnotempty>
- <p class="body"><mm:write /></p>
+ <p><mm:write /></p>
</mm:isnotempty>
</mm:field>
<c:if test="${edit}">
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/css/stijl.css
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/css/stijl.css
2009-05-20 11:26:20 UTC (rev 35323)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/css/stijl.css
2009-05-20 11:32:07 UTC (rev 35324)
@@ -293,7 +293,7 @@
margin: 0;
}
-.content p.intro
+.content div.intro
{
margin-bottom: 1em;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
