Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[940] CometVisu/trunk/visu
|
From: <pe...@us...> - 2012-08-12 13:20:36
|
Revision: 940
http://openautomation.svn.sourceforge.net/openautomation/?rev=940&view=rev
Author: peuter
Date: 2012-08-12 13:20:28 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
- fixed pagejump targets in demo config (id_ prefix was missing)
- fixed some design errors to corrent the look of the demo config in the metal-design
- correct the metal-design rendering of "nowidget"-groups -> border removed
Modified Paths:
--------------
CometVisu/trunk/visu/designs/metal/basic.css
CometVisu/trunk/visu/designs/metal/design_setup.js
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css 2012-08-12 12:41:47 UTC (rev 939)
+++ CometVisu/trunk/visu/designs/metal/basic.css 2012-08-12 13:20:28 UTC (rev 940)
@@ -166,11 +166,12 @@
iframe { border: none; }
-.navbar .widget { border-width: 0 0 1px 0; }
.navbar .widget .label {
float: none;
width: auto;
+}
+.navbar .widget .label > img {
position: absolute;
left: 0.2em;
}
@@ -271,22 +272,40 @@
text-align: left;
margin-left: 0.2em;
}
-.group {
+.group {
margin: 0.2em 0.5em;
+}
+.group.widget {
border: 2px solid #B3B3B3;
border-radius: 1em;
+ -moz-border-radius: 1em;
+ -webkit-border-radius: 1em;
overflow: hidden;
}
.navbar .group {
margin: 0.2em 0 0.1em 0;
border-radius: 0;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+
border-top-right-radius: 1em;
+ -moz-border-top-right-radius: 1em;
+ -webkit-border-top-right-radius: 1em;
+
border-bottom-right-radius: 1em;
+ -moz-border-bottom-right-radius: 1em;
+ -webkit-border-bottom-right-radius: 1em;
+
border-left: none;
}
.navbar .group.root {
border-top-right-radius: 0;
+ -moz-border-top-right-radius: 0;
+ -webkit-border-top-right-radius: 0;
+
border-bottom-left-radius: 1em;
+ -moz-border-bottom-left-radius: 1em;
+ -webkit-border-bottom-left-radius: 1em;
margin-top: 0;
border-top: none;
border-left: 2px solid #B3B3B3;
@@ -299,9 +318,18 @@
padding: 0 1em;
margin: 0;
border: none;
- border-radius: 1.1em;
+ border-radius: 1em;
+ -moz-border-radius: 1em;
+ -webkit-border-radius: 1em;
+
border-bottom-left-radius: 0;
+ -moz-border-bottom-left-radius: 0;
+ -webkit-border-bottom-left-radius: 0;
+
border-bottom-right-radius: 0;
+ -moz-border-bottom-right-radius: 0;
+ -webkit-border-bottom-right-radius: 0;
+
color: #FFF;
font-weight: bold;
background-image: -webkit-gradient(linear, left top, left bottom, from(#999), to(#666)); /* Saf4+, Chrome */
@@ -313,7 +341,11 @@
}
.navbar .group > div > h2 {
border-radius: 0;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
border-top-right-radius: 1em;
+ -moz-border-top-right-radius: 1em;
+ -webkit-border-top-right-radius: 1em;
text-shadow: none;
background-color: #eeeeee;
color: #3E3E3E;
Modified: CometVisu/trunk/visu/designs/metal/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/metal/design_setup.js 2012-08-12 12:41:47 UTC (rev 939)
+++ CometVisu/trunk/visu/designs/metal/design_setup.js 2012-08-12 13:20:28 UTC (rev 940)
@@ -23,26 +23,30 @@
//$(".value < img").css("padding", "0");
$('#navbarLeft').data({'columns': 6} );
+var started=true;
+
$(window).resize(function() {
- if ($('.navbar').size()>0) {
- // hide top navigation
- if ($('#top').css('display')!='none') {
- $('#top').css("display","none");
- $('#top > .nav_path').css("display","none");
- // because the #top bar is missing now we have to reposition the elements in order to fit the new page height
- handleResize();
+ // only execute on start
+ if (started) {
+ if ($('.navbar').size()>0) {
+ $('.navbar > .widget_container:first-child .group:not(.root) .pagejump:first-child .actor').each(function(i) {
+ var target = ($(this).data().target.match(/^id_[0-9_]+$/)==null) ? $('.page h1:contains('+$(this).data().target+')').closest(".page").attr("id") : $(this).data().target;
+ if (target=="id_0") {
+ // pagejump to root-page found
+ $(this).closest(".group").addClass("root");
+ }
+ });
}
- $('.navbar > .widget_container:first-child .group:not(.root) .pagejump:first-child .actor').each(function(i) {
- var target = ($(this).data().target.match(/^id_[0-9_]+$/)==null) ? $('.page h1:contains('+$(this).data().target+')').closest(".page").attr("id") : $(this).data().target;
- if (target=="id_0") {
- // pagejump to root-page found
- $(this).closest(".group").addClass("root");
+ if (/(iphone|ipod)/i.test(navigator.userAgent.toLowerCase())) {
+ $('#top').css('margin-top','1em');
+ }
+ $('.navbar .widget .label > img').each(function(i) {
+ if ($(this).parent().text().trim()) {
+ $(this).css("position","relative");
}
});
+ started=false;
}
- if (/(iphone|ipod)/i.test(navigator.userAgent.toLowerCase())) {
- $('#top').css('margin-top','1em');
- }
});
icons.insert({
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-08-12 12:41:47 UTC (rev 939)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-08-12 13:20:28 UTC (rev 940)
@@ -135,13 +135,13 @@
<navbar position="left" dynamic="true" width="200px">
<text>Test 1</text>
<line/>
- <pagejump target="0_34_7" name="Lithium">
+ <pagejump target="id_0_34_7" name="Lithium">
<label>Flavour</label>
</pagejump>
- <pagejump target="0_34_8" name="Potassium">
+ <pagejump target="id_0_34_8" name="Potassium">
<label>Flavour</label>
</pagejump>
- <pagejump target="0_36">
+ <pagejump target="id_0_36">
<label>2D</label>
</pagejump>
</navbar>
@@ -597,13 +597,13 @@
<navbar position="left" dynamic="true" width="200px">
<text>Test 2</text>
<line/>
- <pagejump target="0_34_7" name="Lithium">
+ <pagejump target="id_0_34_7" name="Lithium">
<label>Flavour</label>
</pagejump>
- <pagejump target="0_34_8" name="Potassium">
+ <pagejump target="id_0_34_8" name="Potassium">
<label>Flavour</label>
</pagejump>
- <pagejump target="0_36">
+ <pagejump target="id_0_36">
<label>2D</label>
</pagejump>
</navbar>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
