Browse files

Merge remote-tracking branch 'cindyli/FLUID-4971'

* cindyli/FLUID-4971:
  FLUID-4971: Fixed the full page manual tests.
  FLUID-4971: Removed unused function call in demo
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: CSS formatting tweaks
  FLUID-4971: Removed uio-demo-theme class in demos to use default
  FLUID-4971: Edited manual test readme, removed 'return to site' links, moved test js out of demo js, edited demo text. Cancel buttons still broken
  FLUID-4971: Moved full page UIO demos into manual-tests
  FLUID-4971: Moved full page UIO demos into manual-tests
  • Loading branch information...
2 parents ffd7f9f + f2d7894 commit 96afc309f3a3aa7aa85a8801b414ece6a42737da @michelled michelled committed Apr 26, 2013
View
60 src/webapp/components/uiOptions/css/FatPanelUIOptions.css
@@ -1,52 +1,52 @@
@font-face {
- font-family: 'OpenSans';
- src:url('fonts/OpenSans-Light.ttf');
- font-weight: normal;
- font-style: normal;
+ font-family: 'OpenSans';
+ src:url('fonts/OpenSans-Light.ttf');
+ font-weight: normal;
+ font-style: normal;
}
/* Top bar and show/hide button */
.fl-uiOptions-fatPanel .fl-panelBar {
- width: 100%;
- background-color: #fff;
- border-bottom: 1px solid #ccc;
+ width: 100%;
+ background-color: #fff;
+ border-bottom: 1px solid #ccc;
}
.fl-uiOptions-fatPanel .fl-panelBar .fl-uio-tabs {
- box-shadow: 2px 2px 3px 0px #6f6f6f;
- border-bottom: 1px solid #ccc;
- border-left: 1px solid #ccc;
- border-bottom-left-radius:8px;
- border-bottom-right-radius:8px;
- background-color: white;
- min-height: 2em;
- margin-right: 10em;
- display:block;
- float:right;
+ box-shadow: 2px 2px 3px 0px #6f6f6f;
+ border-bottom: 1px solid #ccc;
+ border-left: 1px solid #ccc;
+ border-bottom-left-radius:8px;
+ border-bottom-right-radius:8px;
+ background-color: white;
+ min-height: 2em;
+ margin-right: 10em;
+ display:block;
+ float:right;
}
.fl-uiOptions-fatPanel .fl-uiOptions-showHide,
.fl-uiOptions-fatPanel .fl-uiOptions-reset {
- text-transform: lowercase;
- font-weight: bold;
- border:0;
- background-color: white;
- height: 1.8em;
- color: #2f2b2a;
- font-family: 'OpenSans',"Myriad Pro", Helvetica, Arial, sans-serif;
- font-size: 1.1em;
- margin-right: 0.5em;
- margin-left: 0.5em;
+ text-transform: lowercase;
+ font-weight: bold;
+ border:0;
+ background-color: white;
+ height: 1.8em;
+ color: #2f2b2a;
+ font-family: 'OpenSans',"Myriad Pro", Helvetica, Arial, sans-serif;
+ font-size: 1.1em;
+ margin-right: 0.5em;
+ margin-left: 0.5em;
}
.fl-uiOptions-fatPanel .fl-uiOptions-reset {
- border-right: 1px solid #ccc;
+ border-right: 1px solid #ccc;
}
.fl-uiOptions-fatPanel .fl-uiOptions-showHide{
- min-width: 15em;
+ min-width: 15em;
}
-
+
/* IFrame */
.fl-uiOptions-fatPanel-iframe {
View
105 src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
@@ -6,7 +6,7 @@
}
html {
- overflow: visible;
+ overflow: visible;
}
.fl-uiOptions-fatPanel .fl-uiOptions {
@@ -24,45 +24,45 @@ html {
overflow-y: hidden;
color: #766d68;
padding: 10px 0px;
- margin: 0px;
-
+ margin: 0px;
+
}
/* Preference Panels */
.fl-uiOptions-fatPanel ul.fl-uiOptions-panels {
- margin: 0 20px;
+ margin: 0 20px;
white-space: nowrap;
}
.fl-uiOptions-fatPanel .fl-uiOptions-panels li.fl-uiOptions-panel {
- border: 1px solid #615e59;
- border-radius: 5px;
- box-shadow: 2px 2px #7a766d;
- display: inline-block;
- padding: 1em;
- min-height: 9.6em;
- width: 25em;
- background-color: #fff;
- margin-right: 10px;
+ border: 1px solid #615e59;
+ border-radius: 5px;
+ box-shadow: 2px 2px #7a766d;
+ display: inline-block;
+ padding: 1em;
+ min-height: 9.6em;
+ width: 25em;
+ background-color: #fff;
+ margin-right: 10px;
white-space: normal;
vertical-align:middle;
}
.fl-uiOptions-fatPanel h2 {
- color: #766d68;
+ color: #766d68;
padding: 0 0 0.5em 0;
margin: 0 0 1.5em 0;
width: 100%;
border-bottom: solid #ccc 1px;
- box-shadow: 0px 6px 7px -6px rgba(0,0,0,0.3);
- font-size: 1.2em;
- text-transform: lowercase;
- line-height:1.7em;
- height: 2em;
+ box-shadow: 0px 6px 7px -6px rgba(0,0,0,0.3);
+ font-size: 1.2em;
+ text-transform: lowercase;
+ line-height:1.7em;
+ height: 2em;
}
.fl-uiOptions-fatPanel .fl-inputs {
- float: none;
+ float: none;
}
.fl-uiOptions-fatPanel label {
@@ -71,43 +71,43 @@ html {
/* Table of Contents switch */
.fl-uiOptions-fatPanel .fl-uiOptions-fatPanel-toc {
- width: 6em;
- height:2em;
- margin-right:10px;
- float:left;
+ width: 6em;
+ height:2em;
+ margin-right:10px;
+ float:left;
}
.fl-uiOptions-fatPanel .fl-uiOptions-fatPanel-toc label {
- line-height: 1.7em !important;
+ line-height: 1.7em !important;
}
/* Emphasize links & buttons panel */
.fl-uiOptions-fatPanel .fl-links-buttons-options label {
- width: 22em;
- display:inline-block;
+ width: 22em;
+ display:inline-block;
}
.fl-uiOptions-fatPanel .fl-links-buttons-options li {
- margin-bottom: 0.4em;
+ margin-bottom: 0.4em;
}
/* Header icons */
.fl-uiOptions-fatPanel h2 label,
.fl-uiOptions-fatPanel h2 .heading-text {
- float:left;
- padding-top: 0.2em;
+ float:left;
+ padding-top: 0.2em;
}
-.fl-icon-size, .fl-icon-font-style, .fl-icon-line-space, .fl-icon-contrast, .fl-icon-list, .fl-icon-links {
- background-repeat: no-repeat;
- display: inline-block;
- height: 2em;
- width: 2.5em;
- float:left;
- background-size: cover;
+.fl-icon-size, .fl-icon-font-style, .fl-icon-line-space, .fl-icon-contrast, .fl-icon-list, .fl-icon-links {
+ background-repeat: no-repeat;
+ display: inline-block;
+ height: 2em;
+ width: 2.5em;
+ float:left;
+ background-size: cover;
}
-.fl-icon-size { background-image: url("../images/default/uio_icon_textSize.png"); }
+.fl-icon-size { background-image: url("../images/default/uio_icon_textSize.png"); }
.fl-icon-font-style { background-image: url("../images/default/uio_icon_textStyle.png"); }
.fl-icon-line-space { background-image: url("../images/default/uio_icon_lineSpace.png"); }
.fl-icon-contrast { background-image: url("../images/default/uio_icon_contrast.png"); }
@@ -119,48 +119,31 @@ html {
.fl-uiOptions-fatPanel.fl-theme-wb,
.fl-uiOptions-fatPanel.fl-theme-by,
.fl-uiOptions-fatPanel.fl-theme-yb {
- background-image: none;
-}
-
-.fl-uiOptions-fatPanel .fl-choice label.uio-demo-theme,
-.fl-uiOptions-fatPanel .fl-choice label.uio-demo-theme span,
-.fl-uiOptions-fatPanel .fl-choice label.uio-demo-theme .fl-crossout {
- background-color: #FFFFFF !important;
- border-color: #433F3D !important;
- color: #433F3D !important;
-}
-
-.fl-uiOptions .fl-choice .uio-demo-theme .fl-crossout {
- margin-top:-2em;
- border-bottom: 1px dashed #ddbdc0;
- -webkit-transform: rotate(45deg);
- -moz-transform: rotate(45deg);
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=5);
- background-color: transparent !important;
+ background-image: none;
}
-.fl-uiOptions-fatPanel.fl-theme-bw .fl-icon-size { background-image: url("../images/bw/uio_icon_textSize.png"); }
+.fl-uiOptions-fatPanel.fl-theme-bw .fl-icon-size { background-image: url("../images/bw/uio_icon_textSize.png"); }
.fl-uiOptions-fatPanel.fl-theme-bw .fl-icon-font-style { background-image: url("../images/bw/uio_icon_textStyle.png"); }
.fl-uiOptions-fatPanel.fl-theme-bw .fl-icon-line-space { background-image: url("../images/bw/uio_icon_lineSpace.png"); }
.fl-uiOptions-fatPanel.fl-theme-bw .fl-icon-contrast { background-image: url("../images/bw/uio_icon_contrast.png"); }
.fl-uiOptions-fatPanel.fl-theme-bw .fl-icon-list { background-image: url("../images/bw/uio_icon_list.png"); }
.fl-uiOptions-fatPanel.fl-theme-bw .fl-icon-links { background-image: url("../images/bw/uio_icon_button.png"); }
-
-.fl-uiOptions-fatPanel.fl-theme-wb .fl-icon-size { background-image: url("../images/wb/uio_icon_textSize.png"); }
+
+.fl-uiOptions-fatPanel.fl-theme-wb .fl-icon-size { background-image: url("../images/wb/uio_icon_textSize.png"); }
.fl-uiOptions-fatPanel.fl-theme-wb .fl-icon-font-style { background-image: url("../images/wb/uio_icon_textStyle.png"); }
.fl-uiOptions-fatPanel.fl-theme-wb .fl-icon-line-space { background-image: url("../images/wb/uio_icon_lineSpace.png"); }
.fl-uiOptions-fatPanel.fl-theme-wb .fl-icon-contrast { background-image: url("../images/wb/uio_icon_contrast.png"); }
.fl-uiOptions-fatPanel.fl-theme-wb .fl-icon-list { background-image: url("../images/wb/uio_icon_list.png"); }
.fl-uiOptions-fatPanel.fl-theme-wb .fl-icon-links { background-image: url("../images/wb/uio_icon_button.png"); }
-.fl-uiOptions-fatPanel.fl-theme-by .fl-icon-size { background-image: url("../images/by/uio_icon_textSize.png"); }
+.fl-uiOptions-fatPanel.fl-theme-by .fl-icon-size { background-image: url("../images/by/uio_icon_textSize.png"); }
.fl-uiOptions-fatPanel.fl-theme-by .fl-icon-font-style { background-image: url("../images/by/uio_icon_textStyle.png"); }
.fl-uiOptions-fatPanel.fl-theme-by .fl-icon-line-space { background-image: url("../images/by/uio_icon_lineSpace.png"); }
.fl-uiOptions-fatPanel.fl-theme-by .fl-icon-contrast { background-image: url("../images/by/uio_icon_contrast.png"); }
.fl-uiOptions-fatPanel.fl-theme-by .fl-icon-list { background-image: url("../images/by/uio_icon_list.png"); }
.fl-uiOptions-fatPanel.fl-theme-by .fl-icon-links { background-image: url("../images/by/uio_icon_button.png"); }
-.fl-uiOptions-fatPanel.fl-theme-yb .fl-icon-size { background-image: url("../images/yb/uio_icon_textSize.png"); }
+.fl-uiOptions-fatPanel.fl-theme-yb .fl-icon-size { background-image: url("../images/yb/uio_icon_textSize.png"); }
.fl-uiOptions-fatPanel.fl-theme-yb .fl-icon-font-style { background-image: url("../images/yb/uio_icon_textStyle.png"); }
.fl-uiOptions-fatPanel.fl-theme-yb .fl-icon-line-space { background-image: url("../images/yb/uio_icon_lineSpace.png"); }
.fl-uiOptions-fatPanel.fl-theme-yb .fl-icon-contrast { background-image: url("../images/yb/uio_icon_contrast.png"); }
View
261 src/webapp/components/uiOptions/css/UIOptions.css
@@ -77,8 +77,8 @@
/* Slider specifics */
.fl-uiOptions .fl-slider {
- border: 1px solid #b3b3b3;
- border-radius: 0.3em;
+ border: 1px solid #b3b3b3;
+ border-radius: 0.3em;
background-color: #dad6d3;
padding: 0;
position: relative;
@@ -91,29 +91,26 @@
display:block;
top:0;
left:0;
-
- height: 2.2em;
- width: 2.2em;
- margin-top: -0.75em;
- margin-left: -0.4em;
- background-color: #fff;
- border: 1px solid #b3b3b3;
- border-radius: 2em;
- box-shadow: 4px 2px 3px rgba(0,0,0,0.3);
-
- background-image: linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
- background-image: -o-linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
- background-image: -moz-linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
- background-image: -webkit-linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
- background-image: -ms-linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
-
- background-image: -webkit-gradient(
- linear,
- right top,
- left bottom,
- color-stop(0.46, rgb(255,255,255)),
- color-stop(0.73, rgb(233,234,234))
- );
+ height: 2.2em;
+ width: 2.2em;
+ margin-top: -0.75em;
+ margin-left: -0.4em;
+ background-color: #fff;
+ border: 1px solid #b3b3b3;
+ border-radius: 2em;
+ box-shadow: 4px 2px 3px rgba(0,0,0,0.3);
+ background-image: -o-linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
+ background-image: -moz-linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
+ background-image: -webkit-linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
+ background-image: -ms-linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
+ background-image: -webkit-gradient(
+ linear,
+ right top,
+ left bottom,
+ color-stop(0.46, rgb(255,255,255)),
+ color-stop(0.73, rgb(233,234,234))
+ );
+ background-image: linear-gradient(right top, rgb(255,255,255) 46%, rgb(233,234,234) 73%);
}
.fl-uiOptions .fl-slider a:active { outline: none; }
@@ -127,8 +124,8 @@
}
.fl-uiOptions .ui-slider-range {
- background-color: #62bb3d;
- height: 100%;
+ background-color: #62bb3d;
+ height: 100%;
}
.fl-uiOptions .fl-text-slider-left {
@@ -171,76 +168,66 @@
/* Theme radio buttons */
.fl-uiOptions .fl-choice {
- display: inline;
- float: left;
-}
-
-.fl-uiOptions .fl-choice-current {
- width: 0;
- height: 0;
- border-left: 0.75em solid transparent;
- border-right: 0.75em solid transparent;
- border-top: 0.75em solid #433F3D;
- margin-left: 0.75em;
- margin-bottom: 0.5em;
+ display: inline;
+ float: left;
}
.fl-uiOptions .fl-choice label {
- margin-right: 5px;
- border: 1px solid black;
- border-radius: 5px;
- height: 3em;
- width: 3em;
- text-align: center;
- vertical-align: middle;
- display: inline-block;
- line-height: 3em !important;
-}
-.fl-uiOptions .fl-choice .fl-uio-default-theme .fl-crossout {
- margin-top:-1.5em;
- border-bottom: 1px dashed #ddbdc0;
- -webkit-transform: rotate(45deg);
+ margin-right: 5px;
+ border: 1px solid black;
+ border-radius: 5px;
+ height: 3em;
+ width: 3em;
+ text-align: center;
+ vertical-align: middle;
+ display: inline-block;
+ line-height: 3em !important;
+}
+.fl-uiOptions .fl-choice .fl-theme-uio-default .fl-crossout {
+ margin-top:-1.75em;
+ border-bottom: 1px dashed #ddbdc0;
+ -webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=5);
+ -ms-transform: rotate(45deg);
background-color: transparent !important;
}
.fl-uiOptions .fl-choice .fl-preview-A {
- font-size: 2em;
+ font-size: 2em;
}
.fl-uiOptions .fl-choice input:focus ~ label {
- outline: 2px solid black;
+ outline: 2px solid black;
}
-.fl-uiOptions .fl-choice .fl-indicator {
- margin: -1em 0 5px 1em;
- padding-bottom: 1em;
+.fl-uiOptions .fl-choice .fl-indicator {
+ margin: -1em 0 5px 1em;
+ padding-bottom: 1em;
}
.fl-uiOptions .fl-choice input:checked + div {
- background-image: url("../images/default/uio_icon_indicator.png");
- background-repeat: no-repeat;
- background-size: cover;
- width: 1.8em;
- font-size: 0.8em;
+ background-image: url("../images/default/uio_icon_indicator.png");
+ background-repeat: no-repeat;
+ background-size: cover;
+ width: 1.8em;
+ font-size: 0.8em;
}
/* ON/OFF Switch for checkboxes */
/* The container for the toggle, which is also a label for the hidden checkbox. */
.fl-uiOptions .fl-uiOptions-onoff .fl-uiOptions-switch {
- border-radius:50px;
- border: 1px solid #776D67;
- width: 5em;
- height: 2em;
- background-color: #E6E6E6;
- box-shadow: 1em 1.1em 0 0 rgba(250,250,250,0.53) inset;
- overflow:hidden;
- vertical-align: middle;
- display:inline-block;
- transition-duration: 0.2s;
- transition-property: padding-left, width, background-color, margin-left;
- font-size: 1.2em;
+ border-radius:50px;
+ border: 1px solid #776D67;
+ width: 5em;
+ height: 2em;
+ background-color: #E6E6E6;
+ box-shadow: 1em 1.1em 0 0 rgba(250,250,250,0.53) inset;
+ overflow:hidden;
+ vertical-align: middle;
+ display:inline-block;
+ transition-duration: 0.2s;
+ transition-property: padding-left, width, background-color, margin-left;
+ font-size: 1.2em;
}
/* Hide input */
@@ -256,14 +243,14 @@
}
.fl-uiOptions .fl-uiOptions-onoff input:focus + label {
- outline: 2px solid black;
+ outline: 2px solid black;
}
.fl-uiOptions .fl-uiOptions-onoff input:checked + label .fl-uiOptions-switch {
- padding-left: 3em;
- width: 2em;
- background-color: #2da750;
- box-shadow: -1em 1.1em 0.1em 0 rgba(172, 216, 92, 0.63) inset;
+ padding-left: 3em;
+ width: 2em;
+ background-color: #2da750;
+ box-shadow: -1em 1.1em 0.1em 0 rgba(172, 216, 92, 0.63) inset;
}
/* With data attributes defining the on/off text, localizing the templates is easier */
@@ -276,64 +263,64 @@
/* The "on" portion of the toggle and the knob. */
.fl-uiOptions .fl-uiOptions-onoff input + label .fl-uiOptions-switch:before {
- color: #fff;
- border: 1px solid #776D67;
- border-radius: 50px;
- float:left;
- width:1.9em;
- height: 1.9em; /* Width and height of the knob. */
- text-indent:-1.6em;
- line-height:1.7em;
- text-shadow: 1px 1px 1px #000;
- background-color: #fff;
- background-image: linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
- background-image: -o-linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
- background-image: -moz-linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
- background-image: -webkit-linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
- background-image: -ms-linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
- background-image: -webkit-gradient(
- linear,
- left top,
- left bottom,
- color-stop(0, rgb(205,204,202)),
- color-stop(1, rgb(244,244,244))
- );
- box-shadow: 0.2em 0.2em 0.5em #888;
+ color: #fff;
+ border: 1px solid #776D67;
+ border-radius: 50px;
+ float:left;
+ width:1.9em;
+ height: 1.9em; /* Width and height of the knob. */
+ text-indent:-1.6em;
+ line-height:1.7em;
+ text-shadow: 1px 1px 1px #000;
+ background-color: #fff;
+ background-image: -o-linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
+ background-image: -moz-linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
+ background-image: -ms-linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
+ background-image: -webkit-gradient(
+ linear,
+ left top,
+ left bottom,
+ color-stop(0, rgb(205,204,202)),
+ color-stop(1, rgb(244,244,244))
+ );
+ background-image: linear-gradient(bottom, rgb(205,204,202) 0%, rgb(244,244,244) 100%);
+ box-shadow: 0.2em 0.2em 0.5em #888;
}
/* The "off" portion of the toggle. */
.fl-uiOptions .fl-uiOptions-onoff input + label .fl-uiOptions-switch:after {
- float:left;
- position:relative;
- top: 0.36em;
- left: 0.5em;
+ float:left;
+ position:relative;
+ top: 0.36em;
+ left: 0.5em;
}
/* The dark inner circle to the toggle knob. */
.fl-uiOptions .fl-uiOptions-onoff .fl-uiOptions-switch-inner {
- border: 1px solid #493A30;
- border-radius: 50px;
- width: 1em;
- height: 1em;
- position:relative;
- left:-2.85em;
- top:0.46em;
+ border: 1px solid #493A30;
+ border-radius: 50px;
+ width: 1em;
+ height: 1em;
+ position:relative;
+ left:-2.85em;
+ top:0.46em;
- background-color: #675243;
- box-shadow: 0 -0.2em 0.3em 0.05em rgba(250, 250, 250, 0.3) inset;
+ background-color: #675243;
+ box-shadow: 0 -0.2em 0.3em 0.05em rgba(250, 250, 250, 0.3) inset;
- display:inline-block;
+ display:inline-block;
}
.fl-uiOptions .fl-uiOptions-onoff input:checked + label .fl-uiOptions-switch .fl-uiOptions-switch-inner {
- top:-1.6em;
- left: 0.46em;
+ top:-1.6em;
+ left: 0.46em;
}
/* FLUID-4966: Fix horizontal scroll bar */
.fl-uiOptions .fl-hidden-accessible {
- top: 0px;
- left: 0px;
+ top: 0px;
+ left: 0px;
}
/* Theming */
@@ -386,8 +373,8 @@
.fl-theme-wb .fl-uiOptions .ui-slider .ui-slider-handle,
.fl-theme-by .fl-uiOptions .ui-slider .ui-slider-handle,
.fl-theme-yb .fl-uiOptions .ui-slider .ui-slider-handle {
- height: 1.8em;
- width: 1.8em;
+ height: 1.8em;
+ width: 1.8em;
}
/* ON/OFF switch */
@@ -403,20 +390,20 @@
.fl-theme-yb .fl-uiOptions .fl-uiOptions-switch,
.fl-theme-yb .fl-uiOptions .fl-uiOptions-switch-inner,
.fl-theme-yb .fl-uiOptions input + label .fl-uiOptions-switch:before {
- box-shadow: none !important;
- text-shadow: none;
- color: inherit;
- background-image: none;
- background-color: inherit;
+ box-shadow: none !important;
+ text-shadow: none;
+ color: inherit;
+ background-image: none;
+ background-color: inherit;
}
/* Theme radio buttons */
.fl-uiOptions .fl-choice label.fl-theme-bw,
.fl-uiOptions .fl-choice label.fl-theme-bw span,
.fl-uiOptions .fl-choice label.fl-theme-bw .fl-crossout {
- background-color: #FFFFFF !important;
+ background-color: #FFFFFF !important;
border-color: #000000 !important;
- color: #000000 !important;
+ color: #000000 !important;
}
.fl-uiOptions .fl-choice label.fl-theme-wb,
.fl-uiOptions .fl-choice label.fl-theme-wb span,
@@ -440,12 +427,12 @@
color: #FFFF00 !important;
}
-.fl-uiOptions .fl-choice label.fl-uio-default-theme,
-.fl-uiOptions .fl-choice label.fl-uio-default-theme span,
-.fl-uiOptions .fl-choice label.fl-uio-default-theme .fl-crossout {
- background-color: #FFFFFF !important;
+.fl-uiOptions .fl-choice label.fl-theme-uio-default,
+.fl-uiOptions .fl-choice label.fl-theme-uio-default span,
+.fl-uiOptions .fl-choice label.fl-theme-uio-default .fl-crossout {
+ background-color: #FFFFFF !important;
border-color: #433F3D !important;
- color: #433F3D !important;
+ color: #433F3D !important;
}
.fl-theme-bw .fl-uiOptions .fl-choice input:checked + div { background-image: url("../images/bw/uio_icon_indicator.png"); }
@@ -461,5 +448,5 @@
.fl-theme-wb .fl-uiOptions .fl-choice input:focus ~ label,
.fl-theme-by .fl-uiOptions .fl-choice input:focus ~ label,
.fl-theme-yb .fl-uiOptions .fl-choice input:focus ~ label {
- outline: 0.2em solid #00AAFF;
+ outline: 0.2em solid #00AAFF;
}
View
10 src/webapp/components/uiOptions/css/ie8.css
@@ -8,14 +8,14 @@
position: relative;
}
.fl-uiOptions .fl-uiOptions-onoff .fl-uiOptions-switch {
- display: none;
+ display: none;
}
.fl-uiOptions .fl-uiOptions-onoff input:focus + label {
- outline: none;
+ outline: none;
}
.fl-uiOptions-fatPanel .fl-choice .uio-demo-theme .fl-crossout {
- margin-top:-2.75em;
- margin-left: 0.5em;
- -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)";
+ margin-top:-2.75em;
+ margin-left: 0.5em;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)";
}
View
2 src/webapp/components/uiOptions/js/UIEnhancer.js
@@ -39,7 +39,7 @@ var fluid_1_5 = fluid_1_5 || {};
"verdana": "fl-font-uio-verdana"
},
"theme": {
- "default": "fl-uio-default-theme",
+ "default": "fl-theme-uio-default",
"bw": "fl-theme-uio-bw fl-theme-bw",
"wb": "fl-theme-uio-wb fl-theme-wb",
"by": "fl-theme-uio-by fl-theme-by",
View
22 src/webapp/demos/uiOptions/html/uiOptions.html
@@ -65,7 +65,7 @@
<!-- The page-wide UI Enhancer needs to be initialized right away -->
<script type="text/javascript">
$(document).ready(function () {
- demo.initPageEnhancer("uio-demo-theme");
+ demo.initPageEnhancer();
demo.initFatPanel(".flc-uiOptions-fatPanel");
})
</script>
@@ -84,18 +84,6 @@
</div>
</div>
<!-- END markup for fat-panel UI Options -->
-
- <div class="fl-force-right fl-push disp-opts-buttons">
- <div class="disp-opts-button-container fl-inverted-color">
- <button class="disp-opts-with-preview disp-opts-button">Display Preferences<br/><span class="preview">(with preview)</span></button>
- </div>
- <div class="disp-opts-button-container fl-inverted-color">
- <button class="disp-opts-without-preview disp-opts-button">Display Preferences<br/><span class="preview">(without preview)</span></button>
- </div>
- </div>
- <script type="text/javascript">
- demo.setUpButtons();
- </script>
<div class="fl-container-950 fl-centered">
<div class="flc-toc-tocContainer toc"> </div>
@@ -108,11 +96,9 @@
<div class="instructions">
<h2>Some helpful tips</h2>
<ol>
- <li>User Interface Options comes in three configurations.<br/>
- <span class="instruction-comment">All three configurations provide the same options,
- but with different interfaces. On this page, "Fat panel" can be found along the top edge,
- and both "Full page with preview" and "Full page without preview" can be found along the
- right edge.</span></li>
+ <li>User Interface Options and its different configurations.<br/>
+ <span class="instruction-comment">On this page, the "Fat panel" version of UI Options can be found along the top edge.
+ There are other layout options in development - see <a href="http://wiki.fluidproject.org/display/fluid/%28Floe%29+UI+Options+Design+Wireframes%2C+C.1" target="_blank" title="Opens in new window">UI Options Design Wireframes</a>.</span></li>
<li>Try tinkering with the options.</li>
</ol>
</div>
View
47 src/webapp/demos/uiOptions/js/uiOptionsDemo.js
@@ -66,58 +66,11 @@ var demo = demo || {};
};
/**
- * The basic options for configuring the full-page versions of UI Options are the same,
- * regardless of whether or not the Preview is used. These settings used by both
- * full-page version, with and without Preview.
- */
- var basicFullPageOpts = {
- // Tell UIOptions where to redirect to if the user cancels the operation
- uiOptions: {
- options: {
- listeners: {
- onCancel: function () {
- window.location = "uiOptions.html";
- }
- }
- }
- }
- };
-
- var fullPageOpts = $.extend(true, {}, basicFullPageOpts, commonOpts);
-
- /**
- * Initialize UI Options on the "Full Page, No Preview" version.
- */
- demo.initFullNoPreview = function (container, options) {
- fluid.uiOptions.fullNoPreview(container, $.extend(true, {}, fullPageOpts, options));
- };
-
- /**
- * Initialize UI Options on the "Full Page, With Preview" version.
- */
- demo.initFullWithPreview = function (container, options) {
- fluid.uiOptions.fullPreview(container, $.extend(true, {}, fullPageOpts, options));
- };
-
- /**
* Initialize UI Options on the "Fat Panel" version. This version of UI Options uses the
* page itself as a live preview.
*/
demo.initFatPanel = function (container) {
fluid.uiOptions.fatPanel(container, commonOpts);
};
-
- /**
- * Set up the buttons to link to the full-page versions of UI Options.
- */
- demo.setUpButtons = function () {
- // Configure the buttons
- $(".disp-opts-with-preview").click(function () {
- window.location = "uiOptionsFullWithPreview.html";
- });
- $(".disp-opts-without-preview").click(function () {
- window.location = "uiOptionsFullWithoutPreview.html";
- });
- };
})(jQuery, fluid);
View
20 src/webapp/tests/manual-tests/ReadMe.txt
@@ -1,11 +1,27 @@
This directory contains tests that are run manually.
-UI Options:
+UI Options, Fat Panel:
To run this test:
1. open SomeKindOfNews.html in a browser
2. activate the "Show Display Preferences" button in the top right corner of the screen
3. experiment with the various UI Options settings and verify that the window
- contents are styles correctly.
+ contents are styled correctly.
+
+UI Options, Full with Preview:
+ To run this test:
+ 1. open uiOptionsFullWithPreview.html in a browser
+ 2. experiment with the various UI Options settings and verify that the preview window
+ contents are styled correctly.
+ 3. use the "save and apply" button to apply the preview styles to UI Options
+ 4. use the "reset" button to reset the styles
+
+UI Options, Full without Preview:
+ To run this test:
+ 1. open uiOptionsFullWithoutPreview.html in a browser
+ 2. experiment with the various UI Options settings
+ 3. use the "save and apply" button to apply the styles to UI Options and verify that the
+ contents are styled correctly.
+ 4. use the "reset and apply" button to reset the styles
Dropdown
To run this test:
View
0 ...demos/uiOptions/css/UIOptionsFullPage.css → ...ts/manual-tests/css/UIOptionsFullPage.css
File renamed without changes.
View
8 ...ptions/html/uiOptionsFullWithPreview.html → ...-tests/html/uiOptionsFullWithPreview.html
@@ -54,14 +54,14 @@
<script type="text/javascript" src="../../../components/uiOptions/js/FullPreviewUIOptions.js"></script>
<script type="text/javascript" src="../../../components/tableOfContents/js/TableOfContents.js"></script>
- <script type="text/javascript" src="../js/uiOptionsDemo.js"></script>
+ <script type="text/javascript" src="../js/uiOptionsFullPage.js"></script>
</head>
<body>
<!-- The page-wide UI Enhancer needs to be initialized right away -->
<script type="text/javascript">
$(document).ready(function () {
- demo.initPageEnhancer("uio-demo-theme");
+ demo.initPageEnhancer();
demo.initFullWithPreview("#myUIOptions", {
preview: {
options: {
@@ -72,10 +72,6 @@
});
</script>
- <div class="backButton fl-inverted-color">
- <a href="uiOptions.html">Return To Site</a>
- </div>
-
<div class="content">
<span class="fl-hidden">
<div class="flc-toc-tocContainer">
View
8 ...ons/html/uiOptionsFullWithoutPreview.html → ...sts/html/uiOptionsFullWithoutPreview.html
@@ -49,12 +49,12 @@
<script type="text/javascript" src="../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/TextfieldSlider.js"></script>
- <script type="text/javascript" src="../../../components/uiOptions/js/SettingsPanels.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIOptions.js"></script>
+ <script type="text/javascript" src="../../../components/uiOptions/js/SettingsPanels.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/FullNoPreviewUIOptions.js"></script>
<script type="text/javascript" src="../../../components/tableOfContents/js/TableOfContents.js"></script>
- <script type="text/javascript" src="../js/uiOptionsDemo.js"></script>
+ <script type="text/javascript" src="../js/uiOptionsFullPage.js"></script>
</head>
<body>
@@ -66,10 +66,6 @@
});
</script>
- <div class="backButton fl-inverted-color">
- <a href="uiOptions.html">Return To Site</a>
- </div>
-
<div class="content">
<span class="fl-hidden">
<div class="flc-toc-tocContainer">
View
2 ...emos/uiOptions/html/UIOptionsPreview.html → ...s/manual-tests/html/uiOptionsPreview.html
@@ -17,7 +17,7 @@
<link rel="stylesheet" type="text/css" href="../../../lib/jquery/ui/css/fl-theme-yb/yb.css" />
<link rel="stylesheet" type="text/css" href="../../../lib/jquery/ui/css/fl-theme-bw/bw.css" />
<link rel="stylesheet" type="text/css" href="../../../lib/jquery/ui/css/fl-theme-wb/wb.css" />
- <link rel="stylesheet" type="text/css" href="../css/uiOptions.css" />
+ <link rel="stylesheet" type="text/css" href="../../../demos/uiOptions/css/uiOptions.css" />
<script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
View
90 src/webapp/tests/manual-tests/js/uiOptionsFullPage.js
@@ -0,0 +1,90 @@
+/*
+Copyright 2013 OCAD University
+
+Licensed under the Educational Community License (ECL), Version 2.0 or the New
+BSD license. You may not use this file except in compliance with one these
+Licenses.
+
+You may obtain a copy of the ECL 2.0 License and BSD License at
+https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
+*/
+
+// Declare dependencies
+/*global skon:true, fluid, jQuery*/
+
+// JSLint options
+/*jslint white: true, funcinvoke: true, undef: true, newcap: true, nomen: true, regexp: true, bitwise: true, browser: true, forin: true, maxerr: 100, indent: 4 */
+
+var demo = demo || {};
+(function ($, fluid) {
+ /**
+ * The UI Options interface is defined by several HTML templates. The component
+ * needs to know where those templates are. This variable will be used by all
+ * versions of the component.
+ */
+ var pathToTemplates = "../../../components/uiOptions/html/";
+
+ /**
+ * The UI Enhancer's Table of Contents uses a template. This path variable is used by all
+ * three versions of the component, as well as by the UI Enhancer present in the Preview
+ * itself.
+ */
+ var pathToTocTemplate = "../../../components/tableOfContents/html/TableOfContents.html";
+
+ /**
+ * Initialize UI Enhancer for the page.
+ */
+ demo.initPageEnhancer = function (customThemeName) {
+ fluid.pageEnhancer({
+ gradeNames: ["fluid.uiEnhancer.defaultActions"],
+ tocTemplate: pathToTocTemplate,
+ classnameMap: {
+ theme: {
+ "default": customThemeName
+ }
+ }
+ });
+ };
+
+ /**
+ * The basic options for configuring the full-page versions of UI Options are the same,
+ * regardless of whether or not the Preview is used. These settings used by both
+ * full-page version, with and without Preview.
+ */
+ var basicFullPageOpts = {
+ gradeNames: ["fluid.uiOptions.transformDefaultPanelsOptions"],
+ // Tell UIOptions where to find all the templates, relative to this file
+ prefix: pathToTemplates,
+ templateLoader: {
+ options: {
+ gradeNames: ["fluid.uiOptions.defaultTemplateLoader"]
+ }
+ },
+ // Tell UIOptions where to redirect to if the user cancels the operation
+ uiOptions: {
+ options: {
+ gradeNames: ["fluid.uiOptions.defaultSettingsPanels"],
+ listeners: {
+ onCancel: function () {
+ alert("Cancelled - would normally cancel any unsaved changes and return to the previous page.");
+ }
+ }
+ }
+ }
+ };
+
+ /**
+ * Initialize UI Options on the "Full Page, No Preview" version.
+ */
+ demo.initFullNoPreview = function (container, options) {
+ fluid.uiOptions.fullNoPreview(container, $.extend(true, {}, basicFullPageOpts, options));
+ };
+
+ /**
+ * Initialize UI Options on the "Full Page, With Preview" version.
+ */
+ demo.initFullWithPreview = function (container, options) {
+ fluid.uiOptions.fullPreview(container, $.extend(true, {}, basicFullPageOpts, options));
+ };
+
+})(jQuery, fluid);

0 comments on commit 96afc30

Please sign in to comment.