You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2012/07/06 13:48:59 UTC
svn commit: r1358146 - in
/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view:
action/ActionButton.java simple/RemoveElement.java
Author: rmatthews
Date: Fri Jul 6 11:48:59 2012
New Revision: 1358146
URL: http://svn.apache.org/viewvc?rev=1358146&view=rev
Log:
ISIS-162 - When an action button is disabled the button is generated as a div within a div so that its structure follows that of the enabled buttons where the input element is contained within the form element
Modified:
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java?rev=1358146&r1=1358145&r2=1358146&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java Fri Jul 6 11:48:59 2012
@@ -106,10 +106,12 @@ public class ActionButton extends Abstra
if (className == null) {
className = "access";
}
- request.appendHtml("<div id=\"" + id +"\" class=\"" + className + " disabled\" title=\"");
+ request.appendHtml("<div id=\"" + id + "\" class=\"" + className + " disabled-form\">");
+ request.appendHtml("<div class=\"button disabled\" title=\"");
request.appendAsHtmlEncoded(message);
request.appendHtml("\" >" + buttonTitle);
request.appendHtml("</div>");
+ request.appendHtml("</div>");
}
public static void write(
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java?rev=1358146&r1=1358145&r2=1358146&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java Fri Jul 6 11:48:59 2012
@@ -90,15 +90,12 @@ public class RemoveElement extends Abstr
}
if (usable.isVetoed()) {
- /*
- request.appendHtml("<span class=\"veto\">");
- request.appendAsHtmlEncoded(usable.getReason());
- request.appendHtml("</span>");
- */
- request.appendHtml("<div class=\"" + cssClass + " disabled\" title=\"");
+ request.appendHtml("<div class=\"" + cssClass + " disabled-form\">");
+ request.appendHtml("<div class=\"button disabled\" title=\"");
request.appendAsHtmlEncoded(usable.getReason());
request.appendHtml("\" >" + title);
request.appendHtml("</div>");
+ request.appendHtml("</div>");
} else {
if (valid(request, adapter)) {
final String classSegment = " class=\"" + cssClass + "\"";