litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging r10056 to the trunk

Browse source
This commit is contained in:
tworrall 2012-09-19 15:25:42 +00:00
parent 950be11440
commit fb483663bf
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
View file

@ -112,6 +112,8 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
} }
String nameStr = prop.getPublicName()==null ? prop.getName()==null ? prop.getURI()==null ? "(no name)" : prop.getURI() : prop.getName() : prop.getPublicName(); String nameStr = prop.getPublicName()==null ? prop.getName()==null ? prop.getURI()==null ? "(no name)" : prop.getURI() : prop.getName() : prop.getPublicName();
nameStr = nameStr.replace("\"","\\\"");
nameStr = nameStr.replace("\'","\\\'");
try { try {
json += "{ \"name\": \"<a href='datapropEdit?uri="+URLEncoder.encode(prop.getURI(),"UTF-8")+"'>" + nameStr + "</a>\", "; json += "{ \"name\": \"<a href='datapropEdit?uri="+URLEncoder.encode(prop.getURI(),"UTF-8")+"'>" + nameStr + "</a>\", ";
} catch (Exception e) { } catch (Exception e) {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
View file

@ -152,6 +152,8 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet {
ObjectProperty prop = (ObjectProperty) propsIt.next(); ObjectProperty prop = (ObjectProperty) propsIt.next();
String propNameStr = ShowObjectPropertyHierarchyController.getDisplayLabel(prop); String propNameStr = ShowObjectPropertyHierarchyController.getDisplayLabel(prop);
propNameStr = propNameStr.replace("\"","\\\"");
propNameStr = propNameStr.replace("\'","\\\'");
try { try {
json += "{ \"name\": \"<a href='./propertyEdit?uri="+URLEncoder.encode(prop.getURI(),"UTF-8")+"'>" json += "{ \"name\": \"<a href='./propertyEdit?uri="+URLEncoder.encode(prop.getURI(),"UTF-8")+"'>"
+ propNameStr + "</a>\", "; + propNameStr + "</a>\", ";

1
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
View file

@ -201,7 +201,6 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
else if ( position < previous_posn ) { else if ( position < previous_posn ) {
tempString += "}, { \"name\": "; tempString += "}, { \"name\": ";
} }
try { try {
tempString += "\"<a href='vclassEdit?uri="+URLEncoder.encode(vcw.getURI(),"UTF-8")+"'>"+ vcw.getLocalNameWithPrefix() +"</a>\", "; tempString += "\"<a href='vclassEdit?uri="+URLEncoder.encode(vcw.getURI(),"UTF-8")+"'>"+ vcw.getLocalNameWithPrefix() +"</a>\", ";
} catch (Exception e) { } catch (Exception e) {

4
webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js
View file

@ -182,10 +182,10 @@
} }
if ( this.children.length == 1 ) { if ( this.children.length == 1 ) {
subclassString += "<span style='font-size:0.8em'> (1 subclass)</span>"; subclassString += "<span style='font-size:0.8em'> (1 subproperty)</span>";
} }
else if ( this.children.length > 1 ) { else if ( this.children.length > 1 ) {
subclassString += "<span style='font-size:0.8em'> (" + this.children.length + " subclasses)</span>"; subclassString += "<span style='font-size:0.8em'> (" + this.children.length + " subproperties)</span>";
} }
childDetails += "<td class='subclassCell' colspan='2'><span class='subclassExpandPlus' id='subclassExpand" childDetails += "<td class='subclassCell' colspan='2'><span class='subclassExpandPlus' id='subclassExpand"