Partial fix for #2626: ToolkitTunes layout broken: the track detail labels and slider...

svn changeset:6923/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/toolkittunes/styles.css b/WebContent/ITMILL/themes/toolkittunes/styles.css
index d6015627f7642efbdd9b50afae297772abec30bf..e0350f5f5d26e09de8e70e77f1b76c5aeae0b401 100644 (file)
--- a/WebContent/ITMILL/themes/toolkittunes/styles.css
+++ b/WebContent/ITMILL/themes/toolkittunes/styles.css
@@ -1,43 +1,5 @@
 @import url(../default/styles.css);
 
-.i-generated-body {
-       /* full height layout does not need scrollable body; 
-       avoids excess scrollbars if moving sub-window over the window area */
-       overflow:hidden;
-}
-
-/******************************************************************************
- * For FormExample.java
- ******************************************************************************/
-.i-form legend {
-       color: #464f52;
-}
-
-.i-orderedlayout-formroot td {
-       vertical-align: top;
-}
-
-/******************************************************************************
- * For GeneratedColumnExample.java.
- ******************************************************************************/
-/* Align columns generated with ValueColumnGenerator to right. */ 
-.i-label-column-type-value {
-    text-align: right;
-}
-
-/* The total value column is displayed in bold. */
-.i-label-column-total {
-       font-weight: bold;
-       text-align: right;
-}
-
-/* Display calculated values in blue color. */
-.i-label-column-price, .i-label-column-consumption, .i-label-column-dailycost {
-    color: blue;
-    text-align: right;
-}
-
-
 
 /******************************************************************************
  * For ToolkitTunesLayout.java
@@ -125,16 +87,16 @@
        -moz-border-radius: 5px;
 }
 
-.tTunes .status .i-orderedlayout-margin-top {
+.tTunes .status .i-horizontallayout-margin-top {
        padding-top: 3px;
 }
-.tTunes .status .i-orderedlayout-margin-bottom {
+.tTunes .status .i-horizontallayout-margin-bottom {
        padding-bottom: 3px;
 }
-.tTunes .status .i-orderedlayout-margin-left {
+.tTunes .status .i-horizontallayout-margin-left {
        padding-left: 9px;
 }
-.tTunes .status .i-orderedlayout-margin-right {
+.tTunes .status .i-horizontallayout-margin-right {
        padding-right: 9px;
 }
 

diff --git a/src/com/itmill/toolkit/demo/ToolkitTunesLayout.java b/src/com/itmill/toolkit/demo/ToolkitTunesLayout.java
index 0e105c63888b9a2cc4f52afe42b734771ba5f7fb..fc0036d448aa8ea9f66106de10a2b0d9b1606257 100644 (file)
--- a/src/com/itmill/toolkit/demo/ToolkitTunesLayout.java
+++ b/src/com/itmill/toolkit/demo/ToolkitTunesLayout.java
@@ -78,7 +78,7 @@ public class ToolkitTunesLayout extends Application {
         top.addComponent(search);
         top.setComponentAlignment(playback, "middle");
         top.setComponentAlignment(volume, "middle");
-        top.setComponentAlignment(status, "middle");
+        top.setComponentAlignment(status, "middle center");
         top.setComponentAlignment(viewmodes, "middle");
         top.setComponentAlignment(search, "middle");
 
@@ -114,7 +114,6 @@ public class ToolkitTunesLayout extends Application {
         // Status area
         status.setWidth("80%");
         status.setSpacing(true);
-        top.setComponentAlignment(status, "middle center");
 
         Button toggleVisualization = new Button("Mode");
         Label timeFromStart = new Label("0:00");
@@ -125,6 +124,8 @@ public class ToolkitTunesLayout extends Application {
         trackDetails.setWidth("100%");
         Label track = new Label("Track Name");
         Label album = new Label("Album Name - Artist");
+        track.setWidth(null);
+        album.setWidth(null);
         Slider progress = new Slider();
         progress.setOrientation(Slider.ORIENTATION_HORIZONTAL);
         progress.setWidth("100%");