Skip to content
Browse files

Merge remote-tracking branch 'origin/master' into preemptive-auth-test

  • Loading branch information...
2 parents 8bc4f36 + fba49a7 commit 3b43a244a5613379b7476d3e1377af4d9522a156 @cstamas cstamas committed Apr 15, 2013
View
11 nexus-oss-webapp/src/main/resources/content/bin/jsw/conf/wrapper.conf
@@ -26,11 +26,12 @@ wrapper.java.classpath.3=./conf/
wrapper.java.library.path.1=bin/jsw/lib
# Additional JVM parameters (tune if needed, but match the sequence of numbers!)
-#wrapper.java.additional.1=-Xdebug
-#wrapper.java.additional.2=-Xnoagent
-#wrapper.java.additional.3=-Djava.compiler=NONE
-#wrapper.java.additional.4=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#wrapper.java.additional.5=-XX:+HeapDumpOnOutOfMemoryError
+wrapper.java.additional.1=-Djava.net.preferIPv4Stack=true
+#wrapper.java.additional.2=-Xdebug
+#wrapper.java.additional.3=-Xnoagent
+#wrapper.java.additional.4=-Djava.compiler=NONE
+#wrapper.java.additional.5=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#wrapper.java.additional.6=-XX:+HeapDumpOnOutOfMemoryError
wrapper.app.parameter.1=./conf/jetty.xml
View
2 ...ncher/src/main/java/org/sonatype/nexus/integrationtests/AbstractNexusIntegrationTest.java
@@ -164,6 +164,8 @@
// guice finalizer turned OFF
System.setProperty( "guice.executor.class", "NONE" );
+ // NEXUS-5660 test with ipv4 as app runs with this set now
+ System.setProperty( "java.net.preferIPv4Stack", "true" );
}
static
View
31 nexus-webapp/src/main/webapp/js/ext/form/field.js
@@ -16,10 +16,12 @@ Ext.override(Ext.form.Field, {
/*
* Override default form field rendering to include help text quick tip on
* question mark rendered after field label.
+ * Specifying 'helpText' will cause a help icon and text to be added as a QuickTip.
+ * Specifying 'persistent' in conjunction with 'helpTest' will create a ToolTip that remains visible, useful for embedding links in the text.
*/
afterRenderOrig : Ext.form.Field.prototype.afterRender,
afterRender : function() {
- var helpClass = null, wrapDiv = null, helpMark = null;
+ var helpClass = null, wrapDiv = null, helpMark = null, self = this;
if ( this.helpMarker === true )
{
wrapDiv = this.getEl().up('div');
@@ -79,12 +81,27 @@ Ext.override(Ext.form.Field, {
cls : helpClass
});
- Ext.QuickTips.register({
- target : helpMark,
- title : '',
- text : this.helpText,
- enabled : true
- });
+ // Use a ToolTip instead of QuickTip if we want the tip to remain in place.
+ // In this case the entire html fo the ToolTip will be set to the provided
+ // 'helpText'.
+ if(this.persistent)
+ {
+ var help = new Ext.ToolTip({
+ html : self.helpText,
+ anchor: 'left',
+ hideDelay: 10000
+ });
+ help.initTarget(helpMark);
+ }
+ else
+ {
+ Ext.QuickTips.register({
+ target : helpMark,
+ title : '',
+ text : this.helpText,
+ enabled : true
+ });
+ }
}
// original method
View
2 nexus-webapp/src/main/webapp/style/Sonatype.css
@@ -197,7 +197,7 @@ button.st-icon-refresh {
.form-label-helpmark-combo {
/* large margin needed to place helpmark next to combobox - the box is position:absolute, and helpmark was covered by dropdown arrow */
- margin-left: 18px;
+ margin-left: 19px;
height: 16px;
width: 16px;
vertical-align: middle;

0 comments on commit 3b43a24

Please sign in to comment.
Something went wrong with that request. Please try again.