Author: kevinshen
Date: 2009-05-05 11:30:52 +0200 (Tue, 05 May 2009)
New Revision: 34959
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/config/builders/versioning/archive.xml
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning.properties
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_nl.properties
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_zh.properties
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/services/versioning/VersioningServiceMMBaseImpl.java
CMSContainer/trunk/CMSContainer_Modules/versioning/src/webapp/editors/versioning/versioning.jsp
Log:
CMSC-638 Add an icon in the version history showing if a version has been
published in the past
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/config/builders/versioning/archive.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/versioning/config/builders/versioning/archive.xml
2009-05-05 08:39:17 UTC (rev 34958)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/config/builders/versioning/archive.xml
2009-05-05 09:30:52 UTC (rev 34959)
@@ -94,7 +94,7 @@
</editor>
<datatype base="integer"
xmlns="http://www.mmbase.org/xmlns/datatypes"/>
</field>
- <field>
+ <field name="publish">
<descriptions>
<description xml:lang="nl"></description>
<description xml:lang="en"></description>
@@ -112,11 +112,31 @@
<search>-1</search>
</positions>
</editor>
- <datatype base="yesno" xmlns="http://www.mmbase.org/xmlns/datatypes";
/>
- <db>
- <name>publish</name>
- <type key="false" required="true" state="persistent">BOOLEAN</type>
- </db>
+ <datatype base="yesno" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <required value="true"/>
+ </datatype>
</field>
+ <field name="onlive">
+ <descriptions>
+ <description xml:lang="nl"></description>
+ <description xml:lang="en"></description>
+ <description xml:lang="zh"></description>
+ </descriptions>
+ <gui>
+ <guiname xml:lang="nl">publish</guiname>
+ <guiname xml:lang="en">publish</guiname>
+ <guiname xml:lang="zh">发布</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>10</input>
+ <list>-1</list>
+ <search>-1</search>
+ </positions>
+ </editor>
+ <datatype base="yesno" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <required value="true"/>
+ </datatype>
+ </field>
</fieldlist>
</builder>
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning.properties
2009-05-05 08:39:17 UTC (rev 34958)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning.properties
2009-05-05 09:30:52 UTC (rev 34959)
@@ -21,4 +21,6 @@
versioning.admin.createmissing=Create missing archive nodes
versioning.admin.createmissing.confirm=Are you sure you want to create the
missing archive nodes, this can serveral minutes and put a serious load on the
server.
versioning.admin.createmissing.done=The {0} missing archive nodes have been
created in {1} seconds.
-versioning.publish=publish
+versioning.publish=onlive
+versioning.status.published=Status: Published
+versioning.status.draft=Status: Draft
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_nl.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_nl.properties
2009-05-05 08:39:17 UTC (rev 34958)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_nl.properties
2009-05-05 09:30:52 UTC (rev 34959)
@@ -21,4 +21,6 @@
versioning.admin.createmissing=Maak ontbrekende nodes aan
versioning.admin.createmissing.confirm=Weet u zeker dat u archiefnodes wil
aanmaken voor alle content die er geen heeft? Dit kan meerdere minuten duren en
een zware belasting op de server leggen.
versioning.admin.createmissing.done=De {0} ontbrekende archiefnodes zijn
aangemaakt in {1} seconden.
-versioning.publish=publish
\ No newline at end of file
+versioning.publish=onlive
+versioning.status.published=Status: Published
+versioning.status.draft=Status: Draft
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_zh.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_zh.properties
2009-05-05 08:39:17 UTC (rev 34958)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_zh.properties
2009-05-05 09:30:52 UTC (rev 34959)
@@ -21,4 +21,6 @@
versioning.admin.createmissing=创建丢失归档结点.
versioning.admin.createmissing.confirm=你确定创建丢失归档文件,这将花费一些时间并将连续上传到服务器.
versioning.admin.createmissing.done={0}对事归档结点已建立耗时 {1}秒.
-versioning.publish=发布
+versioning.publish=在live端
+versioning.status.published=状态: 发布
+versioning.status.draft=状态: 未发布
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/services/versioning/VersioningServiceMMBaseImpl.java
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/services/versioning/VersioningServiceMMBaseImpl.java
2009-05-05 08:39:17 UTC (rev 34958)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/services/versioning/VersioningServiceMMBaseImpl.java
2009-05-05 09:30:52 UTC (rev 34959)
@@ -203,9 +203,10 @@
formerArchiveXml = new String(versionNode.getByteValue(NODE_DATA),
"UTF-8");
if (data.equals(formerArchiveXml)) {
versionNode.setBooleanValue("publish", true);
+ versionNode.setBooleanValue("onlive", true);
}
else {
- versionNode.setBooleanValue("publish", false);
+ versionNode.setBooleanValue("onlive", false);
}
versionNode.commit();
}
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/src/webapp/editors/versioning/versioning.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/versioning/src/webapp/editors/versioning/versioning.jsp
2009-05-05 08:39:17 UTC (rev 34958)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/src/webapp/editors/versioning/versioning.jsp
2009-05-05 09:30:52 UTC (rev 34959)
@@ -54,6 +54,7 @@
<th><fmt:message key="versioning.author"/></th>
<th><fmt:message key="versioning.publish"/></th>
<th> </th>
+ <th> </th>
</tr>
</thead>
<tbody class="hover">
@@ -73,7 +74,7 @@
<mm:field name="firstname"/> <mm:field name="prefix"/>
<mm:field name="surname"/> (<mm:field name="username"/>)
</mm:node>
</td>
- <td><mm:field name="publish"/>
+ <td><mm:field name="onlive"/>
</td>
<td>
<c:url value="/editors/versioning/RestoreAction.do"
var="restoreUrl">
@@ -87,6 +88,18 @@
</a>
</c:if>
</td>
+ <td>
+ <mm:field name="publish" jspvar="isPublished" write="false"/>
+ <c:if test="${isPublished}">
+ <c:set var="status" value="published"/>
+ </c:if>
+ <c:if test="${!isPublished}">
+ <c:set var="status" value="draft"/>
+ </c:if>
+ <img src="../gfx/icons/status_${status}.png"
+ alt="<fmt:message key="versioning.status.${status}" />"
+ title="<fmt:message key="versioning.status.${status}" />"/>
+ </td>
</tr>
<mm:last>
</tbody>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
