Author: tdraier
Date: Wed Dec 19 17:13:50 2007
New Revision: 19393
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19393&repname=
=3Djahia
Log:
file manager info/edit panes update
Added:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_view_simple.jsp
- copied, changed from r19331, branches/JAHIA-5-0-3-DMS-JACKRABBIT-BR=
ANCH/core/src/webapp/jsp/jahia/engines/filemanager/info_view.jsp
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/engi=
nes/filemanager/DAVFilemanager_Engine.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_edit.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_view.jsp
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/engines/filemanager/DAVFilemanager_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/engines/filemanager/DAVFilema=
nager_Engine.java&rev=3D19393&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/engi=
nes/filemanager/DAVFilemanager_Engine.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/engi=
nes/filemanager/DAVFilemanager_Engine.java Wed Dec 19 17:13:50 2007
@@ -24,6 +24,7 @@
package org.jahia.engines.filemanager;
=
import org.apache.regexp.RE;
+import org.jahia.api.Constants;
import org.jahia.bin.Jahia;
import org.jahia.data.JahiaData;
import org.jahia.data.fields.JahiaField;
@@ -383,7 +384,9 @@
}
} else if (tab.equals("edit")) {
try {
- saveProperties((JCRFileNodeWrapper) object, jParam=
s );
+ if (object instanceof JCRFileNodeWrapper) {
+ saveJCRProperties((JCRFileNodeWrapper) object,=
jParams );
+ }
} catch (JahiaException e) {
logger.error("Cannot save properties",e);
}
@@ -861,8 +864,9 @@
final FileNode object =3D jahiaWebdavBaseService.getDAVFileAccess(
pathes[0], jParams.getUser());
final String tab =3D (String) engineMap.get("tab");
+ engineMap.put("jcr", new Boolean(object instanceof JCRFileNodeWrap=
per));
if (tab.equals("general") || tab.equals("edit")) {
- loadProperties(object, engineMap, jParams);
+// loadProperties(object, engineMap, jParams);
} else if (tab.equals("rightsMgmt")) {
loadAcl(object, jParams, engineMap);
} else if (tab.equals("usages")) {
@@ -872,20 +876,19 @@
engineMap.put("object", object);
}
=
- private boolean loadProperties(final FileNode dav, final Map engineMap=
, final ProcessingContext jParams) throws JahiaException{
+ private boolean saveJCRProperties(final JCRFileNodeWrapper dav, final =
ProcessingContext jParams) throws JahiaException{
+ List types =3D dav.getExtensionMixinTypes();
+ Node objectNode =3D dav.getObjectNode();
try {
- List types =3D dav.getAvailableTypes();
- engineMap.put("availableTypes", types);
- return true;
+ if (!objectNode.isNodeType(Constants.JAHIAMIX_METADATA)) {
+ objectNode.addMixin(Constants.JAHIAMIX_METADATA);
+ types.add(dav.getJahiaMetadataType());
+ } else {
+ types.add(dav.getJahiaMetadataType()); =
+ }
} catch (RepositoryException e) {
- e.printStackTrace(); //To change body of catch statement use =
File | Settings | File Templates.
- return false;
+ logger.error("Cannot add jahia metadata type",e);
}
- }
-
- private boolean saveProperties(final JCRFileNodeWrapper dav, final Pro=
cessingContext jParams) throws JahiaException{
- List types =3D dav.getExtensionMixinTypes();
- Node objectNode =3D dav.getObjectNode();
for (Iterator iterator =3D types.iterator(); iterator.hasNext();) {
NodeType t =3D (NodeType) iterator.next();
PropertyDefinition[] pds =3D t.getPropertyDefinitions();
@@ -900,11 +903,13 @@
boolean isCategory =3D false;
String rootCategory;
Value[] defaultValues =3D pd.getDefaultValues(=
);
- for (int j =3D 0; j < defaultValues.length; j+=
+) {
- String defaultValue =3D defaultValues[j].g=
etString();
- if (defaultValue.startsWith("###category##=
#")) {
- isCategory =3D true;
- rootCategory =3D defaultValue.substrin=
g("###category###".length());
+ if (defaultValues !=3D null) {
+ for (int j =3D 0; j < defaultValues.length=
; j++) {
+ String defaultValue =3D defaultValues[=
j].getString();
+ if (defaultValue.startsWith("###catego=
ry###")) {
+ isCategory =3D true;
+ rootCategory =3D defaultValue.subs=
tring("###category###".length());
+ }
}
}
if (newValue !=3D null) {
@@ -933,6 +938,14 @@
}
}
}
+ String newType =3D jParams.getParameter("newType");
+ if (newType !=3D null && newType.length()>0) {
+ try {
+ objectNode.addMixin(newType);
+ } catch (RepositoryException e) {
+ e.printStackTrace(); //To change body of catch statement =
use File | Settings | File Templates.
+ }
+ }
return true;
}
=
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/info.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info.js=
p&rev=3D19393&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info.jsp Wed Dec 19 17:13:50 2007
@@ -57,6 +57,7 @@
<li><a href=3D"javascript:handleTabChange('general')"><jahia:engineRes=
ourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.general.label"/></a></li>
<% } %>
+ <% if (((Boolean)engineMap.get("jcr")).booleanValue()) { %>
<% if ("edit".equals(tab)) { %>
<li class=3D"selected"><div><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.editFile.label"/></div></li>
@@ -64,6 +65,7 @@
<li><a href=3D"javascript:handleTabChange('edit')"><jahia:engineResour=
ceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.editFile.label"/></a></li>
<% } %>
+ <% } %>
<% if (!object.isCollection()) { %>
<% if ("usages".equals(tab)) { %>
<li class=3D"selected"><div><jahia:engineResourceBundle
@@ -82,6 +84,7 @@
resourceName=3D"org.jahia.engines.include.actionSelector.Right=
sMgmt.label"/></a></li>
<% } %>
<% } %>
+ <% if (((Boolean)engineMap.get("jcr")).booleanValue()) { %>
<% if (object.hasPermission(FileNode.WRITE)) { %>
<% if ("version".equals(tab)) { %>
<li class=3D"selected"><div>Versions</div></li>
@@ -89,6 +92,7 @@
<li><a href=3D"javascript:handleTabChange('version')">Versions</a></li>
<% } %>
<% } %>
+ <% } %>
</ul>
=
<div id=3D"main">
@@ -105,7 +109,11 @@
</strong>
<hr/>
<% if (tab.equals("general")) { %>
+ <% if (((Boolean)engineMap.get("jcr")).booleanValue()) { %>
<jsp:include page=3D"info_view.jsp"/>
+ <% } else { %>
+ <jsp:include page=3D"info_view_simple.jsp"/>
+ <% } %>
<% } else if (tab.equals("edit")) { %>
<jsp:include page=3D"info_edit.jsp"/>
<% } else if ("usages".equals(tab)) { %>
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/info_edit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info_ed=
it.jsp&rev=3D19393&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_edit.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_edit.jsp Wed Dec 19 17:13:50 2007
@@ -19,6 +19,7 @@
<%@ page import=3D"javax.jcr.nodetype.PropertyDefinition" %>
<%@ page import=3D"java.text.SimpleDateFormat" %>
<%@ page import=3D"java.util.*" %>
+<%@ taglib uri=3D"jcr" prefix=3D"jcr" %>
<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%
@@ -28,7 +29,7 @@
final String[] pathes =3D (String[]) engineMap.get("pathes");
final String tab =3D (String) engineMap.get("tab");
session.setAttribute("tab", tab);
- final FileNode object =3D (FileNode) engineMap.get("object");
+ final JCRFileNodeWrapper object =3D (JCRFileNodeWrapper) engineMap.get=
("object");
final String decodedPath =3D TableEntry.javascriptDecode(pathes[0]);
String selectCategoriesURL =3D CategoriesSelect_Engine.getInstance().r=
enderLink (jData.params(), "");
String type;
@@ -132,14 +133,14 @@
</tr>
<tr>
<td>Title:</td>
- <td><%=3DDAVAbstractAction.getFormatedString(object.getProperty("j=
:title"))%></td>
+ <% String title=3Dobject.getProperty("j:title"); %>
+ <td><input name=3D"prop_j_title" value=3D"<%=3D(title =3D=3D null)=
?"":DAVAbstractAction.getFormatedString(title)%>"/></td>
</tr>
<tr>
<td><jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
filemanager.Filemanager_Engine.path.label"/>
:</td>
<td>
- <a style=3D"text-align:left" href=3D"<%=3D object.getUrl() %>">
- /site/<%=3DjParams.getSiteKey()%><%=3DdecodedPath%>
+ <a style=3D"text-align:left" href=3D"<%=3D object.getUrl() %>"=
><%=3D object.getUrl() %>
</a>
</td>
</tr>
@@ -155,11 +156,13 @@
</tr>
<tr>
<td>Description:</td>
- <td><%=3DDAVAbstractAction.getFormatedString(object.getProperty("j=
:description"))%></td>
+ <% String description=3Dobject.getProperty("j:description"); %>
+ <td><textarea name=3D"prop_j_description"><%=3D(description =3D=3D=
null)?"":DAVAbstractAction.getFormatedString(description)%></textarea></td>
</tr>
<tr>
<td>Keyword:</td>
- <td><%=3DDAVAbstractAction.getFormatedString(object.getProperty("j=
:keywords"))%></td>
+ <% String keywords=3Dobject.getProperty("j:keywords"); %>
+ <td><input name=3D"prop_j_keywords" value=3D"<%=3D(keywords =3D=3D=
null)?"":DAVAbstractAction.getFormatedString(keywords)%>"/></td>
</tr>
<tr>
<td colspan=3D"2"><hr>Lifecycle<hr/></td>
@@ -184,9 +187,11 @@
=
<%
List types =3D object.getExtensionMixinTypes();
+ List availableTypes =3D object.getAvailableTypes();
for (Iterator iterator =3D types.iterator(); iterator.hasNext();) {
NodeType nodeType =3D (NodeType) iterator.next();
String name =3D nodeType.getName();
+ availableTypes.remove(name);
name =3D name.replace(':','_');
String typelabel =3D JahiaResourceBundle.getEngineResource("or=
g.jahia.services.jcr.types." + name,
jParams, jParams.getLocale());
@@ -223,11 +228,13 @@
case PropertyType.LONG:
case PropertyType.STRING:
Value[] defaultValues =3D propertyDefinition.g=
etDefaultValues();
- for (int i =3D 0; i < defaultValues.length; i+=
+) {
- String defaultValue =3D defaultValues[i].g=
etString();
- if (defaultValue.startsWith("###category##=
#")) {
- isCategory =3D true;
- rootCategory =3D defaultValue.substrin=
g("###category###".length());
+ if (defaultValues !=3D null) {
+ for (int i =3D 0; i < defaultValues.length=
; i++) {
+ String defaultValue =3D defaultValues[=
i].getString();
+ if (defaultValue.startsWith("###catego=
ry###")) {
+ isCategory =3D true;
+ rootCategory =3D defaultValue.subs=
tring("###category###".length());
+ }
}
}
if (!isCategory) {
@@ -349,8 +356,30 @@
<%
}
}
- %>
=
+ if (!availableTypes.isEmpty()) {
+ %>
+ <tr>
+ <td colspan=3D"2"><hr>Add a new type<hr/></td>
+ </tr>
+ <tr>
+ <td colspan=3D"2">
+ <select name=3D"newType">
+ <option value=3D"">--- Select ---</option>
+ <%
+ for (Iterator iterator =3D availableTypes.iterator(); iter=
ator.hasNext();) {
+ String name =3D (String) iterator.next();
+ String name2 =3D name.replace(':','_');
+ String typelabel =3D JahiaResourceBundle.getEngineReso=
urce("org.jahia.services.jcr.types." + name2,
+ jParams, jParams.getLocale());
+ if (typelabel =3D=3D null ) {
+ typelabel =3D name2;
+ }
+ %><option value=3D"<%=3Dname%>"><%=3Dtypelabel%><%
+ }
+ %>
+ </select>
+ </td>
+ </tr>
+ <% } %>
</table>
-
-
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/info_view.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info_vi=
ew.jsp&rev=3D19393&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_view.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_view.jsp Wed Dec 19 17:13:50 2007
@@ -23,7 +23,7 @@
final String[] pathes =3D (String[]) engineMap.get("pathes");
final String tab =3D (String) engineMap.get("tab");
session.setAttribute("tab", tab);
- final FileNode object =3D (FileNode) engineMap.get("object");
+ final JCRFileNodeWrapper object =3D (JCRFileNodeWrapper) engineMap.get=
("object");
final String decodedPath =3D TableEntry.javascriptDecode(pathes[0]);
String type;
if (object.isCollection()) {
@@ -138,11 +138,13 @@
case PropertyType.LONG:
case PropertyType.STRING:
Value[] defaultValues =3D propertyDefinition.getDefaultVal=
ues();
- for (int i =3D 0; i < defaultValues.length; i++) {
- String defaultValue =3D defaultValues[i].getString();
- if (defaultValue.startsWith("###category###")) {
- isCategory =3D true;
- rootCategory =3D defaultValue.substring("###catego=
ry###".length());
+ if (defaultValues !=3D null) {
+ for (int i =3D 0; i < defaultValues.length; i++) {
+ String defaultValue =3D defaultValues[i].getString=
();
+ if (defaultValue.startsWith("###category###")) {
+ isCategory =3D true;
+ rootCategory =3D defaultValue.substring("###ca=
tegory###".length());
+ }
}
}
%>
Copied: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahi=
a/engines/filemanager/info_view_simple.jsp (from r19331, branches/JAHIA-5-0=
-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info=
_view.jsp)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info_vi=
ew_simple.jsp&rev=3D19393&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_view.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_view_simple.jsp Wed Dec 19 17:13:50 2007
@@ -3,17 +3,7 @@
<%@ page import=3D"org.jahia.engines.filemanager.TableEntry" %>
<%@ page import=3D"org.jahia.params.ParamBean" %>
<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle" %>
-<%@ page import=3D"org.jahia.api.Constants" %>
<%@ page import=3D"org.jahia.services.content.FileNode" %>
-<%@ page import=3D"org.jahia.services.content.JCRFileNodeWrapper" %>
-<%@ page import=3D"javax.jcr.Node" %>
-<%@ page import=3D"javax.jcr.Property" %>
-<%@ page import=3D"javax.jcr.PropertyType" %>
-<%@ page import=3D"javax.jcr.Value" %>
-<%@ page import=3D"javax.jcr.nodetype.ItemDefinition" %>
-<%@ page import=3D"javax.jcr.nodetype.NodeDefinition" %>
-<%@ page import=3D"javax.jcr.nodetype.NodeType" %>
-<%@ page import=3D"javax.jcr.nodetype.PropertyDefinition" %>
<%@ page import=3D"java.util.*" %>
<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
@@ -96,109 +86,6 @@
<%=3DDAVAbstractAction.getFormatedString(object.getModificationUse=
r())%></td>
</tr>
=
-<%
- List types =3D object.getExtensionMixinTypes();
- for (Iterator iterator =3D types.iterator(); iterator.hasNext();) {
- NodeType nodeType =3D (NodeType) iterator.next();
- String name =3D nodeType.getName();
- name =3D name.replace(':','_');
- String typelabel =3D JahiaResourceBundle.getEngineResource("org.ja=
hia.services.jcr.types." + name,
- jParams, jParams.getLocale());
- if (typelabel =3D=3D null ) {
- typelabel =3D name;
- }
-%>
-<tr>
- <td colspan=3D"2"><hr><%=3D typelabel %><hr/></td>
-</tr>
-<%
- Map props =3D object.getProperties(nodeType.getName());
- for (Iterator iterator1 =3D props.keySet().iterator(); iterator1.hasNe=
xt();) {
-%>
-<tr>
- <%
- ItemDefinition itemDefinition =3D (ItemDefinition) iterator1.next(=
);
- if (itemDefinition instanceof PropertyDefinition) {
- PropertyDefinition propertyDefinition =3D (PropertyDefinition)=
itemDefinition;
- Property property =3D (Property) props.get(propertyDefinition);
- if (property !=3D null) {
- String propname =3D propertyDefinition.getName();
- propname =3D propname.replace(':','_');
- String label =3D JahiaResourceBundle.getEngineResource("or=
g.jahia.services.jcr.types." + propname,
- jParams, jParams.getLocale());
- if (label =3D=3D null) {
- label =3D propname;
- }
- %>
- <td><%=3D label %>: </td>
- <%
- boolean isCategory =3D false;
- String rootCategory;
- switch (propertyDefinition.getRequiredType()) {
- case PropertyType.LONG:
- case PropertyType.STRING:
- Value[] defaultValues =3D propertyDefinition.getDefaultVal=
ues();
- for (int i =3D 0; i < defaultValues.length; i++) {
- String defaultValue =3D defaultValues[i].getString();
- if (defaultValue.startsWith("###category###")) {
- isCategory =3D true;
- rootCategory =3D defaultValue.substring("###catego=
ry###".length());
- }
- }
- %>
- <td><%=3DDAVAbstractAction.getFormatedString(property.getValue().getSt=
ring())%></td>
- <%
- break;
- case PropertyType.DATE:
- %>
- <td><%=3DDAVAbstractAction.getFormatedDate(property.getDate().getTime(=
))%></td>
- <%
- break;
- }
- }
- } else {
- // display child nodes (currently only sub-content=
s)
-
- NodeDefinition nodeDefinition =3D (NodeDefinition)=
itemDefinition;
- Node node =3D (Node) props.get(nodeDefinition);
- if (node !=3D null) {
- String nodename =3D nodeDefinition.getName();
- nodename =3D nodename.replace(':','_');
- String label =3D JahiaResourceBundle.getEngine=
Resource("org.jahia.services.jcr.types." + nodename,
- jParams, jParams.getLocale());
- if (label =3D=3D null) {
- label =3D nodename;
- }
- NodeType[] nts =3D nodeDefinition.getRequiredP=
rimaryTypes();
- List names =3D new ArrayList();
- for (int i =3D 0; i < nts.length; i++) {
- NodeType nt =3D nts[i];
- names.add(nt.getName());
- }
-
- %>
- <td><%=3D label %>: </td>
- <%
- if (names.contains("nt:resource")) {
- if (node.getProperty(Constants.JCR_MIMETYPE).getString().start=
sWith("image/")) {
- %>
- <td><img src=3D"<jahia:serverHttpPath/>/repository/default<%=3Ddecoded=
Path%>/<%=3D node.getName()%>" /></td>
- <% } else {
- %>
- <td><a href=3D"<jahia:serverHttpPath/>/repository/default<%=3DdecodedP=
ath%>/<%=3D node.getName()%>"><%=3D node.getName()%></a>
- <%
- }
- %> </td> <%
- }
- }
- }
-%>
-</tr>
-<%
- }
- }
-%>
-
</table>
=
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list