svn commit: r1758656 - in /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main: java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/

[lo...@apache.org]

Author: lofwyr
Date: Wed Aug 31 17:00:20 2016
New Revision: 1758656

URL: http://svn.apache.org/viewvc?rev=1758656&view=rev
Log:
TOBAGO-1587: links doesn't support rightklick->newTab
TOBAGO-1557: Consolidate <tc:button>, <tc:link> and <tc:command>

* styling of the tree
* fix styling of the menu
* better look for disabled links
* removing #/ for disabled links, because it's not needed.


[developed by hnoeth]

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java?rev=1758656&r1=1758655&r2=1758656&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java Wed Aug 31 17:00:20 2016
@@ -108,9 +108,7 @@ public abstract class CommandRendererBas
     writer.writeNameAttribute(clientId);
     writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
 
-    if (disabled) {
-      writer.writeAttribute(HtmlAttributes.HREF, "#/", false);
-    } else {
+    if (!disabled) {
       final String href;
       String commands = RenderUtils.getBehaviorCommands(facesContext, command);
       if (commands == null) { // old way
@@ -125,7 +123,6 @@ public abstract class CommandRendererBas
         writer.writeAttribute(HtmlAttributes.TARGET, target, false);
       } else {
         writer.writeAttribute(DataAttributes.COMMANDS, commands, true);
-        writer.writeAttribute(HtmlAttributes.HREF, "#/", false);
       }
 
       if (label.getAccessKey() != null) {

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css?rev=1758656&r1=1758655&r2=1758656&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css Wed Aug 31 17:00:20 2016
@@ -234,22 +234,22 @@ table.tobago-gridLayout > tbody > tr:fir
 }
 
 .tobago-link-markup-disabled {
-  color: #909090;
+  cursor: not-allowed;
+  opacity: .65;
 }
 
-.tobago-link-markup-disabled:focus, .tobago-link-markup-disabled:hover {
-  color: #484848;
-}
-
-button.tobago-link, button.tobago-command {
+button.tobago-link, button.tobago-command, button.tobago-treeCommand {
   font-weight: normal;
   color: #0275d8;
   border-width: 0;
   padding: 0;
   background-color: transparent;
+  text-align: left;
 }
 
-button.tobago-link:focus, button.tobago-link:hover, button.tobago-command:focus, button.tobago-command:hover {
+button.tobago-link:focus, button.tobago-link:hover,
+button.tobago-command:focus, button.tobago-command:hover,
+button.tobago-treeCommand:focus, button.tobago-treeCommand:hover {
   color: #014c8c;
   text-decoration: underline;
   background-color: transparent;
@@ -313,12 +313,9 @@ button.tobago-link:focus, button.tobago-
   display: block;
 }
 
-.dropdown-submenu > a:after, .dropdown-submenu > button:after {
-  display: block;
+.dropdown-submenu:after {
   content: " ";
   float: right;
-  width: 0;
-  height: 0;
   border-color: transparent;
   border-style: solid;
   border-width: 5px 0 5px 5px;
@@ -327,6 +324,10 @@ button.tobago-link:focus, button.tobago-
   margin-right: -10px;
 }
 
+.dropdown-submenu > button:after {
+  display: none;
+}
+
 .dropdown-submenu:hover > a:after {
   border-left-color: #ffffff;
 }