Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[936] CometVisu/trunk/visu
|
From: <pe...@us...> - 2012-08-10 22:48:36
|
Revision: 936
http://openautomation.svn.sourceforge.net/openautomation/?rev=936&view=rev
Author: peuter
Date: 2012-08-10 22:48:28 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
- now every corner in a group is rounded
- if a navbar is defined the pagelinks on top are hidden
- special design for a pagejump to the root page ("Home-Button") if it is on top of the navbar, see sample config
- groups must not have a name anymore
- added a custom "scrolltopage" event which is called at the end of each page scroll
Modified Paths:
--------------
CometVisu/trunk/visu/designs/metal/basic.css
CometVisu/trunk/visu/designs/metal/design_setup.js
CometVisu/trunk/visu/designs/metal/visu_config_metal.xml
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css 2012-08-10 19:52:30 UTC (rev 935)
+++ CometVisu/trunk/visu/designs/metal/basic.css 2012-08-10 22:48:28 UTC (rev 936)
@@ -58,15 +58,6 @@
{
clear:both;
}
-
-div#top {
- padding-top: 8px;
- border-top: 3px solid #1d1d1d;
- border-bottom: 1px solid #0a0a0a;
- background-color: #121212;
- padding-bottom: 2px;
-}
-
.page h1 {
display: none;
margin-top: 0;
@@ -176,8 +167,13 @@
.group div.widget_container:first-child, .group div.widget_container:first-child .widget {
border-top-left-radius: 1em;
}
-
+.navbar .group div.widget_container:first-child, .navbar .group div.widget_container:first-child .widget {
+ border-top-left-radius: 0;
+ border-top-right-radius: 1em;
+}
iframe { border: none; }
+
+.navbar .widget { border-width: 0 0 1px 0; }
.navbar .widget .label {
float: none;
@@ -286,8 +282,6 @@
margin: 0.2em 0.5em;
border: 2px solid #B3B3B3;
border-radius: 1em;
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
/*padding-bottom: 1em;
background: #eeeeee;*/
}
Modified: CometVisu/trunk/visu/designs/metal/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/metal/design_setup.js 2012-08-10 19:52:30 UTC (rev 935)
+++ CometVisu/trunk/visu/designs/metal/design_setup.js 2012-08-10 22:48:28 UTC (rev 936)
@@ -23,7 +23,50 @@
//$(".value < img").css("padding", "0");
$('#navbarLeft').data({'columns': 6} );
+var rootPageJumpChanged = false;
+$(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 repositition the elements in order to fit the new page height
+ handleResize();
+ }
+ if (!rootPageJumpChanged) {
+ $('.navbar > .widget_container:first-child .group .pagejump:first-child .actor').each(function(i) {
+ var data = $(this).data();
+ var target = data.target;
+ if (target.match(/^id_[0-9_]+$/)==null) {
+ // find Page-ID by name
+ $('.page h1').each(function(i) {
+ if ($(this).text()==target) {
+ target = $(this).closest(".page").attr('id');
+ return;
+ }
+ });
+ }
+ if (target=="id_0") {
+ // pagejump to root-page found
+ $(this).closest(".group").css({
+ 'border-top-right-radius': 0,
+ 'border-bottom-left-radius': '1em',
+ 'margin-top': 0,
+ 'border-top': 'none',
+ 'border-left': '2px solid #B3B3B3'
+ });
+ $('.navbar > .widget_container:first-child .group .widget_container:last-child, .navbar > .widget_container:first-child .group div.widget_container:last-child .widget').css({
+ 'border-bottom-left-radius': '1em',
+ 'border': 'none'
+ });
+ }
+ });
+ rootPageJumpChanged=true;
+ }
+ }
+});
+
function getOffsetCorners(elem) {
return {
top_left: {top: Math.round(elem.offset().top), left: Math.round(elem.offset().left) },
@@ -49,25 +92,25 @@
if (roundUpperCorners) {
// upper left corner is done by regular css-rule
// upper right corner
- if (Math.abs(elemCorners.top_right.top-groupCorners.top_right.top)<threshold && Math.abs(elemCorners.top_right.left-groupCorners.top_right.left)<threshold) {
- $(this).css({'border-top-right-radius': '1em'});
- $(this).children().css({'border-top-right-radius': '1em'});
+ if (group.css('border-top-right-radius')!="0px" && Math.abs(elemCorners.top_right.top-groupCorners.top_right.top)<threshold && Math.abs(elemCorners.top_right.left-groupCorners.top_right.left)<threshold) {
+ $(this).css({'border-top-right-radius': group.css('border-top-right-radius')});
+ $(this).children().css({'border-top-right-radius': group.css('border-top-right-radius')});
}
}
- if (Math.abs(elemCorners.bottom_right.top-groupCorners.bottom_right.top)<threshold && Math.abs(elemCorners.bottom_right.left-groupCorners.bottom_right.left)<threshold) {
- $(this).css({'border-bottom-right-radius': '1em'});
- $(this).children().css({'border-bottom-right-radius': '1em'});
+ if (group.css('border-bottom-right-radius')!="0px" && Math.abs(elemCorners.bottom_right.top-groupCorners.bottom_right.top)<threshold && Math.abs(elemCorners.bottom_right.left-groupCorners.bottom_right.left)<threshold) {
+ $(this).css({'border-bottom-right-radius': group.css('border-bottom-right-radius')});
+ $(this).children().css({'border-bottom-right-radius': group.css('border-bottom-right-radius')});
}
- if (Math.abs(elemCorners.bottom_left.top-groupCorners.bottom_left.top)<threshold && Math.abs(elemCorners.bottom_left.left-groupCorners.bottom_left.left)<threshold) {
- $(this).css({'border-bottom-left-radius': '1em'});
- $(this).children().css({'border-bottom-left-radius': '1em'});
+ if (group.css('border-bottom-left-radius')!="0px" && Math.abs(elemCorners.bottom_left.top-groupCorners.bottom_left.top)<threshold && Math.abs(elemCorners.bottom_left.left-groupCorners.bottom_left.left)<threshold) {
+ $(this).css({'border-bottom-left-radius': group.css('border-bottom-left-radius')});
+ $(this).children().css({'border-bottom-left-radius': group.css('border-bottom-left-radius')});
}
});
});
}
-//$(window).bind('resize',function() {
-// roundCorners();
-//});
+$(window).bind('scrolltopage',function() {
+ roundCorners();
+});
icons.insert({
'CometVisu' : { '*' : '128',
Modified: CometVisu/trunk/visu/designs/metal/visu_config_metal.xml
===================================================================
--- CometVisu/trunk/visu/designs/metal/visu_config_metal.xml 2012-08-10 19:52:30 UTC (rev 935)
+++ CometVisu/trunk/visu/designs/metal/visu_config_metal.xml 2012-08-10 22:48:28 UTC (rev 936)
@@ -102,6 +102,13 @@
</meta>
<page name="Übersicht">
<navbar position="left" dynamic="true" width="200px">
+ <group nowidget="true">
+ <pagejump target="Übersicht">
+ <label>
+ <icon name="steuer_home" />
+ </label>
+ </pagejump>
+ </group>
<group name="Räume" nowidget="true">
<pagejump target="Wohnzimmer" name="Wohnen">
<label>
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-08-10 19:52:30 UTC (rev 935)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-08-10 22:48:28 UTC (rev 936)
@@ -599,6 +599,7 @@
$(this).parent().addClass("active");
}
});
+ $(window).trigger('scrolltopage',page_id);
}
function updateTopNavigation() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
