Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[583] CometVisu/trunk/visu
|
From: <net...@us...> - 2011-12-18 11:21:31
|
Revision: 583
http://openautomation.svn.sourceforge.net/openautomation/?rev=583&view=rev
Author: netzkind
Date: 2011-12-18 11:21:22 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
correct width for widgets on small-screen devices, no longer css-calc widths; Tested on Windows (FF8, Chrome 15), Built-in browsers of: Samsung Galaxy S2 (Gingerbread), Samsung Galaxy Tab 10.1 (Honeycomb), iPhone 3GS (iOS 5), Samsung Galaxy S (Gingerbread)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/alaska/basic.css
CometVisu/trunk/visu/designs/alaska/mobile.css
CometVisu/trunk/visu/designs/alaska_slim/basic.css
CometVisu/trunk/visu/designs/alaska_slim/mobile.css
CometVisu/trunk/visu/designs/discreet/basic.css
CometVisu/trunk/visu/designs/discreet/mobile.css
CometVisu/trunk/visu/designs/discreet_sand/basic.css
CometVisu/trunk/visu/designs/discreet_sand/mobile.css
CometVisu/trunk/visu/designs/discreet_slim/basic.css
CometVisu/trunk/visu/designs/discreet_slim/mobile.css
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/pure/mobile.css
CometVisu/trunk/visu/designs/structure_custom.js
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/edit/visuconfig_edit.js
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
CometVisu/trunk/visu/plugins/gweather/structure_plugin.js
CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js
CometVisu/trunk/visu/plugins/jsonviewer/structure_plugin.js
CometVisu/trunk/visu/plugins/rss/structure_plugin.js
Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/alaska/basic.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -87,10 +87,17 @@
text-decoration: none;
}
+.widget_container {
+ width: 50%;
+ float: left;
+}
+
+.widget_container .widget_container {
+ width: 100%;
+}
+
.widget
{
- float:left;
- width:48%;
margin: 0.2em;
padding: 0.2em;
border-style: solid none none none; /* oben rechts unten links */
@@ -99,11 +106,6 @@
background: transparent;
}
-.widget .widget
-{
- width:98%;
-}
-
.text > div, .link > a
{
float:left;
Modified: CometVisu/trunk/visu/designs/alaska/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/mobile.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/alaska/mobile.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -1,14 +1,11 @@
-.widget
-{
- width:98%;
-}
-
-#bottom
-{
- display: none;
-}
-
-.page
-{
- overflow: visible;
-}
+.widget_container {
+ width: 98%;
+}
+
+#bottom {
+ display: none;
+}
+
+.page {
+ overflow: visible;
+}
Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -82,10 +82,17 @@
text-decoration: none;
}
+.widget_container {
+ width: 33%;
+ float: left;
+}
+
+.widget_container .widget_container {
+ width: 100%;
+}
+
.widget
{
- float:left;
- width:32%;
margin: 0.2em;
padding: 0.2em;
border-style: solid none none none; /* oben rechts unten links */
@@ -94,11 +101,6 @@
background: transparent;
}
-.widget .widget
-{
- width:98%;
-}
-
.text > div, .link > a {
float:left;
text-align:left;
Modified: CometVisu/trunk/visu/designs/alaska_slim/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/mobile.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/alaska_slim/mobile.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -1,14 +1,11 @@
-.widget
-{
- width:98%;
-}
-
-#bottom
-{
- display: none;
-}
-
-.page
-{
- overflow: visible;
-}
+.widget_container {
+ width: 98%;
+}
+
+#bottom {
+ display: none;
+}
+
+.page {
+ overflow: visible;
+}
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -81,10 +81,17 @@
vertical-align: middle;
}
+.widget_container {
+ width: 50%;
+ float: left;
+}
+
+.widget_container .widget_container {
+ width: 100%;
+}
+
.widget
{
- float:left;
- width:48%;
margin: .2em;
padding: 0.3em;
/* border:yellow 1px solid; */
@@ -98,11 +105,6 @@
background-color: #101010;
}
-.widget .widget
-{
- width:98%;
-}
-
.text > div,
.link > a {
float:left;
Modified: CometVisu/trunk/visu/designs/discreet/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/mobile.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/discreet/mobile.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -1,12 +1,11 @@
-.widget
-{
- width:98%;
-}
-
-#bottom {
- display: none;
-}
-
-.page {
- overflow: visible;
-}
+.widget_container {
+ width: 98%;
+}
+
+#bottom {
+ display: none;
+}
+
+.page {
+ overflow: visible;
+}
Modified: CometVisu/trunk/visu/designs/discreet_sand/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/basic.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/discreet_sand/basic.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -1,377 +1,383 @@
-@font-face { font-family: Liberation; src:url(fonts/liberationsans.ttf); }
-@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/liberationsans-bold.ttf); }
-
-body
-{
- color: #453420; /*#2F2A20;*/
- font-family: Arial, Liberation;
- font-size: 5.5mm;
- overflow: hidden;
- margin:0;
- background: #CFC8B5; /* url(images/body_bg.png) repeat-x; */
-}
-
-h1
-{
- font-size: 2em;
- padding-left: 15px;
-}
-
-body hr
-{
- clear:both;
- color: #7F735F;
- background-color: #7F735F;
- height: 1px;
- border:none;
- padding:0px;
- margin:0.1em;
-}
-
-#pages hr {
- border: 0; height: 30px; margin: 0 .5%;
- background: transparent url(images/hr_bg.png) 50% repeat-x;
- clear: both;
-}
-
-
-body br
-{
- clear:both;
-}
-
-div#top {
- padding-top: 8px;
- border-top: 3px solid #BAAF98;
- background: #165D7E url(images/nav_bg.png) bottom repeat-x;
- padding-bottom: 8px;
-}
-
-.page h1 {
- margin-top: 0;
- padding-top: .1em;
- background: #CFC8B5;
- color: #2F2A20;
- /*background: #7F735F url(images/head_bg.png) scroll repeat-x bottom;*/
-}
-
-.nav_path
-{
- color: #EFEBE0; /*#81664b;*/
- margin-left: 15px;
-}
-.nav_path a
-{
- color: #EFEBE0; /*#3F3327;*/
- text-decoration:none;
-}
-
-.footer,
-.footer *
-{
- color: #000000;
- font-size: 0.9em;
- vertical-align: middle;
-}
-
-.widget
-{
- float:left;
- width:48%;
- margin: .2em;
- padding: 0.3em;
- /* border:yellow 1px solid; */
- border-color: #7F735F;
- border-style: solid;
- border-width: 2px 0px 0px 2px;
- -moz-border-radius: 8px;
- -webkit-border-radius: 8px;
- border-radius: 8px;
- min-height: 2em;
- background-color: #BAAF98;
-}
-
-.text > div,
-.link > a {
- float:left;
- text-align:left;
- padding-left: 1em;
-}
-
-.widget .label,
-.widget.info .actor,
-.text > div,
-.link > a {
- line-height: 2em;
-}
-
-.widget .label
-{
- float:left;
- width:49%;
-/* color:red; */
-/* padding-right:0.25em; */
- text-align:left;
- padding-left: 1em;
-/* border:blue 1px solid; */
-}
-.widget .actor
-{
- float:left;
- margin-left:1em;
- text-align:left;
-}
-.widget .actor div
-{
- float:left;
- white-space: pre-wrap;
-}
-
-
-.green.switchPressed div, .green.switchUnpressed div{
- background: transparent url(images/dot_green.png) no-repeat center center;
- color: #3F2F1F !important;
-}
-.red.switchPressed div, .red.switchUnpressed div{
- background: transparent url(images/dot_red.png) no-repeat center center;
- color: #3F2F1F !important;
-}
-
-
-.red
-{
- color:#f44;
- font-weight:bold;
-}
-
-.green
-{
- color:#4f4;
-}
-
-.blue
-{
- color:#44f;
-}
-
-.purple
-{
- color:#f4f;
-}
-
-.link a
-{
- color: #165d7e; /*#3F2F1F;*/
- width: 49%;
-}
-
-.page
-{
- float:left;
- width: 900px;
- overflow: auto;
- position: relative;
-}
-
-.switchPressed, .switchUnpressed {
- border-style: solid;
- -moz-border-radius: 12px;
- -webkit-border-radius: 12px;
- border-radius: 12px;
- padding: 1px;
- background: url(images/button_bg.png) #A79367 repeat-x;
-}
-
-.switchUnpressed
-{
- border-width: 1px 2px 2px 1px;
- border-color: #6C6251 #4F483B #4F483B #6C6251;
- margin-top: 0px;
- background-color: #EFE6D1;
- background-position: center +2px;
-}
-.switchUnpressed div, .switchPressed div
-{
- padding: 5px;
- width: 5em;
- float: left;
- background: transparent;
- text-align: center;
- cursor: pointer;
-}
-
-.switchPressed
-{
- border-width: 2px 1px 1px 2px;
- border-color: #4F483B #6C6251 #6C6251 #4F483B;
- margin-top: 1px;
- background-position: center -2px;
-}
-
-.switchUnpressed div {
- margin-left: -1px;
-}
-
-.switchPressed div {
- margin-top: -1px;
-}
-
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }
-.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
-.ui-widget-content a { color: #333333; }
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
-
-.dim .actor
-{
- width: 3em;
-}
-.widget .ui-slider
-{
- width: 30%;
- float: left;
- margin-left: 10px;
- margin-left: 1em;
- margin-top: 0.5em;
- border-color: #4F483B #6C6251 #6C6251 #4F483B;
- background: url(images/gradient.png) #F8EFC6 repeat-y;
-}
-
-.widget .ui-slider-handle
-{
- border-style: solid;
- -moz-border-radius: 12px;
- -webkit-border-radius: 12px;
- border-radius: 12px;
- padding: 1px;
- background: url(images/button_bg.png) #A79367 repeat-x;
- border-width: 1px 2px 2px 1px;
- border-color: #6C6251 #4F483B #4F483B #6C6251;
-}
-/* Clearfix */
-.clearfix:after {
- content: ".";
- display: block;
- clear: both;
- visibility: hidden;
- line-height: 0;
- height: 0;
-}
-
-.clearfix {
- display: inline-block;
-}
-
-html[xmlns] .clearfix {
- display: block;
-}
-
-*:first-child+html .clearfix {
- min-height: 0;
-}
-
-* html .clearfix {
- height: 1%;
-}
-
-* html>body .clearfix {
- display: inline-block;
- width: 100%;
-}
-
-* html .clearfix {
- /* Hides from IE-mac \*/
- height: 1%;
- /* End hide from IE-mac */
-}
-
-.loading {
- display: block !important;
-}
-
-div#loading {
- display: none !important;
-}
-
-
-.popup,
-.popup_background {
- position: absolute;
- width: 90%;
- height: 90%;
- top: 5%;
- left: 5%;
-}
-
-.popup {
- z-index: 101;
- background: transparent;
-}
-
-
-.popup_background {
- z-index: 100;
- border-color: #7F735F;
- border-style: solid;
- border-width: 2px 0px 0px 2px;
- -moz-border-radius: 8px;
- -webkit-border-radius: 8px;
- border-radius: 8px;
- background: #BAAF98;
- opacity: .98;
-}
-
-.popup div {
- margin: 4px;
-}
-
-.popup div.head {
- border-bottom: 1px solid;
-}
-
-.popup_background.error {
- background: #800000;
- border: #f00;
-}
-
-.clickable {
- cursor: pointer;
-}
-
-.diagram_inline {
- width: 320px;
- height: 180px;
-}
-
-.diagram_preview {
- width: 320px;
- height: 2em;
-}
-
-.tickLabel {
- color: #453420;
-}
-
-#diagramTooltip {
- z-index: 1000;
- color: black;
- border: 1px solid #fdd;
- padding: 2px;
- background-color: #fee;
- opacity: 0.80;
+@font-face { font-family: Liberation; src:url(fonts/liberationsans.ttf); }
+@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/liberationsans-bold.ttf); }
+
+body
+{
+ color: #453420; /*#2F2A20;*/
+ font-family: Arial, Liberation;
+ font-size: 5.5mm;
+ overflow: hidden;
+ margin:0;
+ background: #CFC8B5; /* url(images/body_bg.png) repeat-x; */
+}
+
+h1
+{
+ font-size: 2em;
+ padding-left: 15px;
+}
+
+body hr
+{
+ clear:both;
+ color: #7F735F;
+ background-color: #7F735F;
+ height: 1px;
+ border:none;
+ padding:0px;
+ margin:0.1em;
+}
+
+#pages hr {
+ border: 0; height: 30px; margin: 0 .5%;
+ background: transparent url(images/hr_bg.png) 50% repeat-x;
+ clear: both;
+}
+
+
+body br
+{
+ clear:both;
+}
+
+div#top {
+ padding-top: 8px;
+ border-top: 3px solid #BAAF98;
+ background: #165D7E url(images/nav_bg.png) bottom repeat-x;
+ padding-bottom: 8px;
+}
+
+.page h1 {
+ margin-top: 0;
+ padding-top: .1em;
+ background: #CFC8B5;
+ color: #2F2A20;
+ /*background: #7F735F url(images/head_bg.png) scroll repeat-x bottom;*/
+}
+
+.nav_path
+{
+ color: #EFEBE0; /*#81664b;*/
+ margin-left: 15px;
+}
+.nav_path a
+{
+ color: #EFEBE0; /*#3F3327;*/
+ text-decoration:none;
+}
+
+.footer,
+.footer *
+{
+ color: #000000;
+ font-size: 0.9em;
+ vertical-align: middle;
+}
+
+.widget_container {
+ width: 50%;
+ float: left;
+}
+
+.widget_container .widget_container {
+ width: 100%;
+}
+
+.widget
+{
+ margin: .2em;
+ padding: 0.3em;
+ border-color: #7F735F;
+ border-style: solid;
+ border-width: 2px 0px 0px 2px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ min-height: 2em;
+ background-color: #BAAF98;
+}
+
+.text > div,
+.link > a {
+ float:left;
+ text-align:left;
+ padding-left: 1em;
+}
+
+.widget .label,
+.widget.info .actor,
+.text > div,
+.link > a {
+ line-height: 2em;
+}
+
+.widget .label
+{
+ float:left;
+ width:49%;
+/* color:red; */
+/* padding-right:0.25em; */
+ text-align:left;
+ padding-left: 1em;
+/* border:blue 1px solid; */
+}
+.widget .actor
+{
+ float:left;
+ margin-left:1em;
+ text-align:left;
+}
+.widget .actor div
+{
+ float:left;
+ white-space: pre-wrap;
+}
+
+
+.green.switchPressed div, .green.switchUnpressed div{
+ background: transparent url(images/dot_green.png) no-repeat center center;
+ color: #3F2F1F !important;
+}
+.red.switchPressed div, .red.switchUnpressed div{
+ background: transparent url(images/dot_red.png) no-repeat center center;
+ color: #3F2F1F !important;
+}
+
+
+.red
+{
+ color:#f44;
+ font-weight:bold;
+}
+
+.green
+{
+ color:#4f4;
+}
+
+.blue
+{
+ color:#44f;
+}
+
+.purple
+{
+ color:#f4f;
+}
+
+.link a
+{
+ color: #165d7e; /*#3F2F1F;*/
+ width: 49%;
+}
+
+.page
+{
+ float:left;
+ width: 900px;
+ overflow: auto;
+ position: relative;
+}
+
+.switchPressed, .switchUnpressed {
+ border-style: solid;
+ -moz-border-radius: 12px;
+ -webkit-border-radius: 12px;
+ border-radius: 12px;
+ padding: 1px;
+ background: url(images/button_bg.png) #A79367 repeat-x;
+}
+
+.switchUnpressed
+{
+ border-width: 1px 2px 2px 1px;
+ border-color: #6C6251 #4F483B #4F483B #6C6251;
+ margin-top: 0px;
+ background-color: #EFE6D1;
+ background-position: center +2px;
+}
+.switchUnpressed div, .switchPressed div
+{
+ padding: 5px;
+ width: 5em;
+ float: left;
+ background: transparent;
+ text-align: center;
+ cursor: pointer;
+}
+
+.switchPressed
+{
+ border-width: 2px 1px 1px 2px;
+ border-color: #4F483B #6C6251 #6C6251 #4F483B;
+ margin-top: 1px;
+ background-position: center -2px;
+}
+
+.switchUnpressed div {
+ margin-left: -1px;
+}
+
+.switchPressed div {
+ margin-top: -1px;
+}
+
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
+.ui-widget-content a { color: #333333; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+.dim .actor
+{
+ width: 3em;
+}
+.widget .ui-slider
+{
+ width: 30%;
+ float: left;
+ margin-left: 10px;
+ margin-left: 1em;
+ margin-top: 0.5em;
+ border-color: #4F483B #6C6251 #6C6251 #4F483B;
+ background: url(images/gradient.png) #F8EFC6 repeat-y;
+}
+
+.widget .ui-slider-handle
+{
+ border-style: solid;
+ -moz-border-radius: 12px;
+ -webkit-border-radius: 12px;
+ border-radius: 12px;
+ padding: 1px;
+ background: url(images/button_bg.png) #A79367 repeat-x;
+ border-width: 1px 2px 2px 1px;
+ border-color: #6C6251 #4F483B #4F483B #6C6251;
+}
+/* Clearfix */
+.clearfix:after {
+ content: ".";
+ display: block;
+ clear: both;
+ visibility: hidden;
+ line-height: 0;
+ height: 0;
+}
+
+.clearfix {
+ display: inline-block;
+}
+
+html[xmlns] .clearfix {
+ display: block;
+}
+
+*:first-child+html .clearfix {
+ min-height: 0;
+}
+
+* html .clearfix {
+ height: 1%;
+}
+
+* html>body .clearfix {
+ display: inline-block;
+ width: 100%;
+}
+
+* html .clearfix {
+ /* Hides from IE-mac \*/
+ height: 1%;
+ /* End hide from IE-mac */
+}
+
+.loading {
+ display: block !important;
+}
+
+div#loading {
+ display: none !important;
+}
+
+
+.popup,
+.popup_background {
+ position: absolute;
+ width: 90%;
+ height: 90%;
+ top: 5%;
+ left: 5%;
+}
+
+.popup {
+ z-index: 101;
+ background: transparent;
+}
+
+
+.popup_background {
+ z-index: 100;
+ border-color: #7F735F;
+ border-style: solid;
+ border-width: 2px 0px 0px 2px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ background: #BAAF98;
+ opacity: .98;
+}
+
+.popup div {
+ margin: 4px;
+}
+
+.popup div.head {
+ border-bottom: 1px solid;
+}
+
+.popup_background.error {
+ background: #800000;
+ border: #f00;
+}
+
+.clickable {
+ cursor: pointer;
+}
+
+.diagram_inline {
+ width: 320px;
+ height: 180px;
+}
+
+.diagram_preview {
+ width: 320px;
+ height: 2em;
+}
+
+.tickLabel {
+ color: #453420;
+}
+
+#diagramTooltip {
+ z-index: 1000;
+ color: black;
+ border: 1px solid #fdd;
+ padding: 2px;
+ background-color: #fee;
+ opacity: 0.80;
}
\ No newline at end of file
Modified: CometVisu/trunk/visu/designs/discreet_sand/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/mobile.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/discreet_sand/mobile.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -1,12 +1,11 @@
-.widget
-{
- width:98%;
-}
-
-#bottom {
- display: none;
-}
-
-.page {
- overflow: visible;
-}
+.widget_container {
+ width: 98%;
+}
+
+#bottom {
+ display: none;
+}
+
+.page {
+ overflow: visible;
+}
Modified: CometVisu/trunk/visu/designs/discreet_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/basic.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/discreet_slim/basic.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -74,10 +74,17 @@
vertical-align: middle;
}
+.widget_container {
+ width: 33%;
+ float: left;
+}
+
+.widget_container .widget_container {
+ width: 100%;
+}
+
.widget
{
- float:left;
- width:32%;
margin: .1em;
padding: 0.15em;
/* border:yellow 1px solid; */
@@ -88,11 +95,6 @@
background-color: #101010;
}
-.widget .widget
-{
- width:98%;
-}
-
.text > div,
.link > a {
float:left;
Modified: CometVisu/trunk/visu/designs/discreet_slim/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/mobile.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/discreet_slim/mobile.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -1,12 +1,11 @@
-.widget
-{
- width:98%;
-}
-
-#bottom {
- display: none;
-}
-
-.page {
- overflow: visible;
-}
+.widget_container {
+ width: 98%;
+}
+
+#bottom {
+ display: none;
+}
+
+.page {
+ overflow: visible;
+}
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -1,475 +1,468 @@
-body
-{
- background-color: black;
- color: white;
- font-family: Verdana, Helvetica, sans-serif;
- font-family: 'URW Gothic L','Century Gothic','Apple Gothic',Arial,sans-serif;
- font-size: 5mm;
- overflow: hidden;
- margin:0;
- -moz-user-select: none;
- -khtml-user-select: none;
- -webkit-user-select: none;
- user-select: none;
-}
-
-h1
-{
- font-size: 2em;
- margin-left: 15px;
-}
-
-h2
-{
- font-size: 1.25em;
- margin-left: 15px;
- margin-top: 5px;
- margin-bottom: 5px;
-}
-
-body hr
-{
- clear:both;
- color: #ff8000;
- background-color: #ff8000;
- height: 1px;
- border:none;
- padding:0px;
- margin:0.1em;
-}
-
-body br
-{
- clear:both;
-}
-
-.nav_path
-{
- color: #ff8000;
- margin-left: 15px;
-}
-.nav_path a
-{
- color: white;
- text-decoration:none;
-}
-
-.footer,
-.footer *
-{
- color: #ff8000;
- font-size: 0.9em;
- vertical-align: middle;
-}
-
-.widget
-{
- float:left;
- width:48%; /* dumb fallback */
- width: -moz-calc(50% - 0.6em);
- width: -webkit-calc(50% - 0.6em);
- width: -o-calc(50% - 0.6em);
- width: calc(50% - 0.6em);
- margin:0.10em;
- padding:0.1em;
- /* border:yellow 1px solid; */
- border: none;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
- min-height: 2em;
-}
-
-.editmode .widget
-{
- border: 1px solid #444;
-}
-
-.widget .widget
-{
- width:98%; /* dumb fallback */
- width: -moz-calc(100% - 0.6em);
- width: -webkit-calc(100% - 0.6em);
- width: -o-calc(100% - 0.6em);
- width: calc(100% - 0.6em);
-}
-
-.widget .label,
-.widget.info .actor,
-.text > div,
-.link > a {
- padding: 5px;
-}
-
-.widget .label
-{
- float:left;
- width:49%;
-/* color:red; */
-/* padding-right:0.25em; */
- text-align:right;
-/* border:blue 1px solid; */
-}
-
-.widget .actor
-{
- float:left;
- margin-left:1em;
-}
-
-.widget .actor div
-{
- float:left;
- white-space: pre-wrap;
-}
-
-.center
-{
- text-align:center;
-}
-
-.left
-{
- text-align:left;
-}
-
-.right
-{
- text-align:right;
-}
-
-.red
-{
- color:#f44;
-
-}
-
-.green
-{
- color:#4f4;
-}
-
-.blue
-{
- color:#44f;
-}
-
-.purple
-{
- color:#f4f;
-}
-
-.link a
-{
- color: #ff8000;
- text-align: right;
- width: 49%;
- padding: 5px;
-}
-
-.page
-{
- float:left;
- width: 900px;
- overflow: auto;
- position: relative;
-}
-
-.switchUnpressed
-{
- border-style: solid;
- border-width: 1px;
- border-color: #666 #444 #444 #666;
- -moz-border-radius: 7px;
- -webkit-border-radius: 7px;
- border-radius: 7px;
- padding: 1px;
-}
-.switchUnpressed div
-{
- border-style: solid;
- border-width: 1px;
- border-color: #fff #666 #666 #fff;
- padding: 3px;
- width: 5em;
- float: left;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-
-.switchPressed
-{
- border-style: solid;
- border-width: 1px;
- border-color: #666 #fff #fff #666;
- -moz-border-radius: 7px;
- -webkit-border-radius: 7px;
- border-radius: 7px;
- padding: 1px;
-}
-.switchPressed div
-{
- border-style: solid;
- border-width: 1px;
- border-color: #444 #666 #666 #444;
- padding: 3px;
- width: 5em;
- float: left;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-
-.switchInvisible
-{
- border: none;
- padding: 1px;
-}
-
-.switchInvisible div
-{
- border: none;
- padding: 5px;
- width: 5em;
- float: left;
-}
-
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }
-.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
-.ui-widget-content a { color: #333333; }
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
-
-.dim .actor
-{
- width: 3em;
-}
-.widget .ui-slider
-{
- width: 30%;
- float: left;
- margin-left: 10px;
- margin-left: 1em;
- margin-top: 0.5em;
- border-color: #666 #fff #fff #666;
-}
-
-.widget .ui-slider-handle
-{
- border-color: #fff #666 #666 #fff;
-}
-/* Clearfix */
-.clearfix:after {
- content: ".";
- display: block;
- clear: both;
- visibility: hidden;
- line-height: 0;
- height: 0;
-}
-
-.clearfix {
- display: inline-block;
-}
-
-html[xmlns] .clearfix {
- display: block;
-}
-
-*:first-child+html .clearfix {
- min-height: 0;
-}
-
-* html .clearfix {
- height: 1%;
-}
-
-* html>body .clearfix {
- display: inline-block;
- width: 100%;
-}
-
-* html .clearfix {
- /* Hides from IE-mac \*/
- height: 1%;
- /* End hide from IE-mac */
-}
-
-.loading {
- display: block !important;
-}
-
-div#loading {
- display: none !important;
-}
-
-.popup,
-.popup_background {
- position: absolute;
- width: 90%;
- height: 90%;
- top: 5%;
- left: 5%;
-}
-
-.popup {
- z-index: 101;
- background: transparent;
-}
-
-
-.popup_background {
- z-index: 100;
- -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px;
- background: #000;
- border: 1px solid #fff;
- opacity: 0.75;
-}
-
-.popup div {
- margin: 4px;
-}
-
-.popup div.head {
- border-bottom: 1px solid;
-}
-
-.popup_background.error {
- background: #800000;
- border: #f00;
-}
-
-.clickable {
- cursor: pointer;
-}
-
-.diagram_inline {
- width: 320px;
- height: 180px;
-}
-
-.diagram_preview {
- width: 240px;
- height: 2em;
-}
-
-#diagramTooltip {
- z-index: 1000;
- color: black;
- border: 1px solid #fdd;
- padding: 2px;
- background-color: #fee;
- opacity: 0.80;
-}
-
-/*****************************************************************************/
-/* The definition of the flavours - overwrite the generic settings */
-/*****************************************************************************/
-
-.flavour_black hr
-{
- background-color: #000000;
-}
-.flavour_black .link a
-{
- color: #000000;
-}
-.flavour_black.group
-{
- border: #000000 1px solid;
-}
-
-.flavour_white hr
-{
- background-color: #ffffff;
-}
-.flavour_white .link a
-{
- color: #ffffff;
-}
-.flavour_white.group
-{
- border: #ffffff 1px solid;
-}
-
-.flavour_antimony hr
-{
- background-color: #00ddff;
-}
-.flavour_antimony .link a
-{
- color: #00ddff;
-}
-.flavour_antimony.group
-{
- border: #00ddff 1px solid;
-}
-
-.flavour_boron hr
-{
- background-color: #00ff11;
-}
-.flavour_boron .link a
-{
- color: #00ff11;
-}
-.flavour_boron.group
-{
- border: #00ff11 1px solid;
-}
-
-.flavour_lithium hr
-{
- background-color: #ff0000;
-}
-.flavour_lithium .link a
-{
- color: #ff0000;
-}
-.flavour_lithium.group
-{
- border: #ff0000 1px solid;
-}
-
-.flavour_potassium hr
-{
- background-color: #d00055;
-}
-.flavour_potassium .link a
-{
- color: #d00055;
-}
-.flavour_potassium.group
-{
- border: #d00055 1px solid;
-}
-
-.flavour_sodium hr
-{
- background-color: #ff8000;
-}
-.flavour_sodium .link a
-{
- color: #ff8000;
-}
-.flavour_sodium.group
-{
- border: #ff8000 1px solid;
-}
-
+body
+{
+ background-color: black;
+ color: white;
+ font-family: Verdana, Helvetica, sans-serif;
+ font-family: 'URW Gothic L','Century Gothic','Apple Gothic',Arial,sans-serif;
+ font-size: 5mm;
+ overflow: hidden;
+ margin:0;
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ -webkit-user-select: none;
+ user-select: none;
+}
+
+h1
+{
+ font-size: 2em;
+ margin-left: 15px;
+}
+
+h2
+{
+ font-size: 1.25em;
+ margin-left: 15px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
+body hr
+{
+ clear:both;
+ color: #ff8000;
+ background-color: #ff8000;
+ height: 1px;
+ border:none;
+ padding:0px;
+ margin:0.1em;
+}
+
+body br
+{
+ clear:both;
+}
+
+.nav_path
+{
+ color: #ff8000;
+ margin-left: 15px;
+}
+.nav_path a
+{
+ color: white;
+ text-decoration:none;
+}
+
+.footer,
+.footer *
+{
+ color: #ff8000;
+ font-size: 0.9em;
+ vertical-align: middle;
+}
+
+.widget_container {
+ width: 50%;
+ float: left;
+}
+
+.widget_container .widget_container {
+ width: 100%;
+}
+
+.widget
+{
+ margin:0.10em;
+ padding:0.1em;
+ border: none;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+ min-height: 2em;
+}
+
+.editmode .widget
+{
+ border: 1px solid #444;
+}
+
+.widget .label,
+.widget.info .actor,
+.text > div,
+.link > a {
+ padding: 5px;
+}
+
+.widget .label
+{
+ float:left;
+ width:49%;
+/* color:red; */
+/* padding-right:0.25em; */
+ text-align:right;
+/* border:blue 1px solid; */
+}
+
+.widget .actor
+{
+ float:left;
+ margin-left:1em;
+}
+
+.widget .actor div
+{
+ float:left;
+ white-space: pre-wrap;
+}
+
+.center
+{
+ text-align:center;
+}
+
+.left
+{
+ text-align:left;
+}
+
+.right
+{
+ text-align:right;
+}
+
+.red
+{
+ color:#f44;
+
+}
+
+.green
+{
+ color:#4f4;
+}
+
+.blue
+{
+ color:#44f;
+}
+
+.purple
+{
+ color:#f4f;
+}
+
+.link a
+{
+ color: #ff8000;
+ text-align: right;
+ width: 49%;
+ padding: 5px;
+}
+
+.page
+{
+ float:left;
+ width: 900px;
+ overflow: auto;
+ position: relative;
+}
+
+.switchUnpressed
+{
+ border-style: solid;
+ border-width: 1px;
+ border-color: #666 #444 #444 #666;
+ -moz-border-radius: 7px;
+ -webkit-border-radius: 7px;
+ border-radius: 7px;
+ padding: 1px;
+}
+.switchUnpressed div
+{
+ border-style: solid;
+ border-width: 1px;
+ border-color: #fff #666 #666 #fff;
+ padding: 3px;
+ width: 5em;
+ float: left;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+
+.switchPressed
+{
+ border-style: solid;
+ border-width: 1px;
+ border-color: #666 #fff #fff #666;
+ -moz-border-radius: 7px;
+ -webkit-border-radius: 7px;
+ border-radius: 7px;
+ padding: 1px;
+}
+.switchPressed div
+{
+ border-style: solid;
+ border-width: 1px;
+ border-color: #444 #666 #666 #444;
+ padding: 3px;
+ width: 5em;
+ float: left;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+
+.switchInvisible
+{
+ border: none;
+ padding: 1px;
+}
+
+.switchInvisible div
+{
+ border: none;
+ padding: 5px;
+ width: 5em;
+ float: left;
+}
+
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
+.ui-widget-content a { color: #333333; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+.dim .actor
+{
+ width: 3em;
+}
+.widget .ui-slider
+{
+ width: 30%;
+ float: left;
+ margin-left: 10px;
+ margin-left: 1em;
+ margin-top: 0.5em;
+ border-color: #666 #fff #fff #666;
+}
+
+.widget .ui-slider-handle
+{
+ border-color: #fff #666 #666 #fff;
+}
+/* Clearfix */
+.clearfix:after {
+ content: ".";
+ display: block;
+ clear: both;
+ visibility: hidden;
+ line-height: 0;
+ height: 0;
+}
+
+.clearfix {
+ display: inline-block;
+}
+
+html[xmlns] .clearfix {
+ display: block;
+}
+
+*:first-child+html .clearfix {
+ min-height: 0;
+}
+
+* html .clearfix {
+ height: 1%;
+}
+
+* html>body .clearfix {
+ display: inline-block;
+ width: 100%;
+}
+
+* html .clearfix {
+ /* Hides from IE-mac \*/
+ height: 1%;
+ /* End hide from IE-mac */
+}
+
+.loading {
+ display: block !important;
+}
+
+div#loading {
+ display: none !important;
+}
+
+.popup,
+.popup_background {
+ position: absolute;
+ width: 90%;
+ height: 90%;
+ top: 5%;
+ left: 5%;
+}
+
+.popup {
+ z-index: 101;
+ background: transparent;
+}
+
+
+.popup_background {
+ z-index: 100;
+ -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px;
+ background: #000;
+ border: 1px solid #fff;
+ opacity: 0.75;
+}
+
+.popup div {
+ margin: 4px;
+}
+
+.popup div.head {
+ border-bottom: 1px solid;
+}
+
+.popup_background.error {
+ background: #800000;
+ border: #f00;
+}
+
+.clickable {
+ cursor: pointer;
+}
+
+.diagram_inline {
+ width: 320px;
+ height: 180px;
+}
+
+.diagram_preview {
+ width: 240px;
+ height: 2em;
+}
+
+#diagramTooltip {
+ z-index: 1000;
+ color: black;
+ border: 1px solid #fdd;
+ padding: 2px;
+ background-color: #fee;
+ opacity: 0.80;
+}
+
+/*****************************************************************************/
+/* The definition of the flavours - overwrite the generic settings */
+/*****************************************************************************/
+
+.flavour_black hr
+{
+ background-color: #000000;
+}
+.flavour_black .link a
+{
+ color: #000000;
+}
+.flavour_black.group
+{
+ border: #000000 1px solid;
+}
+
+.flavour_white hr
+{
+ background-color: #ffffff;
+}
+.flavour_white .link a
+{
+ color: #ffffff;
+}
+.flavour_white.group
+{
+ border: #ffffff 1px solid;
+}
+
+.flavour_antimony hr
+{
+ background-color: #00ddff;
+}
+.flavour_antimony .link a
+{
+ color: #00ddff;
+}
+.flavour_antimony.group
+{
+ border: #00ddff 1px solid;
+}
+
+.flavour_boron hr
+{
+ background-color: #00ff11;
+}
+.flavour_boron .link a
+{
+ color: #00ff11;
+}
+.flavour_boron.group
+{
+ border: #00ff11 1px solid;
+}
+
+.flavour_lithium hr
+{
+ background-color: #ff0000;
+}
+.flavour_lithium .link a
+{
+ color: #ff0000;
+}
+.flavour_lithium.group
+{
+ border: #ff0000 1px solid;
+}
+
+.flavour_potassium hr
+{
+ background-color: #d00055;
+}
+.flavour_potassium .link a
+{
+ color: #d00055;
+}
+.flavour_potassium.group
+{
+ border: #d00055 1px solid;
+}
+
+.flavour_sodium hr
+{
+ background-color: #ff8000;
+}
+.flavour_sodium .link a
+{
+ color: #ff8000;
+}
+.flavour_sodium.group
+{
+ border: #ff8000 1px solid;
+}
+
Modified: CometVisu/trunk/visu/designs/pure/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/mobile.css 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/pure/mobile.css 2011-12-18 11:21:22 UTC (rev 583)
@@ -1,12 +1,11 @@
-.widget
-{
- width:98%;
-}
-
-#bottom {
- display: none;
-}
-
-.page {
- overflow: visible;
-}
+.widget_container {
+ width: 98%;
+}
+
+#bottom {
+ display: none;
+}
+
+.page {
+ overflow: visible;
+}
Modified: CometVisu/trunk/visu/designs/structure_custom.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_custom.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/structure_custom.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -42,7 +42,7 @@
*/
VisuDesign_Custom.prototype.addCreator("designtoggle", {
create: function( page, path ) {
- var ret_val = $('<div class="widget" />');
+ var ret_val = $('<div class="widget clearfix" />');
ret_val.addClass( 'switch' );
var label = '<div class="label">' + page.textContent + '</div>';
var actor = '<div class="actor switchUnpressed">';
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -82,7 +82,7 @@
if ($p.attr('visible')=='false') {
ret_val=$('');
} else { // default is visible
- ret_val = $('<div class="widget"/>');
+ ret_val = $('<div class="widget clearfix"/>');
ret_val.addClass( 'link' ).addClass('pagelink');
ret_val.append( '<div ' + wstyle + '><a href="javascript:scrollToPage(\''+path+'\')">' + name + '</a></div>' );
}
@@ -132,7 +132,7 @@
maturity: Maturity.development,
create: function( page, path, flavour ) {
var $p = $(page);
- var ret_val = $('<div class="widget group" />');
+ var ret_val = $('<div class="widget clearfix group" />');
if( $p.attr('flavour') ) flavour = $p.attr('flavour');// sub design choice
var hstyle = ''; // heading style
if( $p.attr('align') ) hstyle += 'text-align:' + $p.attr('align') + ';';
@@ -180,7 +180,7 @@
this.addCreator('text', {
create: function( page, path ) {
var $p = $(page);
- var ret_val = $('<div class="widget text" />');
+ var ret_val = $('<div class="widget clearfix text" />');
var style = '';
if( $p.attr('align') ) style += 'text-align:' + $p.attr('align') + ';';
if( style != '' ) style = 'style="' + style + '"';
@@ -200,7 +200,7 @@
var $p = $(page);
var layout = $p.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
- var ret_val = $('<div class="widget info" ' + style + ' />');
+ var ret_val = $('<div class="widget clearfix info" ' + style + ' />');
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
@@ -239,7 +239,7 @@
var $p = $(page);
var layout = $p.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
- var ret_val = $('<div class="widget slide" ' + style + ' />');
+ var ret_val = $('<div class="widget clearfix slide" ' + style + ' />');
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
@@ -352,7 +352,7 @@
this.addCreator('switch', {
create: function( page, path ) {
var $p = $(page);
- var ret_val = $('<div class="widget switch" />');
+ var ret_val = $('<div class="widget clearfix switch" />');
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
@@ -409,7 +409,7 @@
this.addCreator('toggle', {
create: function( page, path ) {
var $p = $(page);
- var ret_val = $('<div class="widget toggle" />');
+ var ret_val = $('<div class="widget clearfix toggle" />');
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
@@ -473,7 +473,7 @@
this.addCreator('multitrigger', {
create: function( page, path ) {
var $p = $(page);
- var ret_val = $('<div class="widget switch" />');
+ var ret_val = $('<div class="widget clearfix switch" />');
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
@@ -605,7 +605,7 @@
create: function( page, path ) {
var $p = $(page);
var value = $p.attr('value') ? $p.attr('value') : 0;
- var ret_val = $('<div class="widget switch" />');
+ var ret_val = $('<div class="widget clearfix switch" />');
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
@@ -665,7 +665,7 @@
this.addCreator('image', {
create: function( page, path ) {
var $p = $(page);
- var ret_val = $('<div class="widget image" />');
+ var ret_val = $('<div class="widget clearfix image" />');
var labelElement = $p.find('label')[0];
ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
var style = '';
@@ -698,7 +698,7 @@
this.addCreator('video', {
create: function( page, path ) {
var $p = $(page);
- var ret_val = $('<div class="widget video" />');
+ var ret_val = $('<div class="widget clearfix video" />');
var labelElement = $p.find('label')[0];
ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
var autoplay = ($p.attr('autoplay') && $p.attr('autoplay')=='true') ? ' autoplay="autoplay"' : '';
@@ -763,7 +763,7 @@
this.addCreator('infotrigger', {
create: function( page, path ) {
var $p = $(page);
- var ret_val = $('<div class="widget switch" />');
+ var ret_val = $('<div class="widget clearfix switch" />');
// handle label
var labelElement = $p.find('label')[0];
@@ -912,7 +912,7 @@
this.addCreator('unknown', {
create: function( page, path ) {
- var ret_val = $('<div class="widget" />');
+ var ret_val = $('<div class="widget clearfix" />');
ret_val.append( '<pre>unknown: ' + page.nodeName + '</pre>' );
return ret_val;
},
Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -73,7 +73,7 @@
jQuery("#pages").bind("done", function() {
$("#pages hr, #pages br").each(function() {
if ($(this).closest(".widget").length == 0) {
- $(this).wrap("<div class=\"widget line\" />");
+ $(this).wrap("<div class=\"widget clearfix line\" />");
var d = $.extend({}, $(this).data());
$(this).closest("div.widget").data(d);
}
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/lib/templateengine.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -337,7 +337,12 @@
.data("path", path)
.data("nodeName", page.nodeName)
.data("textContent", page.textContent);
- return retval;
+
+ if (jQuery(retval).is(".widget")) {
+ retval = jQuery("<div class='widget_container' />").append(retval);
+ }
+
+ return retval;
}
function scrollToPage( page_id, speed )
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -23,7 +23,7 @@
VisuDesign_Custom.prototype.addCreator("colorchooser", {
create: function( page, path ) {
var $p = $(page);
- var ret_val = $('<div class="widget" />');
+ var ret_val = $('<div class="widget clearfix" />');
ret_val.addClass( 'colorChooser' );
var labelElement = $p.find('label')[0];
Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -32,7 +32,7 @@
var id = "diagram_" + uniqid();
- var ret_val = $('<div class="widget" />');
+ var ret_val = $('<div class="widget clearfix" />');
ret_val.addClass( 'diagram' );
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
@@ -92,7 +92,7 @@
var id = "diagram_" + uniqid();
- var ret_val = $('<div class="widget" />');
+ var ret_val = $('<div class="widget clearfix" />');
ret_val.addClass( 'diagram' );
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
@@ -211,7 +211,7 @@
var id = "diagram_" + uniqid();
- var ret_val = $('<div class="widget" />');
+ var ret_val = $('<div class="widget clearfix" />');
ret_val.addClass( 'diagram' );
var labelElement = $p.find('label')[0];
Modified: CometVisu/trunk/visu/plugins/gweather/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/gweather/structure_plugin.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/plugins/gweather/structure_plugin.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -32,7 +32,7 @@
var id = "gweather_" + uniqid();
- var ret_val = $('<div class="widget" />');
+ var ret_val = $('<div class="widget clearfix" />');
ret_val.addClass( 'gweather' );
var label = '<div class="label">' + page.textContent + '</div>';
var actor = $("<div class=\"actor\"><div class=\"gweather\" id=\"" + id + "\">loading</div></div>");
Modified: CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -31,7 +31,7 @@
}
var id = "jqclock_" + uniqid();
- var ret_val = $('<div class="widget" />');
+ var ret_val = $('<div class="widget clearfix" />');
ret_val.addClass( 'jqclock' );
var label = '<div class="label">' + page.textContent + '</div>';
var actor = $("<div class=\"actor\"><div class=\"jqclock_inline\" id=\"" + id + "\"></div></div>");
Modified: CometVisu/trunk/visu/plugins/jsonviewer/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/jsonviewer/structure_plugin.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/plugins/jsonviewer/structure_plugin.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -23,7 +23,7 @@
maturity: Maturity.development,
create: function( page, path ) {
var $p = $(page);
- var ret_val = $('<div class="widget text" />');
+ var ret_val = $('<div class="widget clearfix text" />');
var style = '';
if( style != '' ) style = 'style="' + style + '"';
Modified: CometVisu/trunk/visu/plugins/rss/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/rss/structure_plugin.js 2011-12-16 23:02:51 UTC (rev 582)
+++ CometVisu/trunk/visu/plugins/rss/structure_plugin.js 2011-12-18 11:21:22 UTC (rev 583)
@@ -32,7 +32,7 @@
var id = "rss_" + uniqid();
- var ret_val = $('<div class="widget" />');
+ var ret_val = $('<div class="widget clearfix" />');
ret_val.addClass( 'rss' );
var label = '<div class="label">' + page.textContent + '</div>';
var actor = $("<div class=\"actor\"><div class=\"rss_inline\" id=\"" + id + "\">loading...</div></div>");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
