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

Merge branch 'develop' into feature/theming

Browse source
This commit is contained in:
Graham Triggs 2017-04-30 19:27:15 +01:00
commit 23c0ee372d
7 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java
View file

@ -6,7 +6,6 @@ import java.io.IOException;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Properties;
import org.apache.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
@ -88,6 +87,7 @@ class IndividualResponseBuilder {
body.put("verbosePropertySwitch", getVerbosePropertyValues()); body.put("verbosePropertySwitch", getVerbosePropertyValues());
addAltMetricOptions(body); addAltMetricOptions(body);
addPlumPrintOptions(body);
//Execute data getters that might apply to this individual, e.g. because of the class of the individual //Execute data getters that might apply to this individual, e.g. because of the class of the individual
try{ try{
@ -202,6 +202,27 @@ class IndividualResponseBuilder {
} }
} }
private void addPlumPrintOptions(Map<String, Object> body) {
ConfigurationProperties properties = ConfigurationProperties.getBean(vreq);
if (properties != null) {
String enabled = properties.getProperty("resource.plum-print", "disabled");
String displayTo = properties.getProperty("resource.plum-print.displayto", "right");
String printHideEmpty = properties.getProperty("resource.plum-print.hide-when-empty", "true");
String printPopover = properties.getProperty("resource.plum-print.popover", "right");
String printSize = properties.getProperty("resource.plum-print.size", "medium");
if (!"disabled".equalsIgnoreCase(enabled)) {
body.put("plumPrintEnabled", true);
body.put("plumPrintDisplayTo", displayTo);
body.put("plumPrintHideEmpty", "true".equalsIgnoreCase(printHideEmpty) ? "true" : "false");
body.put("plumPrintPopover", printPopover);
body.put("plumPrintSize", printSize);
}
}
}
private boolean getTemporalVisualizationFlag() { private boolean getTemporalVisualizationFlag() {
String property = ConfigurationProperties.getBean(vreq).getProperty( String property = ConfigurationProperties.getBean(vreq).getProperty(
"visualization.temporal"); "visualization.temporal");

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/StackTraceLayout.java
View file

@ -14,7 +14,7 @@ import org.apache.log4j.spi.LoggingEvent;
* *
* <pre> * <pre>
* log4j.appender.RiotAppender=org.apache.log4j.RollingFileAppender * log4j.appender.RiotAppender=org.apache.log4j.RollingFileAppender
* log4j.appender.RiotAppender.File= $${catalina.home}/logs/${webapp.name}.riot.log * log4j.appender.RiotAppender.File= $${catalina.base}/logs/${webapp.name}.riot.log
* log4j.appender.RiotAppender.MaxFileSize=10MB * log4j.appender.RiotAppender.MaxFileSize=10MB
* log4j.appender.RiotAppender.MaxBackupIndex=10 * log4j.appender.RiotAppender.MaxBackupIndex=10
* log4j.appender.RiotAppender.layout=edu.cornell.mannlib.vitro.webapp.utils.logging.StackTraceLayout * log4j.appender.RiotAppender.layout=edu.cornell.mannlib.vitro.webapp.utils.logging.StackTraceLayout

2
installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
View file

@ -1,5 +1,5 @@
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= ${catalina.home}/logs/${app-name}solr.log log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}solr.log
log4j.appender.AllAppender.MaxFileSize=10MB log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10 log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout

2
installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
View file

@ -24,7 +24,7 @@
# debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion. # debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= ${catalina.home}/logs/${app-name}.all.log log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}.all.log
log4j.appender.AllAppender.MaxFileSize=10MB log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10 log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout

2
legacy/webapp/config/log4j.properties
View file

@ -24,7 +24,7 @@
# debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion. # debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= $${catalina.home}/logs/${webapp.name}.all.log log4j.appender.AllAppender.File= $${catalina.base}/logs/${webapp.name}.all.log
log4j.appender.AllAppender.MaxFileSize=10MB log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10 log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout

2
solr/src/main/resources/log4j.properties
View file

@ -1,5 +1,5 @@
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= ${catalina.home}/logs/solr.log log4j.appender.AllAppender.File= ${catalina.base}/logs/solr.log
log4j.appender.AllAppender.MaxFileSize=10MB log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10 log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout

2
webapp/src/main/webapp/css/individual/individual-property-groups.css
View file

@ -19,7 +19,7 @@ section.property-group h2 {
top: 8px; /* changed for redesign, was 0 */ top: 8px; /* changed for redesign, was 0 */
right: 12px; /* changed for redesign, was -21px;*/ right: 12px; /* changed for redesign, was -21px;*/
} }
section.property-group div { section.property-group > div {
margin-top:15px; margin-top:15px;
/* display:none; */ /* display:none; */
} }